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

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

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 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
OLDNEW
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 return iter->second; 868 return iter->second;
869 return NULL; 869 return NULL;
870 } 870 }
871 871
872 // static 872 // static
873 RenderFrameImpl* RenderFrameImpl::CreateMainFrame( 873 RenderFrameImpl* RenderFrameImpl::CreateMainFrame(
874 RenderViewImpl* render_view, 874 RenderViewImpl* render_view,
875 int32_t routing_id, 875 int32_t routing_id,
876 int32_t widget_routing_id, 876 int32_t widget_routing_id,
877 bool hidden, 877 bool hidden,
878 const blink::WebScreenInfo& screen_info, 878 const ScreenInfo& screen_info,
879 CompositorDependencies* compositor_deps, 879 CompositorDependencies* compositor_deps,
880 blink::WebFrame* opener) { 880 blink::WebFrame* opener) {
881 // A main frame RenderFrame must have a RenderWidget. 881 // A main frame RenderFrame must have a RenderWidget.
882 DCHECK_NE(MSG_ROUTING_NONE, widget_routing_id); 882 DCHECK_NE(MSG_ROUTING_NONE, widget_routing_id);
883 883
884 RenderFrameImpl* render_frame = 884 RenderFrameImpl* render_frame =
885 RenderFrameImpl::Create(render_view, routing_id); 885 RenderFrameImpl::Create(render_view, routing_id);
886 render_frame->InitializeBlameContext(nullptr); 886 render_frame->InitializeBlameContext(nullptr);
887 WebLocalFrame* web_frame = WebLocalFrame::create( 887 WebLocalFrame* web_frame = WebLocalFrame::create(
888 blink::WebTreeScopeType::Document, render_frame, opener); 888 blink::WebTreeScopeType::Document, render_frame, opener);
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 SyncSelectionIfRequired(); 1290 SyncSelectionIfRequired();
1291 } 1291 }
1292 1292
1293 RenderWidgetFullscreenPepper* RenderFrameImpl::CreatePepperFullscreenContainer( 1293 RenderWidgetFullscreenPepper* RenderFrameImpl::CreatePepperFullscreenContainer(
1294 PepperPluginInstanceImpl* plugin) { 1294 PepperPluginInstanceImpl* plugin) {
1295 GURL active_url; 1295 GURL active_url;
1296 if (render_view_->webview()) 1296 if (render_view_->webview())
1297 active_url = render_view()->GetURLForGraphicsContext3D(); 1297 active_url = render_view()->GetURLForGraphicsContext3D();
1298 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( 1298 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
1299 render_view()->routing_id(), GetRenderWidget()->compositor_deps(), 1299 render_view()->routing_id(), GetRenderWidget()->compositor_deps(),
1300 plugin, active_url, GetRenderWidget()->screenInfo()); 1300 plugin, active_url, GetRenderWidget()->screen_info());
1301 widget->show(blink::WebNavigationPolicyIgnore); 1301 widget->show(blink::WebNavigationPolicyIgnore);
1302 return widget; 1302 return widget;
1303 } 1303 }
1304 1304
1305 bool RenderFrameImpl::IsPepperAcceptingCompositionEvents() const { 1305 bool RenderFrameImpl::IsPepperAcceptingCompositionEvents() const {
1306 if (!focused_pepper_plugin_) 1306 if (!focused_pepper_plugin_)
1307 return false; 1307 return false;
1308 return focused_pepper_plugin_->IsPluginAcceptingCompositionEvents(); 1308 return focused_pepper_plugin_->IsPluginAcceptingCompositionEvents();
1309 } 1309 }
1310 1310
(...skipping 5040 matching lines...) Expand 10 before | Expand all | Expand 10 after
6351 // event target. Potentially a Pepper plugin will receive the event. 6351 // event target. Potentially a Pepper plugin will receive the event.
6352 // In order to tell whether a plugin gets the last mouse event and which it 6352 // In order to tell whether a plugin gets the last mouse event and which it
6353 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6353 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6354 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6354 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6355 // |pepper_last_mouse_event_target_|. 6355 // |pepper_last_mouse_event_target_|.
6356 pepper_last_mouse_event_target_ = nullptr; 6356 pepper_last_mouse_event_target_ = nullptr;
6357 #endif 6357 #endif
6358 } 6358 }
6359 6359
6360 } // namespace content 6360 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698