Attachment 130363 Details for Bug 80242 – Patch

[patch] Patch

bug-80242-20120306144050.patch (text/plain), 3.16 KB, created by Allan Sandfeld Jensen on 2012-03-06 05:40:52 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Allan Sandfeld Jensen

Created: 2012-03-06 05:40:52 PST

Size: 3.16 KB

patch

obsolete

>Subversion Revision: 109900
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2eb7a5e1abf170e30e2d6dae44bba33967091364..7bad89347f4d90e73da9d4e48575176be109ea65 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2012-03-06  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
>+
>+        REGRESSION(r106232): The resize handler is always called after loading.
>+        https://bugs.webkit.org/show_bug.cgi?id=80242
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Instead of using the layoutsize, use the viewport size including any scrollbars.
>+
>+        * page/FrameView.cpp:
>+        (WebCore::FrameView::reset):
>+        (WebCore::FrameView::layout):
>+        (WebCore::FrameView::performPostLayoutTasks):
>+        * page/FrameView.h:
>+
> 2012-03-06  Pavel Podivilov  <podivilov@chromium.org>
> 
>         Web Inspector: remove reference to RawSourceCode from UISourceCode.
>diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
>index e191221966f88b1dab90d20ecc6d1ef1e7af4e7b..57d61c5a3c2812378c66123b81302ff9dfd9d134 100644
>--- a/Source/WebCore/page/FrameView.cpp
>+++ b/Source/WebCore/page/FrameView.cpp
>@@ -225,7 +225,7 @@ void FrameView::reset()
>     m_firstLayout = true;
>     m_firstLayoutCallbackPending = false;
>     m_wasScrolledByUser = false;
>-    m_lastLayoutSize = LayoutSize();
>+    m_lastViewportSize = LayoutSize();
>     m_lastZoomFactor = 1.0f;
>     m_deferringRepaints = 0;
>     m_repaintCount = 0;
>@@ -1041,7 +1041,7 @@ void FrameView::layout(bool allowSubtree)
> 
>                     m_firstLayout = false;
>                     m_firstLayoutCallbackPending = true;
>-                    m_lastLayoutSize = LayoutSize(layoutWidth(), layoutHeight());
>+                    m_lastViewportSize = visibleContentRect(true).size();
>                     m_lastZoomFactor = root->style()->zoom();
> 
>                     // Set the initial vMode to AlwaysOn if we're auto.
>@@ -2326,10 +2326,10 @@ void FrameView::performPostLayoutTasks()
>     m_actionScheduler->resume();
> 
>     if (!root->printing()) {
>-        LayoutSize currentSize = LayoutSize(layoutWidth(), layoutHeight());
>+        LayoutSize currentSize = visibleContentRect(true).size();
>         float currentZoomFactor = root->style()->zoom();
>-        bool resized = !m_firstLayout && (currentSize != m_lastLayoutSize || currentZoomFactor != m_lastZoomFactor);
>-        m_lastLayoutSize = currentSize;
>+        bool resized = !m_firstLayout && (currentSize != m_lastViewportSize || currentZoomFactor != m_lastZoomFactor);
>+        m_lastViewportSize = currentSize;
>         m_lastZoomFactor = currentZoomFactor;
>         if (resized)
>             m_frame->eventHandler()->sendResizeEvent();
>diff --git a/Source/WebCore/page/FrameView.h b/Source/WebCore/page/FrameView.h
>index b406966741e8d5db3e447e228391e39455eca0ae..1b38fc3acab6762bf09ba17ebd66e71c6c229e6a 100644
>--- a/Source/WebCore/page/FrameView.h
>+++ b/Source/WebCore/page/FrameView.h
>@@ -444,7 +444,7 @@ private:
>     bool m_firstLayout;
>     bool m_isTransparent;
>     Color m_baseBackgroundColor;
>-    LayoutSize m_lastLayoutSize;
>+    LayoutSize m_lastViewportSize;
>     float m_lastZoomFactor;
> 
>     String m_mediaType;

Actions: View | Formatted Diff | Diff

Attachments on bug 80242: 130059 | 130363 | 130598 | 130617 | 130618 | 130800 | 130802 | 131854 | 132015 | 132025