Diff
Modified: trunk/Source/Platform/ChangeLog (134288 => 134289)
--- trunk/Source/Platform/ChangeLog 2012-11-12 20:58:20 UTC (rev 134288)
+++ trunk/Source/Platform/ChangeLog 2012-11-12 21:02:11 UTC (rev 134289)
@@ -1,3 +1,16 @@
+2012-11-12 Alexandre Elias <[email protected]>
+
+ [chromium] Delete WebCompositor.h
+ https://bugs.webkit.org/show_bug.cgi?id=101137
+
+ Reviewed by James Robinson.
+
+ The implementation of this class is getting deleted and all
+ WebKit-side users are already going via WebCompositorSupport instead.
+
+ * Platform.gypi:
+ * chromium/public/WebCompositor.h: Removed.
+
2012-11-12 Tommy Widenflycht <[email protected]>
MediaStream API: Schedule the RTCDataChannel events to be triggered at idle state
Modified: trunk/Source/Platform/Platform.gypi (134288 => 134289)
--- trunk/Source/Platform/Platform.gypi 2012-11-12 20:58:20 UTC (rev 134288)
+++ trunk/Source/Platform/Platform.gypi 2012-11-12 21:02:11 UTC (rev 134289)
@@ -44,7 +44,6 @@
'chromium/public/WebClipboard.h',
'chromium/public/WebColor.h',
'chromium/public/WebCommon.h',
- 'chromium/public/WebCompositor.h',
'chromium/public/WebCompositorSupport.h',
'chromium/public/WebCompositorSoftwareOutputDevice.h',
'chromium/public/WebCompositorOutputSurface.h',
Deleted: trunk/Source/Platform/chromium/public/WebCompositor.h (134288 => 134289)
--- trunk/Source/Platform/chromium/public/WebCompositor.h 2012-11-12 20:58:20 UTC (rev 134288)
+++ trunk/Source/Platform/chromium/public/WebCompositor.h 2012-11-12 21:02:11 UTC (rev 134289)
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebCompositor_h
-#define WebCompositor_h
-
-#include "WebCommon.h"
-
-namespace WebKit {
-
-class WebThread;
-
-// This class contains global routines for interacting with the
-// compositor.
-//
-// All calls to the WebCompositor must be made from the main thread.
-class WebCompositor {
-public:
- // Initializes the compositor. Threaded compositing is enabled by passing in
- // a non-null WebThread. No compositor classes or methods should be used
- // prior to calling initialize.
- WEBKIT_EXPORT static void initialize(WebThread*);
-
- // Returns whether the compositor was initialized with threading enabled.
- WEBKIT_EXPORT static bool isThreadingEnabled();
-
- // Shuts down the compositor. This must be called when all compositor data
- // types have been deleted. No compositor classes or methods should be used
- // after shutdown.
- WEBKIT_EXPORT static void shutdown();
-
- // These may only be called before initialize.
- WEBKIT_EXPORT static void setPerTilePaintingEnabled(bool);
- WEBKIT_EXPORT static void setPartialSwapEnabled(bool);
- WEBKIT_EXPORT static void setAcceleratedAnimationEnabled(bool);
- WEBKIT_EXPORT static void setPageScalePinchZoomEnabled(bool);
-
-protected:
- virtual ~WebCompositor() { }
-};
-
-} // namespace WebKit
-
-#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (134288 => 134289)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-12 20:58:20 UTC (rev 134288)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-12 21:02:11 UTC (rev 134289)
@@ -1,3 +1,15 @@
+2012-11-12 Alexandre Elias <[email protected]>
+
+ [chromium] Delete WebCompositor.h
+ https://bugs.webkit.org/show_bug.cgi?id=101137
+
+ Reviewed by James Robinson.
+
+ The implementation of this class is getting deleted and all
+ WebKit-side users are already going via WebCompositorSupport instead.
+
+ * tests/WebCompositorInputHandlerImplTest.cpp:
+
2012-11-12 Dirk Pranke <[email protected]>
Fix Chromium DEPS version after accidentally checking in HEAD a couple days ago.
Modified: trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp (134288 => 134289)
--- trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp 2012-11-12 20:58:20 UTC (rev 134288)
+++ trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp 2012-11-12 21:02:11 UTC (rev 134289)
@@ -32,7 +32,6 @@
#include "WebInputEvent.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include <public/WebCompositor.h>
#include <public/WebFloatPoint.h>
#include <public/WebInputHandler.h>
#include <public/WebInputHandlerClient.h>
@@ -536,4 +535,3 @@
}
}
-
