Commit 8b28bbc8 authored by cmarrin@apple.com's avatar cmarrin@apple.com
Browse files

2011-01-24 Chris Marrin <cmarrin@apple.com>

        Reviewed by Eric Seidel.

        Change ENABLE_3D_CANVAS to ENABLE_WEBGL
        https://bugs.webkit.org/show_bug.cgi?id=53041

        * configure.ac:
2011-01-24  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Eric Seidel.

        Change ENABLE_3D_CANVAS to ENABLE_WEBGL
        https://bugs.webkit.org/show_bug.cgi?id=53041

        * Configurations/FeatureDefines.xcconfig:
2011-01-24  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Eric Seidel.

        Change ENABLE_3D_CANVAS to ENABLE_WEBGL
        https://bugs.webkit.org/show_bug.cgi?id=53041

        * WebKit.gyp:
        * features.gypi:
        * src/Extensions3DChromium.cpp:
        * src/GraphicsContext3DChromium.cpp:
        * src/WebRuntimeFeatures.cpp:
        (WebKit::WebRuntimeFeatures::enableWebGL):
        (WebKit::WebRuntimeFeatures::isWebGLEnabled):
2011-01-24  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Eric Seidel.

        Change ENABLE_3D_CANVAS to ENABLE_WEBGL
        https://bugs.webkit.org/show_bug.cgi?id=53041

        * Api/qwebsettings.cpp:
        (QWebSettingsPrivate::apply):
2011-01-24  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Eric Seidel.

        Change ENABLE_3D_CANVAS to ENABLE_WEBGL
        https://bugs.webkit.org/show_bug.cgi?id=53041

        * WebView.cpp:
        (WebView::notifyPreferencesChanged):
2011-01-24  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Eric Seidel.

        Change ENABLE_3D_CANVAS to ENABLE_WEBGL
        https://bugs.webkit.org/show_bug.cgi?id=53041

        * Configurations/FeatureDefines.xcconfig:
