Title: [87748] trunk/Source/WebCore
- Revision
- 87748
- Author
- [email protected]
- Date
- 2011-05-31 13:21:30 -0700 (Tue, 31 May 2011)
Log Message
2011-05-31 Justin Novosad <[email protected]>
Reviewed by Stephen White.
[Chromium] Build fails when ACCELERATED_2D_CANVAS is disabled
https://bugs.webkit.org/show_bug.cgi?id=61790
Changing the build guards in these two files that are required
by the accelerated compositing feature.
* platform/graphics/gpu/LoopBlinnMathUtils.cpp:
* platform/graphics/gpu/TilingData.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87747 => 87748)
--- trunk/Source/WebCore/ChangeLog 2011-05-31 19:51:03 UTC (rev 87747)
+++ trunk/Source/WebCore/ChangeLog 2011-05-31 20:21:30 UTC (rev 87748)
@@ -1,3 +1,29 @@
+2011-05-31 Justin Novosad <[email protected]>
+
+ Reviewed by Stephen White.
+
+ [Chromium] Build fails when ACCELERATED_2D_CANVAS is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=61790
+ Changing the build guards in these two files that are required
+ by the accelerated compositing feature.
+
+ * platform/graphics/gpu/LoopBlinnMathUtils.cpp:
+ * platform/graphics/gpu/TilingData.cpp:
+
+<<<<<<< .mine
+2011-05-31 Justin Novosad <[email protected]>
+
+ Reviewed by Stephen White.
+
+ [Chromium] Build fails when ACCELERATED_2D_CANVAS is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=61790
+ Changing the build guards in these two files that are required
+ by the accelerated compositing feature.
+
+ * platform/graphics/gpu/LoopBlinnMathUtils.cpp:
+ * platform/graphics/gpu/TilingData.cpp:
+
+=======
2011-05-31 Rob Buis <[email protected]>
Reviewed by Dirk Schulze.
@@ -128,6 +154,7 @@
* dom/XMLDocumentParser.cpp:
(WebCore::XMLDocumentParser::insertErrorMessageBlock):
+>>>>>>> .r87747
2011-05-31 Andreas Kling <[email protected]>
Reviewed by Antti Koivisto.
Modified: trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp (87747 => 87748)
--- trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp 2011-05-31 19:51:03 UTC (rev 87747)
+++ trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp 2011-05-31 20:21:30 UTC (rev 87748)
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(ACCELERATED_COMPOSITING) || ENABLE(ACCELERATED_2D_CANVAS)
#include "LoopBlinnMathUtils.h"
Modified: trunk/Source/WebCore/platform/graphics/gpu/TilingData.cpp (87747 => 87748)
--- trunk/Source/WebCore/platform/graphics/gpu/TilingData.cpp 2011-05-31 19:51:03 UTC (rev 87747)
+++ trunk/Source/WebCore/platform/graphics/gpu/TilingData.cpp 2011-05-31 20:21:30 UTC (rev 87748)
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(ACCELERATED_COMPOSITING) || ENABLE(ACCELERATED_2D_CANVAS)
#include "TilingData.h"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
