Attachment 349757 Details for Bug 189579 – Patch (move definition to Platform.h)

[patch] Patch (move definition to Platform.h)

189579.patch (text/plain), 4.38 KB, created by Frédéric Wang (:fredw) on 2018-09-14 05:35:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang (:fredw)

Created: 2018-09-14 05:35:52 PDT

Size: 4.38 KB

patch

obsolete

>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 964ec8ccb81..c2fe3cb6a78 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-09-14  Frederic Wang  <fwang@igalia.com>
>+
>+        Build error in ImageBufferCG when compiled with IOSurfacePool
>+        https://bugs.webkit.org/show_bug.cgi?id=189579
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-13  Jer Noble  <jer.noble@apple.com>
> 
>         Enable USE_MEDIAREMOTE on iOS
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 12a1e938fbf..e569cdc5638 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -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 */
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 11cfad13cfc..1a2154e9a2c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-09-14  Frederic Wang  <fwang@igalia.com>
>+
>+        Build error in ImageBufferCG when compiled with IOSurfacePool
>+        https://bugs.webkit.org/show_bug.cgi?id=189579
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-13  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Capturing event listeners are called during bubbling phase for shadow hosts
>diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
>index 4537bbbe45b..8f70e9789de 100644
>--- a/Source/WebCore/html/HTMLCanvasElement.cpp
>+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
>@@ -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"
>diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h b/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
>index 57b16cf578a..c55a54ad911 100644
>--- a/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
>+++ b/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
>@@ -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;
>diff --git a/Source/WebCore/platform/graphics/cocoa/IOSurface.h b/Source/WebCore/platform/graphics/cocoa/IOSurface.h
>index 3f68ecf96fa..daf6e90985a 100644
>--- a/Source/WebCore/platform/graphics/cocoa/IOSurface.h
>+++ b/Source/WebCore/platform/graphics/cocoa/IOSurface.h
>@@ -40,6 +40,10 @@ namespace WebCore {
> 
> class HostWindow;
>     
>+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
>+class ImageBuffer;
>+#endif
>+
> class IOSurface final {
>     WTF_MAKE_FAST_ALLOCATED;
> public:

Actions: View | Formatted Diff | Diff

Attachments on bug 189579: 349660 | 349673 | 349757