WebCL: Move WebCLException to core/webcl.

Raphael Kubo da Costa · Raphael Kubo da Costa · commit 6912fdebf2d8 · 2015-09-07T16:50:04.000+02:00
This solves a layering violation, even if in an ugly way: ExceptionState
depends on V8ThrowException, which was including and depending on
WebCLException. The former is in bindings/core, which is not supposed to
depend on anything in modules/, which is where the latter was.

The WebCLException.* files do not have any dependency on other files in
modules/webcl (some unnecessary includes have been removed), so we can
easily move them to core/webcl instead and resolve the layering
violations.

The deeper issue of whether WebCLException should inherit from
DOMException and how to do this cleanly in Blink persists.

This change is a requirement for moving to M45, as work on upstream bug
358074 has reinforced these layering separations and causing code built
with component=shared_library to fail to link.
diff --git a/Source/bindings/core/v8/V8ThrowException.cpp b/Source/bindings/core/v8/V8ThrowException.cpp
@@ -28,10 +28,10 @@
 #include "bindings/core/v8/BindingSecurity.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMException.h"
-#include "bindings/modules/v8/V8WebCLException.h"
+#include "bindings/core/v8/V8WebCLException.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
-#include "modules/webcl/WebCLException.h"
+#include "core/webcl/WebCLException.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
diff --git a/Source/core/core.gypi b/Source/core/core.gypi
@@ -381,6 +381,7 @@
             'timing/PerformanceResourceTiming.idl',
             'timing/PerformanceTiming.idl',
             'timing/WorkerPerformance.idl',
+            'webcl/WebCLException.idl',
             'workers/SharedWorker.idl',
             'workers/Worker.idl',
             'workers/WorkerConsole.idl',
@@ -2007,6 +2008,8 @@
             'timing/WorkerGlobalScopePerformance.h',
             'timing/WorkerPerformance.cpp',
             'timing/WorkerPerformance.h',
+            'webcl/WebCLException.cpp',
+            'webcl/WebCLException.h',
             'workers/AbstractWorker.cpp',
             'workers/AbstractWorker.h',
             'workers/DedicatedWorkerGlobalScope.cpp',
diff --git a/Source/core/webcl/WebCLException.cpp b/Source/core/webcl/WebCLException.cpp
@@ -7,8 +7,8 @@
 
 #if ENABLE(WEBCL)
 
