OLD | NEW |
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 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 RenderViewImpl::RenderViewImpl( | 369 RenderViewImpl::RenderViewImpl( |
370 gfx::NativeViewId parent_hwnd, | 370 gfx::NativeViewId parent_hwnd, |
371 int32 opener_id, | 371 int32 opener_id, |
372 const content::RendererPreferences& renderer_prefs, | 372 const content::RendererPreferences& renderer_prefs, |
373 const WebPreferences& webkit_prefs, | 373 const WebPreferences& webkit_prefs, |
374 SharedRenderViewCounter* counter, | 374 SharedRenderViewCounter* counter, |
375 int32 routing_id, | 375 int32 routing_id, |
376 int32 surface_id, | 376 int32 surface_id, |
377 int64 session_storage_namespace_id, | 377 int64 session_storage_namespace_id, |
378 const string16& frame_name, | 378 const string16& frame_name, |
379 int32 next_page_id) | 379 int32 next_page_id, |
380 : RenderWidget(WebKit::WebPopupTypeNone), | 380 const WebKit::WebScreenInfo& screen_info) |
| 381 : RenderWidget(WebKit::WebPopupTypeNone, screen_info), |
381 webkit_preferences_(webkit_prefs), | 382 webkit_preferences_(webkit_prefs), |
382 send_content_state_immediately_(false), | 383 send_content_state_immediately_(false), |
383 enabled_bindings_(0), | 384 enabled_bindings_(0), |
384 send_preferred_size_changes_(false), | 385 send_preferred_size_changes_(false), |
385 is_loading_(false), | 386 is_loading_(false), |
386 navigation_gesture_(NavigationGestureUnknown), | 387 navigation_gesture_(NavigationGestureUnknown), |
387 opened_by_user_gesture_(true), | 388 opened_by_user_gesture_(true), |
388 opener_suppressed_(false), | 389 opener_suppressed_(false), |
389 page_id_(-1), | 390 page_id_(-1), |
390 last_page_id_sent_to_browser_(-1), | 391 last_page_id_sent_to_browser_(-1), |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
555 RenderViewImpl* RenderViewImpl::Create( | 556 RenderViewImpl* RenderViewImpl::Create( |
556 gfx::NativeViewId parent_hwnd, | 557 gfx::NativeViewId parent_hwnd, |
557 int32 opener_id, | 558 int32 opener_id, |
558 const content::RendererPreferences& renderer_prefs, | 559 const content::RendererPreferences& renderer_prefs, |
559 const WebPreferences& webkit_prefs, | 560 const WebPreferences& webkit_prefs, |
560 SharedRenderViewCounter* counter, | 561 SharedRenderViewCounter* counter, |
561 int32 routing_id, | 562 int32 routing_id, |
562 int32 surface_id, | 563 int32 surface_id, |
563 int64 session_storage_namespace_id, | 564 int64 session_storage_namespace_id, |
564 const string16& frame_name, | 565 const string16& frame_name, |
565 int32 next_page_id) { | 566 int32 next_page_id, |
| 567 const WebKit::WebScreenInfo& screen_info) { |
566 DCHECK(routing_id != MSG_ROUTING_NONE); | 568 DCHECK(routing_id != MSG_ROUTING_NONE); |
567 return new RenderViewImpl( | 569 return new RenderViewImpl( |
568 parent_hwnd, | 570 parent_hwnd, |
569 opener_id, | 571 opener_id, |
570 renderer_prefs, | 572 renderer_prefs, |
571 webkit_prefs, | 573 webkit_prefs, |
572 counter, | 574 counter, |
573 routing_id, | 575 routing_id, |
574 surface_id, | 576 surface_id, |
575 session_storage_namespace_id, | 577 session_storage_namespace_id, |
576 frame_name, | 578 frame_name, |
577 next_page_id); // adds reference | 579 next_page_id, |
| 580 screen_info); |
578 } | 581 } |
579 | 582 |
580 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( | 583 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( |
581 WebKit::WebPeerConnectionHandlerClient* client) { | 584 WebKit::WebPeerConnectionHandlerClient* client) { |
582 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 585 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
583 if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) | 586 if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) |
584 return NULL; | 587 return NULL; |
585 EnsureMediaStreamImpl(); | 588 EnsureMediaStreamImpl(); |
586 return media_stream_impl_->CreatePeerConnectionHandler(client); | 589 return media_stream_impl_->CreatePeerConnectionHandler(client); |
587 } | 590 } |
(...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1404 RenderViewImpl* view = RenderViewImpl::Create( | 1407 RenderViewImpl* view = RenderViewImpl::Create( |
1405 0, | 1408 0, |
1406 routing_id_, | 1409 routing_id_, |
1407 renderer_preferences_, | 1410 renderer_preferences_, |
1408 webkit_preferences_, | 1411 webkit_preferences_, |
1409 shared_popup_counter_, | 1412 shared_popup_counter_, |
1410 routing_id, | 1413 routing_id, |
1411 surface_id, | 1414 surface_id, |
1412 cloned_session_storage_namespace_id, | 1415 cloned_session_storage_namespace_id, |
1413 frame_name, | 1416 frame_name, |
1414 1); | 1417 1, |
| 1418 screen_info_); |
1415 view->opened_by_user_gesture_ = params.user_gesture; | 1419 view->opened_by_user_gesture_ = params.user_gesture; |
1416 | 1420 |
1417 // Record whether the creator frame is trying to suppress the opener field. | 1421 // Record whether the creator frame is trying to suppress the opener field. |
1418 view->opener_suppressed_ = opener_suppressed; | 1422 view->opener_suppressed_ = opener_suppressed; |
1419 | 1423 |
1420 // Record the security origin of the creator. | 1424 // Record the security origin of the creator. |
1421 GURL creator_url(creator->document().securityOrigin().toString().utf8()); | 1425 GURL creator_url(creator->document().securityOrigin().toString().utf8()); |
1422 if (!creator_url.is_valid() || !creator_url.IsStandard()) | 1426 if (!creator_url.is_valid() || !creator_url.IsStandard()) |
1423 creator_url = GURL(); | 1427 creator_url = GURL(); |
1424 view->creator_url_ = creator_url; | 1428 view->creator_url_ = creator_url; |
1425 | 1429 |
1426 // Copy over the alternate error page URL so we can have alt error pages in | 1430 // Copy over the alternate error page URL so we can have alt error pages in |
1427 // the new render view (we don't need the browser to send the URL back down). | 1431 // the new render view (we don't need the browser to send the URL back down). |
1428 view->alternate_error_page_url_ = alternate_error_page_url_; | 1432 view->alternate_error_page_url_ = alternate_error_page_url_; |
1429 | 1433 |
1430 return view->webview(); | 1434 return view->webview(); |
1431 } | 1435 } |
1432 | 1436 |
1433 WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) { | 1437 WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) { |
1434 RenderWidget* widget = RenderWidget::Create(routing_id_, popup_type); | 1438 RenderWidget* widget = |
| 1439 RenderWidget::Create(routing_id_, popup_type, screen_info_); |
1435 return widget->webwidget(); | 1440 return widget->webwidget(); |
1436 } | 1441 } |
1437 | 1442 |
1438 WebWidget* RenderViewImpl::createPopupMenu(const WebPopupMenuInfo& info) { | 1443 WebWidget* RenderViewImpl::createPopupMenu(const WebPopupMenuInfo& info) { |
1439 // TODO(jcivelli): Remove this deprecated method when its been removed from | 1444 // TODO(jcivelli): Remove this deprecated method when its been removed from |
1440 // the WebViewClient interface. It's been replaced by | 1445 // the WebViewClient interface. It's been replaced by |
1441 // createExternalPopupMenu. | 1446 // createExternalPopupMenu. |
1442 NOTREACHED(); | 1447 NOTREACHED(); |
1443 return NULL; | 1448 return NULL; |
1444 } | 1449 } |
(...skipping 3503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4948 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 4953 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
4949 return !!RenderThreadImpl::current()->compositor_thread(); | 4954 return !!RenderThreadImpl::current()->compositor_thread(); |
4950 } | 4955 } |
4951 | 4956 |
4952 void RenderViewImpl::OnJavaBridgeInit() { | 4957 void RenderViewImpl::OnJavaBridgeInit() { |
4953 DCHECK(!java_bridge_dispatcher_.get()); | 4958 DCHECK(!java_bridge_dispatcher_.get()); |
4954 #if defined(ENABLE_JAVA_BRIDGE) | 4959 #if defined(ENABLE_JAVA_BRIDGE) |
4955 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 4960 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
4956 #endif | 4961 #endif |
4957 } | 4962 } |
OLD | NEW |