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

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

Issue 9302022: WebWidgetClient::screenInfo() no longer does a synchronous IPC. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Refreshed patch to merge with tip of tree 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
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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 RenderViewImpl::RenderViewImpl( 404 RenderViewImpl::RenderViewImpl(
405 gfx::NativeViewId parent_hwnd, 405 gfx::NativeViewId parent_hwnd,
406 int32 opener_id, 406 int32 opener_id,
407 const content::RendererPreferences& renderer_prefs, 407 const content::RendererPreferences& renderer_prefs,
408 const WebPreferences& webkit_prefs, 408 const WebPreferences& webkit_prefs,
409 SharedRenderViewCounter* counter, 409 SharedRenderViewCounter* counter,
410 int32 routing_id, 410 int32 routing_id,
411 int32 surface_id, 411 int32 surface_id,
412 int64 session_storage_namespace_id, 412 int64 session_storage_namespace_id,
413 const string16& frame_name, 413 const string16& frame_name,
414 int32 next_page_id) 414 int32 next_page_id,
415 : RenderWidget(WebKit::WebPopupTypeNone), 415 const WebKit::WebScreenInfo& screen_info)
416 : RenderWidget(WebKit::WebPopupTypeNone, screen_info),
416 webkit_preferences_(webkit_prefs), 417 webkit_preferences_(webkit_prefs),
417 send_content_state_immediately_(false), 418 send_content_state_immediately_(false),
418 enabled_bindings_(0), 419 enabled_bindings_(0),
419 send_preferred_size_changes_(false), 420 send_preferred_size_changes_(false),
420 is_loading_(false), 421 is_loading_(false),
421 navigation_gesture_(NavigationGestureUnknown), 422 navigation_gesture_(NavigationGestureUnknown),
422 opened_by_user_gesture_(true), 423 opened_by_user_gesture_(true),
423 opener_suppressed_(false), 424 opener_suppressed_(false),
424 page_id_(-1), 425 page_id_(-1),
425 last_page_id_sent_to_browser_(-1), 426 last_page_id_sent_to_browser_(-1),
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 RenderViewImpl* RenderViewImpl::Create( 607 RenderViewImpl* RenderViewImpl::Create(
607 gfx::NativeViewId parent_hwnd, 608 gfx::NativeViewId parent_hwnd,
608 int32 opener_id, 609 int32 opener_id,
609 const content::RendererPreferences& renderer_prefs, 610 const content::RendererPreferences& renderer_prefs,
610 const WebPreferences& webkit_prefs, 611 const WebPreferences& webkit_prefs,
611 SharedRenderViewCounter* counter, 612 SharedRenderViewCounter* counter,
612 int32 routing_id, 613 int32 routing_id,
613 int32 surface_id, 614 int32 surface_id,
614 int64 session_storage_namespace_id, 615 int64 session_storage_namespace_id,
615 const string16& frame_name, 616 const string16& frame_name,
616 int32 next_page_id) { 617 int32 next_page_id,
618 const WebKit::WebScreenInfo& screen_info) {
617 DCHECK(routing_id != MSG_ROUTING_NONE); 619 DCHECK(routing_id != MSG_ROUTING_NONE);
618 return new RenderViewImpl( 620 return new RenderViewImpl(
619 parent_hwnd, 621 parent_hwnd,
620 opener_id, 622 opener_id,
621 renderer_prefs, 623 renderer_prefs,
622 webkit_prefs, 624 webkit_prefs,
623 counter, 625 counter,
624 routing_id, 626 routing_id,
625 surface_id, 627 surface_id,
626 session_storage_namespace_id, 628 session_storage_namespace_id,
627 frame_name, 629 frame_name,
628 next_page_id); // adds reference 630 next_page_id,
631 screen_info);
629 } 632 }
630 633
631 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( 634 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
632 WebKit::WebPeerConnectionHandlerClient* client) { 635 WebKit::WebPeerConnectionHandlerClient* client) {
633 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 636 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
634 if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) 637 if (!cmd_line->HasSwitch(switches::kEnableMediaStream))
635 return NULL; 638 return NULL;
636 EnsureMediaStreamImpl(); 639 EnsureMediaStreamImpl();
637 if (!media_stream_impl_.get()) 640 if (!media_stream_impl_.get())
638 return NULL; 641 return NULL;
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 RenderViewImpl* view = RenderViewImpl::Create( 1460 RenderViewImpl* view = RenderViewImpl::Create(
1458 0, 1461 0,
1459 routing_id_, 1462 routing_id_,
1460 renderer_preferences_, 1463 renderer_preferences_,
1461 webkit_preferences_, 1464 webkit_preferences_,
1462 shared_popup_counter_, 1465 shared_popup_counter_,
1463 routing_id, 1466 routing_id,
1464 surface_id, 1467 surface_id,
1465 cloned_session_storage_namespace_id, 1468 cloned_session_storage_namespace_id,
1466 frame_name, 1469 frame_name,
1467 1); 1470 1,
1471 screen_info_);
1468 view->opened_by_user_gesture_ = params.user_gesture; 1472 view->opened_by_user_gesture_ = params.user_gesture;
1469 1473
1470 // Record whether the creator frame is trying to suppress the opener field. 1474 // Record whether the creator frame is trying to suppress the opener field.
1471 view->opener_suppressed_ = opener_suppressed; 1475 view->opener_suppressed_ = opener_suppressed;
1472 1476
1473 // Record the security origin of the creator. 1477 // Record the security origin of the creator.
1474 GURL creator_url(creator->document().securityOrigin().toString().utf8()); 1478 GURL creator_url(creator->document().securityOrigin().toString().utf8());
1475 if (!creator_url.is_valid() || !creator_url.IsStandard()) 1479 if (!creator_url.is_valid() || !creator_url.IsStandard())
1476 creator_url = GURL(); 1480 creator_url = GURL();
1477 view->creator_url_ = creator_url; 1481 view->creator_url_ = creator_url;
1478 1482
1479 // Copy over the alternate error page URL so we can have alt error pages in 1483 // Copy over the alternate error page URL so we can have alt error pages in
1480 // the new render view (we don't need the browser to send the URL back down). 1484 // the new render view (we don't need the browser to send the URL back down).
1481 view->alternate_error_page_url_ = alternate_error_page_url_; 1485 view->alternate_error_page_url_ = alternate_error_page_url_;
1482 1486
1483 return view->webview(); 1487 return view->webview();
1484 } 1488 }
1485 1489
1486 WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) { 1490 WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) {
1487 RenderWidget* widget = RenderWidget::Create(routing_id_, popup_type); 1491 RenderWidget* widget =
1492 RenderWidget::Create(routing_id_, popup_type, screen_info_);
1488 return widget->webwidget(); 1493 return widget->webwidget();
1489 } 1494 }
1490 1495
1491 WebWidget* RenderViewImpl::createPopupMenu(const WebPopupMenuInfo& info) { 1496 WebWidget* RenderViewImpl::createPopupMenu(const WebPopupMenuInfo& info) {
1492 // TODO(jcivelli): Remove this deprecated method when its been removed from 1497 // TODO(jcivelli): Remove this deprecated method when its been removed from
1493 // the WebViewClient interface. It's been replaced by 1498 // the WebViewClient interface. It's been replaced by
1494 // createExternalPopupMenu. 1499 // createExternalPopupMenu.
1495 NOTREACHED(); 1500 NOTREACHED();
1496 return NULL; 1501 return NULL;
1497 } 1502 }
(...skipping 3576 matching lines...) Expand 10 before | Expand all | Expand 10 after
5074 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5079 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5075 return !!RenderThreadImpl::current()->compositor_thread(); 5080 return !!RenderThreadImpl::current()->compositor_thread();
5076 } 5081 }
5077 5082
5078 void RenderViewImpl::OnJavaBridgeInit() { 5083 void RenderViewImpl::OnJavaBridgeInit() {
5079 DCHECK(!java_bridge_dispatcher_.get()); 5084 DCHECK(!java_bridge_dispatcher_.get());
5080 #if defined(ENABLE_JAVA_BRIDGE) 5085 #if defined(ENABLE_JAVA_BRIDGE)
5081 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5086 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5082 #endif 5087 #endif
5083 } 5088 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698