Title: [119287] trunk/Source
- Revision
- 119287
- Author
- [email protected]
- Date
- 2012-06-01 15:14:44 -0700 (Fri, 01 Jun 2012)
Log Message
[chromium] Unreviewed compile fix for r119283
For the record, Dana Jensens <[email protected]> wrote this slightly faster than I did.
Source/WebCore:
* platform/graphics/chromium/LayerChromium.h:
(WebCore::LayerChromium::bounds):
* platform/graphics/chromium/cc/CCLayerImpl.h:
(WebCore::CCLayerImpl::bounds):
Source/WebKit/chromium:
* tests/CCAnimationTestCommon.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (119286 => 119287)
--- trunk/Source/WebCore/ChangeLog 2012-06-01 22:11:58 UTC (rev 119286)
+++ trunk/Source/WebCore/ChangeLog 2012-06-01 22:14:44 UTC (rev 119287)
@@ -1,3 +1,14 @@
+2012-06-01 James Robinson <[email protected]>
+
+ [chromium] Unreviewed compile fix for r119283
+
+ For the record, Dana Jensens <[email protected]> wrote this slightly faster than I did.
+
+ * platform/graphics/chromium/LayerChromium.h:
+ (WebCore::LayerChromium::bounds):
+ * platform/graphics/chromium/cc/CCLayerImpl.h:
+ (WebCore::CCLayerImpl::bounds):
+
2012-06-01 Ian Vollick <[email protected]>
[chromium] Accelerated animations should use WebTransformOperations
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h (119286 => 119287)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2012-06-01 22:11:58 UTC (rev 119286)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2012-06-01 22:14:44 UTC (rev 119287)
@@ -80,7 +80,6 @@
virtual float opacity() const OVERRIDE { return m_opacity; }
virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix&) OVERRIDE;
virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE { return m_transform; }
- virtual const IntSize& bounds() const OVERRIDE { return m_bounds; }
const LayerChromium* rootLayer() const;
LayerChromium* parent() const;
@@ -102,6 +101,7 @@
Color backgroundColor() const { return m_backgroundColor; }
void setBounds(const IntSize&);
+ const IntSize& bounds() const { return m_bounds; }
virtual IntSize contentBounds() const { return bounds(); }
void setMasksToBounds(bool);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h (119286 => 119287)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h 2012-06-01 22:11:58 UTC (rev 119286)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h 2012-06-01 22:14:44 UTC (rev 119287)
@@ -63,7 +63,6 @@
virtual float opacity() const OVERRIDE { return m_opacity; }
virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix&) OVERRIDE;
virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE { return m_transform; }
- virtual const IntSize& bounds() const OVERRIDE { return m_bounds; }
// Tree structure.
CCLayerImpl* parent() const { return m_parent; }
@@ -166,6 +165,7 @@
CCRenderSurface* targetRenderSurface() const { return m_targetRenderSurface; }
void setTargetRenderSurface(CCRenderSurface* surface) { m_targetRenderSurface = surface; }
+ const IntSize& bounds() const { return m_bounds; }
void setBounds(const IntSize&);
const IntSize& contentBounds() const { return m_contentBounds; }
Modified: trunk/Source/WebKit/chromium/ChangeLog (119286 => 119287)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-01 22:11:58 UTC (rev 119286)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-01 22:14:44 UTC (rev 119287)
@@ -1,3 +1,11 @@
+2012-06-01 James Robinson <[email protected]>
+
+ [chromium] Unreviewed compile fix for r119283
+
+ For the record, Dana Jensens <[email protected]> wrote this slightly faster than I did.
+
+ * tests/CCAnimationTestCommon.h:
+
2012-06-01 Ian Vollick <[email protected]>
[chromium] Accelerated animations should use WebTransformOperations
Modified: trunk/Source/WebKit/chromium/tests/CCAnimationTestCommon.h (119286 => 119287)
--- trunk/Source/WebKit/chromium/tests/CCAnimationTestCommon.h 2012-06-01 22:11:58 UTC (rev 119286)
+++ trunk/Source/WebKit/chromium/tests/CCAnimationTestCommon.h 2012-06-01 22:14:44 UTC (rev 119287)
@@ -89,12 +89,10 @@
virtual float opacity() const OVERRIDE { return m_opacity; }
virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix& transform) OVERRIDE { m_transform = transform; }
virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE { return m_transform; }
- virtual const WebCore::IntSize& bounds() const OVERRIDE { return m_bounds; }
private:
float m_opacity;
WebKit::WebTransformationMatrix m_transform;
- WebCore::IntSize m_bounds;
};
void addOpacityTransitionToController(WebCore::CCLayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
