Title: [124262] trunk/Source/WebCore
- Revision
- 124262
- Author
- [email protected]
- Date
- 2012-07-31 16:00:18 -0700 (Tue, 31 Jul 2012)
Log Message
Read tag names and attributes from the saved tokens in HTMLTreeBuilder::processEndTag(AtomicHTMLToken*)
https://bugs.webkit.org/show_bug.cgi?id=92715
Reviewed by Adam Barth.
This is a follow-up patch for r123577. Changed oneBelowTop to return HTMLStackItem*.
No new tests, covered by existing tests.
* html/parser/HTMLConstructionSite.h:
(WebCore::HTMLConstructionSite::oneBelowTop):
* html/parser/HTMLElementStack.cpp:
(WebCore::HTMLElementStack::oneBelowTop):
* html/parser/HTMLElementStack.h:
(HTMLElementStack):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (124261 => 124262)
--- trunk/Source/WebCore/ChangeLog 2012-07-31 22:59:49 UTC (rev 124261)
+++ trunk/Source/WebCore/ChangeLog 2012-07-31 23:00:18 UTC (rev 124262)
@@ -1,3 +1,21 @@
+2012-07-31 Kwang Yul Seo <[email protected]>
+
+ Read tag names and attributes from the saved tokens in HTMLTreeBuilder::processEndTag(AtomicHTMLToken*)
+ https://bugs.webkit.org/show_bug.cgi?id=92715
+
+ Reviewed by Adam Barth.
+
+ This is a follow-up patch for r123577. Changed oneBelowTop to return HTMLStackItem*.
+
+ No new tests, covered by existing tests.
+
+ * html/parser/HTMLConstructionSite.h:
+ (WebCore::HTMLConstructionSite::oneBelowTop):
+ * html/parser/HTMLElementStack.cpp:
+ (WebCore::HTMLElementStack::oneBelowTop):
+ * html/parser/HTMLElementStack.h:
+ (HTMLElementStack):
+
2012-07-31 Eric Seidel <[email protected]>
StyleResolver::canShareStyleWithElement does not need to use getAttribute for classAttr in the non-SVG case
Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.h (124261 => 124262)
--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.h 2012-07-31 22:59:49 UTC (rev 124261)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.h 2012-07-31 23:00:18 UTC (rev 124262)
@@ -114,7 +114,7 @@
Element* currentElement() const { return m_openElements.top(); }
ContainerNode* currentNode() const { return m_openElements.topNode(); }
HTMLStackItem* currentStackItem() const { return m_openElements.topStackItem(); }
- Element* oneBelowTop() const { return m_openElements.oneBelowTop(); }
+ HTMLStackItem* oneBelowTop() const { return m_openElements.oneBelowTop(); }
HTMLElementStack* openElements() const { return &m_openElements; }
HTMLFormattingElementList* activeFormattingElements() const { return &m_activeFormattingElements; }
Modified: trunk/Source/WebCore/html/parser/HTMLElementStack.cpp (124261 => 124262)
--- trunk/Source/WebCore/html/parser/HTMLElementStack.cpp 2012-07-31 22:59:49 UTC (rev 124261)
+++ trunk/Source/WebCore/html/parser/HTMLElementStack.cpp 2012-07-31 23:00:18 UTC (rev 124262)
@@ -383,13 +383,13 @@
return m_top.get();
}
-Element* HTMLElementStack::oneBelowTop() const
+HTMLStackItem* HTMLElementStack::oneBelowTop() const
{
// We should never call this if there are fewer than 2 elements on the stack.
ASSERT(m_top);
ASSERT(m_top->next());
if (m_top->next()->stackItem()->isElementNode())
- return m_top->next()->element();
+ return m_top->next()->stackItem().get();
return 0;
}
Modified: trunk/Source/WebCore/html/parser/HTMLElementStack.h (124261 => 124262)
--- trunk/Source/WebCore/html/parser/HTMLElementStack.h 2012-07-31 22:59:49 UTC (rev 124261)
+++ trunk/Source/WebCore/html/parser/HTMLElementStack.h 2012-07-31 23:00:18 UTC (rev 124262)
@@ -98,7 +98,7 @@
return m_top->stackItem().get();
}
- Element* oneBelowTop() const;
+ HTMLStackItem* oneBelowTop() const;
ElementRecord* topRecord() const;
Element* bottom() const;
ElementRecord* find(Element*) const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
