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

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: Fixed broken Windows build on last iteration. Thank you commit queue/trybots :) 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') | content/renderer/render_widget.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 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 RenderViewImpl::RenderViewImpl( 411 RenderViewImpl::RenderViewImpl(
412 gfx::NativeViewId parent_hwnd, 412 gfx::NativeViewId parent_hwnd,
413 int32 opener_id, 413 int32 opener_id,
414 const content::RendererPreferences& renderer_prefs, 414 const content::RendererPreferences& renderer_prefs,
415 const WebPreferences& webkit_prefs, 415 const WebPreferences& webkit_prefs,
416 SharedRenderViewCounter* counter, 416 SharedRenderViewCounter* counter,
417 int32 routing_id, 417 int32 routing_id,
418 int32 surface_id, 418 int32 surface_id,
419 int64 session_storage_namespace_id, 419 int64 session_storage_namespace_id,
420 const string16& frame_name, 420 const string16& frame_name,
421 int32 next_page_id) 421 int32 next_page_id,
422 : RenderWidget(WebKit::WebPopupTypeNone), 422 const WebKit::WebScreenInfo& screen_info)
423 : RenderWidget(WebKit::WebPopupTypeNone, screen_info),
423 webkit_preferences_(webkit_prefs), 424 webkit_preferences_(webkit_prefs),
424 send_content_state_immediately_(false), 425 send_content_state_immediately_(false),
425 enabled_bindings_(0), 426 enabled_bindings_(0),
426 send_preferred_size_changes_(false), 427 send_preferred_size_changes_(false),
427 is_loading_(false), 428 is_loading_(false),
428 navigation_gesture_(NavigationGestureUnknown), 429 navigation_gesture_(NavigationGestureUnknown),
429 opened_by_user_gesture_(true), 430 opened_by_user_gesture_(true),
430 opener_suppressed_(false), 431 opener_suppressed_(false),
431 page_id_(-1), 432 page_id_(-1),
432 last_page_id_sent_to_browser_(-1), 433 last_page_id_sent_to_browser_(-1),
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 RenderViewImpl* RenderViewImpl::Create( 614 RenderViewImpl* RenderViewImpl::Create(
614 gfx::NativeViewId parent_hwnd, 615 gfx::NativeViewId parent_hwnd,
615 int32 opener_id, 616 int32 opener_id,
616 const content::RendererPreferences& renderer_prefs, 617 const content::RendererPreferences& renderer_prefs,
617 const WebPreferences& webkit_prefs, 618 const WebPreferences& webkit_prefs,
618 SharedRenderViewCounter* counter, 619 SharedRenderViewCounter* counter,
619 int32 routing_id, 620 int32 routing_id,
620 int32 surface_id, 621 int32 surface_id,
621 int64 session_storage_namespace_id, 622 int64 session_storage_namespace_id,
622 const string16& frame_name, 623 const string16& frame_name,
623 int32 next_page_id) { 624 int32 next_page_id,
625 const WebKit::WebScreenInfo& screen_info) {
624 DCHECK(routing_id != MSG_ROUTING_NONE); 626 DCHECK(routing_id != MSG_ROUTING_NONE);
625 return new RenderViewImpl( 627 return new RenderViewImpl(
626 parent_hwnd, 628 parent_hwnd,
627 opener_id, 629 opener_id,
628 renderer_prefs, 630 renderer_prefs,
629 webkit_prefs, 631 webkit_prefs,
630 counter, 632 counter,
631 routing_id, 633 routing_id,
632 surface_id, 634 surface_id,
633 session_storage_namespace_id, 635 session_storage_namespace_id,
634 frame_name, 636 frame_name,
635 next_page_id); // adds reference 637 next_page_id,
638 screen_info);
636 } 639 }
637 640
638 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( 641 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
639 WebKit::WebPeerConnectionHandlerClient* client) { 642 WebKit::WebPeerConnectionHandlerClient* client) {
640 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 643 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
641 if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) 644 if (!cmd_line->HasSwitch(switches::kEnableMediaStream))
642 return NULL; 645 return NULL;
643 EnsureMediaStreamImpl(); 646 EnsureMediaStreamImpl();
644 if (!media_stream_impl_.get()) 647 if (!media_stream_impl_.get())
645 return NULL; 648 return NULL;
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 RenderViewImpl* view = RenderViewImpl::Create( 1467 RenderViewImpl* view = RenderViewImpl::Create(
1465 0, 1468 0,
1466 routing_id_, 1469 routing_id_,
1467 renderer_preferences_, 1470 renderer_preferences_,
1468 webkit_preferences_, 1471 webkit_preferences_,
1469 shared_popup_counter_, 1472 shared_popup_counter_,
1470 routing_id, 1473 routing_id,
1471 surface_id, 1474 surface_id,
1472 cloned_session_storage_namespace_id, 1475 cloned_session_storage_namespace_id,
1473 frame_name, 1476 frame_name,
1474 1); 1477 1,
1478 screen_info_);
1475 view->opened_by_user_gesture_ = params.user_gesture; 1479 view->opened_by_user_gesture_ = params.user_gesture;
1476 1480
1477 // Record whether the creator frame is trying to suppress the opener field. 1481 // Record whether the creator frame is trying to suppress the opener field.
1478 view->opener_suppressed_ = opener_suppressed; 1482 view->opener_suppressed_ = opener_suppressed;
1479 1483
1480 // Record the security origin of the creator. 1484 // Record the security origin of the creator.
1481 GURL creator_url(creator->document().securityOrigin().toString().utf8()); 1485 GURL creator_url(creator->document().securityOrigin().toString().utf8());
1482 if (!creator_url.is_valid() || !creator_url.IsStandard()) 1486 if (!creator_url.is_valid() || !creator_url.IsStandard())
1483 creator_url = GURL(); 1487 creator_url = GURL();
1484 view->creator_url_ = creator_url; 1488 view->creator_url_ = creator_url;
1485 1489
1486 // Copy over the alternate error page URL so we can have alt error pages in 1490 // Copy over the alternate error page URL so we can have alt error pages in
1487 // the new render view (we don't need the browser to send the URL back down). 1491 // the new render view (we don't need the browser to send the URL back down).
1488 view->alternate_error_page_url_ = alternate_error_page_url_; 1492 view->alternate_error_page_url_ = alternate_error_page_url_;
1489 1493
1490 return view->webview(); 1494 return view->webview();
1491 } 1495 }
1492 1496
1493 WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) { 1497 WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) {
1494 RenderWidget* widget = RenderWidget::Create(routing_id_, popup_type); 1498 RenderWidget* widget =
1499 RenderWidget::Create(routing_id_, popup_type, screen_info_);
1495 return widget->webwidget(); 1500 return widget->webwidget();
1496 } 1501 }
1497 1502
1498 WebWidget* RenderViewImpl::createPopupMenu(const WebPopupMenuInfo& info) { 1503 WebWidget* RenderViewImpl::createPopupMenu(const WebPopupMenuInfo& info) {
1499 // TODO(jcivelli): Remove this deprecated method when its been removed from 1504 // TODO(jcivelli): Remove this deprecated method when its been removed from
1500 // the WebViewClient interface. It's been replaced by 1505 // the WebViewClient interface. It's been replaced by
1501 // createExternalPopupMenu. 1506 // createExternalPopupMenu.
1502 NOTREACHED(); 1507 NOTREACHED();
1503 return NULL; 1508 return NULL;
1504 } 1509 }
(...skipping 3588 matching lines...) Expand 10 before | Expand all | Expand 10 after
5093 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5098 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5094 return !!RenderThreadImpl::current()->compositor_thread(); 5099 return !!RenderThreadImpl::current()->compositor_thread();
5095 } 5100 }
5096 5101
5097 void RenderViewImpl::OnJavaBridgeInit() { 5102 void RenderViewImpl::OnJavaBridgeInit() {
5098 DCHECK(!java_bridge_dispatcher_.get()); 5103 DCHECK(!java_bridge_dispatcher_.get());
5099 #if defined(ENABLE_JAVA_BRIDGE) 5104 #if defined(ENABLE_JAVA_BRIDGE)
5100 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5105 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5101 #endif 5106 #endif
5102 } 5107 }
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698