-#include "modules/webcl/WebCL.h"
-#include "modules/webcl/WebCLException.h"
+#include "core/webcl/WebCLException.h"
+#include <CL/cl.h>
 
 namespace blink {
 
diff --git a/Source/core/webcl/WebCLException.h b/Source/core/webcl/WebCLException.h
@@ -7,12 +7,9 @@
 #define WebCLException_h
 
 #include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ScriptWrappable.h"
 #include <wtf/ThreadSafeRefCounted.h>
 
-#if ENABLE(WEBCL)
-#include "modules/webcl/WebCLConfig.h"
-#endif
-
 #define WEBCLEXCEPTIONOFFSET 0
 
 namespace blink {
diff --git a/Source/core/webcl/WebCLException.idl b/Source/core/webcl/WebCLException.idl
diff --git a/Source/modules/modules.gypi b/Source/modules/modules.gypi
@@ -236,7 +236,6 @@
       'webcl/WebCLContext.idl',
       'webcl/WebCLDevice.idl',
       'webcl/WebCLEvent.idl',
-      'webcl/WebCLException.idl',
       'webcl/WebCLImage.idl',
       'webcl/WebCLKernel.idl',
       'webcl/WebCLKernelArgInfo.idl',
@@ -1495,8 +1494,6 @@
       'webcl/WebCLDevice.h',
       'webcl/WebCLEvent.cpp',
       'webcl/WebCLEvent.h',
-      'webcl/WebCLException.cpp',
-      'webcl/WebCLException.h',
       'webcl/WebCLExtension.cpp',
       'webcl/WebCLExtension.h',
       'webcl/WebCLHTMLUtil.cpp',
diff --git a/Source/modules/webcl/WebCL.cpp b/Source/modules/webcl/WebCL.cpp
@@ -6,14 +6,14 @@
 #include "config.h"
 
 #if ENABLE(WEBCL)
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
 #include "modules/webcl/WebCLOpenCL.h"
 #include "modules/webcl/WebCLCallback.h"
 #include "modules/webcl/WebCLCommandQueue.h"
 #include "modules/webcl/WebCLConfig.h"
 #include "modules/webcl/WebCLContext.h"
 #include "modules/webcl/WebCLDevice.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLExtension.h"
 #include "modules/webcl/WebCLEvent.h"
 #include "modules/webcl/WebCLImage.h"
diff --git a/Source/modules/webcl/WebCLBuffer.cpp b/Source/modules/webcl/WebCLBuffer.cpp
@@ -7,10 +7,10 @@
 
 #if ENABLE(WEBCL)
 
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
 #include "modules/webcl/WebCLBuffer.h"
 #include "modules/webcl/WebCLContext.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLMemoryObject.h"
 #include "modules/webcl/WebCLOpenCL.h"
 
diff --git a/Source/modules/webcl/WebCLCommandQueue.cpp b/Source/modules/webcl/WebCLCommandQueue.cpp
@@ -13,10 +13,10 @@
 #include "core/dom/DOMTypedArray.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/ImageData.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
 #include "modules/webcl/WebCLBuffer.h"
 #include "modules/webcl/WebCLCommandQueue.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLEvent.h"
 #include "modules/webcl/WebCLHTMLUtil.h"
 #include "modules/webcl/WebCLImage.h"
diff --git a/Source/modules/webcl/WebCLCommandQueue.h b/Source/modules/webcl/WebCLCommandQueue.h
@@ -8,6 +8,7 @@
 
 #if ENABLE(WEBCL)
 #include "modules/webcl/WebCLCallback.h"
+#include "modules/webcl/WebCLConfig.h"
 #include "modules/webcl/WebCLObject.h"
 
 #include <wtf/PassRefPtr.h>
diff --git a/Source/modules/webcl/WebCLContext.cpp b/Source/modules/webcl/WebCLContext.cpp
@@ -11,6 +11,7 @@
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
+#include "core/webcl/WebCLException.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "bindings/core/v8/V8Binding.h"
@@ -19,7 +20,6 @@
 #include "modules/webcl/WebCLContext.h"
 #include "modules/webcl/WebCLCommandQueue.h"
 #include "modules/webcl/WebCLDevice.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLHTMLUtil.h"
 #include "modules/webcl/WebCLImage.h"
 #include "modules/webcl/WebCLImageDescriptor.h"
diff --git a/Source/modules/webcl/WebCLDevice.cpp b/Source/modules/webcl/WebCLDevice.cpp
@@ -7,10 +7,10 @@
 
 #if ENABLE(WEBCL)
 #include "bindings/modules/v8/V8WebCLPlatform.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
 #include "modules/webcl/WebCLContext.h"
 #include "modules/webcl/WebCLDevice.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLOpenCL.h"
 
 namespace blink {
diff --git a/Source/modules/webcl/WebCLEvent.cpp b/Source/modules/webcl/WebCLEvent.cpp
@@ -8,9 +8,9 @@
 #if ENABLE(WEBCL)
 #include "bindings/modules/v8/V8WebCLCommandQueue.h"
 #include "bindings/modules/v8/V8WebCLContext.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
 #include "modules/webcl/WebCLEvent.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLOpenCL.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "public/platform/Platform.h"
diff --git a/Source/modules/webcl/WebCLEvent.h b/Source/modules/webcl/WebCLEvent.h
@@ -8,6 +8,7 @@
 
 #if ENABLE(WEBCL)
 #include "modules/webcl/WebCLCallback.h"
+#include "modules/webcl/WebCLConfig.h"
 #include "modules/webcl/WebCLObject.h"
 
 #include <wtf/PassRefPtr.h>
diff --git a/Source/modules/webcl/WebCLExtension.h b/Source/modules/webcl/WebCLExtension.h
@@ -8,8 +8,8 @@
 
 #if ENABLE(WEBCL)
 
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCLConfig.h"
-#include "modules/webcl/WebCLException.h"
 
 namespace blink {
 
diff --git a/Source/modules/webcl/WebCLHTMLUtil.cpp b/Source/modules/webcl/WebCLHTMLUtil.cpp
@@ -11,10 +11,10 @@
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
+#include "core/webcl/WebCLException.h"
 #include "platform/graphics/gpu/WebGLImageConversion.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "modules/webcl/WebCL.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLHTMLUtil.h"
 
 namespace blink {
diff --git a/Source/modules/webcl/WebCLImage.cpp b/Source/modules/webcl/WebCLImage.cpp
@@ -6,9 +6,9 @@
 #include "config.h"
 
 #if ENABLE(WEBCL)
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
 #include "modules/webcl/WebCLContext.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLImage.h"
 #include "modules/webcl/WebCLOpenCL.h"
 
diff --git a/Source/modules/webcl/WebCLKernel.cpp b/Source/modules/webcl/WebCLKernel.cpp
@@ -13,10 +13,10 @@
 #include "bindings/modules/v8/V8WebCLSampler.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/DOMTypedArray.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
 #include "modules/webcl/WebCLBuffer.h"
 #include "modules/webcl/WebCLDevice.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLImage.h"
 #include "modules/webcl/WebCLKernel.h"
 #include "modules/webcl/WebCLKernelArgInfo.h"
diff --git a/Source/modules/webcl/WebCLKernelArgInfoProvider.cpp b/Source/modules/webcl/WebCLKernelArgInfoProvider.cpp
@@ -6,7 +6,7 @@
 #include "config.h"
 
 #if ENABLE(WEBCL)
-#include "modules/webcl/WebCLException.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCLKernel.h"
 #include "modules/webcl/WebCLKernelArgInfoProvider.h"
 #include "modules/webcl/WebCLProgram.h"
diff --git a/Source/modules/webcl/WebCLMemoryObject.cpp b/Source/modules/webcl/WebCLMemoryObject.cpp
@@ -8,8 +8,8 @@
 #if ENABLE(WEBCL)
 #include "bindings/modules/v8/V8WebCLContext.h"
 #include "bindings/modules/v8/V8WebCLMemoryObject.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLMemoryObject.h"
 #include "modules/webcl/WebCLOpenCL.h"
 
diff --git a/Source/modules/webcl/WebCLMemoryObject.h b/Source/modules/webcl/WebCLMemoryObject.h
@@ -7,6 +7,7 @@
 #define WebCLMemoryObject_h
 
 #if ENABLE(WEBCL)
+#include "modules/webcl/WebCLConfig.h"
 #include "modules/webcl/WebCLObject.h"
 
 #include <wtf/PassRefPtr.h>
diff --git a/Source/modules/webcl/WebCLMemoryUtil.h b/Source/modules/webcl/WebCLMemoryUtil.h
@@ -8,7 +8,7 @@
 
 #if ENABLE(WEBCL)
 
-#include "modules/webcl/WebCLException.h"
+#include "core/webcl/WebCLException.h"
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 #include <wtf/WeakPtr.h>
diff --git a/Source/modules/webcl/WebCLObject.h b/Source/modules/webcl/WebCLObject.h
@@ -8,7 +8,7 @@
 
 #if ENABLE(WEBCL)
 
-#include "modules/webcl/WebCLException.h"
+#include "core/webcl/WebCLException.h"
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
diff --git a/Source/modules/webcl/WebCLPlatform.cpp b/Source/modules/webcl/WebCLPlatform.cpp
@@ -7,8 +7,8 @@
 
 #if ENABLE(WEBCL)
 #include "bindings/core/v8/V8Binding.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLOpenCL.h"
 #include "modules/webcl/WebCLPlatform.h"
 
diff --git a/Source/modules/webcl/WebCLProgram.cpp b/Source/modules/webcl/WebCLProgram.cpp
@@ -7,8 +7,8 @@
 
 #if ENABLE(WEBCL)
 #include "bindings/modules/v8/V8WebCLContext.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLKernel.h"
 #include "modules/webcl/WebCLOpenCL.h"
 #include "modules/webcl/WebCLProgram.h"
diff --git a/Source/modules/webcl/WebCLSampler.cpp b/Source/modules/webcl/WebCLSampler.cpp
@@ -7,8 +7,8 @@
 
 #if ENABLE(WEBCL)
 #include "bindings/modules/v8/V8WebCLContext.h"
+#include "core/webcl/WebCLException.h"
 #include "modules/webcl/WebCL.h"
-#include "modules/webcl/WebCLException.h"
 #include "modules/webcl/WebCLOpenCL.h"
 #include "modules/webcl/WebCLSampler.h"
 
diff --git a/Source/modules/webcl/WebCLSampler.h b/Source/modules/webcl/WebCLSampler.h
@@ -7,6 +7,7 @@
 #define WebCLSampler_h
 
 #if ENABLE(WEBCL)
+#include "modules/webcl/WebCLConfig.h"
 #include "modules/webcl/WebCLObject.h"
 
 #include <wtf/PassRefPtr.h>
