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

hclam at chromium.org hclam at chromium.org
Wed Dec 22 14:08:20 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3698df9705377907d671213d5661e72780fd8872
Author: hclam at chromium.org <hclam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 00:30:56 2010 +0000

    Build fix. Not reviewed.
    
    https://bugs.webkit.org/show_bug.cgi?id=47135
    Add a stub method to make the build happy.
    
    * src/ApplicationCacheHost.cpp:
    (WebCore::ApplicationCacheHost::stopLoadingInFrame):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f094637..ebb5eb6 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-04  Alpha Lam  <hclam at chromium.org>
+
+        Build fix. Not reviewed.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47135
+        Add a stub method to make the build happy.
+
+        * src/ApplicationCacheHost.cpp:
+        (WebCore::ApplicationCacheHost::stopLoadingInFrame):
+
 2010-10-04  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by James Robinson.
diff --git a/WebKit/chromium/src/ApplicationCacheHost.cpp b/WebKit/chromium/src/ApplicationCacheHost.cpp
index 55d7322..f1b1a91 100644
--- a/WebKit/chromium/src/ApplicationCacheHost.cpp
+++ b/WebKit/chromium/src/ApplicationCacheHost.cpp
@@ -256,6 +256,11 @@ void ApplicationCacheHost::stopDeferringEvents()
     m_defersEvents = false;
 }
 
+void ApplicationCacheHost::stopLoadingInFrame(Frame* frame)
+{
+    // FIXME: Implement this method.
+}
+
 void ApplicationCacheHost::dispatchDOMEvent(EventID id, int total, int done)
 {
     if (m_domApplicationCache) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list