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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b75a0802cc873d50cc71c850b592fabb477bd1d7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 03:43:36 2010 +0000

    2010-10-04  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [EFL] Viewport data change notification by Bug 46755
            https://bugs.webkit.org/show_bug.cgi?id=46772
    
            Bug 46755 changes virtual function regarding to viewport metatag. Thus, EFL port
            should change the function as well in order to get viewport arguments.
    
            And, setInitLayoutCompleted / getInitLayoutCompleted() are removed because these functions
            aren't needed anymore.
    
            * WebCoreSupport/ChromeClientEfl.cpp:
            (WebCore::ChromeClientEfl::dispatchViewportDataDidChange):
            * WebCoreSupport/ChromeClientEfl.h:
            * WebCoreSupport/FrameLoaderClientEfl.cpp:
            (WebCore::FrameLoaderClientEfl::FrameLoaderClientEfl):
            (WebCore::FrameLoaderClientEfl::dispatchDidCommitLoad):
            (WebCore::FrameLoaderClientEfl::dispatchDidFirstLayout):
            * WebCoreSupport/FrameLoaderClientEfl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 6283246..257219b 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,25 @@
+2010-10-04  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Viewport data change notification by Bug 46755
+        https://bugs.webkit.org/show_bug.cgi?id=46772
+
+        Bug 46755 changes virtual function regarding to viewport metatag. Thus, EFL port 
+        should change the function as well in order to get viewport arguments.
+
+        And, setInitLayoutCompleted / getInitLayoutCompleted() are removed because these functions
+        aren't needed anymore.
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::dispatchViewportDataDidChange):
+        * WebCoreSupport/ChromeClientEfl.h:
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::FrameLoaderClientEfl):
+        (WebCore::FrameLoaderClientEfl::dispatchDidCommitLoad):
+        (WebCore::FrameLoaderClientEfl::dispatchDidFirstLayout):
+        * WebCoreSupport/FrameLoaderClientEfl.h:
+
 2010-10-01  Rafael Antognolli  <antognolli at profusion.mobi>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
index bd9e055..1f1c1ec 100644
--- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
@@ -515,12 +515,8 @@ void ChromeClientEfl::chooseIconForFiles(const Vector<String>&, FileChooser*)
     notImplemented();
 }
 
-void ChromeClientEfl::didReceiveViewportArguments(Frame* frame, const ViewportArguments& arguments) const
+void ChromeClientEfl::dispatchViewportDataDidChange(const ViewportArguments& arguments) const
 {
-    FrameLoaderClientEfl* client = static_cast<FrameLoaderClientEfl*>(frame->loader()->client());
-    if (client->getInitLayoutCompleted())
-        return;
-
     ewk_view_viewport_set(m_view, arguments.width, arguments.height, arguments.initialScale, arguments.minimumScale, arguments.maximumScale, arguments.userScalable);
 }
 
diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
index d939ae6..4339b9a 100644
--- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
@@ -137,7 +137,7 @@ public:
     virtual void cancelGeolocationPermissionRequestForFrame(Frame*);
     virtual void iconForFiles(const Vector<String, 0u>&, PassRefPtr<FileChooser>);
 
-    virtual void didReceiveViewportArguments(Frame* frame, const ViewportArguments& arguments) const;
+    virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;
 
     virtual bool selectItemWritingDirectionIsNatural();
     virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
index 2d452d8..61a7894 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
@@ -72,7 +72,6 @@ FrameLoaderClientEfl::FrameLoaderClientEfl(Evas_Object *view)
     , m_customUserAgent("")
     , m_pluginView(0)
     , m_hasSentResponseToPlugin(false)
-    , m_initLayoutCompleted(false)
 {
 }
 
@@ -615,8 +614,6 @@ void FrameLoaderClientEfl::dispatchDidChangeIcons()
 
 void FrameLoaderClientEfl::dispatchDidCommitLoad()
 {
-    m_initLayoutCompleted = false;
-
     ewk_frame_uri_changed(m_frame);
     if (ewk_view_frame_main_get(m_view) != m_frame)
         return;
@@ -634,7 +631,6 @@ void FrameLoaderClientEfl::dispatchDidFinishDocumentLoad()
 
 void FrameLoaderClientEfl::dispatchDidFirstLayout()
 {
-    m_initLayoutCompleted = true;
     ewk_frame_load_firstlayout_finished(m_frame);
 }
 
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
index 2b4414a..d250b76 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
@@ -55,9 +55,6 @@ class FrameLoaderClientEfl : public FrameLoaderClient {
     void setCustomUserAgent(const String &agent);
     const String& customUserAgent() const;
 
-    void setInitLayoutCompleted(bool completed) { m_initLayoutCompleted = completed; }
-    bool getInitLayoutCompleted() { return m_initLayoutCompleted; }
-
     virtual bool hasWebView() const;
     virtual bool hasFrameView() const;
 
@@ -218,8 +215,6 @@ class FrameLoaderClientEfl : public FrameLoaderClient {
     // Plugin view to redirect data to
     PluginView* m_pluginView;
     bool m_hasSentResponseToPlugin;
-
-    bool m_initLayoutCompleted;
 };
 
 }

-- 
WebKit Debian packaging