Changeset 138395 in webkit

Timestamp:

Dec 21, 2012, 12:58:33 PM (13 years ago)

Author:

kenneth@webkit.org

Message:

Unreviewed potential fix EFL/Qt test breakage on WK2

Only disable scrollbars when in fixed layout mode.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-12-21  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Unreviewed potential fix EFL/Qt test breakage on WK2
+
+        Only disable scrollbars when in fixed layout mode.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+
 2012-12-21  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1236 +1236 @@
 
 #if USE(TILED_BACKING_STORE)
-    m_frame->coreFrame()->createView(webPage->size(), backgroundColor, isTransparent,
-        IntSize(), currentFixedVisibleContentRect, shouldUseFixedLayout,
-        ScrollbarAlwaysOff, /* lock */ true, ScrollbarAlwaysOff, /* lock */ true);
-
-    m_frame->coreFrame()->view()->setDelegatesScrolling(shouldUseFixedLayout);
-    m_frame->coreFrame()->view()->setPaintsEntireContents(shouldUseFixedLayout);
-#else
+    if (shouldUseFixedLayout) {
+        m_frame->coreFrame()->createView(webPage->size(), backgroundColor, isTransparent,
+            IntSize(), currentFixedVisibleContentRect, shouldUseFixedLayout,
+            ScrollbarAlwaysOff, /* lock */ true, ScrollbarAlwaysOff, /* lock */ true);
+
+        m_frame->coreFrame()->view()->setDelegatesScrolling(shouldUseFixedLayout);
+        m_frame->coreFrame()->view()->setPaintsEntireContents(shouldUseFixedLayout);
+        return;
+    }
+#endif
+
     m_frame->coreFrame()->createView(webPage->size(), backgroundColor, isTransparent,
         IntSize(), currentFixedVisibleContentRect, shouldUseFixedLayout);
-#endif
 }