summaryrefslogtreecommitdiff
path: root/src/3rdparty/webkit/WebCore/rendering/LayoutState.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-15 11:06:43 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-15 11:31:31 +0200
commitc411f16870f112c3407c28c22b617f613a82cff4 (patch)
tree29a1bcd590c8b31af2aab445bfe8a978dc5bf582 /src/3rdparty/webkit/WebCore/rendering/LayoutState.h
parent3d77b56b32a0c53ec0bbfaa07236fedb900ff336 (diff)
downloadqt4-tools-c411f16870f112c3407c28c22b617f613a82cff4.tar.gz
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-15062009 ( 65232bf00dc494ebfd978f998c88f58d18ecce1e )
Diffstat (limited to 'src/3rdparty/webkit/WebCore/rendering/LayoutState.h')
-rw-r--r--src/3rdparty/webkit/WebCore/rendering/LayoutState.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/rendering/LayoutState.h b/src/3rdparty/webkit/WebCore/rendering/LayoutState.h
index 551c74a007..afa295206b 100644
--- a/src/3rdparty/webkit/WebCore/rendering/LayoutState.h
+++ b/src/3rdparty/webkit/WebCore/rendering/LayoutState.h
@@ -41,6 +41,9 @@ public:
LayoutState()
: m_clipped(false)
, m_next(0)
+#ifndef NDEBUG
+ , m_renderer(0)
+#endif
{
}
@@ -62,8 +65,14 @@ private:
public:
bool m_clipped;
IntRect m_clipRect;
- IntSize m_offset;
+ IntSize m_offset; // x/y offset from container.
+ IntSize m_layoutDelta; // Transient offset from the final position of the object
+ // used to ensure that repaints happen in the correct place.
+ // This is a total delta accumulated from the root.
LayoutState* m_next;
+#ifndef NDEBUG
+ RenderObject* m_renderer;
+#endif
};
} // namespace WebCore