Changeset 69061 in webkit

Timestamp:

Oct 4, 2010 8:43:36 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-04 Gyuyoung Kim <​gyuyoung.kim@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:

Location:

trunk/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• WebCoreSupport/ChromeClientEfl.h (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (3 diffs)
• WebCoreSupport/FrameLoaderClientEfl.h (modified) (2 diffs)

trunk/WebKit/efl/ChangeLog

@@ +1 @@
+2010-10-04  Gyuyoung Kim  <gyuyoung.kim@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@profusion.mobi>
 

trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -516 +516 @@
 }
 
-void ChromeClientEfl::didReceiveViewportArguments(Frame* frame, const ViewportArguments& arguments) const
-{
-    FrameLoaderClientEfl* client = static_cast<FrameLoaderClientEfl*>(frame->loader()->client());
-    if (client->getInitLayoutCompleted())
-        return;
-
+void ChromeClientEfl::dispatchViewportDataDidChange(const ViewportArguments& arguments) const
+{
     ewk_view_viewport_set(m_view, arguments.width, arguments.height, arguments.initialScale, arguments.minimumScale, arguments.maximumScale, arguments.userScalable);
 }

trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.h

@@ -138 +138 @@
     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();

trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

@@ -73 +73 @@
     , m_pluginView(0)
     , m_hasSentResponseToPlugin(false)
-    , m_initLayoutCompleted(false)
 {
 }
@@ -616 +615 @@
 void FrameLoaderClientEfl::dispatchDidCommitLoad()
 {
-    m_initLayoutCompleted = false;
-
     ewk_frame_uri_changed(m_frame);
     if (ewk_view_frame_main_get(m_view) != m_frame)
@@ -635 +632 @@
 void FrameLoaderClientEfl::dispatchDidFirstLayout()
 {
-    m_initLayoutCompleted = true;
     ewk_frame_load_firstlayout_finished(m_frame);
 }

trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h

@@ -56 +56 @@
     const String& customUserAgent() const;
 
-    void setInitLayoutCompleted(bool completed) { m_initLayoutCompleted = completed; }
-    bool getInitLayoutCompleted() { return m_initLayoutCompleted; }
-
     virtual bool hasWebView() const;
     virtual bool hasFrameView() const;
@@ -219 +216 @@
     PluginView* m_pluginView;
     bool m_hasSentResponseToPlugin;
-
-    bool m_initLayoutCompleted;
 };