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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b064e8911774df42b27a695097f737fd42b29e6c
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 22:33:27 2010 +0000

    Add some stylistic flourish to the last patch as suggested by Lord Darin Adler.
    
    * UIProcess/API/C/WKPage.cpp:
    (WKPageGetSourceForFrame):
    (WKPageGetContentsAsString):
    * UIProcess/WebPageProxy.cpp:
    (WebKit::invalidateCallbackMap):
    * WebProcess/WebPage/WebFrame.cpp:
    (WebKit::WebFrame::contentsAsString):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71680 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ca91642..058002f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,17 @@
 2010-11-09  Sam Weinig  <sam at webkit.org>
 
+        Add some stylistic flourish to the last patch as suggested by Lord Darin Adler.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageGetSourceForFrame):
+        (WKPageGetContentsAsString):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::invalidateCallbackMap):
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::contentsAsString):
+
+2010-11-09  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Anders Carlsson.
 
         Need WebKit2 mechanism for getting the visible page text
diff --git a/WebKit2/UIProcess/API/C/WKPage.cpp b/WebKit2/UIProcess/API/C/WKPage.cpp
index 5fe0206..57c0836 100644
--- a/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -311,7 +311,7 @@ void WKPageRenderTreeExternalRepresentation_b(WKPageRef pageRef, WKPageRenderTre
 }
 #endif
 
-void WKPageGetSourceForFrame(WKPageRef pageRef, WKFrameRef frameRef, void *context, WKPageGetSourceForFrameFunction callback)
+void WKPageGetSourceForFrame(WKPageRef pageRef, WKFrameRef frameRef, void* context, WKPageGetSourceForFrameFunction callback)
 {
     toImpl(pageRef)->getSourceForFrame(toImpl(frameRef), FrameSourceCallback::create(context, callback));
 }
@@ -330,7 +330,7 @@ void WKPageGetSourceForFrame_b(WKPageRef pageRef, WKFrameRef frameRef, WKPageGet
 }
 #endif
 
-void WKPageGetContentsAsString(WKPageRef pageRef, void *context, WKPageGetContentsAsStringFunction callback)
+void WKPageGetContentsAsString(WKPageRef pageRef, void* context, WKPageGetContentsAsStringFunction callback)
 {
     toImpl(pageRef)->getContentsAsString(ContentsAsStringCallback::create(context, callback));
 }
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 68dbbf5..d480707 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -71,9 +71,9 @@ static WTF::RefCountedLeakCounter webPageProxyCounter("WebPageProxy");
 #endif
 
 template<typename T>
-void invalidateCallbackMap(HashMap<uint64_t, RefPtr<T> >& map)
+void invalidateCallbackMap(HashMap<uint64_t, T>& map)
 {
-    Vector<RefPtr<T> > callbacksVector;
+    Vector<T> callbacksVector;
     copyValuesToVector(map, callbacksVector);
     for (size_t i = 0, size = callbacksVector.size(); i < size; ++i)
         callbacksVector[i]->invalidate();
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.cpp b/WebKit2/WebProcess/WebPage/WebFrame.cpp
index 40094f5..175da38 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.cpp
+++ b/WebKit2/WebProcess/WebPage/WebFrame.cpp
@@ -244,12 +244,10 @@ String WebFrame::contentsAsString() const
     if (isFrameSet()) {
         StringBuilder builder;
         for (Frame* child = m_coreFrame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
-            WebFrame* webFrame = static_cast<WebFrameLoaderClient*>(child->loader()->client())->webFrame();
-            builder.append(webFrame->contentsAsString());
-            if (child->tree()->nextSibling())
+            if (!builder.isEmpty())
                 builder.append(' ');
+            builder.append(static_cast<WebFrameLoaderClient*>(child->loader()->client())->webFrame()->contentsAsString());
         }
-        
         // FIXME: It may make sense to use toStringPreserveCapacity() here.
         return builder.toString();
     }

-- 
WebKit Debian packaging