Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

2013-07-06 2013-07-06 SRA-SV / ABT Lab <no.email@needed>

        WebCL changes to existing files (REBASE July2013)

        Tools:
        * Scripts/webkitperl/FeatureList.pm:

        Source/WebCore:
        * Configurations/FeatureDefines.xcconfig:
        * DerivedSources.make
        * config.h:
        * dom/DOMExceptions.in:
        * html/canvas/WebGLRenderingContext.idl:
  • Loading branch information...
commit 622ce7dc57ab34e4d5187f0e2fb25e5e916e295b 1 parent c1cae8b
SRA-SV / ABT Lab authored tonikitoo committed
View
3  Source/WebCore/Configurations/FeatureDefines.xcconfig
@@ -177,6 +177,7 @@ ENABLE_VIDEO = ENABLE_VIDEO;
ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(PLATFORM_NAME));
ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;
ENABLE_VIEW_MODE_CSS_MEDIA = ;
+ENABLE_WEBCL = ENABLE_WEBCL;
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
@@ -185,4 +186,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBCL) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
View
27 Source/WebCore/DerivedSources.make
@@ -38,6 +38,7 @@ VPATH = \
$(WebCore)/Modules/quota \
$(WebCore)/Modules/speech \
$(WebCore)/Modules/webaudio \
+ $(WebCore)/Modules/webcl \
$(WebCore)/Modules/webdatabase \
$(WebCore)/Modules/websockets \
$(WebCore)/bindings/generic \
@@ -159,6 +160,32 @@ BINDING_IDLS = \
$(WebCore)/Modules/webaudio/AnalyserNode.idl \
$(WebCore)/Modules/webaudio/WaveShaperNode.idl \
$(WebCore)/Modules/webaudio/PeriodicWave.idl \
+ $(WebCore)/Modules/webcl/DOMWindowWebCLEnvironment.idl \
+ $(WebCore)/Modules/webcl/WebCLGLContext.idl \
+ $(WebCore)/Modules/webcl/WebCL.idl \
+ $(WebCore)/Modules/webcl/WebCLGLContextProperties.idl \
+ $(WebCore)/Modules/webcl/WebCLBuffer.idl \
+ $(WebCore)/Modules/webcl/WebCLGLImage.idl \
+ $(WebCore)/Modules/webcl/WebCLCommandQueue.idl \
+ $(WebCore)/Modules/webcl/WebCLGLObjectInfo.idl \
+ $(WebCore)/Modules/webcl/WebCLContext.idl \
+ $(WebCore)/Modules/webcl/WebCLImage.idl \
+ $(WebCore)/Modules/webcl/WebCLContextProperties.idl \
+ $(WebCore)/Modules/webcl/WebCLImageDescriptor.idl \
+ $(WebCore)/Modules/webcl/WebCLDevice.idl \
+ $(WebCore)/Modules/webcl/WebCLKernel.idl \
+ $(WebCore)/Modules/webcl/WebCLEvent.idl \
+ $(WebCore)/Modules/webcl/WebCLKernelArgumentTypes.idl \
+ $(WebCore)/Modules/webcl/WebCLException.idl \
+ $(WebCore)/Modules/webcl/WebCLMemoryObject.idl \
+ $(WebCore)/Modules/webcl/WebCLFinishCallback.idl \
+ $(WebCore)/Modules/webcl/WebCLPlatform.idl \
+ $(WebCore)/Modules/webcl/WebCLGL.idl \
+ $(WebCore)/Modules/webcl/WebCLProgram.idl \
+ $(WebCore)/Modules/webcl/WebCLGLBuffer.idl \
+ $(WebCore)/Modules/webcl/WebCLSampler.idl \
+ $(WebCore)/Modules/webcl/WebCLGLCommandQueue.idl \
+ $(WebCore)/Modules/webcl/WorkerContextWebCLEnvironment.idl \
$(WebCore)/Modules/webdatabase/DOMWindowWebDatabase.idl \
$(WebCore)/Modules/webdatabase/Database.idl \
$(WebCore)/Modules/webdatabase/DatabaseCallback.idl \
View
3  Source/WebCore/config.h
@@ -140,3 +140,6 @@ typedef float CGFloat;
#define WTF_USE_AVFOUNDATION 1
#endif
+#if PLATFORM(MAC)
+#define ENABLE_WEBCL 1
+#endif // PLATFORM(MAC)
View
1  Source/WebCore/dom/DOMExceptions.in
@@ -4,6 +4,7 @@ DOMCoreException
EventException
FileException conditional=BLOB
RangeException
+WebCLException conditional=WEBCL
SQLException conditional=SQL_DATABASE
SVGException conditional=SVG
XMLHttpRequestException
View
3  Source/WebCore/html/canvas/WebGLRenderingContext.idl
@@ -41,7 +41,8 @@ typedef /*unrestricted*/ float GLclampf;
[
Conditional=WEBGL,
JSCustomMarkFunction,
- DoNotCheckConstants
+ DoNotCheckConstants,
+ JSGenerateToNativeObject
] interface WebGLRenderingContext : CanvasRenderingContext {
/* ClearBufferMask */
View
5 Tools/Scripts/webkitperl/FeatureList.pm
@@ -155,6 +155,7 @@ my (
$workersSupport,
$xhrTimeoutSupport,
$xsltSupport,
+ $webclSupport,
);
my @features = (
@@ -487,6 +488,10 @@ my @features = (
{ option => "xslt", desc => "Toggle XSLT support",
define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
+
+ { option => "webcl", desc => "Toggle WebCL support",
+ define => "ENABLE_WEBCL", default => 1, value => \$webclSupport },
+
);
sub getFeatureOptionList()

0 comments on commit 622ce7d

Please sign in to comment.
Something went wrong with that request. Please try again.