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

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 23483044: Revert "Plumb PinchVirtualViewport layers into CC." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index c7782a14fdd97ab82bbce26f4692e08ddb5fe073..c89f6fdcd6a467313fc3fc2f6968d32533667668 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -489,27 +489,6 @@ void RenderWidgetCompositor::registerForAnimations(WebKit::WebLayer* layer) {
layer_tree_host_->animation_registrar());
}
-void RenderWidgetCompositor::registerViewportLayers(
- const WebKit::WebLayer* pageScaleLayer,
- const WebKit::WebLayer* innerViewportScrollLayer,
- const WebKit::WebLayer* outerViewportScrollLayer) {
- layer_tree_host_->RegisterViewportLayers(
- static_cast<const webkit::WebLayerImpl*>(pageScaleLayer)->layer(),
- static_cast<const webkit::WebLayerImpl*>(innerViewportScrollLayer)
- ->layer(),
- // The outer viewport layer will only exist when using pinch virtual
- // viewports.
- outerViewportScrollLayer ? static_cast<const webkit::WebLayerImpl*>(
- outerViewportScrollLayer)->layer()
- : NULL);
-}
-
-void RenderWidgetCompositor::clearViewportLayers() {
- layer_tree_host_->RegisterViewportLayers(scoped_refptr<cc::Layer>(),
- scoped_refptr<cc::Layer>(),
- scoped_refptr<cc::Layer>());
-}
-
bool RenderWidgetCompositor::compositeAndReadback(
void *pixels, const WebRect& rect_in_device_viewport) {
return layer_tree_host_->CompositeAndReadback(pixels,
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698