Title: [154447] trunk/Source/WebCore
- Revision
- 154447
- Author
- [email protected]
- Date
- 2013-08-22 08:28:37 -0700 (Thu, 22 Aug 2013)
Log Message
RenderNamedFlowThread should not create NodeRenderingContext objects
https://bugs.webkit.org/show_bug.cgi?id=119923
Reviewed by Antti Koivisto.
Port of https://chromium.googlesource.com/chromium/blink/+/949d7d7e7b8685454742a55cf0ca912bb9a7b177.
Original patch by Elliott Sprehn.
RenderNamedFlowThread should not create NodeRenderingContext objects
RenderNamedFlowThread is using NodeRenderingContext to get the original
parent renderer, but should just be using NodeRenderingTraversal::parent
instead (which is what NodeRenderingContext does internally anyway).
Tests: No change in functionality. No new tests.
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::isChildAllowed):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154446 => 154447)
--- trunk/Source/WebCore/ChangeLog 2013-08-22 14:01:07 UTC (rev 154446)
+++ trunk/Source/WebCore/ChangeLog 2013-08-22 15:28:37 UTC (rev 154447)
@@ -1,3 +1,24 @@
+2013-08-22 Andrei Bucur <[email protected]>
+
+ RenderNamedFlowThread should not create NodeRenderingContext objects
+ https://bugs.webkit.org/show_bug.cgi?id=119923
+
+ Reviewed by Antti Koivisto.
+
+ Port of https://chromium.googlesource.com/chromium/blink/+/949d7d7e7b8685454742a55cf0ca912bb9a7b177.
+ Original patch by Elliott Sprehn.
+
+ RenderNamedFlowThread should not create NodeRenderingContext objects
+
+ RenderNamedFlowThread is using NodeRenderingContext to get the original
+ parent renderer, but should just be using NodeRenderingTraversal::parent
+ instead (which is what NodeRenderingContext does internally anyway).
+
+ Tests: No change in functionality. No new tests.
+
+ * rendering/RenderNamedFlowThread.cpp:
+ (WebCore::RenderNamedFlowThread::isChildAllowed):
+
2013-08-22 Christophe Dumez <[email protected]>
Introduce a SVGUnknownElement class for unknown SVG elements
Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp (154446 => 154447)
--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2013-08-22 14:01:07 UTC (rev 154446)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2013-08-22 15:28:37 UTC (rev 154447)
@@ -30,7 +30,7 @@
#include "FlowThreadController.h"
#include "InlineTextBox.h"
#include "InspectorInstrumentation.h"
-#include "NodeRenderingContext.h"
+#include "NodeRenderingTraversal.h"
#include "NodeTraversal.h"
#include "Position.h"
#include "Range.h"
@@ -38,6 +38,7 @@
#include "RenderRegion.h"
#include "RenderText.h"
#include "RenderView.h"
+#include "ShadowRoot.h"
#include "Text.h"
#include "WebKitNamedFlow.h"
@@ -480,18 +481,16 @@
bool RenderNamedFlowThread::isChildAllowed(RenderObject* child, RenderStyle* style) const
{
- ASSERT(child);
- ASSERT(style);
-
if (!child->node())
return true;
ASSERT(child->node()->isElementNode());
- RenderObject* parentRenderer = NodeRenderingContext(child->node()).parentRenderer();
- if (!parentRenderer)
+ Node* originalParent = NodeRenderingTraversal::parent(child->node());
+
+ if (!originalParent || !originalParent->renderer())
return true;
- return parentRenderer->isChildAllowed(child, style);
+ return originalParent->renderer()->isChildAllowed(child, style);
}
void RenderNamedFlowThread::dispatchRegionLayoutUpdateEvent()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
