Title: [236074] trunk/Source
- Revision
- 236074
- Author
- [email protected]
- Date
- 2018-09-17 11:24:10 -0700 (Mon, 17 Sep 2018)
Log Message
Build error in ImageBufferCG when compiled with IOSurfacePool
https://bugs.webkit.org/show_bug.cgi?id=189579
Patch by Frederic Wang <[email protected]> on 2018-09-17
Reviewed by Tim Horton.
IOSurface.h might be included with different value of IOSURFACE_CANVAS_BACKING_STORE, causing
compilation errors when files in the same unified source do not agree on the definition.
This patch moves the definition of IOSURFACE_CANVAS_BACKING_STORE from ImageBufferDataCG.h
to Platform.h so that IOSURFACE_CANVAS_BACKING_STORE is set to the same value in all files.
Finally some minors changes to explicitly declare/define ImageBuffer are performed in order
to prevent future issues with Unified build rotating.
Source/WebCore:
No new tests, behavior unchanged.
* html/HTMLCanvasElement.cpp: Explicitly include ImageBuffer.h since it's used in this file.
* platform/graphics/cg/ImageBufferDataCG.h: Move definition into Platform.h.
* platform/graphics/cocoa/IOSurface.h: Forward-declare ImageBuffer since it's used in this
header.
Source/WTF:
* wtf/Platform.h: Move definition from ImageBufferDataCG.h.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (236073 => 236074)
--- trunk/Source/WTF/ChangeLog 2018-09-17 18:19:34 UTC (rev 236073)
+++ trunk/Source/WTF/ChangeLog 2018-09-17 18:24:10 UTC (rev 236074)
@@ -1,3 +1,19 @@
+2018-09-17 Frederic Wang <[email protected]>
+
+ Build error in ImageBufferCG when compiled with IOSurfacePool
+ https://bugs.webkit.org/show_bug.cgi?id=189579
+
+ Reviewed by Tim Horton.
+
+ IOSurface.h might be included with different value of IOSURFACE_CANVAS_BACKING_STORE, causing
+ compilation errors when files in the same unified source do not agree on the definition.
+ This patch moves the definition of IOSURFACE_CANVAS_BACKING_STORE from ImageBufferDataCG.h
+ to Platform.h so that IOSURFACE_CANVAS_BACKING_STORE is set to the same value in all files.
+ Finally some minors changes to explicitly declare/define ImageBuffer are performed in order
+ to prevent future issues with Unified build rotating.
+
+ * wtf/Platform.h: Move definition from ImageBufferDataCG.h.
+
2018-09-14 Ryan Haddad <[email protected]>
Unreviewed, rolling out r235990.
Modified: trunk/Source/WTF/wtf/Platform.h (236073 => 236074)
--- trunk/Source/WTF/wtf/Platform.h 2018-09-17 18:19:34 UTC (rev 236073)
+++ trunk/Source/WTF/wtf/Platform.h 2018-09-17 18:24:10 UTC (rev 236074)
@@ -1347,4 +1347,8 @@
#define HAVE_SEC_KEY_PROXY 1
#endif
+#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
+#define USE_IOSURFACE_CANVAS_BACKING_STORE 1
+#endif
+
#endif /* WTF_Platform_h */
Modified: trunk/Source/WebCore/ChangeLog (236073 => 236074)
--- trunk/Source/WebCore/ChangeLog 2018-09-17 18:19:34 UTC (rev 236073)
+++ trunk/Source/WebCore/ChangeLog 2018-09-17 18:24:10 UTC (rev 236074)
@@ -1,3 +1,24 @@
+2018-09-17 Frederic Wang <[email protected]>
+
+ Build error in ImageBufferCG when compiled with IOSurfacePool
+ https://bugs.webkit.org/show_bug.cgi?id=189579
+
+ Reviewed by Tim Horton.
+
+ IOSurface.h might be included with different value of IOSURFACE_CANVAS_BACKING_STORE, causing
+ compilation errors when files in the same unified source do not agree on the definition.
+ This patch moves the definition of IOSURFACE_CANVAS_BACKING_STORE from ImageBufferDataCG.h
+ to Platform.h so that IOSURFACE_CANVAS_BACKING_STORE is set to the same value in all files.
+ Finally some minors changes to explicitly declare/define ImageBuffer are performed in order
+ to prevent future issues with Unified build rotating.
+
+ No new tests, behavior unchanged.
+
+ * html/HTMLCanvasElement.cpp: Explicitly include ImageBuffer.h since it's used in this file.
+ * platform/graphics/cg/ImageBufferDataCG.h: Move definition into Platform.h.
+ * platform/graphics/cocoa/IOSurface.h: Forward-declare ImageBuffer since it's used in this
+ header.
+
2018-09-17 Basuke Suzuki <[email protected]>
[Curl] Respond with requested authentication scheme for authentication challenge.
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (236073 => 236074)
--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2018-09-17 18:19:34 UTC (rev 236073)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2018-09-17 18:24:10 UTC (rev 236074)
@@ -42,6 +42,7 @@
#include "HTMLNames.h"
#include "HTMLParserIdioms.h"
#include "ImageBitmapRenderingContext.h"
+#include "ImageBuffer.h"
#include "ImageData.h"
#include "InspectorInstrumentation.h"
#include "JSDOMConvertDictionary.h"
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h (236073 => 236074)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2018-09-17 18:19:34 UTC (rev 236073)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2018-09-17 18:24:10 UTC (rev 236074)
@@ -33,10 +33,6 @@
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
-#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
-#define USE_IOSURFACE_CANVAS_BACKING_STORE 1
-#endif
-
typedef struct CGColorSpace *CGColorSpaceRef;
typedef struct CGDataProvider *CGDataProviderRef;
typedef uint32_t CGBitmapInfo;
Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h (236073 => 236074)
--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2018-09-17 18:19:34 UTC (rev 236073)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2018-09-17 18:24:10 UTC (rev 236074)
@@ -40,6 +40,10 @@
class HostWindow;
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
+class ImageBuffer;
+#endif
+
class IOSurface final {
WTF_MAKE_FAST_ALLOCATED;
public:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
