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

[kov at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 31c475dda702ba014be68a97f7b0bb6e55c7216e
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 22:09:44 2010 +0000

    2010-12-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Build fix. Take webView{Enter,Exit}Fullscreen back out of the
            WebKit namespace, and remove a function signature that got in by
            mistake because of a bad merge.
    
            * webkit/webkitprivate.h:
            * webkit/webkitwebview.cpp:
            (WebKit::core):
            (WebKit::kit):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 41b136e..5aa5e8c 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Build fix. Take webView{Enter,Exit}Fullscreen back out of the
+        WebKit namespace, and remove a function signature that got in by
+        mistake because of a bad merge.
+
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebview.cpp:
+        (WebKit::core):
+        (WebKit::kit):
+
 2010-12-08  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index a8e9521..4889a15 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -249,9 +249,6 @@ extern "C" {
 
     WEBKIT_API WebKitWebDatabase *
     webkit_security_origin_get_web_database(WebKitSecurityOrigin* securityOrigin, const char* databaseName);
-
-    WEBKIT_API void
-    webkit_web_frame_layout(WebKitWebFrame* frame);
 }
 
 #endif
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 029a7bf..3b87c23 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -5059,27 +5059,6 @@ GtkMenu* webkit_web_view_get_context_menu(WebKitWebView* webView)
 #endif
 }
 
-namespace WebKit {
-
-WebCore::Page* core(WebKitWebView* webView)
-{
-    if (!webView)
-        return 0;
-
-    WebKitWebViewPrivate* priv = webView->priv;
-    return priv ? priv->corePage : 0;
-}
-
-WebKitWebView* kit(WebCore::Page* corePage)
-{
-    if (!corePage)
-        return 0;
-
-    ASSERT(corePage->chrome());
-    WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(corePage->chrome()->client());
-    return client ? client->webView() : 0;
-}
-
 void webViewEnterFullscreen(WebKitWebView* webView, Node* node)
 {
     if (!node->hasTagName(HTMLNames::videoTag))
@@ -5108,4 +5087,25 @@ void webViewExitFullscreen(WebKitWebView* webView)
 #endif
 }
 
+namespace WebKit {
+
+WebCore::Page* core(WebKitWebView* webView)
+{
+    if (!webView)
+        return 0;
+
+    WebKitWebViewPrivate* priv = webView->priv;
+    return priv ? priv->corePage : 0;
+}
+
+WebKitWebView* kit(WebCore::Page* corePage)
+{
+    if (!corePage)
+        return 0;
+
+    ASSERT(corePage->chrome());
+    WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(corePage->chrome()->client());
+    return client ? client->webView() : 0;
+}
+
 }

-- 
WebKit Debian packaging