Changeset 156528 in webkit

Timestamp:

Sep 26, 2013 8:26:53 PM (11 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Sync toWebKitCSSShaderValue() behavior with other toCSSFooValue()
​https://bugs.webkit.org/show_bug.cgi?id=121886

Reviewed by Darin Adler.

toWebKitCSSShaderValue() behavior is different from other to CSSFooValue().
It shouldn't return null. The type checking should be done before doing type cast.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::createCustomFilterOperationWithInlineSyntax):

• css/WebKitCSSShaderValue.h:

(WebCore::toWebKitCSSShaderValue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleResolver.cpp (modified) (4 diffs)
• css/WebKitCSSShaderValue.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-26  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Sync toWebKitCSSShaderValue() behavior with other toCSSFooValue()
+        https://bugs.webkit.org/show_bug.cgi?id=121886
+
+        Reviewed by Darin Adler.
+
+        toWebKitCSSShaderValue() behavior is different from other to CSSFooValue().
+        It shouldn't return null. The type checking should be done before doing type cast.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::createCustomFilterOperationWithInlineSyntax):
+        * css/WebKitCSSShaderValue.h:
+        (WebCore::toWebKitCSSShaderValue):
+
 2013-09-26  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -3624 +3624 @@
     ASSERT(shadersListLength);
 
-    WebKitCSSShaderValue* vertexShader = toWebKitCSSShaderValue(shadersList->itemWithoutBoundsCheck(0));
+
+    WebKitCSSShaderValue* vertexShader = 0;
     WebKitCSSShaderValue* fragmentShader = 0;
+
+    if (shadersList->itemWithoutBoundsCheck(0)->isWebKitCSSShaderValue())
+        vertexShader = toWebKitCSSShaderValue(shadersList->itemWithoutBoundsCheck(0));
+
     CustomFilterProgramType programType = PROGRAM_TYPE_BLENDS_ELEMENT_TEXTURE;
     CustomFilterProgramMixSettings mixSettings;
@@ -3636 +3641 @@
 
             ASSERT(mixFunction->length());
-            fragmentShader = toWebKitCSSShaderValue(iterator.value());
+            if (iterator.value()->isWebKitCSSShaderValue())
+                fragmentShader = toWebKitCSSShaderValue(iterator.value());
+
             iterator.advance();
 
@@ -3652 +3659 @@
         } else {
             programType = PROGRAM_TYPE_NO_ELEMENT_TEXTURE;
-            fragmentShader = toWebKitCSSShaderValue(fragmentShaderOrMixFunction);
+            if (fragmentShaderOrMixFunction->isWebKitCSSShaderValue())
+                fragmentShader = toWebKitCSSShaderValue(fragmentShaderOrMixFunction);
         }
     }
@@ -3658 +3666 @@
     if (!vertexShader && !fragmentShader)
         return 0;
-    
+
     unsigned meshRows = 1;
     unsigned meshColumns = 1;

trunk/Source/WebCore/css/WebKitCSSShaderValue.h

@@ -72 +72 @@
 inline WebKitCSSShaderValue* toWebKitCSSShaderValue(CSSValue* value)
 {
-    return value->isWebKitCSSShaderValue() ? static_cast<WebKitCSSShaderValue*>(value) : 0;
+    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSShaderValue());
+    return static_cast<WebKitCSSShaderValue*>(value);
 }