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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 48ee9ab5b9c9221d3e3702a89fcdfa26d59c7e5a
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 13:44:29 2011 +0000

    2011-01-04  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed WinCE build fix.
    
            * WebCoreSupport/ChromeClientWinCE.cpp:
            (WebKit::ChromeClientWinCE::exceededDatabaseQuota): Added missing semicolon.
            (WebKit::ChromeClientWinCE::reachedApplicationCacheOriginQuota):
            * WebCoreSupport/ChromeClientWinCE.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wince/ChangeLog b/WebKit/wince/ChangeLog
index f392570..f44bddf 100644
--- a/WebKit/wince/ChangeLog
+++ b/WebKit/wince/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-04  Patrick Gansterer  <paroga at webkit.org>
+
+        Unreviewed WinCE build fix.
+
+        * WebCoreSupport/ChromeClientWinCE.cpp:
+        (WebKit::ChromeClientWinCE::exceededDatabaseQuota): Added missing semicolon.
+        (WebKit::ChromeClientWinCE::reachedApplicationCacheOriginQuota):
+        * WebCoreSupport/ChromeClientWinCE.h:
+
 2010-12-29  Patrick Gansterer  <paroga at webkit.org>
 
         Unreviewed build fix for WinCE after r73802.
diff --git a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
index e19d6ad..659d246 100644
--- a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
+++ b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
@@ -305,7 +305,7 @@ void ChromeClientWinCE::print(Frame*)
 #if ENABLE(DATABASE)
 void ChromeClientWinCE::exceededDatabaseQuota(Frame*, const String&)
 {
-    notImplemented()
+    notImplemented();
 }
 #endif
 
@@ -314,6 +314,11 @@ void ChromeClientWinCE::reachedMaxAppCacheSize(int64_t)
 {
     notImplemented();
 }
+
+void ChromeClientWinCE::reachedApplicationCacheOriginQuota(SecurityOrigin*)
+{
+    notImplemented();
+}
 #endif
 
 #if ENABLE(TOUCH_EVENTS)
diff --git a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
index 3069472..4e7fb28 100644
--- a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
+++ b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
@@ -114,7 +114,7 @@ public:
     virtual void print(WebCore::Frame*);
 
 #if ENABLE(DATABASE)
-    virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName) = 0;
+    virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName);
 #endif
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -123,7 +123,14 @@ public:
     // size or past the amount of free space on the device.
     // The chrome client would need to take some action such as evicting some
     // old caches.
-    virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) = 0;
+    virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
+
+    // Callback invoked when the application cache origin quota is reached. This
+    // means that the resources attempting to be cached via the manifest are
+    // more than allowed on this origin. This callback allows the chrome client
+    // to take action, such as prompting the user to ask to increase the quota
+    // for this origin.
+    virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*);
 #endif
 
 #if ENABLE(CONTEXT_MENUS)
@@ -131,7 +138,7 @@ public:
 #endif
 
 #if ENABLE(NOTIFICATIONS)
-    virtual WebCore::NotificationPresenter* notificationPresenter() const = 0;
+    virtual WebCore::NotificationPresenter* notificationPresenter() const;
 #endif
 
     // This can be either a synchronous or asynchronous call. The ChromeClient can display UI asking the user for permission

-- 
WebKit Debian packaging