[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 36e1dfd793e7c0569fe990f3609abd66155e8ded
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 02:36:45 2010 +0000

    Add SPI to stop loading from the InjectedBundle.
    
    Reviewed by Gavin Barraclough.
    
    * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
    (WKBundlePageStopLoading):
    * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
    * WebProcess/WebPage/WebPage.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65210 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9170b3d..2014bf4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Gavin Barraclough.
 
+        Add SPI to stop loading from the InjectedBundle.
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageStopLoading):
+        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+        * WebProcess/WebPage/WebPage.h:
+
+2010-08-11  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
         WKPageStopLoading always asserts
 
         * WebProcess/WebPage/WebPage.cpp:
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
index acaa48e..c1453ca 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
@@ -106,3 +106,8 @@ void WKBundlePageSetZoomMode(WKBundlePageRef pageRef, WKBundlePageZoomMode zoomM
 {
     toWK(pageRef)->setZoomMode(toZoomMode(zoomMode));
 }
+
+void WKBundlePageStopLoading(WKBundlePageRef pageRef)
+{
+    toWK(pageRef)->stopLoading();
+}
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
index 58fe0e2..6d483ea 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
@@ -49,6 +49,8 @@ WK_EXPORT float WKBundlePageGetZoomFactor(WKBundlePageRef page);
 WK_EXPORT void WKBundlePageSetZoomFactor(WKBundlePageRef page, float zoomFactor);
 WK_EXPORT void WKBundlePageSetZoomMode(WKBundlePageRef page, WKBundlePageZoomMode zoomMode);
 
+WK_EXPORT void WKBundlePageStopLoading(WKBundlePageRef page);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index 348a7c3..2d877ba 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -114,11 +114,13 @@ public:
     bool isEditingCommandEnabled(const WTF::String& commandName);
     void clearMainFrameName();
     void sendClose();
-    
+
     float zoomFactor() const;
     void setZoomFactor(float);
     void setZoomMode(WebCore::ZoomMode);
 
+    void stopLoading();
+
 #if USE(ACCELERATED_COMPOSITING)
     void changeAcceleratedCompositingMode(WebCore::GraphicsLayer*);
     void enterAcceleratedCompositingMode(WebCore::GraphicsLayer*);
@@ -139,7 +141,6 @@ private:
     // Actions
     void tryClose();
     void loadURL(const WTF::String&);
-    void stopLoading();
     void reload(bool reloadFromOrigin);
     void goForward(uint64_t);
     void goBack(uint64_t);

-- 
WebKit Debian packaging