Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(592)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 9677031: Bind RenderViewImpl routing_id to SocketStreamHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add CONTENT_EXPORT to ForHandle() Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/glue/websocketstreamhandle_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 20 matching lines...) Expand all
31 #include "content/common/drag_messages.h" 31 #include "content/common/drag_messages.h"
32 #include "content/common/fileapi/file_system_dispatcher.h" 32 #include "content/common/fileapi/file_system_dispatcher.h"
33 #include "content/common/fileapi/webfilesystem_callback_dispatcher.h" 33 #include "content/common/fileapi/webfilesystem_callback_dispatcher.h"
34 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 34 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
35 #include "content/common/intents_messages.h" 35 #include "content/common/intents_messages.h"
36 #include "content/common/java_bridge_messages.h" 36 #include "content/common/java_bridge_messages.h"
37 #include "content/common/pepper_messages.h" 37 #include "content/common/pepper_messages.h"
38 #include "content/common/pepper_plugin_registry.h" 38 #include "content/common/pepper_plugin_registry.h"
39 #include "content/common/quota_dispatcher.h" 39 #include "content/common/quota_dispatcher.h"
40 #include "content/common/request_extra_data.h" 40 #include "content/common/request_extra_data.h"
41 #include "content/common/socket_stream_handle_data.h"
41 #include "content/common/view_messages.h" 42 #include "content/common/view_messages.h"
42 #include "content/public/common/bindings_policy.h" 43 #include "content/public/common/bindings_policy.h"
43 #include "content/public/common/content_client.h" 44 #include "content/public/common/content_client.h"
44 #include "content/public/common/content_constants.h" 45 #include "content/public/common/content_constants.h"
45 #include "content/public/common/content_switches.h" 46 #include "content/public/common/content_switches.h"
46 #include "content/public/common/context_menu_params.h" 47 #include "content/public/common/context_menu_params.h"
47 #include "content/public/common/file_chooser_params.h" 48 #include "content/public/common/file_chooser_params.h"
48 #include "content/public/common/selected_file_info.h" 49 #include "content/public/common/selected_file_info.h"
49 #include "content/public/common/url_constants.h" 50 #include "content/public/common/url_constants.h"
50 #include "content/public/renderer/content_renderer_client.h" 51 #include "content/public/renderer/content_renderer_client.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" 136 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
136 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h " 137 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h "
137 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData. h" 138 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData. h"
138 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h" 139 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h"
139 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" 140 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
140 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandler.h" 141 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandler.h"
141 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandlerClient.h" 142 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandlerClient.h"
142 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" 143 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
143 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" 144 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
144 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" 145 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
146 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStr eamHandle.h"
145 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 147 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
146 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 148 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
147 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h" 149 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h"
148 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques t.h" 150 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques t.h"
149 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRespon se.h" 151 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRespon se.h"
150 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" 152 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
151 #include "third_party/skia/include/core/SkBitmap.h" 153 #include "third_party/skia/include/core/SkBitmap.h"
152 #include "ui/base/javascript_message_type.h" 154 #include "ui/base/javascript_message_type.h"
153 #include "ui/gfx/native_widget_types.h" 155 #include "ui/gfx/native_widget_types.h"
154 #include "ui/gfx/point.h" 156 #include "ui/gfx/point.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 using WebKit::WebRange; 239 using WebKit::WebRange;
238 using WebKit::WebRect; 240 using WebKit::WebRect;
239 using WebKit::WebReferrerPolicy; 241 using WebKit::WebReferrerPolicy;
240 using WebKit::WebScriptSource; 242 using WebKit::WebScriptSource;
241 using WebKit::WebSearchableFormData; 243 using WebKit::WebSearchableFormData;
242 using WebKit::WebSecurityOrigin; 244 using WebKit::WebSecurityOrigin;
243 using WebKit::WebSecurityPolicy; 245 using WebKit::WebSecurityPolicy;
244 using WebKit::WebSettings; 246 using WebKit::WebSettings;
245 using WebKit::WebSharedWorker; 247 using WebKit::WebSharedWorker;
246 using WebKit::WebSize; 248 using WebKit::WebSize;
249 using WebKit::WebSocketStreamHandle;
247 using WebKit::WebStorageNamespace; 250 using WebKit::WebStorageNamespace;
248 using WebKit::WebStorageQuotaCallbacks; 251 using WebKit::WebStorageQuotaCallbacks;
249 using WebKit::WebStorageQuotaError; 252 using WebKit::WebStorageQuotaError;
250 using WebKit::WebStorageQuotaType; 253 using WebKit::WebStorageQuotaType;
251 using WebKit::WebString; 254 using WebKit::WebString;
252 using WebKit::WebTextAffinity; 255 using WebKit::WebTextAffinity;
253 using WebKit::WebTextDirection; 256 using WebKit::WebTextDirection;
254 using WebKit::WebTouchEvent; 257 using WebKit::WebTouchEvent;
255 using WebKit::WebURL; 258 using WebKit::WebURL;
256 using WebKit::WebURLError; 259 using WebKit::WebURLError;
(...skipping 3134 matching lines...) Expand 10 before | Expand all | Expand 10 after
3391 } 3394 }
3392 3395
3393 void RenderViewImpl::dispatchIntent( 3396 void RenderViewImpl::dispatchIntent(
3394 WebFrame* frame, const WebIntentRequest& intentRequest) { 3397 WebFrame* frame, const WebIntentRequest& intentRequest) {
3395 webkit_glue::WebIntentData intent_data(intentRequest.intent()); 3398 webkit_glue::WebIntentData intent_data(intentRequest.intent());
3396 int id = intents_host_->RegisterWebIntent(intentRequest); 3399 int id = intents_host_->RegisterWebIntent(intentRequest);
3397 Send(new IntentsHostMsg_WebIntentDispatch( 3400 Send(new IntentsHostMsg_WebIntentDispatch(
3398 routing_id_, intent_data, id)); 3401 routing_id_, intent_data, id));
3399 } 3402 }
3400 3403
3404 void RenderViewImpl::willOpenSocketStream(
3405 WebSocketStreamHandle* handle) {
3406 SocketStreamHandleData::AddToHandle(handle, routing_id_);
3407 }
3408
3401 // WebKit::WebPageSerializerClient implementation ------------------------------ 3409 // WebKit::WebPageSerializerClient implementation ------------------------------
3402 3410
3403 void RenderViewImpl::didSerializeDataForFrame( 3411 void RenderViewImpl::didSerializeDataForFrame(
3404 const WebURL& frame_url, 3412 const WebURL& frame_url,
3405 const WebCString& data, 3413 const WebCString& data,
3406 WebPageSerializerClient::PageSerializationStatus status) { 3414 WebPageSerializerClient::PageSerializationStatus status) {
3407 Send(new ViewHostMsg_SendSerializedHtmlData( 3415 Send(new ViewHostMsg_SendSerializedHtmlData(
3408 routing_id(), 3416 routing_id(),
3409 frame_url, 3417 frame_url,
3410 data.data(), 3418 data.data(),
(...skipping 1774 matching lines...) Expand 10 before | Expand all | Expand 10 after
5185 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5193 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5186 return !!RenderThreadImpl::current()->compositor_thread(); 5194 return !!RenderThreadImpl::current()->compositor_thread();
5187 } 5195 }
5188 5196
5189 void RenderViewImpl::OnJavaBridgeInit() { 5197 void RenderViewImpl::OnJavaBridgeInit() {
5190 DCHECK(!java_bridge_dispatcher_.get()); 5198 DCHECK(!java_bridge_dispatcher_.get());
5191 #if defined(ENABLE_JAVA_BRIDGE) 5199 #if defined(ENABLE_JAVA_BRIDGE)
5192 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5200 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5193 #endif 5201 #endif
5194 } 5202 }
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/glue/websocketstreamhandle_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698