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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 14:02:45 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1fc97a7c426d33f8936407b840de1884fe7481db
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 20:29:19 2010 +0000

    2010-10-01  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [EFL] Remove check for InitLayoutCompleted on fixed_layout_size_set.
            https://bugs.webkit.org/show_bug.cgi?id=47006
    
            This check isn't needed and isn't done on the other ports. The fixed
            layout property can be set before we have the first layout.
    
            * ewk/ewk_view.cpp:
            (ewk_view_fixed_layout_size_set):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 8522612..6283246 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [EFL] Remove check for InitLayoutCompleted on fixed_layout_size_set.
+        https://bugs.webkit.org/show_bug.cgi?id=47006
+
+        This check isn't needed and isn't done on the other ports. The fixed
+        layout property can be set before we have the first layout.
+
+        * ewk/ewk_view.cpp:
+        (ewk_view_fixed_layout_size_set):
+
+2010-10-01  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [EFL] Call contents_resize when the main frame gets resized.
         https://bugs.webkit.org/show_bug.cgi?id=47004
 
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 3b93516..f72a9e7 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -1048,10 +1048,6 @@ void ewk_view_fixed_layout_size_set(Evas_Object* o, Evas_Coord w, Evas_Coord h)
     EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
 
-    WebCore::FrameLoaderClientEfl* client = static_cast<WebCore::FrameLoaderClientEfl*>(priv->main_frame->loader()->client());
-    if (!client->getInitLayoutCompleted())
-        return;
-
     WebCore::FrameView* view = sd->_priv->main_frame->view();
     if (w <= 0 && h <= 0) {
         if (!priv->fixed_layout.use)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list