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

Side by Side Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 13637017: Delete layout_viewport_size. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android Created 7 years, 8 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
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.h ('k') | ui/compositor/compositor.cc » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/gpu/render_widget_compositor.h" 5 #include "content/renderer/gpu/render_widget_compositor.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 void RenderWidgetCompositor::setRootLayer(const WebKit::WebLayer& layer) { 357 void RenderWidgetCompositor::setRootLayer(const WebKit::WebLayer& layer) {
358 layer_tree_host_->SetRootLayer( 358 layer_tree_host_->SetRootLayer(
359 static_cast<const webkit::WebLayerImpl*>(&layer)->layer()); 359 static_cast<const webkit::WebLayerImpl*>(&layer)->layer());
360 } 360 }
361 361
362 void RenderWidgetCompositor::clearRootLayer() { 362 void RenderWidgetCompositor::clearRootLayer() {
363 layer_tree_host_->SetRootLayer(scoped_refptr<cc::Layer>()); 363 layer_tree_host_->SetRootLayer(scoped_refptr<cc::Layer>());
364 } 364 }
365 365
366 void RenderWidgetCompositor::setViewportSize( 366 void RenderWidgetCompositor::setViewportSize(
367 const WebSize& layout_viewport_size, 367 const WebSize&,
368 const WebSize& device_viewport_size) { 368 const WebSize& device_viewport_size) {
369 layer_tree_host_->SetViewportSize(layout_viewport_size, device_viewport_size); 369 layer_tree_host_->SetViewportSize(device_viewport_size);
370 } 370 }
371 371
372 WebSize RenderWidgetCompositor::layoutViewportSize() const { 372 WebSize RenderWidgetCompositor::layoutViewportSize() const {
373 return layer_tree_host_->layout_viewport_size(); 373 return layer_tree_host_->device_viewport_size();
374 } 374 }
375 375
376 WebSize RenderWidgetCompositor::deviceViewportSize() const { 376 WebSize RenderWidgetCompositor::deviceViewportSize() const {
377 return layer_tree_host_->device_viewport_size(); 377 return layer_tree_host_->device_viewport_size();
378 } 378 }
379 379
380 WebFloatPoint RenderWidgetCompositor::adjustEventPointForPinchZoom( 380 WebFloatPoint RenderWidgetCompositor::adjustEventPointForPinchZoom(
381 const WebFloatPoint& point) const { 381 const WebFloatPoint& point) const {
382 return point; 382 return point;
383 } 383 }
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); 552 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
553 } 553 }
554 554
555 scoped_refptr<cc::ContextProvider> 555 scoped_refptr<cc::ContextProvider>
556 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { 556 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
557 return RenderThreadImpl::current()-> 557 return RenderThreadImpl::current()->
558 OffscreenContextProviderForCompositorThread(); 558 OffscreenContextProviderForCompositorThread();
559 } 559 }
560 560
561 } // namespace content 561 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.h ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698