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

[tonyg at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f4d397b897942ee416fc8916a327f148299036ba
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 21:39:27 2010 +0000

    2010-07-14  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Darin Adler.
    
            Fix enum value names for Navigation.{idl|h}
            https://bugs.webkit.org/show_bug.cgi?id=42282
    
            This is necessary after https://bugs.webkit.org/show_bug.cgi?id=42250.
    
            No new tests because no new functionality.
    
            * page/Navigation.cpp:
            (WebCore::Navigation::type):
            * page/Navigation.h:
            (WebCore::Navigation::):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63356 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 48f6a9d..d071e4d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-14  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix enum value names for Navigation.{idl|h}
+        https://bugs.webkit.org/show_bug.cgi?id=42282
+
+        This is necessary after https://bugs.webkit.org/show_bug.cgi?id=42250.
+
+        No new tests because no new functionality.
+
+        * page/Navigation.cpp:
+        (WebCore::Navigation::type):
+        * page/Navigation.h:
+        (WebCore::Navigation::):
+
 2010-07-14  Johnny Ding  <jnd at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/page/Navigation.cpp b/WebCore/page/Navigation.cpp
index 114e69f..4fec0ee 100644
--- a/WebCore/page/Navigation.cpp
+++ b/WebCore/page/Navigation.cpp
@@ -57,20 +57,20 @@ void Navigation::disconnectFrame()
 unsigned short Navigation::type() const
 {
     if (!m_frame)
-        return Navigate;
+        return NAVIGATE;
 
     DocumentLoader* documentLoader = m_frame->loader()->documentLoader();
     if (!documentLoader)
-        return Navigate;
+        return NAVIGATE;
 
     WebCore::NavigationType navigationType = documentLoader->triggeringAction().type();
     switch (navigationType) {
     case NavigationTypeReload:
-        return Reload;
+        return RELOAD;
     case NavigationTypeBackForward:
-        return BackForward;
+        return BACK_FORWARD;
     default:
-        return Navigate;
+        return NAVIGATE;
     }
 }
 
diff --git a/WebCore/page/Navigation.h b/WebCore/page/Navigation.h
index 85c7b55..ba68ff3 100644
--- a/WebCore/page/Navigation.h
+++ b/WebCore/page/Navigation.h
@@ -47,17 +47,16 @@ public:
     Frame* frame() const;
     void disconnectFrame();
 
+    enum NavigationType {
+        NAVIGATE,
+        RELOAD,
+        BACK_FORWARD
+    };
+
     unsigned short type() const;
     unsigned short redirectCount() const;
 
 private:
-    // Keep in sync with what's in the .idl file.
-    enum NavigationType {
-        Navigate = 0,
-        Reload = 1,
-        BackForward = 2,
-    };
-
     Navigation(Frame*);
 
     Frame* m_frame;

-- 
WebKit Debian packaging