2011-01-24  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Eric Seidel.

        Change ENABLE_3D_CANVAS to ENABLE_WEBGL
        https://bugs.webkit.org/show_bug.cgi?id=53041

        * Configurations/FeatureDefines.xcconfig:
        * DerivedSources.cpp:
        * GNUmakefile.am:
        * WebCore.pro:
        * bindings/generic/RuntimeEnabledFeatures.h:
        * bindings/js/JSArrayBufferCustom.cpp:
        * bindings/js/JSCanvasRenderingContextCustom.cpp:
        (WebCore::toJS):
        * bindings/js/JSDOMWindowCustom.cpp:
        * bindings/js/JSDataViewCustom.cpp:
        * bindings/js/JSDocumentCustom.cpp:
        * bindings/js/JSFloat32ArrayCustom.cpp:
        * bindings/js/JSHTMLCanvasElementCustom.cpp:
        (WebCore::JSHTMLCanvasElement::getContext):
        * bindings/js/JSInt16ArrayCustom.cpp:
        * bindings/js/JSInt32ArrayCustom.cpp:
        * bindings/js/JSInt8ArrayCustom.cpp:
        * bindings/js/JSUint16ArrayCustom.cpp:
        * bindings/js/JSUint32ArrayCustom.cpp:
        * bindings/js/JSUint8ArrayCustom.cpp:
        * bindings/js/JSWebGLRenderingContextCustom.cpp:
        * bindings/js/JSXMLHttpRequestCustom.cpp:
        (WebCore::JSXMLHttpRequest::markChildren):
        (WebCore::JSXMLHttpRequest::send):
        (WebCore::JSXMLHttpRequest::response):
        * bindings/v8/custom/V8ArrayBufferCustom.cpp:
        * bindings/v8/custom/V8ArrayBufferViewCustom.h:
        * bindings/v8/custom/V8DataViewCustom.cpp:
        * bindings/v8/custom/V8DocumentCustom.cpp:
        (WebCore::V8Document::getCSSCanvasContextCallback):
        * bindings/v8/custom/V8Float32ArrayCustom.cpp:
        * bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:
        (WebCore::V8HTMLCanvasElement::getContextCallback):
        * bindings/v8/custom/V8Int16ArrayCustom.cpp:
        * bindings/v8/custom/V8Int32ArrayCustom.cpp:
        * bindings/v8/custom/V8Int8ArrayCustom.cpp:
        * bindings/v8/custom/V8Uint16ArrayCustom.cpp:
        * bindings/v8/custom/V8Uint32ArrayCustom.cpp:
        * bindings/v8/custom/V8Uint8ArrayCustom.cpp:
        * bindings/v8/custom/V8WebGLRenderingContextCustom.cpp:
        * bindings/v8/custom/V8XMLHttpRequestCustom.cpp:
        (WebCore::V8XMLHttpRequest::responseAccessorGetter):
        (WebCore::V8XMLHttpRequest::sendCallback):
        * features.pri:
        * html/HTMLCanvasElement.cpp:
        (WebCore::HTMLCanvasElement::getContext):
        (WebCore::HTMLCanvasElement::reset):
        * html/HTMLCanvasElement.h:
        * html/canvas/ArrayBuffer.cpp:
        * html/canvas/ArrayBuffer.idl:
        * html/canvas/ArrayBufferView.cpp:
        * html/canvas/ArrayBufferView.idl:
        * html/canvas/DataView.cpp:
        * html/canvas/DataView.idl:
        * html/canvas/Float32Array.cpp:
        * html/canvas/Float32Array.idl:
        * html/canvas/Int16Array.cpp:
        * html/canvas/Int16Array.idl:
        * html/canvas/Int32Array.cpp:
        * html/canvas/Int32Array.idl:
        * html/canvas/Int8Array.cpp:
        * html/canvas/Int8Array.idl:
        * html/canvas/OESStandardDerivatives.cpp:
        * html/canvas/OESStandardDerivatives.idl:
        * html/canvas/OESTextureFloat.cpp:
        * html/canvas/OESTextureFloat.idl:
        * html/canvas/Uint16Array.cpp:
        * html/canvas/Uint16Array.idl:
        * html/canvas/Uint32Array.cpp:
        * html/canvas/Uint32Array.idl:
        * html/canvas/Uint8Array.cpp:
        * html/canvas/Uint8Array.idl:
        * html/canvas/WebGLActiveInfo.idl:
        * html/canvas/WebGLBuffer.cpp:
        * html/canvas/WebGLBuffer.idl:
        * html/canvas/WebGLContextAttributes.cpp:
        * html/canvas/WebGLContextAttributes.idl:
        * html/canvas/WebGLContextEvent.idl:
        * html/canvas/WebGLExtension.cpp:
        * html/canvas/WebGLFramebuffer.cpp:
        * html/canvas/WebGLFramebuffer.idl:
        * html/canvas/WebGLGetInfo.cpp:
        * html/canvas/WebGLObject.cpp:
        * html/canvas/WebGLProgram.cpp:
        * html/canvas/WebGLProgram.idl:
        * html/canvas/WebGLRenderbuffer.cpp:
        * html/canvas/WebGLRenderbuffer.idl:
        * html/canvas/WebGLRenderingContext.cpp:
        * html/canvas/WebGLRenderingContext.idl:
        * html/canvas/WebGLShader.cpp:
        * html/canvas/WebGLShader.idl:
        * html/canvas/WebGLTexture.cpp:
        * html/canvas/WebGLTexture.idl:
        * html/canvas/WebGLUniformLocation.cpp:
        * html/canvas/WebGLUniformLocation.idl:
        * html/canvas/WebKitLoseContext.cpp:
        * html/canvas/WebKitLoseContext.idl:
        * page/DOMWindow.idl:
        * platform/graphics/ANGLEWebKitBridge.cpp:
        * platform/graphics/GraphicsContext3D.cpp:
        * platform/graphics/cg/GraphicsContext3DCG.cpp:
        * platform/graphics/gpu/DrawingBuffer.cpp:
        * platform/graphics/gpu/mac/DrawingBufferMac.mm:
        * platform/graphics/mac/GraphicsContext3DMac.mm:
        * platform/graphics/mac/WebGLLayer.mm:
        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
        * platform/graphics/qt/Extensions3DQt.cpp:
        * platform/graphics/qt/GraphicsContext3DQt.cpp:
        * platform/graphics/qt/GraphicsLayerQt.cpp:
        (WebCore::GraphicsLayerQtImpl::GraphicsLayerQtImpl):
        (WebCore::GraphicsLayerQtImpl::paint):
        (WebCore::GraphicsLayerQtImpl::flushChanges):
        * platform/graphics/qt/GraphicsLayerQt.h:
        * platform/graphics/skia/GraphicsContext3DSkia.cpp:
        * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
        * rendering/RenderLayerBacking.cpp:
        (WebCore::isAcceleratedCanvas):
        (WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration):
        (WebCore::RenderLayerBacking::containsPaintedContent):
        (WebCore::RenderLayerBacking::contentChanged):
        * webaudio/AudioBuffer.cpp:
        * webaudio/AudioBuffer.idl:
        * webaudio/RealtimeAnalyser.cpp:
        * webaudio/RealtimeAnalyser.h:
        * webaudio/RealtimeAnalyserNode.h:
        * webaudio/RealtimeAnalyserNode.idl:
        * xml/XMLHttpRequest.cpp:
        (WebCore::XMLHttpRequest::setResponseType):
        (WebCore::XMLHttpRequest::clearResponse):
        (WebCore::XMLHttpRequest::didReceiveData):
        * xml/XMLHttpRequest.h:
