Modified: trunk/Source/WebKit2/ChangeLog (138394 => 138395)
--- trunk/Source/WebKit2/ChangeLog 2012-12-21 19:48:07 UTC (rev 138394)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-21 20:58:33 UTC (rev 138395)
@@ -1,3 +1,12 @@
+2012-12-21 Kenneth Rohde Christiansen <[email protected]>
+
+ 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 <[email protected]>
Remove ResourceLoadScheduler::addMainResourceLoad and all related code
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (138394 => 138395)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-12-21 19:48:07 UTC (rev 138394)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-12-21 20:58:33 UTC (rev 138395)
@@ -1235,16 +1235,19 @@
m_frameCameFromPageCache = false;
#if USE(TILED_BACKING_STORE)
- m_frame->coreFrame()->createView(webPage->size(), backgroundColor, isTransparent,
- IntSize(), currentFixedVisibleContentRect, shouldUseFixedLayout,
- ScrollbarAlwaysOff, /* lock */ true, ScrollbarAlwaysOff, /* lock */ true);
+ 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);
-#else
+ 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
}
void WebFrameLoaderClient::didSaveToPageCache()
