Title: [108728] trunk/Source/WebCore
- Revision
- 108728
- Author
- [email protected]
- Date
- 2012-02-23 21:43:13 -0800 (Thu, 23 Feb 2012)
Log Message
NodeRenderingContext should have ShadowRootList instead of ShadowRoot.
https://bugs.webkit.org/show_bug.cgi?id=79079
Reviewed by Dimitri Glazkov.
Apparently NodeRenderingContext should have ShadowRootList instead of ShadowRoot.
This patch changes it.
No new tests. Simple refactoring.
* dom/NodeRenderingContext.cpp:
(WebCore::NodeRenderingContext::NodeRenderingContext):
(WebCore::NodeRenderingContext::hostChildrenChanged):
(WebCore::NodeRenderingContext::shouldCreateRenderer):
* dom/NodeRenderingContext.h:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108727 => 108728)
--- trunk/Source/WebCore/ChangeLog 2012-02-24 05:31:12 UTC (rev 108727)
+++ trunk/Source/WebCore/ChangeLog 2012-02-24 05:43:13 UTC (rev 108728)
@@ -1,3 +1,22 @@
+2012-02-23 Shinya Kawanaka <[email protected]>
+
+ NodeRenderingContext should have ShadowRootList instead of ShadowRoot.
+ https://bugs.webkit.org/show_bug.cgi?id=79079
+
+ Reviewed by Dimitri Glazkov.
+
+ Apparently NodeRenderingContext should have ShadowRootList instead of ShadowRoot.
+ This patch changes it.
+
+ No new tests. Simple refactoring.
+
+ * dom/NodeRenderingContext.cpp:
+ (WebCore::NodeRenderingContext::NodeRenderingContext):
+ (WebCore::NodeRenderingContext::hostChildrenChanged):
+ (WebCore::NodeRenderingContext::shouldCreateRenderer):
+ * dom/NodeRenderingContext.h:
+ (WebCore):
+
2012-02-23 Ian Vollick <[email protected]>
[chromium] Implement keyframed animations for the cc thread.
Modified: trunk/Source/WebCore/dom/NodeRenderingContext.cpp (108727 => 108728)
--- trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-02-24 05:31:12 UTC (rev 108727)
+++ trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-02-24 05:43:13 UTC (rev 108728)
@@ -47,7 +47,7 @@
: m_phase(AttachingNotInTree)
, m_node(node)
, m_parentNodeForRenderingAndStyle(0)
- , m_visualParentShadowRoot(0)
+ , m_visualParentShadowRootList(0)
, m_insertionPoint(0)
, m_style(0)
, m_parentFlowRenderer(0)
@@ -63,13 +63,10 @@
}
if (parent->isElementNode()) {
- if (toElement(parent)->hasShadowRoot())
- m_visualParentShadowRoot = toElement(parent)->shadowRootList()->youngestShadowRoot();
-
- if (m_visualParentShadowRoot) {
- ShadowRootList* shadowRootList = m_visualParentShadowRoot->host()->shadowRootList();
- if ((m_insertionPoint = shadowRootList->insertionPointFor(m_node))
- && shadowRootList->isSelectorActive()) {
+ if (toElement(parent)->hasShadowRoot()) {
+ m_visualParentShadowRootList = toElement(parent)->shadowRootList();
+ if ((m_insertionPoint = m_visualParentShadowRootList->insertionPointFor(m_node))
+ && m_visualParentShadowRootList->isSelectorActive()) {
m_phase = AttachingDistributed;
m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_insertionPoint).parentNodeForRenderingAndStyle();
return;
@@ -98,7 +95,7 @@
: m_phase(Calculating)
, m_node(node)
, m_parentNodeForRenderingAndStyle(0)
- , m_visualParentShadowRoot(0)
+ , m_visualParentShadowRootList(0)
, m_insertionPoint(0)
, m_style(style)
, m_parentFlowRenderer(0)
@@ -264,7 +261,7 @@
void NodeRenderingContext::hostChildrenChanged()
{
if (m_phase == AttachingNotDistributed)
- m_visualParentShadowRoot->host()->shadowRootList()->hostChildrenChanged();
+ m_visualParentShadowRootList->hostChildrenChanged();
}
bool NodeRenderingContext::shouldCreateRenderer() const
@@ -285,7 +282,7 @@
if (!parentRenderer->canHaveChildren())
return false;
- if (m_visualParentShadowRoot)
+ if (m_visualParentShadowRootList)
return false;
}
Modified: trunk/Source/WebCore/dom/NodeRenderingContext.h (108727 => 108728)
--- trunk/Source/WebCore/dom/NodeRenderingContext.h 2012-02-24 05:31:12 UTC (rev 108727)
+++ trunk/Source/WebCore/dom/NodeRenderingContext.h 2012-02-24 05:43:13 UTC (rev 108728)
@@ -39,7 +39,7 @@
class RenderFlowThread;
class RenderObject;
class RenderStyle;
-class ShadowRoot;
+class ShadowRootList;
class NodeRenderingContext {
public:
@@ -81,7 +81,7 @@
AttachingPhase m_phase;
Node* m_node;
ContainerNode* m_parentNodeForRenderingAndStyle;
- ShadowRoot* m_visualParentShadowRoot;
+ ShadowRootList* m_visualParentShadowRootList;
InsertionPoint* m_insertionPoint;
RefPtr<RenderStyle> m_style;
RenderFlowThread* m_parentFlowRenderer;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