2011-01-24  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Eric Seidel.

        Change ENABLE_3D_CANVAS to ENABLE_WEBGL
        https://bugs.webkit.org/show_bug.cgi?id=53041

        * Configurations/FeatureDefines.xcconfig:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76600 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 427aec1f
2011-01-24 Chris Marrin <cmarrin@apple.com>
Reviewed by Eric Seidel.
Change ENABLE_3D_CANVAS to ENABLE_WEBGL
https://bugs.webkit.org/show_bug.cgi?id=53041
* configure.ac:
2011-01-24 Peter Gal <galpeter@inf.u-szeged.hu>
Rubber-stamped by Csaba Osztrogonác.
......
2011-01-24 Chris Marrin <cmarrin@apple.com>
Reviewed by Eric Seidel.
Change ENABLE_3D_CANVAS to ENABLE_WEBGL
https://bugs.webkit.org/show_bug.cgi?id=53041
* Configurations/FeatureDefines.xcconfig:
2011-01-25 Adam Roben <aroben@apple.com>
 
Windows Production build fix
......
......@@ -38,10 +38,10 @@ ENABLE_ACCELERATED_2D_CANVAS_macosx = $(ENABLE_ACCELERATED_2D_CANVAS_macosx_$(TA
ENABLE_ACCELERATED_2D_CANVAS_macosx_1060 = ;
ENABLE_ACCELERATED_2D_CANVAS_macosx_1070 = ;
ENABLE_3D_CANVAS = $(ENABLE_3D_CANVAS_$(REAL_PLATFORM_NAME));
ENABLE_3D_CANVAS_macosx = $(ENABLE_3D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_3D_CANVAS_macosx_1060 = ENABLE_3D_CANVAS;
ENABLE_3D_CANVAS_macosx_1070 = ENABLE_3D_CANVAS;
ENABLE_WEBGL = $(ENABLE_WEBGL_$(REAL_PLATFORM_NAME));
ENABLE_WEBGL_macosx = $(ENABLE_WEBGL_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_WEBGL_macosx_1060 = ENABLE_WEBGL;
ENABLE_WEBGL_macosx_1070 = ENABLE_WEBGL;
ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(REAL_PLATFORM_NAME));
ENABLE_3D_RENDERING_iphoneos = ENABLE_3D_RENDERING;
......@@ -121,4 +121,4 @@ ENABLE_XHTMLMP = ;
ENABLE_XPATH = ENABLE_XPATH;
ENABLE_XSLT = ENABLE_XSLT;
FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
2011-01-24 Chris Marrin <cmarrin@apple.com>
Reviewed by Eric Seidel.
Change ENABLE_3D_CANVAS to ENABLE_WEBGL
https://bugs.webkit.org/show_bug.cgi?id=53041
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.cpp:
* GNUmakefile.am:
* WebCore.pro:
* bindings/generic/RuntimeEnabledFeatures.h:
* bindings/js/JSArrayBufferCustom.cpp:
* bindings/js/JSCanvasRenderingContextCustom.cpp:
(WebCore::toJS):
* bindings/js/JSDOMWindowCustom.cpp:
* bindings/js/JSDataViewCustom.cpp:
* bindings/js/JSDocumentCustom.cpp:
* bindings/js/JSFloat32ArrayCustom.cpp:
* bindings/js/JSHTMLCanvasElementCustom.cpp:
(WebCore::JSHTMLCanvasElement::getContext):
* bindings/js/JSInt16ArrayCustom.cpp:
* bindings/js/JSInt32ArrayCustom.cpp:
* bindings/js/JSInt8ArrayCustom.cpp:
* bindings/js/JSUint16ArrayCustom.cpp:
* bindings/js/JSUint32ArrayCustom.cpp:
* bindings/js/JSUint8ArrayCustom.cpp:
* bindings/js/JSWebGLRenderingContextCustom.cpp:
* bindings/js/JSXMLHttpRequestCustom.cpp:
(WebCore::JSXMLHttpRequest::markChildren):
(WebCore::JSXMLHttpRequest::send):
(WebCore::JSXMLHttpRequest::response):
* bindings/v8/custom/V8ArrayBufferCustom.cpp:
* bindings/v8/custom/V8ArrayBufferViewCustom.h:
* bindings/v8/custom/V8DataViewCustom.cpp:
* bindings/v8/custom/V8DocumentCustom.cpp:
(WebCore::V8Document::getCSSCanvasContextCallback):
* bindings/v8/custom/V8Float32ArrayCustom.cpp:
* bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:
(WebCore::V8HTMLCanvasElement::getContextCallback):
* bindings/v8/custom/V8Int16ArrayCustom.cpp:
* bindings/v8/custom/V8Int32ArrayCustom.cpp:
* bindings/v8/custom/V8Int8ArrayCustom.cpp:
* bindings/v8/custom/V8Uint16ArrayCustom.cpp:
* bindings/v8/custom/V8Uint32ArrayCustom.cpp:
* bindings/v8/custom/V8Uint8ArrayCustom.cpp:
* bindings/v8/custom/V8WebGLRenderingContextCustom.cpp:
* bindings/v8/custom/V8XMLHttpRequestCustom.cpp:
(WebCore::V8XMLHttpRequest::responseAccessorGetter):
(WebCore::V8XMLHttpRequest::sendCallback):
* features.pri:
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext):
(WebCore::HTMLCanvasElement::reset):
* html/HTMLCanvasElement.h:
* html/canvas/ArrayBuffer.cpp:
* html/canvas/ArrayBuffer.idl:
* html/canvas/ArrayBufferView.cpp:
* html/canvas/ArrayBufferView.idl:
* html/canvas/DataView.cpp:
* html/canvas/DataView.idl:
* html/canvas/Float32Array.cpp:
* html/canvas/Float32Array.idl:
* html/canvas/Int16Array.cpp:
* html/canvas/Int16Array.idl:
* html/canvas/Int32Array.cpp:
* html/canvas/Int32Array.idl:
* html/canvas/Int8Array.cpp:
* html/canvas/Int8Array.idl:
* html/canvas/OESStandardDerivatives.cpp:
* html/canvas/OESStandardDerivatives.idl:
* html/canvas/OESTextureFloat.cpp:
* html/canvas/OESTextureFloat.idl:
* html/canvas/Uint16Array.cpp:
* html/canvas/Uint16Array.idl:
* html/canvas/Uint32Array.cpp:
* html/canvas/Uint32Array.idl:
* html/canvas/Uint8Array.cpp:
* html/canvas/Uint8Array.idl:
* html/canvas/WebGLActiveInfo.idl:
* html/canvas/WebGLBuffer.cpp:
* html/canvas/WebGLBuffer.idl:
* html/canvas/WebGLContextAttributes.cpp:
* html/canvas/WebGLContextAttributes.idl:
* html/canvas/WebGLContextEvent.idl:
* html/canvas/WebGLExtension.cpp:
* html/canvas/WebGLFramebuffer.cpp:
* html/canvas/WebGLFramebuffer.idl:
* html/canvas/WebGLGetInfo.cpp:
* html/canvas/WebGLObject.cpp:
* html/canvas/WebGLProgram.cpp:
* html/canvas/WebGLProgram.idl:
* html/canvas/WebGLRenderbuffer.cpp:
* html/canvas/WebGLRenderbuffer.idl:
* html/canvas/WebGLRenderingContext.cpp:
* html/canvas/WebGLRenderingContext.idl:
* html/canvas/WebGLShader.cpp:
* html/canvas/WebGLShader.idl:
* html/canvas/WebGLTexture.cpp:
* html/canvas/WebGLTexture.idl:
* html/canvas/WebGLUniformLocation.cpp:
* html/canvas/WebGLUniformLocation.idl:
* html/canvas/WebKitLoseContext.cpp:
* html/canvas/WebKitLoseContext.idl:
* page/DOMWindow.idl:
* platform/graphics/ANGLEWebKitBridge.cpp:
* platform/graphics/GraphicsContext3D.cpp:
* platform/graphics/cg/GraphicsContext3DCG.cpp:
* platform/graphics/gpu/DrawingBuffer.cpp:
* platform/graphics/gpu/mac/DrawingBufferMac.mm:
* platform/graphics/mac/GraphicsContext3DMac.mm:
* platform/graphics/mac/WebGLLayer.mm:
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
* platform/graphics/qt/Extensions3DQt.cpp:
* platform/graphics/qt/GraphicsContext3DQt.cpp:
* platform/graphics/qt/GraphicsLayerQt.cpp:
(WebCore::GraphicsLayerQtImpl::GraphicsLayerQtImpl):
(WebCore::GraphicsLayerQtImpl::paint):
(WebCore::GraphicsLayerQtImpl::flushChanges):
* platform/graphics/qt/GraphicsLayerQt.h:
* platform/graphics/skia/GraphicsContext3DSkia.cpp:
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::isAcceleratedCanvas):
(WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration):
(WebCore::RenderLayerBacking::containsPaintedContent):
(WebCore::RenderLayerBacking::contentChanged):
* webaudio/AudioBuffer.cpp:
* webaudio/AudioBuffer.idl:
* webaudio/RealtimeAnalyser.cpp:
* webaudio/RealtimeAnalyser.h:
* webaudio/RealtimeAnalyserNode.h:
* webaudio/RealtimeAnalyserNode.idl:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::setResponseType):
(WebCore::XMLHttpRequest::clearResponse):
(WebCore::XMLHttpRequest::didReceiveData):
* xml/XMLHttpRequest.h:
2011-01-25 Mikhail Naganov <mnaganov@chromium.org>
 
