[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

darin at apple.com darin at apple.com
Wed Dec 22 18:26:19 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit dfffae981391ff960605df145ae822fdde58afeb
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 22:30:41 2010 +0000

    Try to fix Windows build.
    
    * dom/Range.cpp:
    (WebCore::Range::processContents): Put typedef of NodeVector inside the function
    instead of at the top of the file, since the use is restricted to this function.
    There's another NodeVector in ContainerNode.cpp.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b548514..2ae63ad 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-10  Darin Adler  <darin at apple.com>
+
+        Try to fix Windows build.
+
+        * dom/Range.cpp:
+        (WebCore::Range::processContents): Put typedef of NodeVector inside the function
+        instead of at the top of the file, since the use is restricted to this function.
+        There's another NodeVector in ContainerNode.cpp.
+
 2010-12-09  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/dom/Range.cpp b/WebCore/dom/Range.cpp
index cf05b9b..cffc051 100644
--- a/WebCore/dom/Range.cpp
+++ b/WebCore/dom/Range.cpp
@@ -45,8 +45,6 @@
 
 namespace WebCore {
 
-typedef Vector<RefPtr<Node> > NodeVector;
-
 using namespace std;
 
 #ifndef NDEBUG
@@ -598,6 +596,8 @@ bool Range::intersectsNode(Node* refNode, ExceptionCode& ec)
 
 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());

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list