Diff
Modified: trunk/LayoutTests/ChangeLog (135748 => 135749)
--- trunk/LayoutTests/ChangeLog 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/LayoutTests/ChangeLog 2012-11-26 19:57:40 UTC (rev 135749)
@@ -1,3 +1,25 @@
+2012-11-26 Michelangelo De Simone <michelang...@webkit.org>
+
+ [CSS Shaders] Add IDL file and bindings for mix function
+ https://bugs.webkit.org/show_bug.cgi?id=93011
+
+ Reviewed by Dean Jackson.
+
+ Test for the Custom Filter mix() function JS bindings.
+
+ * css3/filters/custom/custom-filter-mix-bindings-expected.txt: Added.
+ * css3/filters/custom/custom-filter-mix-bindings.html: Added.
+ * css3/filters/script-tests/custom-filter-mix-bindings.js: Added.
+ (jsWrapperClass):
+ (shouldBeType):
+ * platform/chromium/css3/filters/custom/custom-filter-mix-bindings-expected.txt: Added.
+ * platform/efl/fast/js/global-constructors-expected.txt: Updated with the new WebKitCSSMixFunctionValueConstructor.
+ * platform/gtk/fast/js/global-constructors-expected.txt: Ditto.
+ * platform/mac/fast/js/global-constructors-expected.txt: Ditto.
+ * platform/qt-5.0/fast/js/global-constructors-expected.txt: Ditto.
+ * platform/qt/fast/js/global-constructors-expected.txt: Ditto.
+ * platform/win/fast/js/global-constructors-expected.txt: Ditto.
+
2012-11-26 Julien Chaffraix <jchaffr...@webkit.org>
RenderBox::computePercentageLogicalHeight should use containingBlockLogicalWidthForContent
Added: trunk/LayoutTests/css3/filters/custom/custom-filter-mix-bindings-expected.txt (0 => 135749)
--- trunk/LayoutTests/css3/filters/custom/custom-filter-mix-bindings-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/filters/custom/custom-filter-mix-bindings-expected.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -0,0 +1,15 @@
+Test mix() function JS bindings.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS cssRule.type is 1
+PASS declaration.length is 1
+PASS jsWrapperClass(mixFunction) is 'WebKitCSSMixFunctionValue'
+PASS jsWrapperClass(mixFunction.__proto__) is 'WebKitCSSMixFunctionValuePrototype'
+PASS jsWrapperClass(mixFunction.constructor) is 'WebKitCSSMixFunctionValueConstructor'
+PASS mixFunctionContent is "mix(url(color-offset.fs))"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/css3/filters/custom/custom-filter-mix-bindings.html (0 => 135749)
--- trunk/LayoutTests/css3/filters/custom/custom-filter-mix-bindings.html (rev 0)
+++ trunk/LayoutTests/css3/filters/custom/custom-filter-mix-bindings.html 2012-11-26 19:57:40 UTC (rev 135749)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src=""
+<script src=""
+</body>
+</html>
Added: trunk/LayoutTests/css3/filters/script-tests/custom-filter-mix-bindings.js (0 => 135749)
--- trunk/LayoutTests/css3/filters/script-tests/custom-filter-mix-bindings.js (rev 0)
+++ trunk/LayoutTests/css3/filters/script-tests/custom-filter-mix-bindings.js 2012-11-26 19:57:40 UTC (rev 135749)
@@ -0,0 +1,53 @@
+description("Test mix() function JS bindings.");
+
+function jsWrapperClass(node) {
+ if (!node)
+ return "[null]";
+ var string = Object.prototype.toString.apply(node);
+ return string.substr(8, string.length - 9);
+}
+
+function shouldBeType(_expression_, className, prototypeName, constructorName) {
+ if (!prototypeName)
+ prototypeName = className + "Prototype";
+ if (!constructorName)
+ constructorName = className + "Constructor";
+ shouldBe("jsWrapperClass(" + _expression_ + ")", "'" + className + "'");
+ shouldBe("jsWrapperClass(" + _expression_ + ".__proto__)", "'" + prototypeName + "'");
+ shouldBe("jsWrapperClass(" + _expression_ + ".constructor)", "'" + constructorName + "'");
+}
+
+function removeBaseURL(src) {
+ var urlRegexp = /url\(([^\)]*)\)/g;
+ return src.replace(urlRegexp, function(match, url) {
+ return "url(" + url.substr(url.lastIndexOf("/") + 1) + ")";
+ });
+}
+
+if (window.testRunner) {
+ window.testRunner.overridePreference("WebKitCSSCustomFilterEnabled", "1");
+ window.testRunner.overridePreference("WebKitWebGLEnabled", "1");
+}
+
+var styleElement = document.createElement("style");
+document.head.appendChild(styleElement);
+var stylesheet = styleElement.sheet;
+
+stylesheet.addRule("body", "-webkit-filter: custom(none mix(url('../resources/color-offset.fs')))", 0);
+
+var cssRule = stylesheet.cssRules.item(0);
+
+shouldBe("cssRule.type", "1");
+
+var declaration = cssRule.style;
+shouldBe("declaration.length", "1");
+
+var filterRule = declaration.getPropertyCSSValue('-webkit-filter');
+var mixFunction = filterRule[0][0][1];
+shouldBeType("mixFunction", "WebKitCSSMixFunctionValue");
+
+var mixFunctionContent = removeBaseURL(mixFunction.cssText);
+
+shouldBeEqualToString("mixFunctionContent", "mix(url(color-offset.fs))");
+
+successfullyParsed = true;
Added: trunk/LayoutTests/platform/chromium/css3/filters/custom/custom-filter-mix-bindings-expected.txt (0 => 135749)
--- trunk/LayoutTests/platform/chromium/css3/filters/custom/custom-filter-mix-bindings-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/css3/filters/custom/custom-filter-mix-bindings-expected.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -0,0 +1,15 @@
+Test mix() function JS bindings.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS cssRule.type is 1
+PASS declaration.length is 1
+PASS jsWrapperClass(mixFunction) is 'WebKitCSSMixFunctionValue'
+FAIL jsWrapperClass(mixFunction.__proto__) should be WebKitCSSMixFunctionValuePrototype. Was Object.
+FAIL jsWrapperClass(mixFunction.constructor) should be WebKitCSSMixFunctionValueConstructor. Was Function.
+PASS mixFunctionContent is "mix(url(color-offset.fs))"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: trunk/LayoutTests/platform/efl/fast/js/global-constructors-expected.txt (135748 => 135749)
--- trunk/LayoutTests/platform/efl/fast/js/global-constructors-expected.txt 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/LayoutTests/platform/efl/fast/js/global-constructors-expected.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -330,6 +330,7 @@
PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'
PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]'
PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
+PASS WebKitCSSMixFunctionValue.toString() is '[object WebKitCSSMixFunctionValueConstructor]'
PASS WebKitCSSRegionRule.toString() is '[object WebKitCSSRegionRuleConstructor]'
PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
PASS WebKitCSSViewportRule.toString() is '[object WebKitCSSViewportRuleConstructor]'
Modified: trunk/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt (135748 => 135749)
--- trunk/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -328,6 +328,7 @@
PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'
PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]'
PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
+PASS WebKitCSSMixFunctionValue.toString() is '[object WebKitCSSMixFunctionValueConstructor]'
PASS WebKitCSSRegionRule.toString() is '[object WebKitCSSRegionRuleConstructor]'
PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
FAIL WebKitMutationObserver.toString() should be [object WebKitMutationObserverConstructor]. Was [object MutationObserverConstructor].
Modified: trunk/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt (135748 => 135749)
--- trunk/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -320,6 +320,7 @@
PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'
PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]'
PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
+PASS WebKitCSSMixFunctionValue.toString() is '[object WebKitCSSMixFunctionValueConstructor]'
PASS WebKitCSSRegionRule.toString() is '[object WebKitCSSRegionRuleConstructor]'
PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
PASS WebKitMutationObserver.toString() is '[object WebKitMutationObserverConstructor]'
Modified: trunk/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt (135748 => 135749)
--- trunk/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -305,6 +305,7 @@
PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'
PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]'
PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
+PASS WebKitCSSMixFunctionValue.toString() is '[object WebKitCSSMixFunctionValueConstructor]'
PASS WebKitCSSRegionRule.toString() is '[object WebKitCSSRegionRuleConstructor]'
PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
PASS WebKitPoint.toString() is '[object WebKitPointConstructor]'
Modified: trunk/LayoutTests/platform/qt-5.0/fast/js/global-constructors-expected.txt (135748 => 135749)
--- trunk/LayoutTests/platform/qt-5.0/fast/js/global-constructors-expected.txt 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/LayoutTests/platform/qt-5.0/fast/js/global-constructors-expected.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -322,6 +322,7 @@
PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'
PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]'
PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
+PASS WebKitCSSMixFunctionValue.toString() is '[object WebKitCSSMixFunctionValueConstructor]'
PASS WebKitCSSRegionRule.toString() is '[object WebKitCSSRegionRuleConstructor]'
PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
FAIL WebKitMutationObserver.toString() should be [object WebKitMutationObserverConstructor]. Was [object MutationObserverConstructor].
Modified: trunk/LayoutTests/platform/win/fast/js/global-constructors-expected.txt (135748 => 135749)
--- trunk/LayoutTests/platform/win/fast/js/global-constructors-expected.txt 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/LayoutTests/platform/win/fast/js/global-constructors-expected.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -310,6 +310,7 @@
PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'
PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]'
PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
+PASS WebKitCSSMixFunctionValue.toString() is '[object WebKitCSSMixFunctionValueConstructor]'
PASS WebKitCSSRegionRule.toString() is '[object WebKitCSSRegionRuleConstructor]'
PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
PASS WebKitMutationObserver.toString() is '[object WebKitMutationObserverConstructor]'
Modified: trunk/Source/WebCore/CMakeLists.txt (135748 => 135749)
--- trunk/Source/WebCore/CMakeLists.txt 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-11-26 19:57:40 UTC (rev 135749)
@@ -332,6 +332,7 @@
css/WebKitCSSKeyframeRule.idl
css/WebKitCSSKeyframesRule.idl
css/WebKitCSSMatrix.idl
+ css/WebKitCSSMixFunctionValue.idl
css/WebKitCSSRegionRule.idl
css/WebKitCSSTransformValue.idl
css/WebKitCSSViewportRule.idl
Modified: trunk/Source/WebCore/ChangeLog (135748 => 135749)
--- trunk/Source/WebCore/ChangeLog 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/ChangeLog 2012-11-26 19:57:40 UTC (rev 135749)
@@ -1,3 +1,32 @@
+2012-11-26 Michelangelo De Simone <michelang...@webkit.org>
+
+ [CSS Shaders] Add IDL file and bindings for mix function
+ https://bugs.webkit.org/show_bug.cgi?id=93011
+
+ Reviewed by Dean Jackson.
+
+ _javascript_ bindings have been added for the Custom Filter mix()
+ function (WebKitCSSMixFunctionValue). As of now, this is only a
+ placeholder that extends CSSValueList without adding any new
+ property.
+
+ Test: css3/filters/custom/custom-filter-mix-bindings.html
+
+ * CMakeLists.txt: mix() IDL has been added to the Generator;
+ DerivedSources have been included.
+ * DerivedSources.cpp: Ditto.
+ * DerivedSources.make: Ditto.
+ * DerivedSources.pri: Ditto.
+ * GNUmakefile.list.am: Ditto.
+ * WebCore.gypi: Ditto.
+ * WebCore.vcproj/WebCore.vcproj: Ditto.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+ * bindings/js/JSCSSValueCustom.cpp:
+ (WebCore::toJS): return a JSC DOM wrapper for WebKitCSSMixFunctionValue.
+ * bindings/v8/custom/V8CSSValueCustom.cpp:
+ (WebCore::V8CSSValue::dispatchWrapCustom): Ditto, for V8.
+ * css/WebKitCSSMixFunctionValue.idl: Added.
+
2012-11-26 Simon Fraser <simon.fra...@apple.com>
Optimize layer updates after scrolling
Modified: trunk/Source/WebCore/DerivedSources.cpp (135748 => 135749)
--- trunk/Source/WebCore/DerivedSources.cpp 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/DerivedSources.cpp 2012-11-26 19:57:40 UTC (rev 135749)
@@ -487,6 +487,9 @@
#include "JSWebKitCSSKeyframesRule.cpp"
#include "JSWebKitCSSTransformValue.cpp"
#include "JSWebKitCSSMatrix.cpp"
+#if ENABLE(CSS_SHADERS)
+#include "JSWebKitCSSMixFunctionValue.cpp"
+#endif
#include "JSWebKitCSSRegionRule.cpp"
#include "JSWebKitNamedFlow.cpp"
#include "JSWebKitPoint.cpp"
Modified: trunk/Source/WebCore/DerivedSources.make (135748 => 135749)
--- trunk/Source/WebCore/DerivedSources.make 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/DerivedSources.make 2012-11-26 19:57:40 UTC (rev 135749)
@@ -194,6 +194,7 @@
$(WebCore)/css/WebKitCSSKeyframeRule.idl \
$(WebCore)/css/WebKitCSSKeyframesRule.idl \
$(WebCore)/css/WebKitCSSMatrix.idl \
+ $(WebCore)/css/WebKitCSSMixFunctionValue.idl \
$(WebCore)/css/WebKitCSSRegionRule.idl \
$(WebCore)/css/WebKitCSSTransformValue.idl \
$(WebCore)/css/WebKitCSSViewportRule.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (135748 => 135749)
--- trunk/Source/WebCore/DerivedSources.pri 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-11-26 19:57:40 UTC (rev 135749)
@@ -211,6 +211,7 @@
$$PWD/css/WebKitCSSKeyframeRule.idl \
$$PWD/css/WebKitCSSKeyframesRule.idl \
$$PWD/css/WebKitCSSMatrix.idl \
+ $$PWD/css/WebKitCSSMixFunctionValue.idl \
$$PWD/css/WebKitCSSRegionRule.idl \
$$PWD/css/WebKitCSSTransformValue.idl \
$$PWD/css/WebKitCSSViewportRule.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (135748 => 135749)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-11-26 19:57:40 UTC (rev 135749)
@@ -1173,7 +1173,164 @@
DerivedSources/WebCore/JSSVGZoomAndPan.cpp \
DerivedSources/WebCore/JSSVGZoomAndPan.h \
DerivedSources/WebCore/JSSVGZoomEvent.cpp \
- DerivedSources/WebCore/JSSVGZoomEvent.h
+ DerivedSources/WebCore/JSSVGZoomEvent.h \
+ DerivedSources/WebCore/JSText.cpp \
+ DerivedSources/WebCore/JSTextEvent.cpp \
+ DerivedSources/WebCore/JSTextEvent.h \
+ DerivedSources/WebCore/JSText.h \
+ DerivedSources/WebCore/JSTextMetrics.cpp \
+ DerivedSources/WebCore/JSTextMetrics.h \
+ DerivedSources/WebCore/JSTextTrack.cpp \
+ DerivedSources/WebCore/JSTextTrack.h \
+ DerivedSources/WebCore/JSTextTrackCue.cpp \
+ DerivedSources/WebCore/JSTextTrackCue.h \
+ DerivedSources/WebCore/JSTextTrackCueList.cpp \
+ DerivedSources/WebCore/JSTextTrackCueList.h \
+ DerivedSources/WebCore/JSTextTrackList.cpp \
+ DerivedSources/WebCore/JSTextTrackList.h \
+ DerivedSources/WebCore/JSTimeRanges.cpp \
+ DerivedSources/WebCore/JSTimeRanges.h \
+ DerivedSources/WebCore/JSTouch.cpp \
+ DerivedSources/WebCore/JSTouchEvent.cpp \
+ DerivedSources/WebCore/JSTouchEvent.h \
+ DerivedSources/WebCore/JSTouch.h \
+ DerivedSources/WebCore/JSTouchList.cpp \
+ DerivedSources/WebCore/JSTouchList.h \
+ DerivedSources/WebCore/JSTrackEvent.cpp \
+ DerivedSources/WebCore/JSTrackEvent.h \
+ DerivedSources/WebCore/JSTreeWalker.cpp \
+ DerivedSources/WebCore/JSTreeWalker.h \
+ DerivedSources/WebCore/JSUIEvent.cpp \
+ DerivedSources/WebCore/JSUIEvent.h \
+ DerivedSources/WebCore/JSUint16Array.cpp \
+ DerivedSources/WebCore/JSUint16Array.h \
+ DerivedSources/WebCore/JSUint32Array.cpp \
+ DerivedSources/WebCore/JSUint32Array.h \
+ DerivedSources/WebCore/JSUint8Array.cpp \
+ DerivedSources/WebCore/JSUint8Array.h \
+ DerivedSources/WebCore/JSUint8ClampedArray.cpp \
+ DerivedSources/WebCore/JSUint8ClampedArray.h \
+ DerivedSources/WebCore/JSValidityState.cpp \
+ DerivedSources/WebCore/JSValidityState.h \
+ DerivedSources/WebCore/JSVoidCallback.cpp \
+ DerivedSources/WebCore/JSVoidCallback.h \
+ DerivedSources/WebCore/JSWaveShaperNode.cpp \
+ DerivedSources/WebCore/JSWaveShaperNode.h \
+ DerivedSources/WebCore/JSWaveTable.cpp \
+ DerivedSources/WebCore/JSWaveTable.h \
+ DerivedSources/WebCore/JSWebGLActiveInfo.cpp \
+ DerivedSources/WebCore/JSWebGLActiveInfo.h \
+ DerivedSources/WebCore/JSWebGLBuffer.cpp \
+ DerivedSources/WebCore/JSWebGLBuffer.h \
+ DerivedSources/WebCore/JSWebGLCompressedTextureS3TC.cpp \
+ DerivedSources/WebCore/JSWebGLCompressedTextureS3TC.h \
+ DerivedSources/WebCore/JSWebGLContextAttributes.cpp \
+ DerivedSources/WebCore/JSWebGLContextAttributes.h \
+ DerivedSources/WebCore/JSWebGLContextEvent.cpp \
+ DerivedSources/WebCore/JSWebGLContextEvent.h \
+ DerivedSources/WebCore/JSWebGLDepthTexture.cpp \
+ DerivedSources/WebCore/JSWebGLDepthTexture.h \
+ DerivedSources/WebCore/JSWebGLFramebuffer.cpp \
+ DerivedSources/WebCore/JSWebGLFramebuffer.h \
+ DerivedSources/WebCore/JSWebGLLoseContext.cpp \
+ DerivedSources/WebCore/JSWebGLLoseContext.h \
+ DerivedSources/WebCore/JSWebGLProgram.cpp \
+ DerivedSources/WebCore/JSWebGLProgram.h \
+ DerivedSources/WebCore/JSWebGLRenderbuffer.cpp \
+ DerivedSources/WebCore/JSWebGLRenderbuffer.h \
+ DerivedSources/WebCore/JSWebGLRenderingContext.cpp \
+ DerivedSources/WebCore/JSWebGLRenderingContext.h \
+ DerivedSources/WebCore/JSWebGLShader.cpp \
+ DerivedSources/WebCore/JSWebGLShader.h \
+ DerivedSources/WebCore/JSWebGLShaderPrecisionFormat.cpp \
+ DerivedSources/WebCore/JSWebGLShaderPrecisionFormat.h \
+ DerivedSources/WebCore/JSWebGLTexture.cpp \
+ DerivedSources/WebCore/JSWebGLTexture.h \
+ DerivedSources/WebCore/JSWebGLUniformLocation.cpp \
+ DerivedSources/WebCore/JSWebGLUniformLocation.h \
+ DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.cpp \
+ DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.h \
+ DerivedSources/WebCore/JSWebKitAnimation.cpp \
+ DerivedSources/WebCore/JSWebKitAnimation.h \
+ DerivedSources/WebCore/JSWebKitAnimationEvent.cpp \
+ DerivedSources/WebCore/JSWebKitAnimationList.h \
+ DerivedSources/WebCore/JSWebKitAnimationList.cpp \
+ DerivedSources/WebCore/JSWebKitAnimationEvent.h \
+ DerivedSources/WebCore/JSWebKitCSSFilterValue.cpp \
+ DerivedSources/WebCore/JSWebKitCSSFilterValue.h \
+ DerivedSources/WebCore/JSWebKitCSSKeyframeRule.cpp \
+ DerivedSources/WebCore/JSWebKitCSSKeyframeRule.h \
+ DerivedSources/WebCore/JSWebKitCSSKeyframesRule.cpp \
+ DerivedSources/WebCore/JSWebKitCSSKeyframesRule.h \
+ DerivedSources/WebCore/JSWebKitCSSMatrix.cpp \
+ DerivedSources/WebCore/JSWebKitCSSMatrix.h \
+ DerivedSources/WebCore/JSWebKitCSSMixFunctionValue.cpp \
+ DerivedSources/WebCore/JSWebKitCSSMixFunctionValue.h \
+ DerivedSources/WebCore/JSWebKitCSSRegionRule.cpp \
+ DerivedSources/WebCore/JSWebKitCSSRegionRule.h \
+ DerivedSources/WebCore/JSWebKitCSSTransformValue.cpp \
+ DerivedSources/WebCore/JSWebKitCSSTransformValue.h \
+ DerivedSources/WebCore/JSWebKitNamedFlow.cpp \
+ DerivedSources/WebCore/JSWebKitNamedFlow.h \
+ DerivedSources/WebCore/JSWebKitPoint.cpp \
+ DerivedSources/WebCore/JSWebKitPoint.h \
+ DerivedSources/WebCore/JSWebKitTransitionEvent.cpp \
+ DerivedSources/WebCore/JSWebKitTransitionEvent.h \
+ DerivedSources/WebCore/JSWebSocket.cpp \
+ DerivedSources/WebCore/JSWebSocket.h \
+ DerivedSources/WebCore/JSWheelEvent.cpp \
+ DerivedSources/WebCore/JSWheelEvent.h \
+ DerivedSources/WebCore/JSWorkerContext.cpp \
+ DerivedSources/WebCore/JSWorkerContext.h \
+ DerivedSources/WebCore/JSWorker.cpp \
+ DerivedSources/WebCore/JSWorker.h \
+ DerivedSources/WebCore/JSWorkerLocation.cpp \
+ DerivedSources/WebCore/JSWorkerLocation.h \
+ DerivedSources/WebCore/JSWorkerNavigator.cpp \
+ DerivedSources/WebCore/JSWorkerNavigator.h \
+ DerivedSources/WebCore/JSXMLHttpRequest.cpp \
+ DerivedSources/WebCore/JSXMLHttpRequestException.cpp \
+ DerivedSources/WebCore/JSXMLHttpRequestException.h \
+ DerivedSources/WebCore/JSXMLHttpRequest.h \
+ DerivedSources/WebCore/JSXMLHttpRequestProgressEvent.cpp \
+ DerivedSources/WebCore/JSXMLHttpRequestProgressEvent.h \
+ DerivedSources/WebCore/JSXMLHttpRequestUpload.cpp \
+ DerivedSources/WebCore/JSXMLHttpRequestUpload.h \
+ DerivedSources/WebCore/JSXMLSerializer.cpp \
+ DerivedSources/WebCore/JSXMLSerializer.h \
+ DerivedSources/WebCore/JSXPathEvaluator.cpp \
+ DerivedSources/WebCore/JSXPathEvaluator.h \
+ DerivedSources/WebCore/JSXPathException.cpp \
+ DerivedSources/WebCore/JSXPathException.h \
+ DerivedSources/WebCore/JSXPathExpression.cpp \
+ DerivedSources/WebCore/JSXPathExpression.h \
+ DerivedSources/WebCore/JSXPathNSResolver.cpp \
+ DerivedSources/WebCore/JSXPathNSResolver.h \
+ DerivedSources/WebCore/JSXPathResult.cpp \
+ DerivedSources/WebCore/JSXPathResult.h \
+ DerivedSources/WebCore/JSXSLTProcessor.cpp \
+ DerivedSources/WebCore/JSXSLTProcessor.h \
+ DerivedSources/WebCore/MathMLElementFactory.cpp \
+ DerivedSources/WebCore/MathMLElementFactory.h \
+ DerivedSources/WebCore/MathMLNames.cpp \
+ DerivedSources/WebCore/MathMLNames.h \
+ DerivedSources/WebCore/SettingsMacros.h \
+ DerivedSources/WebCore/SVGElementFactory.cpp \
+ DerivedSources/WebCore/SVGNames.cpp \
+ DerivedSources/WebCore/UserAgentGtk.h \
+ DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
+ DerivedSources/WebCore/UserAgentStyleSheets.h \
+ DerivedSources/WebCore/WebKitFontFamilyNames.cpp \
+ DerivedSources/WebCore/WebKitFontFamilyNames.h \
+ DerivedSources/WebCore/XLinkNames.cpp \
+ DerivedSources/WebCore/XMLNames.cpp \
+ DerivedSources/WebCore/XMLNames.h \
+ DerivedSources/WebCore/XMLNSNames.cpp \
+ DerivedSources/WebCore/XMLNSNames.h \
+ DerivedSources/WebCore/XMLViewerCSS.h \
+ DerivedSources/WebCore/XMLViewerJS.h \
+ DerivedSources/WebCore/XPathGrammar.cpp \
+ DerivedSources/WebCore/XPathGrammar.h
dom_binding_idls += \
$(WebCore)/Modules/filesystem/DOMFileSystem.idl \
@@ -1336,6 +1493,7 @@
$(WebCore)/css/WebKitCSSKeyframeRule.idl \
$(WebCore)/css/WebKitCSSKeyframesRule.idl \
$(WebCore)/css/WebKitCSSMatrix.idl \
+ $(WebCore)/css/WebKitCSSMixFunctionValue.idl \
$(WebCore)/css/WebKitCSSRegionRule.idl \
$(WebCore)/css/WebKitCSSTransformValue.idl \
$(WebCore)/css/WebKitCSSViewportRule.idl \
Modified: trunk/Source/WebCore/WebCore.gypi (135748 => 135749)
--- trunk/Source/WebCore/WebCore.gypi 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/WebCore.gypi 2012-11-26 19:57:40 UTC (rev 135749)
@@ -972,6 +972,7 @@
'css/WebKitCSSKeyframeRule.idl',
'css/WebKitCSSKeyframesRule.idl',
'css/WebKitCSSMatrix.idl',
+ 'css/WebKitCSSMixFunctionValue.idl',
'css/WebKitCSSRegionRule.idl',
'css/WebKitCSSTransformValue.idl',
'css/WebKitCSSViewportRule.idl',
@@ -8043,6 +8044,8 @@
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSKeyframesRule.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSMatrix.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSMatrix.h',
+ '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSMixFunctionValue.cpp',
+ '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSMixFunctionValue.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSRegionRule.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSRegionRule.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSTransformValue.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (135748 => 135749)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-11-26 19:57:40 UTC (rev 135749)
@@ -23178,6 +23178,62 @@
>
</File>
<File
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitCSSMixFunctionValue.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Production|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitCSSMixFunctionValue.h"
+ >
+ </File>
+ <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitCSSRegionRule.cpp"
>
<FileConfiguration
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (135748 => 135749)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-26 19:57:40 UTC (rev 135749)
@@ -363,6 +363,8 @@
150B923915F08DC400E10986 /* WebKitCSSArrayFunctionValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150B923715F08DC400E10986 /* WebKitCSSArrayFunctionValue.cpp */; };
150B923A15F08DC400E10986 /* WebKitCSSArrayFunctionValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 150B923815F08DC400E10986 /* WebKitCSSArrayFunctionValue.h */; };
15B3FC1915FB217800A81BCB /* CustomFilterArrayParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B3FC1715FB217800A81BCB /* CustomFilterArrayParameter.h */; };
+ 15B8B7C81652C5220036EF55 /* JSWebKitCSSMixFunctionValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15B8B7C61652C5220036EF55 /* JSWebKitCSSMixFunctionValue.cpp */; };
+ 15B8B7C91652C5220036EF55 /* JSWebKitCSSMixFunctionValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B8B7C71652C5220036EF55 /* JSWebKitCSSMixFunctionValue.h */; };
15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C7708A100D3C6A005BA267 /* ValidityState.h */; };
15C7708E100D3C6B005BA267 /* ValidityState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C7708B100D3C6A005BA267 /* ValidityState.cpp */; };
15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C77091100D3CA8005BA267 /* JSValidityState.h */; };
@@ -7485,6 +7487,8 @@
150B923715F08DC400E10986 /* WebKitCSSArrayFunctionValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSArrayFunctionValue.cpp; sourceTree = "<group>"; };
150B923815F08DC400E10986 /* WebKitCSSArrayFunctionValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSArrayFunctionValue.h; sourceTree = "<group>"; };
15B3FC1715FB217800A81BCB /* CustomFilterArrayParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomFilterArrayParameter.h; path = filters/CustomFilterArrayParameter.h; sourceTree = "<group>"; };
+ 15B8B7C61652C5220036EF55 /* JSWebKitCSSMixFunctionValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitCSSMixFunctionValue.cpp; sourceTree = "<group>"; };
+ 15B8B7C71652C5220036EF55 /* JSWebKitCSSMixFunctionValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitCSSMixFunctionValue.h; sourceTree = "<group>"; };
15C77089100D3C6A005BA267 /* ValidityState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ValidityState.idl; sourceTree = "<group>"; };
15C7708A100D3C6A005BA267 /* ValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValidityState.h; sourceTree = "<group>"; };
15C7708B100D3C6A005BA267 /* ValidityState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ValidityState.cpp; sourceTree = "<group>"; };
@@ -19073,6 +19077,8 @@
316FE0700E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h */,
4983913D0F1E767500C23782 /* JSWebKitCSSMatrix.cpp */,
4983913E0F1E767500C23782 /* JSWebKitCSSMatrix.h */,
+ 15B8B7C61652C5220036EF55 /* JSWebKitCSSMixFunctionValue.cpp */,
+ 15B8B7C71652C5220036EF55 /* JSWebKitCSSMixFunctionValue.h */,
8ACC24CD148E24B200EFCC0D /* JSWebKitCSSRegionRule.cpp */,
8ACC24CE148E24B200EFCC0D /* JSWebKitCSSRegionRule.h */,
31611E580E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp */,
@@ -25812,6 +25818,7 @@
447958041643B49A001E0A7F /* ParsedContentType.h in Headers */,
FB2C15C3165D649D0039C9F8 /* CachedSVGDocumentReference.h in Headers */,
31741AAD16636609008A5B7E /* SimulatedClickOptions.h in Headers */,
+ 15B8B7C91652C5220036EF55 /* JSWebKitCSSMixFunctionValue.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -28911,6 +28918,7 @@
1E50084816516AD800B7E098 /* RenderThemeMacShared.mm in Sources */,
CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */,
447958051643B4B2001E0A7F /* ParsedContentType.cpp in Sources */,
+ 15B8B7C81652C5220036EF55 /* JSWebKitCSSMixFunctionValue.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp (135748 => 135749)
--- trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp 2012-11-26 19:57:40 UTC (rev 135749)
@@ -39,6 +39,11 @@
#include "WebKitCSSFilterValue.h"
#endif
+#if ENABLE(CSS_SHADERS)
+#include "JSWebKitCSSMixFunctionValue.h"
+#include "WebKitCSSMixFunctionValue.h"
+#endif
+
#if ENABLE(SVG)
#include "JSSVGColor.h"
#include "JSSVGPaint.h"
@@ -94,6 +99,10 @@
else if (value->isWebKitCSSFilterValue())
wrapper = CREATE_DOM_WRAPPER(exec, globalObject, WebKitCSSFilterValue, value);
#endif
+#if ENABLE(CSS_SHADERS)
+ else if (value->isWebKitCSSMixFunctionValue())
+ wrapper = CREATE_DOM_WRAPPER(exec, globalObject, WebKitCSSMixFunctionValue, value);
+#endif
else if (value->isValueList())
wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CSSValueList, value);
#if ENABLE(SVG)
Modified: trunk/Source/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp (135748 => 135749)
--- trunk/Source/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp 2012-11-26 19:57:40 UTC (rev 135749)
@@ -39,6 +39,11 @@
#include "V8WebKitCSSFilterValue.h"
#endif
+#if ENABLE(CSS_SHADERS)
+#include "V8WebKitCSSMixFunctionValue.h"
+#include "WebKitCSSMixFunctionValue.h"
+#endif
+
#if ENABLE(SVG)
#include "V8SVGColor.h"
#include "V8SVGPaint.h"
@@ -55,6 +60,10 @@
if (impl->isWebKitCSSFilterValue())
return wrap(static_cast<WebKitCSSFilterValue*>(impl), creationContext, isolate);
#endif
+#if ENABLE(CSS_SHADERS)
+ if (impl->isWebKitCSSMixFunctionValue())
+ return wrap(static_cast<WebKitCSSMixFunctionValue*>(impl), creationContext, isolate);
+#endif
if (impl->isValueList())
return wrap(static_cast<CSSValueList*>(impl), creationContext, isolate);
if (impl->isPrimitiveValue())
Added: trunk/Source/WebCore/css/WebKitCSSMixFunctionValue.idl (0 => 135749)
--- trunk/Source/WebCore/css/WebKitCSSMixFunctionValue.idl (rev 0)
+++ trunk/Source/WebCore/css/WebKitCSSMixFunctionValue.idl 2012-11-26 19:57:40 UTC (rev 135749)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+[
+ Conditional=CSS_SHADERS,
+] interface WebKitCSSMixFunctionValue : CSSValueList {
+};
+
Modified: trunk/Source/WebCore/page/DOMWindow.idl (135748 => 135749)
--- trunk/Source/WebCore/page/DOMWindow.idl 2012-11-26 19:45:31 UTC (rev 135748)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2012-11-26 19:57:40 UTC (rev 135749)
@@ -341,6 +341,10 @@
attribute CSSValueListConstructor CSSValueList;
attribute WebKitCSSTransformValueConstructor WebKitCSSTransformValue;
+#if defined(ENABLE_CSS_SHADERS) && ENABLE_CSS_SHADERS
+ attribute WebKitCSSMixFunctionValueConstructor WebKitCSSMixFunctionValue;
+#endif
+
#if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS
attribute WebKitCSSFilterValueConstructor WebKitCSSFilterValue;
#endif
