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

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5ccfc22c56c9f430627e59a9eab26ede462ca274
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 21:49:10 2009 +0000

    2009-11-17  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Dmitry Titov.
    
            Minor cleanup in WebKit API
            https://bugs.webkit.org/show_bug.cgi?id=31616
    
            * public/WebFormElement.h: Add missing WEBKIT_API prefix.
            * public/WebNode.h: Add missing WEBKIT_API prefix.
            * src/WebFormElement.cpp:
            (WebKit::WebFormElement::action): Make action getter const.
            * src/WebNode.cpp:
            (WebKit::WebNode::frame): Utilize WebFrameImpl::fromFrame.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51130 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 97655b6..0aafd2b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-17  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Minor cleanup in WebKit API
+        https://bugs.webkit.org/show_bug.cgi?id=31616
+
+        * public/WebFormElement.h: Add missing WEBKIT_API prefix.
+        * public/WebNode.h: Add missing WEBKIT_API prefix.
+        * src/WebFormElement.cpp:
+        (WebKit::WebFormElement::action): Make action getter const.
+        * src/WebNode.cpp:
+        (WebKit::WebNode::frame): Utilize WebFrameImpl::fromFrame.
+
 2009-11-17  Nicolas Weber  <thakis at chromium.org>
 
         Reviewed by Darin Fisher, Dmitry Titov.
diff --git a/WebKit/chromium/public/WebFormElement.h b/WebKit/chromium/public/WebFormElement.h
index 693a1e9..9923bb9 100644
--- a/WebKit/chromium/public/WebFormElement.h
+++ b/WebKit/chromium/public/WebFormElement.h
@@ -58,10 +58,10 @@ namespace WebKit {
         operator WTF::PassRefPtr<WebCore::HTMLFormElement>() const;
 #endif
 
-        bool autoComplete() const;
-        WebString action();
-        void submit();
-        void getNamedElements(const WebString&, WebVector<WebNode>&);
+        WEBKIT_API bool autoComplete() const;
+        WEBKIT_API WebString action() const;
+        WEBKIT_API void submit();
+        WEBKIT_API void getNamedElements(const WebString&, WebVector<WebNode>&);
     };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebNode.h b/WebKit/chromium/public/WebNode.h
index 4c48915..a312c9f 100644
--- a/WebKit/chromium/public/WebNode.h
+++ b/WebKit/chromium/public/WebNode.h
@@ -68,7 +68,7 @@ public:
 
     WEBKIT_API WebNode parentNode() const;
     WEBKIT_API WebString nodeName() const;
-    WebFrame* frame();
+    WEBKIT_API WebFrame* frame();
 
     template<typename T> T toElement()
     {
diff --git a/WebKit/chromium/src/WebFormElement.cpp b/WebKit/chromium/src/WebFormElement.cpp
index fecd05c..47fe760 100644
--- a/WebKit/chromium/src/WebFormElement.cpp
+++ b/WebKit/chromium/src/WebFormElement.cpp
@@ -64,9 +64,9 @@ bool WebFormElement::autoComplete() const
     return constUnwrap<HTMLFormElement>()->autoComplete();
 }
 
-WebString WebFormElement::action()
+WebString WebFormElement::action() const
 {
-    return unwrap<HTMLFormElement>()->action();
+    return constUnwrap<HTMLFormElement>()->action();
 }
 
 void WebFormElement::submit()
diff --git a/WebKit/chromium/src/WebNode.cpp b/WebKit/chromium/src/WebNode.cpp
index de676c3..07ec9b6 100644
--- a/WebKit/chromium/src/WebNode.cpp
+++ b/WebKit/chromium/src/WebNode.cpp
@@ -97,10 +97,7 @@ void WebNode::assign(WebNodePrivate* p)
 
 WebFrame* WebNode::frame()
 {
-    FrameLoaderClientImpl* frame_loader_client =
-        static_cast<FrameLoaderClientImpl*>(m_private->document()->
-                                            frame()->loader()->client());
-    return static_cast<WebFrame*>(frame_loader_client->webFrame());
+    return WebFrameImpl::fromFrame(m_private->document()->frame());
 }
 
 } // namespace WebKit

-- 
WebKit Debian packaging