OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <string> | |
8 | |
7 #include "base/command_line.h" | 9 #include "base/command_line.h" |
8 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
9 #include "base/time/time.h" | 11 #include "base/time/time.h" |
10 #include "content/child/appcache/appcache_dispatcher.h" | 12 #include "content/child/appcache/appcache_dispatcher.h" |
11 #include "content/child/quota_dispatcher.h" | 13 #include "content/child/quota_dispatcher.h" |
12 #include "content/child/request_extra_data.h" | 14 #include "content/child/request_extra_data.h" |
13 #include "content/common/socket_stream_handle_data.h" | 15 #include "content/common/socket_stream_handle_data.h" |
14 #include "content/common/swapped_out_messages.h" | 16 #include "content/common/swapped_out_messages.h" |
15 #include "content/common/view_messages.h" | 17 #include "content/common/view_messages.h" |
16 #include "content/public/common/content_constants.h" | 18 #include "content/public/common/content_constants.h" |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
206 return NULL; | 208 return NULL; |
207 return new RendererWebApplicationCacheHostImpl( | 209 return new RendererWebApplicationCacheHostImpl( |
208 RenderViewImpl::FromWebView(frame->view()), client, | 210 RenderViewImpl::FromWebView(frame->view()), client, |
209 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); | 211 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); |
210 } | 212 } |
211 | 213 |
212 WebKit::WebCookieJar* RenderFrameImpl::cookieJar(WebKit::WebFrame* frame) { | 214 WebKit::WebCookieJar* RenderFrameImpl::cookieJar(WebKit::WebFrame* frame) { |
213 return render_view_->cookieJar(frame); | 215 return render_view_->cookieJar(frame); |
214 } | 216 } |
215 | 217 |
218 WebKit::WebServiceWorkerRegistry* RenderFrameImpl::serviceWorkerRegistry( | |
219 WebKit::WebFrame* frame) { | |
220 // am I supposed to be using render_view_ here or | |
221 // RenderViewImpl::FromWebView(frame->view()) ? | |
michaeln
2013/09/30 23:41:27
I'd vote to make the WebServiceWorkerRegistry regi
alecflett
2013/10/01 00:17:04
I went this way after some consultation with abart
| |
222 return render_view_->serviceWorkerRegistry(frame); | |
223 } | |
224 | |
216 void RenderFrameImpl::didAccessInitialDocument(WebKit::WebFrame* frame) { | 225 void RenderFrameImpl::didAccessInitialDocument(WebKit::WebFrame* frame) { |
217 render_view_->didAccessInitialDocument(frame); | 226 render_view_->didAccessInitialDocument(frame); |
218 } | 227 } |
219 | 228 |
220 void RenderFrameImpl::didCreateFrame(WebKit::WebFrame* parent, | 229 void RenderFrameImpl::didCreateFrame(WebKit::WebFrame* parent, |
221 WebKit::WebFrame* child) { | 230 WebKit::WebFrame* child) { |
222 render_view_->Send(new ViewHostMsg_FrameAttached( | 231 render_view_->Send(new ViewHostMsg_FrameAttached( |
223 render_view_->GetRoutingID(), parent->identifier(), child->identifier(), | 232 render_view_->GetRoutingID(), parent->identifier(), child->identifier(), |
224 UTF16ToUTF8(child->assignedName()))); | 233 UTF16ToUTF8(child->assignedName()))); |
225 } | 234 } |
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
860 | 869 |
861 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, | 870 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, |
862 int arb_robustness_status_code) { | 871 int arb_robustness_status_code) { |
863 render_view_->Send(new ViewHostMsg_DidLose3DContext( | 872 render_view_->Send(new ViewHostMsg_DidLose3DContext( |
864 GURL(frame->top()->document().securityOrigin().toString()), | 873 GURL(frame->top()->document().securityOrigin().toString()), |
865 THREE_D_API_TYPE_WEBGL, | 874 THREE_D_API_TYPE_WEBGL, |
866 arb_robustness_status_code)); | 875 arb_robustness_status_code)); |
867 } | 876 } |
868 | 877 |
869 } // namespace content | 878 } // namespace content |
OLD | NEW |