[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[jberlin at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 948bd328193f1491f3bca50b407c30d320e89915
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 18:43:36 2011 +0000

    WebKit2: Need WKBundlePagePrivate equivalent of WebKit1's WebViewPrivate's setDefersCallbacks
    https://bugs.webkit.org/show_bug.cgi?id=52038
    
    Reviewed by Jon Honeycutt.
    
    The implementation of WebKit1's WebViewPrivate's setDefersCallbacks on both Windows and Mac
    calls WebCore::Page::setDefersLoading.
    
    * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
    (WKBundlePageSetDefersLoading):
    * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::setDefersLoading):
    * WebProcess/WebPage/WebPage.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75253 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fc28907..544883e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-06  Jessie Berlin  <jberlin at apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        WebKit2: Need WKBundlePagePrivate equivalent of WebKit1's WebViewPrivate's setDefersCallbacks
+        https://bugs.webkit.org/show_bug.cgi?id=52038
+
+        The implementation of WebKit1's WebViewPrivate's setDefersCallbacks on both Windows and Mac
+        calls WebCore::Page::setDefersLoading.
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageSetDefersLoading):
+        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setDefersLoading):
+        * WebProcess/WebPage/WebPage.h:
+
 2011-01-06  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
index 79b6ad3..9693b6a 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
@@ -93,6 +93,11 @@ void WKBundlePageStopLoading(WKBundlePageRef pageRef)
     toImpl(pageRef)->stopLoading();
 }
 
+void WKBundlePageSetDefersLoading(WKBundlePageRef pageRef, bool defersLoading)
+{
+    toImpl(pageRef)->setDefersLoading(defersLoading);
+}
+
 WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef pageRef)
 {
     return toCopiedAPI(toImpl(pageRef)->renderTreeExternalRepresentation());
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
index 1a63ed0..4bc8fed 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
@@ -33,6 +33,7 @@ extern "C" {
 #endif
 
 WK_EXPORT void WKBundlePageStopLoading(WKBundlePageRef page);
+WK_EXPORT void WKBundlePageSetDefersLoading(WKBundlePageRef page, bool defersLoading);
 WK_EXPORT bool WKBundlePageIsEditingCommandEnabled(WKBundlePageRef page, WKStringRef commandName);
 WK_EXPORT void WKBundlePageClearMainFrameName(WKBundlePageRef page);
 WK_EXPORT void WKBundlePageClose(WKBundlePageRef page);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 01b6621..cf44ee4 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -412,6 +412,11 @@ void WebPage::stopLoading()
     m_mainFrame->coreFrame()->loader()->stopForUserCancel();
 }
 
+void WebPage::setDefersLoading(bool defersLoading)
+{
+    m_page->setDefersLoading(defersLoading);
+}
+
 void WebPage::reload(bool reloadFromOrigin)
 {
     m_mainFrame->coreFrame()->loader()->reload(reloadFromOrigin);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index 82d9ba3..cbf7516 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -195,6 +195,7 @@ public:
     bool drawsTransparentBackground() const { return m_drawsTransparentBackground; }
 
     void stopLoading();
+    void setDefersLoading(bool deferLoading);
 
 #if USE(ACCELERATED_COMPOSITING)
     void changeAcceleratedCompositingMode(WebCore::GraphicsLayer*);

-- 
WebKit Debian packaging