Title: [159022] trunk/Source/WebCore
- Revision
- 159022
- Author
- [email protected]
- Date
- 2013-11-10 02:58:54 -0800 (Sun, 10 Nov 2013)
Log Message
Remove unused FragmentationDisabler class.
<https://webkit.org/b/124118>
This RAII object was added in r144744 to avoid a crash when using
MathML inside CSS regions. Its only user was removed in r157070.
Reviewed by Antti Koivisto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159021 => 159022)
--- trunk/Source/WebCore/ChangeLog 2013-11-10 10:56:32 UTC (rev 159021)
+++ trunk/Source/WebCore/ChangeLog 2013-11-10 10:58:54 UTC (rev 159022)
@@ -1,5 +1,15 @@
2013-11-10 Andreas Kling <[email protected]>
+ Remove unused FragmentationDisabler class.
+ <https://webkit.org/b/124118>
+
+ This RAII object was added in r144744 to avoid a crash when using
+ MathML inside CSS regions. Its only user was removed in r157070.
+
+ Reviewed by Antti Koivisto.
+
+2013-11-10 Andreas Kling <[email protected]>
+
Simplify some is-this-a-MathML-element? checks.
<https://webkit.org/b/124119>
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (159021 => 159022)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2013-11-10 10:56:32 UTC (rev 159021)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2013-11-10 10:58:54 UTC (rev 159022)
@@ -1191,36 +1191,4 @@
return *m_imageQualityController;
}
-FragmentationDisabler::FragmentationDisabler(RenderObject* root)
-{
- LayoutState* layoutState = root->view().layoutState();
-
- m_root = root;
- m_fragmenting = layoutState && layoutState->isPaginated();
- m_flowThreadState = m_root->flowThreadState();
-#ifndef NDEBUG
- m_layoutState = layoutState;
-#endif
-
- if (layoutState)
- layoutState->m_isPaginated = false;
-
- if (m_flowThreadState != RenderObject::NotInsideFlowThread)
- m_root->setFlowThreadStateIncludingDescendants(RenderObject::NotInsideFlowThread);
-}
-
-FragmentationDisabler::~FragmentationDisabler()
-{
- LayoutState* layoutState = m_root->view().layoutState();
-#ifndef NDEBUG
- ASSERT(m_layoutState == layoutState);
-#endif
-
- if (layoutState)
- layoutState->m_isPaginated = m_fragmenting;
-
- if (m_flowThreadState != RenderObject::NotInsideFlowThread)
- m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderView.h (159021 => 159022)
--- trunk/Source/WebCore/rendering/RenderView.h 2013-11-10 10:56:32 UTC (rev 159021)
+++ trunk/Source/WebCore/rendering/RenderView.h 2013-11-10 10:58:54 UTC (rev 159022)
@@ -433,20 +433,6 @@
RenderView* m_view;
};
-class FragmentationDisabler {
- WTF_MAKE_NONCOPYABLE(FragmentationDisabler);
-public:
- FragmentationDisabler(RenderObject* root);
- ~FragmentationDisabler();
-private:
- RenderObject* m_root;
- RenderObject::FlowThreadState m_flowThreadState;
- bool m_fragmenting;
-#ifndef NDEBUG
- LayoutState* m_layoutState;
-#endif
-};
-
inline Frame& RenderObject::frame() const
{
return view().frameView().frame();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
