Diff
Modified: trunk/Source/Platform/ChangeLog (131961 => 131962)
--- trunk/Source/Platform/ChangeLog 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Source/Platform/ChangeLog 2012-10-19 23:57:30 UTC (rev 131962)
@@ -1,3 +1,15 @@
+2012-10-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r131944.
+ http://trac.webkit.org/changeset/131944
+ https://bugs.webkit.org/show_bug.cgi?id=99891
+
+ On second thoughts, not such a great idea (Requested by jamesr
+ on #webkit).
+
+ * chromium/public/WebCompositorSupport.h:
+ (WebCompositorSupport):
+
2012-10-19 Alexandre Elias <[email protected]>
[chromium] API to pass impl thread via WebLayerTreeView
Modified: trunk/Source/Platform/chromium/public/WebCompositorSupport.h (131961 => 131962)
--- trunk/Source/Platform/chromium/public/WebCompositorSupport.h 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Source/Platform/chromium/public/WebCompositorSupport.h 2012-10-19 23:57:30 UTC (rev 131962)
@@ -74,8 +74,6 @@
virtual void setPageScalePinchZoomEnabled(bool) { }
// May return 0 if initialization fails.
- virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& root, const WebLayerTreeView::Settings& settings, WebThread* implThread) { return createLayerTreeView(client, root, settings); }
- // FIXME(aelias): Delete this version when the above is implemented.
virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; }
Modified: trunk/Source/WebKit/chromium/ChangeLog (131961 => 131962)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-10-19 23:57:30 UTC (rev 131962)
@@ -1,3 +1,24 @@
+2012-10-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r131944.
+ http://trac.webkit.org/changeset/131944
+ https://bugs.webkit.org/show_bug.cgi?id=99891
+
+ On second thoughts, not such a great idea (Requested by jamesr
+ on #webkit).
+
+ * public/WebView.h:
+ (WebKit):
+ (WebView):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::WebViewImpl):
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+ (WebKit):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+ * tests/GraphicsLayerChromiumTest.cpp:
+ (WebKit::GraphicsLayerChromiumTest::GraphicsLayerChromiumTest):
+
2012-10-19 Jochen Eisinger <[email protected]>
[chromium] when building a shared library component build, we must not depend on WebCore
Modified: trunk/Source/WebKit/chromium/public/WebView.h (131961 => 131962)
--- trunk/Source/WebKit/chromium/public/WebView.h 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Source/WebKit/chromium/public/WebView.h 2012-10-19 23:57:30 UTC (rev 131962)
@@ -58,7 +58,6 @@
class WebSpellCheckClient;
class WebString;
class WebTextFieldDecoratorClient;
-class WebThread;
class WebViewClient;
struct WebActiveWheelFlingParameters;
struct WebMediaPlayerAction;
@@ -468,8 +467,6 @@
virtual bool isSelectionEditable() const = 0;
- virtual void setCompositorImplThread(WebThread*) = 0;
-
// Benchmarking support -------------------------------------------------
virtual WebViewBenchmarkSupport* benchmarkSupport() { return 0; }
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (131961 => 131962)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-10-19 23:57:30 UTC (rev 131962)
@@ -424,7 +424,6 @@
, m_compositorSurfaceReady(false)
, m_deviceScaleInCompositor(1)
, m_inputHandlerIdentifier(-1)
- , m_compositorImplThread(0)
#endif
#if ENABLE(INPUT_SPEECH)
, m_speechInputClient(SpeechInputClientImpl::create(client))
@@ -3872,11 +3871,6 @@
setBackgroundColor(view->documentBackgroundColor());
}
-void WebViewImpl::setCompositorImplThread(WebThread* compositorImplThread)
-{
- m_compositorImplThread = compositorImplThread;
-}
-
void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
{
WebKit::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
@@ -3914,7 +3908,7 @@
m_nonCompositedContentHost->setShowDebugBorders(page()->settings()->showDebugBorders());
m_nonCompositedContentHost->setOpaque(!isTransparent());
- m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(this, *m_rootLayer, layerTreeViewSettings, m_compositorImplThread));
+ m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(this, *m_rootLayer, layerTreeViewSettings));
if (m_layerTreeView) {
if (m_webSettings->applyDefaultDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1) {
ASSERT(page()->deviceScaleFactor());
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (131961 => 131962)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-10-19 23:57:30 UTC (rev 131962)
@@ -202,7 +202,6 @@
virtual bool isActive() const;
virtual void setIsActive(bool value);
virtual void setDomainRelaxationForbidden(bool, const WebString& scheme);
- virtual void setCompositorImplThread(WebThread*);
virtual bool dispatchBeforeUnloadEvent();
virtual void dispatchUnloadEvent();
virtual WebFrame* mainFrame();
@@ -841,7 +840,6 @@
bool m_compositorSurfaceReady;
float m_deviceScaleInCompositor;
int m_inputHandlerIdentifier;
- WebThread* m_compositorImplThread;
#endif
static const WebInputEvent* m_currentInputEvent;
Modified: trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp (131961 => 131962)
--- trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp 2012-10-19 23:57:30 UTC (rev 131962)
@@ -66,7 +66,7 @@
Platform::current()->compositorSupport()->initialize(0);
m_graphicsLayer = static_pointer_cast<GraphicsLayerChromium>(GraphicsLayer::create(&m_client));
m_platformLayer = m_graphicsLayer->platformLayer();
- m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(&m_layerTreeViewClient, *m_platformLayer, WebLayerTreeView::Settings(), 0));
+ m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(&m_layerTreeViewClient, *m_platformLayer, WebLayerTreeView::Settings()));
m_layerTreeView->setViewportSize(WebSize(1, 1), WebSize(1, 1));
}
Modified: trunk/Tools/ChangeLog (131961 => 131962)
--- trunk/Tools/ChangeLog 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Tools/ChangeLog 2012-10-19 23:57:30 UTC (rev 131962)
@@ -1,3 +1,15 @@
+2012-10-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r131944.
+ http://trac.webkit.org/changeset/131944
+ https://bugs.webkit.org/show_bug.cgi?id=99891
+
+ On second thoughts, not such a great idea (Requested by jamesr
+ on #webkit).
+
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::createNewWindow):
+
2012-10-19 Alexandre Elias <[email protected]>
[chromium] API to pass impl thread via WebLayerTreeView
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (131961 => 131962)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-10-19 23:40:31 UTC (rev 131961)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-10-19 23:57:30 UTC (rev 131962)
@@ -741,7 +741,6 @@
{
WebViewHost* host = new WebViewHost(this);
WebView* view = WebView::create(host);
- view->setCompositorImplThread(m_webCompositorThread.get());
view->setPermissionClient(webPermissions());
view->setDevToolsAgentClient(devToolsAgent);
host->setWebWidget(view);
