Diff
Modified: trunk/Source/WebCore/ChangeLog (124092 => 124093)
--- trunk/Source/WebCore/ChangeLog 2012-07-30 21:31:06 UTC (rev 124092)
+++ trunk/Source/WebCore/ChangeLog 2012-07-30 21:33:32 UTC (rev 124093)
@@ -1,3 +1,19 @@
+2012-07-30 James Robinson <jam...@chromium.org>
+
+ [chromium] Add miscellaneous missing includes and OVERRIDE declarations in compositor code
+ https://bugs.webkit.org/show_bug.cgi?id=92680
+
+ Reviewed by Adrienne Walker.
+
+ * platform/graphics/chromium/TextureCopier.h:
+ (AcceleratedTextureCopier):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+ (CCLayerTreeHostImpl):
+ * platform/graphics/chromium/cc/CCPrioritizedTextureManager.h:
+ * platform/graphics/chromium/cc/CCRenderPassDrawQuad.h:
+ * platform/graphics/chromium/cc/CCResourceProvider.h:
+ (WebCore):
+
2012-07-30 Adrienne Walker <e...@google.com>
[chromium] Remove dependency on ScrollbarTheme from the compositor
Modified: trunk/Source/WebCore/platform/graphics/chromium/TextureCopier.h (124092 => 124093)
--- trunk/Source/WebCore/platform/graphics/chromium/TextureCopier.h 2012-07-30 21:31:06 UTC (rev 124092)
+++ trunk/Source/WebCore/platform/graphics/chromium/TextureCopier.h 2012-07-30 21:33:32 UTC (rev 124093)
@@ -28,6 +28,8 @@
#include "GraphicsContext3D.h"
#include "ProgramBinding.h"
#include "ShaderChromium.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
namespace WebKit {
class WebGraphicsContext3D;
@@ -59,8 +61,8 @@
}
virtual ~AcceleratedTextureCopier();
- virtual void copyTexture(unsigned sourceTextureId, unsigned destTextureId, const IntSize&);
- virtual void flush();
+ virtual void copyTexture(unsigned sourceTextureId, unsigned destTextureId, const IntSize&) OVERRIDE;
+ virtual void flush() OVERRIDE;
protected:
AcceleratedTextureCopier(WebKit::WebGraphicsContext3D*, bool usingBindUniforms);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (124092 => 124093)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-07-30 21:31:06 UTC (rev 124092)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-07-30 21:33:32 UTC (rev 124093)
@@ -69,17 +69,17 @@
virtual ~CCLayerTreeHostImpl();
// CCInputHandlerClient implementation
- virtual CCInputHandlerClient::ScrollStatus scrollBegin(const IntPoint&, CCInputHandlerClient::ScrollInputType);
- virtual void scrollBy(const IntSize&);
- virtual void scrollEnd();
- virtual void pinchGestureBegin();
- virtual void pinchGestureUpdate(float, const IntPoint&);
- virtual void pinchGestureEnd();
- virtual void startPageScaleAnimation(const IntSize& targetPosition, bool anchorPoint, float pageScale, double startTime, double duration);
- virtual CCActiveGestureAnimation* activeGestureAnimation() { return m_activeGestureAnimation.get(); }
+ virtual CCInputHandlerClient::ScrollStatus scrollBegin(const IntPoint&, CCInputHandlerClient::ScrollInputType) OVERRIDE;
+ virtual void scrollBy(const IntSize&) OVERRIDE;
+ virtual void scrollEnd() OVERRIDE;
+ virtual void pinchGestureBegin() OVERRIDE;
+ virtual void pinchGestureUpdate(float, const IntPoint&) OVERRIDE;
+ virtual void pinchGestureEnd() OVERRIDE;
+ virtual void startPageScaleAnimation(const IntSize& targetPosition, bool anchorPoint, float pageScale, double startTime, double duration) OVERRIDE;
+ virtual CCActiveGestureAnimation* activeGestureAnimation() OVERRIDE { return m_activeGestureAnimation.get(); }
// To clear an active animation, pass nullptr.
- virtual void setActiveGestureAnimation(PassOwnPtr<CCActiveGestureAnimation>);
- virtual void scheduleAnimation();
+ virtual void setActiveGestureAnimation(PassOwnPtr<CCActiveGestureAnimation>) OVERRIDE;
+ virtual void scheduleAnimation() OVERRIDE;
struct FrameData {
Vector<IntRect> occludingScreenSpaceRects;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCPrioritizedTextureManager.h (124092 => 124093)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCPrioritizedTextureManager.h 2012-07-30 21:31:06 UTC (rev 124092)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCPrioritizedTextureManager.h 2012-07-30 21:33:32 UTC (rev 124093)
@@ -31,6 +31,9 @@
#include "GraphicsContext3D.h"
#include "IntRect.h"
#include "IntSize.h"
+#include <wtf/HashSet.h>
+#include <wtf/ListHashSet.h>
+#include <wtf/Vector.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderPassDrawQuad.h (124092 => 124093)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderPassDrawQuad.h 2012-07-30 21:31:06 UTC (rev 124092)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderPassDrawQuad.h 2012-07-30 21:33:32 UTC (rev 124093)
@@ -26,6 +26,7 @@
#ifndef CCRenderPassDrawQuad_h
#define CCRenderPassDrawQuad_h
+#include "IntRect.h"
#include "cc/CCResourceProvider.h"
#include <public/WebCompositorQuad.h>
#include <wtf/PassOwnPtr.h>
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.h (124092 => 124093)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.h 2012-07-30 21:31:06 UTC (rev 124092)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.h 2012-07-30 21:33:32 UTC (rev 124093)
@@ -44,6 +44,7 @@
class CCGraphicsContext;
class CCScopedLockResourceForRead;
class CCScopedLockResourceForWrite;
+class IntRect;
class LayerTextureSubImage;
// Thread-safety notes: this class is not thread-safe and can only be called
