[webkit-changes] [119291] trunk/Source/WebKit/chromium

Fri, 01 Jun 2012 15:43:18 -0700

Title: [119291] trunk/Source/WebKit/chromium
Revision
119291
Author
[email protected]
Date
2012-06-01 15:43:11 -0700 (Fri, 01 Jun 2012)

Log Message

Use fully qualified name for Fixed to avoid the collision with "typedef SInt32 Fixed" in MacTypes.h

* tests/GraphicsLayerChromiumTest.cpp:
(WebKitTests::TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (119290 => 119291)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-06-01 22:34:30 UTC (rev 119290)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-06-01 22:43:11 UTC (rev 119291)
@@ -1,3 +1,10 @@
+2012-06-01  Ryosuke Niwa  <[email protected]>
+
+        Use fully qualified name for Fixed to avoid the collision with "typedef SInt32 Fixed" in MacTypes.h
+
+        * tests/GraphicsLayerChromiumTest.cpp:
+        (WebKitTests::TEST_F):
+
 2012-06-01  James Robinson  <[email protected]>
 
         [chromium] Unreviewed compile fix for r119283

Modified: trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp (119290 => 119291)


--- trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp	2012-06-01 22:34:30 UTC (rev 119290)
+++ trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp	2012-06-01 22:43:11 UTC (rev 119291)
@@ -34,6 +34,7 @@
 #include "LayerChromium.h"
 #include "Matrix3DTransformOperation.h"
 #include "RotateTransformOperation.h"
+#include "Length.h"
 #include "TranslateTransformOperation.h"
 #include "WebCompositor.h"
 
@@ -209,11 +210,11 @@
     WebCore::KeyframeValueList values(AnimatedPropertyWebkitTransform);
 
     TransformOperations operations1;
-    operations1.operations().append(TranslateTransformOperation::create(Length(2, Fixed), Length(0, Fixed), TransformOperation::TRANSLATE_X));
+    operations1.operations().append(TranslateTransformOperation::create(Length(2, WebCore::Fixed), Length(0, WebCore::Fixed), TransformOperation::TRANSLATE_X));
     values.insert(new TransformAnimationValue(0, &operations1));
 
     TransformOperations operations2;
-    operations2.operations().append(TranslateTransformOperation::create(Length(4, Fixed), Length(0, Fixed), TransformOperation::TRANSLATE_X));
+    operations2.operations().append(TranslateTransformOperation::create(Length(4, WebCore::Fixed), Length(0, WebCore::Fixed), TransformOperation::TRANSLATE_X));
     values.insert(new TransformAnimationValue(duration, &operations2));
 
     RefPtr<Animation> animation = Animation::create();
@@ -292,11 +293,11 @@
     WebCore::KeyframeValueList values(AnimatedPropertyWebkitTransform);
 
     TransformOperations operations1;
-    operations1.operations().append(TranslateTransformOperation::create(Length(2, Fixed), Length(0, Fixed), TransformOperation::TRANSLATE_X));
+    operations1.operations().append(TranslateTransformOperation::create(Length(2, WebCore::Fixed), Length(0, WebCore::Fixed), TransformOperation::TRANSLATE_X));
     values.insert(new TransformAnimationValue(0, &operations1));
 
     TransformOperations operations2;
-    operations2.operations().append(TranslateTransformOperation::create(Length(4, Fixed), Length(0, Fixed), TransformOperation::TRANSLATE_X));
+    operations2.operations().append(TranslateTransformOperation::create(Length(4, WebCore::Fixed), Length(0, WebCore::Fixed), TransformOperation::TRANSLATE_X));
     values.insert(new TransformAnimationValue(duration, &operations2));
 
     RefPtr<Animation> animation = Animation::create();
@@ -329,11 +330,11 @@
     WebCore::KeyframeValueList values(AnimatedPropertyWebkitTransform);
 
     TransformOperations operations1;
-    operations1.operations().append(TranslateTransformOperation::create(Length(2, Fixed), Length(0, Fixed), TransformOperation::TRANSLATE_X));
+    operations1.operations().append(TranslateTransformOperation::create(Length(2, WebCore::Fixed), Length(0, WebCore::Fixed), TransformOperation::TRANSLATE_X));
     values.insert(new TransformAnimationValue(0, &operations1));
 
     TransformOperations operations2;
-    operations2.operations().append(TranslateTransformOperation::create(Length(4, Fixed), Length(0, Fixed), TransformOperation::TRANSLATE_X));
+    operations2.operations().append(TranslateTransformOperation::create(Length(4, WebCore::Fixed), Length(0, WebCore::Fixed), TransformOperation::TRANSLATE_X));
     values.insert(new TransformAnimationValue(duration, &operations2));
 
     RefPtr<Animation> animation = Animation::create();
@@ -368,11 +369,11 @@
     WebCore::KeyframeValueList values(AnimatedPropertyWebkitTransform);
 
     TransformOperations operations1;
-    operations1.operations().append(TranslateTransformOperation::create(Length(2, Fixed), Length(0, Fixed), TransformOperation::TRANSLATE_X));
+    operations1.operations().append(TranslateTransformOperation::create(Length(2, WebCore::Fixed), Length(0, WebCore::Fixed), TransformOperation::TRANSLATE_X));
     values.insert(new TransformAnimationValue(0, &operations1));
 
     TransformOperations operations2;
-    operations2.operations().append(TranslateTransformOperation::create(Length(4, Fixed), Length(0, Fixed), TransformOperation::TRANSLATE_X));
+    operations2.operations().append(TranslateTransformOperation::create(Length(4, WebCore::Fixed), Length(0, WebCore::Fixed), TransformOperation::TRANSLATE_X));
     values.insert(new TransformAnimationValue(duration, &operations2));
 
     RefPtr<Animation> animation = Animation::create();

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to