[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f6376b17fa45a3c9e53eab7d0e7aaa54bdb307c9
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 6 17:40:06 2009 +0000

    2009-12-06  Maxime Simon  <simon.maxime at gmail.com>
    
            Reviewed by Adam Barth.
    
            Build fix. Add in FrameLoaderClientHaiku the declaration of three functions introduced in r51644.
    
            * WebCoreSupport/FrameLoaderClientHaiku.cpp:
            (WebCore::FrameLoaderClientHaiku::dispatchDidPushStateWithinPage):
            (WebCore::FrameLoaderClientHaiku::dispatchDidReplaceStateWithinPage):
            (WebCore::FrameLoaderClientHaiku::dispatchDidPopStateWithinPage):
            * WebCoreSupport/FrameLoaderClientHaiku.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/haiku/ChangeLog b/WebKit/haiku/ChangeLog
index 7ee29bd..2aa4ad7 100644
--- a/WebKit/haiku/ChangeLog
+++ b/WebKit/haiku/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-06  Maxime Simon  <simon.maxime at gmail.com>
+
+        Reviewed by Adam Barth.
+
+        Build fix. Add in FrameLoaderClientHaiku the declaration of three functions introduced in r51644.
+
+        * WebCoreSupport/FrameLoaderClientHaiku.cpp:
+        (WebCore::FrameLoaderClientHaiku::dispatchDidPushStateWithinPage):
+        (WebCore::FrameLoaderClientHaiku::dispatchDidReplaceStateWithinPage):
+        (WebCore::FrameLoaderClientHaiku::dispatchDidPopStateWithinPage):
+        * WebCoreSupport/FrameLoaderClientHaiku.h:
+
 2009-12-03  Pavel Feldman  <pfeldman at dhcp-172-28-174-220.spb.corp.google.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
index 6ed650f..3a84c4f 100644
--- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
@@ -208,6 +208,21 @@ void FrameLoaderClientHaiku::dispatchDidChangeLocationWithinPage()
     notImplemented();
 }
 
+void FrameLoaderClientHaiku::dispatchDidPushStateWithinPage()
+{
+    notImplemented();
+}
+
+void FrameLoaderClientHaiku::dispatchDidReplaceStateWithinPage()
+{
+    notImplemented();
+}
+
+void FrameLoaderClientHaiku::dispatchDidPopStateWithinPage()
+{
+    notImplemented();
+}
+
 void FrameLoaderClientHaiku::dispatchWillClose()
 {
     notImplemented();
diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
index c59d45f..2ffde8f 100644
--- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
+++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
@@ -94,9 +94,11 @@ namespace WebCore {
         virtual void dispatchDidHandleOnloadEvents();
         virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();
         virtual void dispatchDidCancelClientRedirect();
-        virtual void dispatchWillPerformClientRedirect(const KURL&, double interval,
-                                                       double fireDate);
+        virtual void dispatchWillPerformClientRedirect(const KURL&, double interval, double fireDate);
         virtual void dispatchDidChangeLocationWithinPage();
+        virtual void dispatchDidPushStateWithinPage();
+        virtual void dispatchDidReplaceStateWithinPage();
+        virtual void dispatchDidPopStateWithinPage();
         virtual void dispatchWillClose();
         virtual void dispatchDidReceiveIcon();
         virtual void dispatchDidStartProvisionalLoad();

-- 
WebKit Debian packaging