Merge 132398

Source/WebCore/rendering/RenderObject.h

Index: Source/WebCore/rendering/RenderObject.h
===================================================================
--- Source/WebCore/rendering/RenderObject.h	(revision 132816)
+++ Source/WebCore/rendering/RenderObject.h	(working copy)
@@ -237,6 +237,16 @@
     bool hasAXObject() const { return m_hasAXObject; }
     bool isSetNeedsLayoutForbidden() const { return m_setNeedsLayoutForbidden; }
     void setNeedsLayoutIsForbidden(bool flag) { m_setNeedsLayoutForbidden = flag; }
+
+    // Helper class forbidding calls to setNeedsLayout() during its lifetime.
+    class SetLayoutNeededForbiddenScope {
+    public:
+        explicit SetLayoutNeededForbiddenScope(RenderObject*);
+        ~SetLayoutNeededForbiddenScope();
+    private:
+        RenderObject* m_renderObject;
+        bool m_preexistingForbidden;
+    };
 #endif
 
     // Obtains the nearest enclosing block (including this block) that contributes a first-line style to our inline