Title: [100258] trunk/Source
- Revision
- 100258
- Author
- [email protected]
- Date
- 2011-11-15 02:52:27 -0800 (Tue, 15 Nov 2011)
Log Message
[chromium] scroll deltas are cleared during commit to the main thread
https://bugs.webkit.org/show_bug.cgi?id=71916
Reviewed by James Robinson.
Source/WebCore:
Patch is covered by unit test.
Add a member m_sentScrollDelta to CCLayerImpl to keep track of the scroll delta being
sent to the main thread during commit. This gives a simpler approach to keep tracking of a
layer's scroll delta in impl thread.
* platform/graphics/chromium/LayerChromium.h:
(WebCore::LayerChromium::sentScrollDelta):
* platform/graphics/chromium/cc/CCLayerImpl.h:
(WebCore::CCLayerImpl::sentScrollDelta):
(WebCore::CCLayerImpl::setSentScrollDelta):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::processScrollDeltas):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
Source/WebKit/chromium:
Modify test to verify sentScrollDeltas() values of CCLayerImpl during commit.
* tests/CCLayerTreeHostImplTest.cpp:
(WebKit::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (100257 => 100258)
--- trunk/Source/WebCore/ChangeLog 2011-11-15 10:37:07 UTC (rev 100257)
+++ trunk/Source/WebCore/ChangeLog 2011-11-15 10:52:27 UTC (rev 100258)
@@ -1,3 +1,25 @@
+2011-11-15 Alpha Lam <[email protected]>
+
+ [chromium] scroll deltas are cleared during commit to the main thread
+ https://bugs.webkit.org/show_bug.cgi?id=71916
+
+ Reviewed by James Robinson.
+
+ Patch is covered by unit test.
+
+ Add a member m_sentScrollDelta to CCLayerImpl to keep track of the scroll delta being
+ sent to the main thread during commit. This gives a simpler approach to keep tracking of a
+ layer's scroll delta in impl thread.
+
+ * platform/graphics/chromium/LayerChromium.h:
+ (WebCore::LayerChromium::sentScrollDelta):
+ * platform/graphics/chromium/cc/CCLayerImpl.h:
+ (WebCore::CCLayerImpl::sentScrollDelta):
+ (WebCore::CCLayerImpl::setSentScrollDelta):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::processScrollDeltas):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+
2011-11-15 Simon Hausmann <[email protected]>
[Qt] REGRESSION(100123): It made inspector tests crash
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (100257 => 100258)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2011-11-15 10:37:07 UTC (rev 100257)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2011-11-15 10:52:27 UTC (rev 100258)
@@ -301,6 +301,7 @@
layer->setSublayerTransform(m_sublayerTransform);
layer->setTransform(m_transform);
layer->setUpdateRect(m_updateRect);
+ layer->setSentScrollDelta(IntSize());
if (maskLayer())
maskLayer()->pushPropertiesTo(layer->maskLayer());
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h (100257 => 100258)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h 2011-11-15 10:37:07 UTC (rev 100257)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h 2011-11-15 10:52:27 UTC (rev 100258)
@@ -163,6 +163,9 @@
float scaleDelta() const { return m_scaleDelta; }
void setScaleDelta(float);
+ const IntSize& sentScrollDelta() const { return m_sentScrollDelta; }
+ void setSentScrollDelta(const IntSize& sentScrollDelta) { m_sentScrollDelta = sentScrollDelta; }
+
void scrollBy(const IntSize& scroll);
bool scrollable() const { return m_scrollable; }
@@ -248,6 +251,7 @@
bool m_drawsContent;
IntSize m_scrollDelta;
+ IntSize m_sentScrollDelta;
IntSize m_maxScrollPosition;
float m_scaleDelta;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (100257 => 100258)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2011-11-15 10:37:07 UTC (rev 100257)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2011-11-15 10:52:27 UTC (rev 100258)
@@ -342,6 +342,7 @@
m_scrollLayerImpl->setScrollPosition(m_scrollLayerImpl->scrollPosition() + m_scrollLayerImpl->scrollDelta());
m_scrollLayerImpl->setPosition(m_scrollLayerImpl->position() - m_scrollLayerImpl->scrollDelta());
+ m_scrollLayerImpl->setSentScrollDelta(m_scrollLayerImpl->scrollDelta());
m_scrollLayerImpl->setScrollDelta(IntSize());
return scrollInfo.release();
Modified: trunk/Source/WebKit/chromium/ChangeLog (100257 => 100258)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-15 10:37:07 UTC (rev 100257)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-15 10:52:27 UTC (rev 100258)
@@ -1,3 +1,15 @@
+2011-11-15 Alpha Lam <[email protected]>
+
+ [chromium] scroll deltas are cleared during commit to the main thread
+ https://bugs.webkit.org/show_bug.cgi?id=71916
+
+ Reviewed by James Robinson.
+
+ Modify test to verify sentScrollDeltas() values of CCLayerImpl during commit.
+
+ * tests/CCLayerTreeHostImplTest.cpp:
+ (WebKit::TEST_F):
+
2011-11-14 Julien Chaffraix <[email protected]>
[chromium] Fix the build after moving some arrays to WTF
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (100257 => 100258)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2011-11-15 10:37:07 UTC (rev 100257)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2011-11-15 10:52:27 UTC (rev 100258)
@@ -127,6 +127,7 @@
scrollInfo = m_hostImpl->processScrollDeltas();
ASSERT_EQ(root->scrollPosition(), scrollPosition + scrollDelta);
ASSERT_EQ(scrollInfo->scrolls.size(), 1u);
+ EXPECT_EQ(root->sentScrollDelta(), scrollDelta);
expectContains(*scrollInfo.get(), root->id(), scrollDelta);
expectClearedScrollDeltasRecursive(root.get());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