Reviewed by Pavel Feldman.
......@@ -38,10 +38,10 @@ ENABLE_ACCELERATED_2D_CANVAS_macosx = $(ENABLE_ACCELERATED_2D_CANVAS_macosx_$(TA
ENABLE_ACCELERATED_2D_CANVAS_macosx_1060 = ;
ENABLE_ACCELERATED_2D_CANVAS_macosx_1070 = ;
ENABLE_3D_CANVAS = $(ENABLE_3D_CANVAS_$(REAL_PLATFORM_NAME));
ENABLE_3D_CANVAS_macosx = $(ENABLE_3D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_3D_CANVAS_macosx_1060 = ENABLE_3D_CANVAS;
ENABLE_3D_CANVAS_macosx_1070 = ENABLE_3D_CANVAS;
ENABLE_WEBGL = $(ENABLE_WEBGL_$(REAL_PLATFORM_NAME));
ENABLE_WEBGL_macosx = $(ENABLE_WEBGL_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_WEBGL_macosx_1060 = ENABLE_WEBGL;
ENABLE_WEBGL_macosx_1070 = ENABLE_WEBGL;
ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(REAL_PLATFORM_NAME));
ENABLE_3D_RENDERING_iphoneos = ENABLE_3D_RENDERING;
......@@ -121,4 +121,4 @@ ENABLE_XHTMLMP = ;
ENABLE_XPATH = ENABLE_XPATH;
ENABLE_XSLT = ENABLE_XSLT;
FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
......@@ -37,7 +37,7 @@
#include "JSCanvasPattern.cpp"
#include "JSCanvasRenderingContext.cpp"
#include "JSCanvasRenderingContext2D.cpp"
#if ENABLE(3D_CANVAS)
#if ENABLE(WEBGL)
#include "JSWebGLRenderingContext.cpp"
#endif
#include "JSCDATASection.cpp"
......
......@@ -4682,9 +4682,9 @@ endif # END ENABLE_BLOB
# ---
# 3D canvas (WebGL) support
# ---
if ENABLE_3D_CANVAS
FEATURE_DEFINES += ENABLE_3D_CANVAS=1
webcore_cppflags += -DENABLE_3D_CANVAS=1
if ENABLE_WEBGL
FEATURE_DEFINES += ENABLE_WEBGL=1
webcore_cppflags += -DENABLE_WEBGL=1
webcore_sources += \
Source/WebCore/html/canvas/WebGLActiveInfo.h \
Source/WebCore/html/canvas/WebGLBuffer.cpp \
......@@ -4711,7 +4711,7 @@ webcore_sources += \
Source/WebCore/html/canvas/WebGLTexture.h \
Source/WebCore/html/canvas/WebGLUniformLocation.cpp \
Source/WebCore/html/canvas/WebGLUniformLocation.h
endif # END ENABLE_3D_CANVAS
endif # END ENABLE_WEBGL
DerivedSources/WebCore/CSSPropertyNames.cpp: DerivedSources/WebCore/CSSPropertyNames.h
DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
......
......@@ -3759,7 +3759,7 @@ contains(DEFINES, ENABLE_WEB_SOCKETS=1) {
}
}
contains(DEFINES, ENABLE_BLOB=1) | contains(DEFINES, ENABLE_3D_CANVAS=1) {
contains(DEFINES, ENABLE_BLOB=1) | contains(DEFINES, ENABLE_WEBGL=1) {
!v8 {
HEADERS += \
bindings/js/JSArrayBufferViewHelper.h
......@@ -3802,7 +3802,7 @@ contains(DEFINES, ENABLE_BLOB=1) | contains(DEFINES, ENABLE_3D_CANVAS=1) {
html/canvas/Uint16Array.cpp
}
contains(DEFINES, ENABLE_3D_CANVAS=1) {
contains(DEFINES, ENABLE_WEBGL=1) {
tobe|!tobe: QT += opengl
HEADERS += \
......
......@@ -97,7 +97,7 @@ public:
static bool webkitAudioContextEnabled() { return isWebAudioEnabled; }
#endif
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
static void setWebGLEnabled(bool isEnabled) { isWebGLEnabled = isEnabled; }
static bool arrayBufferEnabled() { return isWebGLEnabled; }
static bool int8ArrayEnabled() { return isWebGLEnabled; }
......
......@@ -25,7 +25,7 @@
#include "config.h"
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
#include "JSArrayBuffer.h"
......@@ -54,4 +54,4 @@ EncodedJSValue JSC_HOST_CALL JSArrayBufferConstructor::constructJSArrayBuffer(Ex
} // namespace WebCore
#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB)
#endif // ENABLE(WEBGL) || ENABLE(BLOB)
......@@ -28,7 +28,7 @@
#include "CanvasRenderingContext2D.h"
#include "JSCanvasRenderingContext2D.h"
#if ENABLE(3D_CANVAS)
#if ENABLE(WEBGL)
#include "WebGLRenderingContext.h"
#include "JSWebGLRenderingContext.h"
#endif
......@@ -42,7 +42,7 @@ JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CanvasR
if (!object)
return jsUndefined();
#if ENABLE(3D_CANVAS)
#if ENABLE(WEBGL)
if (object->is3d())
return getDOMObjectWrapper<JSWebGLRenderingContext>(exec, globalObject, static_cast<WebGLRenderingContext*>(object));
#endif
......
......@@ -48,7 +48,7 @@
#include <runtime/JSFunction.h>
#include <runtime/PrototypeFunction.h>
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
#include "JSArrayBuffer.h"
#include "JSDataView.h"
#include "JSFloat32Array.h"
......@@ -538,7 +538,7 @@ JSValue JSDOMWindow::webKitCSSMatrix(ExecState* exec) const
return getDOMConstructor<JSWebKitCSSMatrixConstructor>(exec, this);
}
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
JSValue JSDOMWindow::arrayBuffer(ExecState* exec) const
{
return getDOMConstructor<JSArrayBufferConstructor>(exec, this);
......
......@@ -25,7 +25,7 @@
#include "config.h"
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
#include "JSDataView.h"
......@@ -161,4 +161,4 @@ JSValue JSDataView::setUint8(ExecState* exec)
} // namespace WebCore
#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB)
#endif // ENABLE(WEBGL) || ENABLE(BLOB)
......@@ -25,7 +25,7 @@
#include "FrameLoader.h"
#include "HTMLDocument.h"
#include "JSCanvasRenderingContext2D.h"
#if ENABLE(3D_CANVAS)
#if ENABLE(WEBGL)
#include "JSWebGLRenderingContext.h"
#endif
#include "JSDOMWindowCustom.h"
......
......@@ -25,7 +25,7 @@
#include "config.h"
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
#include "JSFloat32Array.h"
......@@ -63,4 +63,4 @@ EncodedJSValue JSC_HOST_CALL JSFloat32ArrayConstructor::constructJSFloat32Array(
} // namespace WebCore
#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB)
#endif // ENABLE(WEBGL) || ENABLE(BLOB)
......@@ -30,7 +30,7 @@
#include "CanvasContextAttributes.h"
#include "HTMLCanvasElement.h"
#include "JSCanvasRenderingContext2D.h"
#if ENABLE(3D_CANVAS)
#if ENABLE(WEBGL)
#include "JSWebGLRenderingContext.h"
#include "WebGLContextAttributes.h"
#endif
......@@ -55,7 +55,7 @@ JSValue JSHTMLCanvasElement::getContext(ExecState* exec)
HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(impl());
const UString& contextId = exec->argument(0).toString(exec);
RefPtr<CanvasContextAttributes> attrs;
#if ENABLE(3D_CANVAS)
#if ENABLE(WEBGL)
if (contextId == "experimental-webgl" || contextId == "webkit-3d") {
attrs = WebGLContextAttributes::create();
WebGLContextAttributes* webGLAttrs = static_cast<WebGLContextAttributes*>(attrs.get());
......
......@@ -25,7 +25,7 @@
#include "config.h"
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
#include "JSInt16Array.h"
......@@ -63,4 +63,4 @@ EncodedJSValue JSC_HOST_CALL JSInt16ArrayConstructor::constructJSInt16Array(Exec
} // namespace WebCore
#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB)
#endif // ENABLE(WEBGL) || ENABLE(BLOB)
......@@ -25,7 +25,7 @@
#include "config.h"
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
#include "JSInt32Array.h"
......@@ -63,4 +63,4 @@ EncodedJSValue JSC_HOST_CALL JSInt32ArrayConstructor::constructJSInt32Array(Exec
} // namespace WebCore
#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB)
#endif // ENABLE(WEBGL) || ENABLE(BLOB)
......@@ -25,7 +25,7 @@
#include "config.h"
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
#include "JSInt8Array.h"
......@@ -64,4 +64,4 @@ EncodedJSValue JSC_HOST_CALL JSInt8ArrayConstructor::constructJSInt8Array(ExecSt
} // namespace WebCore
#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB)
#endif // ENABLE(WEBGL) || ENABLE(BLOB)
......@@ -25,7 +25,7 @@
#include "config.h"
#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
#if ENABLE(WEBGL) || ENABLE(BLOB)
#include "JSUint16Array.h"
......@@ -63,4 +63,4 @@ EncodedJSValue JSC_HOST_CALL JSUint16ArrayConstructor::constructJSUint16Array(Ex
} // namespace WebCore
#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB)
#endif // ENABLE(WEBGL) || ENABLE(BLOB)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment