diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-16 14:51:15 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-16 14:51:15 +0200 |
| commit | 4e6b3a206fa4ad8bb0b664f7674c9a70376d6e26 (patch) | |
| tree | 7bb9ad7e31c24d1cf1707e03e6f1a80f6d033951 /Source/WebCore/dom/ComposedShadowTreeWalker.cpp | |
| parent | 3977e3d2f72f7fe2c887c1ec0e0c342e1d169f42 (diff) | |
| download | qtwebkit-4e6b3a206fa4ad8bb0b664f7674c9a70376d6e26.tar.gz | |
Imported WebKit commit 953baa67aa07087b6ecd4199351ec554c724e27d (http://svn.webkit.org/repository/webkit/trunk@122676)
Diffstat (limited to 'Source/WebCore/dom/ComposedShadowTreeWalker.cpp')
| -rw-r--r-- | Source/WebCore/dom/ComposedShadowTreeWalker.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebCore/dom/ComposedShadowTreeWalker.cpp b/Source/WebCore/dom/ComposedShadowTreeWalker.cpp index 1d8feed18..2faf8593c 100644 --- a/Source/WebCore/dom/ComposedShadowTreeWalker.cpp +++ b/Source/WebCore/dom/ComposedShadowTreeWalker.cpp @@ -51,18 +51,18 @@ static inline ElementShadow* shadowOfParent(const Node* node) return 0; } -inline void ComposedShadowTreeWalker::ParentTranversalDetails::didTraverseInsertionPoint(InsertionPoint* insertionPoint) +inline void ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseInsertionPoint(InsertionPoint* insertionPoint) { if (!m_insertionPoint) m_insertionPoint = insertionPoint; } -inline void ComposedShadowTreeWalker::ParentTranversalDetails::didTraverseShadowRoot(const ShadowRoot* root) +inline void ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseShadowRoot(const ShadowRoot* root) { m_resetStyleInheritance = m_resetStyleInheritance || root->resetStyleInheritance(); } -inline void ComposedShadowTreeWalker::ParentTranversalDetails::didFindNode(ContainerNode* node) +inline void ComposedShadowTreeWalker::ParentTraversalDetails::didFindNode(ContainerNode* node) { if (!m_outOfComposition) m_node = node; @@ -75,7 +75,7 @@ ComposedShadowTreeWalker ComposedShadowTreeWalker::fromFirstChild(const Node* no return walker; } -void ComposedShadowTreeWalker::findParent(const Node* node, ParentTranversalDetails* details) +void ComposedShadowTreeWalker::findParent(const Node* node, ParentTraversalDetails* details) { ComposedShadowTreeWalker walker(node, CrossUpperBoundary, CanStartFromShadowBoundary); ContainerNode* found = toContainerNode(walker.traverseParent(walker.get(), details)); @@ -203,7 +203,7 @@ inline Node* ComposedShadowTreeWalker::escapeFallbackContentElement(const Node* return 0; } -inline Node* ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents(const Node* node, ParentTranversalDetails* details) const +inline Node* ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents(const Node* node, ParentTraversalDetails* details) const { ASSERT(node); if (!isInsertionPoint(node)) @@ -222,7 +222,7 @@ void ComposedShadowTreeWalker::parent() // FIXME: Use an iterative algorithm so that it can be inlined. // https://bugs.webkit.org/show_bug.cgi?id=90415 -Node* ComposedShadowTreeWalker::traverseParent(const Node* node, ParentTranversalDetails* details) const +Node* ComposedShadowTreeWalker::traverseParent(const Node* node, ParentTraversalDetails* details) const { if (!canCrossUpperBoundary() && node->isShadowRoot()) { ASSERT(toShadowRoot(node)->isYoungest()); @@ -243,14 +243,14 @@ Node* ComposedShadowTreeWalker::traverseParent(const Node* node, ParentTranversa return traverseParentInCurrentTree(node, details); } -inline Node* ComposedShadowTreeWalker::traverseParentInCurrentTree(const Node* node, ParentTranversalDetails* details) const +inline Node* ComposedShadowTreeWalker::traverseParentInCurrentTree(const Node* node, ParentTraversalDetails* details) const { if (Node* parent = node->parentNode()) return parent->isShadowRoot() ? traverseParentBackToYoungerShadowRootOrHost(toShadowRoot(parent), details) : traverseNodeEscapingFallbackContents(parent, details); return 0; } -Node* ComposedShadowTreeWalker::traverseParentBackToYoungerShadowRootOrHost(const ShadowRoot* shadowRoot, ParentTranversalDetails* details) const +Node* ComposedShadowTreeWalker::traverseParentBackToYoungerShadowRootOrHost(const ShadowRoot* shadowRoot, ParentTraversalDetails* details) const { ASSERT(shadowRoot); if (shadowRoot->isYoungest()) { |