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 <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1242 | 1242 |
1243 blink::WebWorkerPermissionClientProxy* | 1243 blink::WebWorkerPermissionClientProxy* |
1244 RenderFrameImpl::createWorkerPermissionClientProxy(blink::WebFrame* frame) { | 1244 RenderFrameImpl::createWorkerPermissionClientProxy(blink::WebFrame* frame) { |
1245 if (!frame || !frame->view()) | 1245 if (!frame || !frame->view()) |
1246 return NULL; | 1246 return NULL; |
1247 DCHECK(!frame_ || frame_ == frame); | 1247 DCHECK(!frame_ || frame_ == frame); |
1248 return GetContentClient()->renderer()->CreateWorkerPermissionClientProxy( | 1248 return GetContentClient()->renderer()->CreateWorkerPermissionClientProxy( |
1249 this, frame); | 1249 this, frame); |
1250 } | 1250 } |
1251 | 1251 |
1252 bool RenderFrameImpl::canCreatePluginWithoutRenderer( | |
Charlie Reis
2014/04/08 18:51:48
nit: Please put this after cookieJar so that it's
wjmaclean
2014/04/09 16:50:03
Done.
Charlie Reis
2014/04/09 19:09:09
I don't see an updated patch. Please upload the n
| |
1253 const blink::WebString& mimeType) { | |
1254 // At present we only support this for BrowserPlugin, but we can add | |
1255 // additional plugin types later. | |
1256 return base::UTF16ToASCII(mimeType) == kBrowserPluginMimeType; | |
1257 } | |
1258 | |
1252 blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebFrame* frame) { | 1259 blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebFrame* frame) { |
1253 DCHECK(!frame_ || frame_ == frame); | 1260 DCHECK(!frame_ || frame_ == frame); |
1254 return &cookie_jar_; | 1261 return &cookie_jar_; |
1255 } | 1262 } |
1256 | 1263 |
1257 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( | 1264 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( |
1258 blink::WebFrame* frame) { | 1265 blink::WebFrame* frame) { |
1259 DCHECK(!frame_ || frame_ == frame); | 1266 DCHECK(!frame_ || frame_ == frame); |
1260 // At this point we should have non-null data source. | 1267 // At this point we should have non-null data source. |
1261 DCHECK(frame->dataSource()); | 1268 DCHECK(frame->dataSource()); |
(...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3077 selection_text_offset_ = offset; | 3084 selection_text_offset_ = offset; |
3078 selection_range_ = range; | 3085 selection_range_ = range; |
3079 // This IPC is dispatched by RenderWidetHost, so use its routing ID. | 3086 // This IPC is dispatched by RenderWidetHost, so use its routing ID. |
3080 Send(new ViewHostMsg_SelectionChanged( | 3087 Send(new ViewHostMsg_SelectionChanged( |
3081 GetRenderWidget()->routing_id(), text, offset, range)); | 3088 GetRenderWidget()->routing_id(), text, offset, range)); |
3082 } | 3089 } |
3083 GetRenderWidget()->UpdateSelectionBounds(); | 3090 GetRenderWidget()->UpdateSelectionBounds(); |
3084 } | 3091 } |
3085 | 3092 |
3086 } // namespace content | 3093 } // namespace content |
OLD | NEW |