Title: [111285] trunk/Source/WebKit/chromium
- Revision
- 111285
- Author
- [email protected]
- Date
- 2012-03-19 18:13:38 -0700 (Mon, 19 Mar 2012)
Log Message
[chromium] Stop deriving WebCompositor from WebCompositorInputHandler
https://bugs.webkit.org/show_bug.cgi?id=80586
Reviewed by Darin Fisher.
* public/WebCompositor.h:
(WebKit):
* public/WebCompositorInputHandler.h:
(WebCompositorInputHandler):
* public/WebWidgetClient.h:
(WebWidgetClient):
(WebKit::WebWidgetClient::didActivateCompositor):
* src/WebCompositorInputHandlerImpl.cpp:
(WebKit::WebCompositorInputHandler::fromIdentifier):
* src/WebCompositorInputHandlerImpl.h:
(WebCompositorInputHandlerImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (111284 => 111285)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-20 01:06:21 UTC (rev 111284)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-20 01:13:38 UTC (rev 111285)
@@ -1,3 +1,22 @@
+2012-03-19 Nat Duca <[email protected]>
+
+ [chromium] Stop deriving WebCompositor from WebCompositorInputHandler
+ https://bugs.webkit.org/show_bug.cgi?id=80586
+
+ Reviewed by Darin Fisher.
+
+ * public/WebCompositor.h:
+ (WebKit):
+ * public/WebCompositorInputHandler.h:
+ (WebCompositorInputHandler):
+ * public/WebWidgetClient.h:
+ (WebWidgetClient):
+ (WebKit::WebWidgetClient::didActivateCompositor):
+ * src/WebCompositorInputHandlerImpl.cpp:
+ (WebKit::WebCompositorInputHandler::fromIdentifier):
+ * src/WebCompositorInputHandlerImpl.h:
+ (WebCompositorInputHandlerImpl):
+
2012-03-18 James Robinson <[email protected]>
[chromium] Implement fling-by-wheel on compositor thread
Modified: trunk/Source/WebKit/chromium/public/WebCompositor.h (111284 => 111285)
--- trunk/Source/WebKit/chromium/public/WebCompositor.h 2012-03-20 01:06:21 UTC (rev 111284)
+++ trunk/Source/WebKit/chromium/public/WebCompositor.h 2012-03-20 01:13:38 UTC (rev 111285)
@@ -26,7 +26,6 @@
#ifndef WebCompositor_h
#define WebCompositor_h
-#include "WebCompositorInputHandler.h"
#include "platform/WebCommon.h"
namespace WebKit {
@@ -34,16 +33,11 @@
class WebInputEvent;
class WebThread;
-#define WEBCOMPOSITOR_HAS_INITIALIZE
-
// This class contains global routines for interacting with the
// compositor.
//
// All calls to the WebCompositor must be made from the main thread.
-//
-// This class currently temporarily inherits from WebCompositorInputHandler
-// while we migrate downstream code to use WebCompositorInputHandler directly.
-class WebCompositor : public WebCompositorInputHandler {
+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
Modified: trunk/Source/WebKit/chromium/public/WebCompositorInputHandler.h (111284 => 111285)
--- trunk/Source/WebKit/chromium/public/WebCompositorInputHandler.h 2012-03-20 01:06:21 UTC (rev 111284)
+++ trunk/Source/WebKit/chromium/public/WebCompositorInputHandler.h 2012-03-20 01:13:38 UTC (rev 111285)
@@ -30,7 +30,6 @@
namespace WebKit {
-class WebCompositor;
class WebCompositorInputHandlerClient;
class WebInputEvent;
class WebThread;
@@ -41,7 +40,7 @@
public:
// The return value is temporarily WebCompositor until all downstream code
// is switched to use WebCompositorInputHandler.
- WEBKIT_EXPORT static WebCompositor* fromIdentifier(int);
+ WEBKIT_EXPORT static WebCompositorInputHandler* fromIdentifier(int);
virtual void setClient(WebCompositorInputHandlerClient*) = 0;
virtual void handleInputEvent(const WebInputEvent&) = 0;
Modified: trunk/Source/WebKit/chromium/public/WebWidgetClient.h (111284 => 111285)
--- trunk/Source/WebKit/chromium/public/WebWidgetClient.h 2012-03-20 01:06:21 UTC (rev 111284)
+++ trunk/Source/WebKit/chromium/public/WebWidgetClient.h 2012-03-20 01:13:38 UTC (rev 111285)
@@ -56,12 +56,12 @@
virtual void didAutoResize(const WebSize& newSize) { }
// Called when the compositor is enabled or disabled.
- // The WebCompositor identifier can be used on the compositor thread to get access
- // to the WebCompositor instance associated with this WebWidget.
- // If there is no WebCompositor associated with this WebWidget (for example if
- // threaded compositing is not enabled) then calling WebCompositor::fromIdentifier()
+ // The inputHandlerIdentifier can be used on the compositor thread to get access
+ // to the WebCompositorInputHandler instance associated with this WebWidget.
+ // If there is no WebCompositorInputHandler associated with this WebWidget (for example if
+ // threaded compositing is not enabled) then calling WebCompositorInputHandler::fromIdentifier()
// for the specified identifier will return 0.
- virtual void didActivateCompositor(int compositorIdentifier) { }
+ virtual void didActivateCompositor(int inputHandlerIdentifier) { }
virtual void didDeactivateCompositor() { }
// Called for compositing mode when the draw commands for a WebKit-side
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (111284 => 111285)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-03-20 01:06:21 UTC (rev 111284)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-03-20 01:13:38 UTC (rev 111285)
@@ -86,9 +86,9 @@
int WebCompositorInputHandlerImpl::s_nextAvailableIdentifier = 1;
HashSet<WebCompositorInputHandlerImpl*>* WebCompositorInputHandlerImpl::s_compositors = 0;
-WebCompositor* WebCompositorInputHandler::fromIdentifier(int identifier)
+WebCompositorInputHandler* WebCompositorInputHandler::fromIdentifier(int identifier)
{
- return static_cast<WebCompositor*>(WebCompositorInputHandlerImpl::fromIdentifier(identifier));
+ return WebCompositorInputHandlerImpl::fromIdentifier(identifier);
}
PassOwnPtr<WebCompositorInputHandlerImpl> WebCompositorInputHandlerImpl::create(WebCore::CCInputHandlerClient* inputHandlerClient)
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h (111284 => 111285)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h 2012-03-20 01:06:21 UTC (rev 111284)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h 2012-03-20 01:13:38 UTC (rev 111285)
@@ -50,8 +50,7 @@
class WebCompositorInputHandlerClient;
-// Temporarily subclassing from WebCompositor while downstream changes land.
-class WebCompositorInputHandlerImpl : public WebCompositor, public WebCore::CCInputHandler, public WebCore::CCGestureCurveTarget {
+class WebCompositorInputHandlerImpl : public WebCompositorInputHandler, public WebCore::CCInputHandler, public WebCore::CCGestureCurveTarget {
WTF_MAKE_NONCOPYABLE(WebCompositorInputHandlerImpl);
public:
static PassOwnPtr<WebCompositorInputHandlerImpl> create(WebCore::CCInputHandlerClient*);
@@ -59,11 +58,11 @@
virtual ~WebCompositorInputHandlerImpl();
- // WebCompositor implementation
+ // WebCompositorInputHandler implementation.
virtual void setClient(WebCompositorInputHandlerClient*);
virtual void handleInputEvent(const WebInputEvent&);
- // WebCore::CCInputHandler implementation
+ // WebCore::CCInputHandler implementation.
virtual int identifier() const;
virtual void animate(double monotonicTime);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
