Diff
Modified: trunk/Source/WebKit2/ChangeLog (105503 => 105504)
--- trunk/Source/WebKit2/ChangeLog 2012-01-20 11:29:36 UTC (rev 105503)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-20 11:39:41 UTC (rev 105504)
@@ -1,3 +1,24 @@
+2012-01-20 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r105497.
+ http://trac.webkit.org/changeset/105497
+ https://bugs.webkit.org/show_bug.cgi?id=76696
+
+ Leaking in Qt layout tests and timing out in GTK API tests.
+ (Requested by jturcotte on #webkit).
+
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewPrivate::initialize):
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ (WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl):
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::DrawingAreaImpl):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ * WebProcess/WebPage/qt/WebPageQt.cpp:
+ (WebKit::WebPage::platformInitialize):
+
2012-01-20 Mario Sanchez Prada <[email protected]>
[GTK] Expose accessibility hierarchy in WebKit2 to ATK/AT-SPI based ATs
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (105503 => 105504)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-01-20 11:29:36 UTC (rev 105503)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-01-20 11:39:41 UTC (rev 105504)
@@ -66,7 +66,6 @@
macro(HyperlinkAuditingEnabled, hyperlinkAuditingEnabled, Bool, bool, true) \
macro(NeedsSiteSpecificQuirks, needsSiteSpecificQuirks, Bool, bool, false) \
macro(AcceleratedCompositingEnabled, acceleratedCompositingEnabled, Bool, bool, true) \
- macro(ForceCompositingMode, forceCompositingMode, Bool, bool, true) \
macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, false) \
macro(CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing, Bool, bool, true) \
macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (105503 => 105504)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-01-20 11:29:36 UTC (rev 105503)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-01-20 11:39:41 UTC (rev 105504)
@@ -105,7 +105,6 @@
// Any page setting should preferrable be set before creating the page.
setUseTraditionalDesktopBehaviour(false);
webPageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(true);
- webPageProxy->pageGroup()->preferences()->setForceCompositingMode(true);
pageClient.initialize(q_ptr, pageViewPrivate->eventHandler.data(), &undoController);
webPageProxy->initializeWebPage();
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (105503 => 105504)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2012-01-20 11:29:36 UTC (rev 105503)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2012-01-20 11:39:41 UTC (rev 105504)
@@ -30,9 +30,7 @@
#include "DrawingAreaProxyMessages.h"
#include "LayerTreeContext.h"
#include "UpdateInfo.h"
-#include "WebPageGroup.h"
#include "WebPageProxy.h"
-#include "WebPreferences.h"
#include "WebProcessProxy.h"
#include <WebCore/Region.h>
@@ -58,11 +56,6 @@
, m_isBackingStoreDiscardable(true)
, m_discardBackingStoreTimer(RunLoop::current(), this, &DrawingAreaProxyImpl::discardBackingStore)
{
-#if USE(TEXTURE_MAPPER)
- // Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
- if (webPageProxy->pageGroup()->preferences()->forceCompositingMode())
- m_layerTreeHostProxy = adoptPtr(new LayerTreeHostProxy(this));
-#endif
}
DrawingAreaProxyImpl::~DrawingAreaProxyImpl()
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (105503 => 105504)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2012-01-20 11:29:36 UTC (rev 105503)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2012-01-20 11:39:41 UTC (rev 105504)
@@ -68,7 +68,7 @@
, m_displayTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::displayTimerFired)
, m_exitCompositingTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
{
- if (webPage->corePage()->settings()->acceleratedDrawingEnabled() || webPage->corePage()->settings()->forceCompositingMode())
+ if (webPage->corePage()->settings()->acceleratedDrawingEnabled())
m_alwaysUseCompositing = true;
if (m_alwaysUseCompositing)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (105503 => 105504)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-20 11:29:36 UTC (rev 105503)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-20 11:39:41 UTC (rev 105504)
@@ -1840,7 +1840,6 @@
settings->setShowsToolTipOverTruncatedText(store.getBoolValueForKey(WebPreferencesKey::showsToolTipOverTruncatedTextKey()));
settings->setAcceleratedCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
- settings->setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
settings->setAcceleratedDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedDrawingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
settings->setCanvasUsesAcceleratedDrawing(store.getBoolValueForKey(WebPreferencesKey::canvasUsesAcceleratedDrawingKey()) && LayerTreeHost::supportsAcceleratedCompositing());
settings->setShowDebugBorders(store.getBoolValueForKey(WebPreferencesKey::compositingBordersVisibleKey()));
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp (105503 => 105504)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2012-01-20 11:29:36 UTC (rev 105503)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2012-01-20 11:39:41 UTC (rev 105504)
@@ -90,6 +90,10 @@
void WebPage::platformInitialize()
{
+ Settings* settings = m_page->settings();
+
+ // If accelerated compositing is enabled, we want to be in force-compositing mode, so that we don't switch between composited/non-composited state.
+ settings->setForceCompositingMode(true);
}
void WebPage::platformPreferencesDidChange(const WebPreferencesStore&)
