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

Side by Side Diff: Source/WebKit/chromium/src/PinchViewports.cpp

Issue 16799005: Insert pinch zoom virtual viewport layers to graphics layer tree. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments. Created 7 years, 6 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
OLDNEW
(Empty)
1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are
6 * met:
7 *
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the
13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */
30
31 #include "config.h"
32 #include "WebKit/chromium/src/PinchViewports.h"
33
34 #include "WebKit/chromium/src/WebSettingsImpl.h"
35 #include "WebKit/chromium/src/WebViewImpl.h"
36 #include "core/page/FrameView.h"
37 #include "core/platform/graphics/FloatSize.h"
38 #include "core/platform/graphics/GraphicsLayer.h"
39 #include "core/rendering/RenderLayerCompositor.h"
40 #include "public/platform/Platform.h"
41 #include "public/platform/WebCompositorSupport.h"
42 #include "public/platform/WebLayerTreeView.h"
43 #include "public/platform/WebScrollbarLayer.h"
44
45 using WebCore::GraphicsLayer;
46
47 namespace WebKit {
48
49 PassOwnPtr<PinchViewports> PinchViewports::create(WebViewImpl* owner)
50 {
51 return adoptPtr(new PinchViewports(owner));
52 }
53
54 PinchViewports::PinchViewports(WebViewImpl* owner)
55 : m_owner(owner)
56 , m_innerViewportClipLayer(GraphicsLayer::create(m_owner->graphicsLayerFacto ry(), this))
57 , m_pageScaleLayer(GraphicsLayer::create(m_owner->graphicsLayerFactory(), th is))
58 , m_innerViewportScrollLayer(GraphicsLayer::create(m_owner->graphicsLayerFac tory(), this))
59 , m_overlayScrollbarHorizontal(GraphicsLayer::create(m_owner->graphicsLayerF actory(), this))
60 , m_overlayScrollbarVertical(GraphicsLayer::create(m_owner->graphicsLayerFac tory(), this))
61 {
62 m_innerViewportClipLayer->setMasksToBounds(true);
63 m_innerViewportClipLayer->platformLayer()->setIsContainerForFixedPositionLay ers(true);
64
65 m_innerViewportScrollLayer->platformLayer()->setScrollable(true);
66
67 #ifndef NDEBUG
68 m_innerViewportClipLayer->setName("inner viewport clip layer");
69 m_pageScaleLayer->setName("page scale layer");
70 m_innerViewportScrollLayer->setName("inner viewport scroll layer");
71 m_overlayScrollbarHorizontal->setName("overlay scrollbar horizontal");
72 m_overlayScrollbarVertical->setName("overlay scrollbar vertical");
73 #endif
74
75 m_innerViewportClipLayer->addChild(m_pageScaleLayer.get());
76 m_pageScaleLayer->addChild(m_innerViewportScrollLayer.get());
77 m_innerViewportClipLayer->addChild(m_overlayScrollbarHorizontal.get());
78 m_innerViewportClipLayer->addChild(m_overlayScrollbarVertical.get());
79
80 // Setup the inner viewport overlay scrollbars.
81 setupScrollbar(WebScrollbar::Horizontal);
82 setupScrollbar(WebScrollbar::Vertical);
83 }
84
85 PinchViewports::~PinchViewports() { }
86
87 void PinchViewports::setViewportSize(const WebSize& newSize)
88 {
89 ASSERT(m_innerViewportClipLayer);
aelias_OOO_until_Jul13 2013/06/18 19:52:28 nit: no need for this assertion since you create i
wjmaclean 2013/06/18 20:11:40 Done.
90 m_innerViewportClipLayer->setSize(WebCore::FloatSize(newSize.width, newSize. height));
91
92 // Need to re-compute sizes for the overlay scrollbars.
93 setupScrollbar(WebScrollbar::Horizontal);
94 setupScrollbar(WebScrollbar::Vertical);
95 }
96
97 // Modifies the top of the graphics layer tree to add layers needed to support
98 // the inner/outer viewport fixed-position model for pinch zoom. When finished,
99 // the tree will look like this (with * denoting added layers):
100 //
101 // *innerViewportClipLayer (fixed pos container)
102 // +- *pageScaleLayer
103 // | +- *innerViewportScrollLayer
104 // | +-- overflowControlsHostLayer (root layer)
105 // | +-- outerViewportClipLayer (fixed pos container) [frame clip lay er in RenderLayerCompositor]
106 // | | +-- outerViewportScrollLayer [frame scroll layer in RenderLa yerCompositor]
107 // | | +-- content layers ...
108 // | +-- horizontal ScrollbarLayer (non-overlay)
109 // | +-- verticalScrollbarLayer (non-overlay)
110 // | +-- scroll corner (non-overlay)
111 // +- *horizontalScrollbarLayer (overlay)
112 // +- *verticalScrollbarLayer (overlay)
113 //
114 void PinchViewports::setOverflowControlsHostLayer(GraphicsLayer* layer)
115 {
116 if (layer) {
117 ASSERT(!m_innerViewportScrollLayer->children().size());
118 m_innerViewportScrollLayer->addChild(layer);
119 } else {
120 m_innerViewportScrollLayer->removeAllChildren();
121 return;
122 }
123
124 WebCore::Page* page = m_owner->page();
125 // We only need to disable the existing (outer viewport) scrollbars
126 // if the existing ones are already overlay.
127 if (!page || !page->mainFrame()->view()->hasOverlayScrollbars())
128 return;
129
130 // Disable the existing outer-viewport scrollbars, since we don't need to
131 // display two sets of overlay scrollbars.
132 // FIXME: If we knew in advance before the overflowControlsHostLayer goes
aelias_OOO_until_Jul13 2013/06/18 19:52:28 I don't entirely follow what this problem is; why
wjmaclean 2013/06/18 20:11:40 We only ever find out (I think) that the old compo
aelias_OOO_until_Jul13 2013/06/18 22:26:00 I suggest removing the early return and doing: sc
133 // away, we would re-enable the drawing of these scrollbars.
134 // FIXME: When scrollbar existence is no longer tied to scrollability, see
135 // issue crbug.com/247055, inhibit the creation of these scrollbars when the y're not needed.
aelias_OOO_until_Jul13 2013/06/18 19:52:28 Why should we ever inhibit their creation? They m
wjmaclean 2013/06/18 20:11:40 Done.
136 if (GraphicsLayer* scrollbar = m_owner->compositor()->layerForHorizontalScro llbar())
137 scrollbar->setDrawsContent(false);
138 if (GraphicsLayer* scrollbar = m_owner->compositor()->layerForVerticalScroll bar())
139 scrollbar->setDrawsContent(false);
140 }
141
142 void PinchViewports::setupScrollbar(WebScrollbar::Orientation orientation)
143 {
144 bool isHorizontal = orientation == WebScrollbar::Horizontal;
145 GraphicsLayer* scrollbarGraphicsLayer = isHorizontal ?
146 m_overlayScrollbarHorizontal.get() : m_overlayScrollbarVertical.get();
147
148 const int kOverlayScrollbarThickness = m_owner->settingsImpl()->pinchOverlay ScrollbarThickness();
149
150 ASSERT(scrollbarGraphicsLayer);
aelias_OOO_until_Jul13 2013/06/18 19:52:28 nit: also no need for this assert since it's creat
wjmaclean 2013/06/18 20:11:40 Done.
151
152 int xPosition = isHorizontal ? 0 : m_innerViewportClipLayer->size().width() - kOverlayScrollbarThickness;
153 int yPosition = isHorizontal ? m_innerViewportClipLayer->size().height() - k OverlayScrollbarThickness : 0;
154 int width = isHorizontal ? m_innerViewportClipLayer->size().width() - kOverl ayScrollbarThickness : kOverlayScrollbarThickness;
155 int height = isHorizontal ? kOverlayScrollbarThickness : m_innerViewportClip Layer->size().height() - kOverlayScrollbarThickness;
156
157 scrollbarGraphicsLayer->setPosition(WebCore::IntPoint(xPosition, yPosition)) ;
158 scrollbarGraphicsLayer->setSize(WebCore::IntSize(width, height));
159 }
160
161 void PinchViewports::registerViewportLayersWithTreeView(WebLayerTreeView* layerT reeView) const
162 {
163 if (!layerTreeView)
164 return;
165
166 WebCore::RenderLayerCompositor* compositor = m_owner->compositor();
167 ASSERT(compositor);
168 layerTreeView->registerPinchViewportLayers(
169 m_innerViewportClipLayer->platformLayer(),
170 m_pageScaleLayer->platformLayer(),
171 m_innerViewportScrollLayer->platformLayer(),
172 compositor->scrollLayer()->platformLayer(),
173 m_overlayScrollbarHorizontal->platformLayer(),
174 m_overlayScrollbarVertical->platformLayer());
175 }
176
177 void PinchViewports::clearViewportLayersForTreeView(WebLayerTreeView* layerTreeV iew) const
178 {
179 if (!layerTreeView)
180 return;
181
182 layerTreeView->clearPinchViewportLayers();
183 }
184
185 void PinchViewports::notifyAnimationStarted(const GraphicsLayer*, double time)
186 {
187 }
188
189 void PinchViewports::paintContents(const GraphicsLayer*, WebCore::GraphicsContex t&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip)
190 {
191 }
192
193 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698