Title: [103442] branches/safari-534.54-branch/Source/WebCore
Diff
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (103441 => 103442)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2011-12-21 21:49:25 UTC (rev 103441)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2011-12-21 21:51:49 UTC (rev 103442)
@@ -1,5 +1,17 @@
2011-12-21 Lucas Forschler <[email protected]>
+ Merge 94512
+
+ 2011-09-04 Abhishek Arya <[email protected]>
+
+ Unreviewed. Compile fix for r94511.
+
+ * dom/Range.cpp:
+ (WebCore::Range::processContents):
+ (WebCore::Range::processAncestorsAndTheirSiblings):
+
+2011-12-21 Lucas Forschler <[email protected]>
+
Merge 94511
2011-09-04 Abhishek Arya <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/dom/Range.cpp (103441 => 103442)
--- branches/safari-534.54-branch/Source/WebCore/dom/Range.cpp 2011-12-21 21:49:25 UTC (rev 103441)
+++ branches/safari-534.54-branch/Source/WebCore/dom/Range.cpp 2011-12-21 21:51:49 UTC (rev 103442)
@@ -56,8 +56,6 @@
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, rangeCounter, ("Range"));
-typedef Vector<RefPtr<Node> > NodeVector;
-
inline Range::Range(PassRefPtr<Document> ownerDocument)
: m_ownerDocument(ownerDocument)
, m_start(m_ownerDocument)
@@ -672,6 +670,8 @@
PassRefPtr<DocumentFragment> Range::processContents(ActionType action, ExceptionCode& ec)
{
+ typedef Vector<RefPtr<Node> > NodeVector;
+
RefPtr<DocumentFragment> fragment;
if (action == EXTRACT_CONTENTS || action == CLONE_CONTENTS)
fragment = DocumentFragment::create(m_ownerDocument.get());
@@ -866,6 +866,8 @@
PassRefPtr<Node> Range::processAncestorsAndTheirSiblings(ActionType action, Node* container, ContentsProcessDirection direction, PassRefPtr<Node> passedClonedContainer, Node* commonRoot, ExceptionCode& ec)
{
+ typedef Vector<RefPtr<Node> > NodeVector;
+
RefPtr<Node> clonedContainer = passedClonedContainer;
Vector<RefPtr<Node> > ancestors;
for (ContainerNode* n = container->parentNode(); n && n != commonRoot; n = n->parentNode())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
