Changeset 122447 in webkit
- Timestamp:
- Jul 12, 2012 4:54:26 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r122446 r122447 1 2012-07-12 MORITA Hajime <morrita@google.com> 2 3 Typo: ParentTranversalDetails should be ParentTraversalDetails 4 https://bugs.webkit.org/show_bug.cgi?id=91059 5 6 Reviewed by Andreas Kling. 7 8 Did a bare rename from ParentTranversalDetails to ParentTraversalDetails 9 10 No new tests, just a rename. 11 12 * dom/ComposedShadowTreeWalker.cpp: 13 (WebCore::ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseInsertionPoint): 14 (WebCore::ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseShadowRoot): 15 (WebCore::ComposedShadowTreeWalker::ParentTraversalDetails::didFindNode): 16 (WebCore::ComposedShadowTreeWalker::findParent): 17 (WebCore::ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents): 18 (WebCore::ComposedShadowTreeWalker::traverseParent): 19 (WebCore::ComposedShadowTreeWalker::traverseParentInCurrentTree): 20 (WebCore::ComposedShadowTreeWalker::traverseParentBackToYoungerShadowRootOrHost): 21 * dom/ComposedShadowTreeWalker.h: 22 (WebCore::ComposedShadowTreeWalker::ParentTraversalDetails::ParentTraversalDetails): 23 (ComposedShadowTreeWalker): 24 * dom/NodeRenderingContext.h: 25 (NodeRenderingContext): 26 1 27 2012-07-11 Antti Koivisto <antti@apple.com> 2 28 -
trunk/Source/WebCore/dom/ComposedShadowTreeWalker.cpp
r121875 r122447 52 52 } 53 53 54 inline void ComposedShadowTreeWalker::ParentTra nversalDetails::didTraverseInsertionPoint(InsertionPoint* insertionPoint)54 inline void ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseInsertionPoint(InsertionPoint* insertionPoint) 55 55 { 56 56 if (!m_insertionPoint) … … 58 58 } 59 59 60 inline void ComposedShadowTreeWalker::ParentTra nversalDetails::didTraverseShadowRoot(const ShadowRoot* root)60 inline void ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseShadowRoot(const ShadowRoot* root) 61 61 { 62 62 m_resetStyleInheritance = m_resetStyleInheritance || root->resetStyleInheritance(); 63 63 } 64 64 65 inline void ComposedShadowTreeWalker::ParentTra nversalDetails::didFindNode(ContainerNode* node)65 inline void ComposedShadowTreeWalker::ParentTraversalDetails::didFindNode(ContainerNode* node) 66 66 { 67 67 if (!m_outOfComposition) … … 76 76 } 77 77 78 void ComposedShadowTreeWalker::findParent(const Node* node, ParentTra nversalDetails* details)78 void ComposedShadowTreeWalker::findParent(const Node* node, ParentTraversalDetails* details) 79 79 { 80 80 ComposedShadowTreeWalker walker(node, CrossUpperBoundary, CanStartFromShadowBoundary); … … 204 204 } 205 205 206 inline Node* ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents(const Node* node, ParentTra nversalDetails* details) const206 inline Node* ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents(const Node* node, ParentTraversalDetails* details) const 207 207 { 208 208 ASSERT(node); … … 223 223 // FIXME: Use an iterative algorithm so that it can be inlined. 224 224 // https://bugs.webkit.org/show_bug.cgi?id=90415 225 Node* ComposedShadowTreeWalker::traverseParent(const Node* node, ParentTra nversalDetails* details) const225 Node* ComposedShadowTreeWalker::traverseParent(const Node* node, ParentTraversalDetails* details) const 226 226 { 227 227 if (!canCrossUpperBoundary() && node->isShadowRoot()) { … … 244 244 } 245 245 246 inline Node* ComposedShadowTreeWalker::traverseParentInCurrentTree(const Node* node, ParentTra nversalDetails* details) const246 inline Node* ComposedShadowTreeWalker::traverseParentInCurrentTree(const Node* node, ParentTraversalDetails* details) const 247 247 { 248 248 if (Node* parent = node->parentNode()) … … 251 251 } 252 252 253 Node* ComposedShadowTreeWalker::traverseParentBackToYoungerShadowRootOrHost(const ShadowRoot* shadowRoot, ParentTra nversalDetails* details) const253 Node* ComposedShadowTreeWalker::traverseParentBackToYoungerShadowRootOrHost(const ShadowRoot* shadowRoot, ParentTraversalDetails* details) const 254 254 { 255 255 ASSERT(shadowRoot); -
trunk/Source/WebCore/dom/ComposedShadowTreeWalker.h
r121518 r122447 50 50 }; 51 51 52 class ParentTra nversalDetails {52 class ParentTraversalDetails { 53 53 public: 54 ParentTra nversalDetails()54 ParentTraversalDetails() 55 55 : m_node(0) 56 56 , m_insertionPoint(0) … … 81 81 // for (ComposedShadowTreeWalker walker = ComposedShadowTreeWalker::fromFirstChild(node); walker.get(); walker.nextSibling()) 82 82 static ComposedShadowTreeWalker fromFirstChild(const Node*, Policy = CrossUpperBoundary); 83 static void findParent(const Node*, ParentTra nversalDetails*);83 static void findParent(const Node*, ParentTraversalDetails*); 84 84 85 85 Node* get() const { return const_cast<Node*>(m_node); } … … 97 97 98 98 private: 99 ComposedShadowTreeWalker(const Node*, ParentTra nversalDetails*);99 ComposedShadowTreeWalker(const Node*, ParentTraversalDetails*); 100 100 101 101 enum TraversalDirection { … … 132 132 Node* traverseLastChild(const Node*) const; 133 133 Node* traverseChild(const Node*, TraversalDirection) const; 134 Node* traverseParent(const Node*, ParentTra nversalDetails* = 0) const;134 Node* traverseParent(const Node*, ParentTraversalDetails* = 0) const; 135 135 136 136 static Node* traverseNextSibling(const Node*); … … 143 143 static Node* escapeFallbackContentElement(const Node*, TraversalDirection); 144 144 145 Node* traverseNodeEscapingFallbackContents(const Node*, ParentTra nversalDetails* = 0) const;146 Node* traverseParentInCurrentTree(const Node*, ParentTra nversalDetails* = 0) const;147 Node* traverseParentBackToYoungerShadowRootOrHost(const ShadowRoot*, ParentTra nversalDetails* = 0) const;145 Node* traverseNodeEscapingFallbackContents(const Node*, ParentTraversalDetails* = 0) const; 146 Node* traverseParentInCurrentTree(const Node*, ParentTraversalDetails* = 0) const; 147 Node* traverseParentBackToYoungerShadowRootOrHost(const ShadowRoot*, ParentTraversalDetails* = 0) const; 148 148 149 149 const Node* m_node; -
trunk/Source/WebCore/dom/NodeRenderingContext.h
r121518 r122447 71 71 private: 72 72 Node* m_node; 73 ComposedShadowTreeWalker::ParentTra nversalDetails m_parentDetails;73 ComposedShadowTreeWalker::ParentTraversalDetails m_parentDetails; 74 74 RefPtr<RenderStyle> m_style; 75 75 RenderNamedFlowThread* m_parentFlowRenderer;
Note: See TracChangeset
for help on using the changeset viewer.