Attachment 124728 Details for Bug 77436 – Patch

[patch] Patch

bug-77436-20120131102418.patch (text/plain), 3.50 KB, created by Fady Samuel on 2012-01-31 07:24:19 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fady Samuel

Created: 2012-01-31 07:24:19 PST

Size: 3.50 KB

patch

obsolete

>Subversion Revision: 106129
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 77ef63b3dcb874f41ef49c3c5043e638262eb8ca..b4f6f4cafd718aa2d7f326f9d04ade559bbc21e3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2012-01-31  Fady Samuel  <fsamuel@chromium.org>
>+
>+        [Chromium] Minimum Scale Factor computed based on stale visibleContentsRect
>+        https://bugs.webkit.org/show_bug.cgi?id=77436
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Calling webView->layout on frames that don't have documents causes
>+        a crash.
>+
>+        * page/FrameView.cpp:
>+        (WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive):
>+
> 2012-01-27  Tony Chang  <tony@chromium.org>
> 
>         flexbox scrollbars don't take flex-direction into account
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 95e214297295cb716a2680940d42876c83021f7a..f81a3d7ed60a90e29a4ae3ab3027839bc4102013 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,18 @@
>+2012-01-31  Fady Samuel  <fsamuel@chromium.org>
>+
>+        [Chromium] Minimum Scale Factor computed based on stale visibleContentsRect
>+        https://bugs.webkit.org/show_bug.cgi?id=77436
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We need to make sure that a page is fully laid out before computing
>+        a new minimum scale factor because the minimum scale factor depends on the
>+        contents size, which might be stale. This can cause weird, slightly off
>+        page scaling in some cases.
>+
>+        * src/ChromeClientImpl.cpp:
>+        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
>+
> 2012-01-26  Kent Tamura  <tkent@chromium.org>
> 
>         [Chromium] Cleanup of WebPopupMenuImpl
>diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
>index 401d3f778945314195e6f32e8d5753df0722eaa2..39c3630c2e152f45e9f4fe46f1f9fb2152ae4d5c 100644
>--- a/Source/WebCore/page/FrameView.cpp
>+++ b/Source/WebCore/page/FrameView.cpp
>@@ -2958,6 +2958,9 @@ void FrameView::updateLayoutAndStyleIfNeededRecursive()
>     // region but then become included later by the second frame adding rects to the dirty region
>     // when it lays out.
> 
>+    if (!m_frame->document())
>+        return;
>+
>     m_frame->document()->updateStyleIfNeeded();
> 
>     if (needsLayout())
>diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>index fb07b4c103fb279a24c4f1678eb5988f32173ba6..d376d802bc8d48132b14064d7549019eeacfaf21 100644
>--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>@@ -658,8 +658,13 @@ void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArgumen
>     // FIXME: Investigate the impact this has on layout/rendering if any.
>     // This exposes the correct device scale to javascript and media queries.
>     m_webView->setDeviceScaleFactor(computed.devicePixelRatio);
>-    m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale);
>     m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * computed.devicePixelRatio);
>+    // We need to make sure the page has completed layout before we call setPageScaleFactorLimits
>+    // because it evaluates the minimum scale factor based on visibleContentRect which gets the
>+    // document width.
>+    m_webView->layout();
>+    m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale);
>+
> #endif
> }
>

Flags:

jamesr: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 77436: 124728