Context Navigation

Changeset 106711 in webkit

Timestamp:

Feb 3, 2012, 5:05:24 PM (15 years ago)

Author:

andersca@apple.com

Message:

Apply changed properties from the updated scrolling tree state
https://bugs.webkit.org/show_bug.cgi?id=77792

Reviewed by Andreas Kling.

(WebCore::ScrollingTreeNode::update):
Update the tree node properties from the scrolling tree state.

(WebCore::ScrollingTreeNode::scrollingTree):
(WebCore::ScrollingTreeNode::viewportRect):
(WebCore::ScrollingTreeNode::contentsSize):
Add getters.

(WebCore::ScrollingTreeState::changedProperties):
New function for accessing the changed properties of the scrolling tree state.

(WebCore::ScrollingTreeNodeMac::update):
Update the scroll layer from the scrolling tree if necessary.

Location:

trunk/Source/WebCore

Files:

-              r106706
+              r106711
+-02-03  Anders Carlsson  <andersca@apple.com>
+        Apply changed properties from the updated scrolling tree state
+        https://bugs.webkit.org/show_bug.cgi?id=77792
+        Reviewed by Andreas Kling.
+        * page/scrolling/ScrollingTreeNode.cpp:
+        (WebCore::ScrollingTreeNode::update):
+        Update the tree node properties from the scrolling tree state.
+        * page/scrolling/ScrollingTreeNode.h:
+        (WebCore::ScrollingTreeNode::scrollingTree):
+        (WebCore::ScrollingTreeNode::viewportRect):
+        (WebCore::ScrollingTreeNode::contentsSize):
+        Add getters.
+        * page/scrolling/ScrollingTreeState.h:
+        (WebCore::ScrollingTreeState::changedProperties):
+        New function for accessing the changed properties of the scrolling tree state.
+        * page/scrolling/mac/ScrollingTreeNodeMac.h:
+        * page/scrolling/mac/ScrollingTreeNodeMac.mm:
+        (WebCore::ScrollingTreeNodeMac::update):
+        Update the scroll layer from the scrolling tree if necessary.
 -02-03  Brady Eidson  <beidson@apple.com>

-              r106696
+              r106711
 #if ENABLE(THREADED_SCROLLING)
+#include "ScrollingTreeState.h"
 namespace WebCore {
 …
+}
 void ScrollingTreeNode::update(ScrollingTreeState*)
+void ScrollingTreeNode::update(ScrollingTreeState* state)
+{
+    // FIXME: Update the tree node properties.
+    if (state->changedProperties() & ScrollingTreeState::ViewportRect)
+        m_viewportRect = state->viewportRect();
+    if (state->changedProperties() & ScrollingTreeState::ContentsSize)
+        m_contentsSize = state->contentsSize();
+}

-              r106696
+              r106711
 #if ENABLE(THREADED_SCROLLING)
+#include "IntRect.h"
 #include <wtf/PassOwnPtr.h>
 …
     explicit ScrollingTreeNode(ScrollingTree*);
+    ScrollingTree* scrollingTree() const { return m_scrollingTree; }
+    const IntRect& viewportRect() const { return m_viewportRect; }
+    const IntSize& contentsSize() const { return m_contentsSize; }
 private:
     ScrollingTree* m_scrollingTree;
+    IntRect m_viewportRect;
+    IntSize m_contentsSize;
 };

r106690	r106711
55	55
56	56	bool hasChangedProperties() const { return m_changedProperties; }
	57	unsigned changedProperties() const { return m_changedProperties; }
57	58
58	59	const IntRect& viewportRect() const { return m_viewportRect; }

r106696	r106711
41	41
42	42	private:
	43	virtual void update(ScrollingTreeState*) OVERRIDE;
	44
43	45	RetainPtr<CALayer> m_scrollLayer;
44	46	};

-              r106696
+              r106711
 #if ENABLE(THREADED_SCROLLING)
+#include "ScrollingTreeState.h"
 namespace WebCore {
 …
+}
+void ScrollingTreeNodeMac::update(ScrollingTreeState* state)
+{
+    ScrollingTreeNode::update(state);
+    if (state->changedProperties() & ScrollingTreeState::ScrollLayer)
+        m_scrollLayer = state->platformScrollLayer();
+}
 } // namespace WebCore

Note: See TracChangeset for help on using the changeset viewer.