Title: [163922] trunk/Source/WebCore
- Revision
- 163922
- Author
- akl...@apple.com
- Date
- 2014-02-11 17:55:40 -0800 (Tue, 11 Feb 2014)
Log Message
Move renderNamedFlowThreadWrapper() to RenderElement.
<https://webkit.org/b/128634>
This function is only ever called on RenderElements so move it there
from RenderObject.
Reviewed by Antti Koivisto.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::renderNamedFlowThreadWrapper):
* rendering/RenderElement.h:
* rendering/RenderObject.cpp:
* rendering/RenderObject.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163921 => 163922)
--- trunk/Source/WebCore/ChangeLog 2014-02-12 01:54:19 UTC (rev 163921)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 01:55:40 UTC (rev 163922)
@@ -1,3 +1,19 @@
+2014-02-11 Andreas Kling <akl...@apple.com>
+
+ Move renderNamedFlowThreadWrapper() to RenderElement.
+ <https://webkit.org/b/128634>
+
+ This function is only ever called on RenderElements so move it there
+ from RenderObject.
+
+ Reviewed by Antti Koivisto.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::renderNamedFlowThreadWrapper):
+ * rendering/RenderElement.h:
+ * rendering/RenderObject.cpp:
+ * rendering/RenderObject.h:
+
2014-02-11 Myles C. Maxfield <mmaxfi...@apple.com>
Position and thickness of underline as text size changes
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (163921 => 163922)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-12 01:54:19 UTC (rev 163921)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-12 01:55:40 UTC (rev 163922)
@@ -44,6 +44,7 @@
#include "RenderLayerCompositor.h"
#include "RenderLineBreak.h"
#include "RenderListItem.h"
+#include "RenderNamedFlowThread.h"
#include "RenderRegion.h"
#include "RenderRuby.h"
#include "RenderRubyText.h"
@@ -1274,4 +1275,12 @@
return borderImage && borderImage->canRender(this, style().effectiveZoom()) && borderImage->isLoaded();
}
+RenderNamedFlowThread* RenderElement::renderNamedFlowThreadWrapper()
+{
+ auto renderer = this;
+ while (renderer && renderer->isAnonymousBlock() && !renderer->isRenderNamedFlowThread())
+ renderer = renderer->parent();
+ return renderer && renderer->isRenderNamedFlowThread() ? toRenderNamedFlowThread(renderer) : nullptr;
}
+
+}
Modified: trunk/Source/WebCore/rendering/RenderElement.h (163921 => 163922)
--- trunk/Source/WebCore/rendering/RenderElement.h 2014-02-12 01:54:19 UTC (rev 163921)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-02-12 01:55:40 UTC (rev 163922)
@@ -141,6 +141,8 @@
bool hasBlendMode() const { return false; }
#endif
+ RenderNamedFlowThread* renderNamedFlowThreadWrapper();
+
protected:
enum BaseTypeFlags {
RenderLayerModelObjectFlag = 1 << 0,
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (163921 => 163922)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-12 01:54:19 UTC (rev 163921)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-12 01:55:40 UTC (rev 163922)
@@ -538,15 +538,6 @@
return 0;
}
-RenderNamedFlowThread* RenderObject::renderNamedFlowThreadWrapper() const
-{
- RenderObject* object = const_cast<RenderObject*>(this);
- while (object && object->isAnonymousBlock() && !object->isRenderNamedFlowThread())
- object = object->parent();
-
- return object && object->isRenderNamedFlowThread() ? toRenderNamedFlowThread(object) : 0;
-}
-
RenderBlock* RenderObject::firstLineBlock() const
{
return 0;
Modified: trunk/Source/WebCore/rendering/RenderObject.h (163921 => 163922)
--- trunk/Source/WebCore/rendering/RenderObject.h 2014-02-12 01:54:19 UTC (rev 163921)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-02-12 01:55:40 UTC (rev 163922)
@@ -217,8 +217,6 @@
return locateFlowThreadContainingBlock();
}
- RenderNamedFlowThread* renderNamedFlowThreadWrapper() const;
-
// FIXME: The meaning of this function is unclear.
virtual bool isEmpty() const { return !firstChildSlow(); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
