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

Unified Diff: content/browser/devtools/renderer_overrides_handler.cc

Issue 373903003: Fix viewport computation in Mac UC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/devtools/renderer_overrides_handler.cc
diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc
index 3f5359659b81cc966994082b80051d2b100eb9eb..dafc8c7473454802afcd06c1cfc27694bc614c43 100644
--- a/content/browser/devtools/renderer_overrides_handler.cc
+++ b/content/browser/devtools/renderer_overrides_handler.cc
@@ -209,8 +209,8 @@ void RendererOverridesHandler::InnerSwapCompositorFrame() {
cc::CompositorFrameMetadata& metadata = last_compositor_frame_metadata_;
float page_scale = metadata.page_scale_factor;
- gfx::SizeF viewport_size_dip = gfx::ScaleSize(metadata.viewport_size,
- page_scale);
+ gfx::SizeF viewport_size_dip = gfx::ScaleSize(
+ metadata.scrollable_viewport_size, page_scale);
float total_bar_height_dip = metadata.location_bar_content_translation.y() +
metadata.overdraw_bottom_height;
@@ -608,14 +608,14 @@ void RendererOverridesHandler::ScreencastFrameCaptured(
viewport->SetDouble(devtools::DOM::Rect::kParamY,
metadata.root_scroll_offset.y());
viewport->SetDouble(devtools::DOM::Rect::kParamWidth,
- metadata.viewport_size.width());
+ metadata.scrollable_viewport_size.width());
viewport->SetDouble(devtools::DOM::Rect::kParamHeight,
- metadata.viewport_size.height());
+ metadata.scrollable_viewport_size.height());
response_metadata->Set(
devtools::Page::ScreencastFrameMetadata::kParamViewport, viewport);
- gfx::SizeF viewport_size_dip = gfx::ScaleSize(metadata.viewport_size,
- metadata.page_scale_factor);
+ gfx::SizeF viewport_size_dip = gfx::ScaleSize(
+ metadata.scrollable_viewport_size, metadata.page_scale_factor);
response_metadata->SetDouble(
devtools::Page::ScreencastFrameMetadata::kParamDeviceWidth,
viewport_size_dip.width());
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698