Changeset 156379 in webkit


Ignore:
Timestamp:
Sep 24, 2013 6:17:53 PM (11 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

Add toWebKitCSS*Value functions to cast from CSSValue
​https://bugs.webkit.org/show_bug.cgi?id=121776

Reviewed by Darin Adler.

CSS_VALUE_TYPE_CASTS can't cover WebKitCSS*Value classes. So, this patch adds toWebKitCSS*Value manually.

No new tests, no behavior change.

  • css/CSSValue.cpp:

(WebCore::CSSValue::destroy):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::createCustomFilterOperationWithInlineSyntax):
(WebCore::StyleResolver::createFilterOperations):

  • css/TransformFunctions.cpp:

(WebCore::transformsForValue):

  • css/WebKitCSSArrayFunctionValue.h:

(WebCore::toWebKitCSSArrayFunctionValue):

  • css/WebKitCSSFilterValue.h:

(WebCore::toWebKitCSSFilterValue):

  • css/WebKitCSSMatFunctionValue.h:

(WebCore::toWebKitCSSMatFunctionValue):

  • css/WebKitCSSMixFunctionValue.h:

(WebCore::toWebKitCSSMixFunctionValue):

  • css/WebKitCSSSVGDocumentValue.h:

(WebCore::toWebKitCSSSVGDocumentValue):

  • css/WebKitCSSShaderValue.h:

(WebCore::toWebKitCSSShaderValue):

  • css/WebKitCSSTransformValue.h:

(WebCore::toWebKitCSSTransformValue):

Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r156377 r156379  
     12013-09-24  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Add toWebKitCSS*Value functions to cast from CSSValue
     4        https://bugs.webkit.org/show_bug.cgi?id=121776
     5
     6        Reviewed by Darin Adler.
     7
     8        CSS_VALUE_TYPE_CASTS can't cover WebKitCSS*Value classes. So, this patch adds toWebKitCSS*Value manually.
     9
     10        No new tests, no behavior change.
     11
     12        * css/CSSValue.cpp:
     13        (WebCore::CSSValue::destroy):
     14        * css/StyleResolver.cpp:
     15        (WebCore::StyleResolver::createCustomFilterOperationWithInlineSyntax):
     16        (WebCore::StyleResolver::createFilterOperations):
     17        * css/TransformFunctions.cpp:
     18        (WebCore::transformsForValue):
     19        * css/WebKitCSSArrayFunctionValue.h:
     20        (WebCore::toWebKitCSSArrayFunctionValue):
     21        * css/WebKitCSSFilterValue.h:
     22        (WebCore::toWebKitCSSFilterValue):
     23        * css/WebKitCSSMatFunctionValue.h:
     24        (WebCore::toWebKitCSSMatFunctionValue):
     25        * css/WebKitCSSMixFunctionValue.h:
     26        (WebCore::toWebKitCSSMixFunctionValue):
     27        * css/WebKitCSSSVGDocumentValue.h:
     28        (WebCore::toWebKitCSSSVGDocumentValue):
     29        * css/WebKitCSSShaderValue.h:
     30        (WebCore::toWebKitCSSShaderValue):
     31        * css/WebKitCSSTransformValue.h:
     32        (WebCore::toWebKitCSSTransformValue):
     33
    1342013-09-24  Antti Koivisto  <antti@apple.com>
    235

  • trunk/Source/WebCore/css/CSSValue.cpp

    r156313 r156379  
    447447        return;
    448448    case WebKitCSSTransformClass:
    449         delete static_cast<WebKitCSSTransformValue*>(this);
     449        delete toWebKitCSSTransformValue(this);
    450450        return;
    451451    case LineBoxContainClass:
    … …  
    465465        return;
    466466    case WebKitCSSFilterClass:
    467         delete static_cast<WebKitCSSFilterValue*>(this);
     467        delete toWebKitCSSFilterValue(this);
    468468        return;
    469469#if ENABLE(CSS_SHADERS)
    470470    case WebKitCSSArrayFunctionValueClass:
    471         delete static_cast<WebKitCSSArrayFunctionValue*>(this);
     471        delete toWebKitCSSArrayFunctionValue(this);
    472472        return;
    473473    case WebKitCSSMatFunctionValueClass:
    474         delete static_cast<WebKitCSSMatFunctionValue*>(this);
     474        delete toWebKitCSSMatFunctionValue(this);
    475475        return;
    476476    case WebKitCSSMixFunctionValueClass:
    477         delete static_cast<WebKitCSSMixFunctionValue*>(this);
     477        delete toWebKitCSSMixFunctionValue(this);
    478478        return;
    479479    case WebKitCSSShaderClass:
    … …  
    495495        return;
    496496    case WebKitCSSSVGDocumentClass:
    497         delete static_cast<WebKitCSSSVGDocumentValue*>(this);
     497        delete toWebKitCSSSVGDocumentValue(this);
    498498        return;
    499499#endif

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r156347 r156379  
    36323632        CSSValue* fragmentShaderOrMixFunction = shadersList->itemWithoutBoundsCheck(1);
    36333633        if (fragmentShaderOrMixFunction->isWebKitCSSMixFunctionValue()) {
    3634             WebKitCSSMixFunctionValue* mixFunction = static_cast<WebKitCSSMixFunctionValue*>(fragmentShaderOrMixFunction);
     3634            WebKitCSSMixFunctionValue* mixFunction = toWebKitCSSMixFunctionValue(fragmentShaderOrMixFunction);
    36353635            CSSValueListIterator iterator(mixFunction);
    36363636
    … …  
    37533753            continue;
    37543754
    3755         WebKitCSSFilterValue* filterValue = static_cast<WebKitCSSFilterValue*>(i.value());
     3755        WebKitCSSFilterValue* filterValue = toWebKitCSSFilterValue(i.value());
    37563756        FilterOperation::OperationType operationType = filterOperationForType(filterValue->operationType());
    37573757
    … …  
    37803780                continue;
    37813781
    3782             WebKitCSSSVGDocumentValue* svgDocumentValue = static_cast<WebKitCSSSVGDocumentValue*>(argument);
     3782            WebKitCSSSVGDocumentValue* svgDocumentValue = toWebKitCSSSVGDocumentValue(argument);
    37833783            KURL url = m_state.document().completeURL(svgDocumentValue->url());
    37843784

  • trunk/Source/WebCore/css/TransformFunctions.cpp

    r156260 r156379  
    9797            continue;
    9898
    99         WebKitCSSTransformValue* transformValue = static_cast<WebKitCSSTransformValue*>(i.value());
     99        WebKitCSSTransformValue* transformValue = toWebKitCSSTransformValue(i.value());
    100100        if (!transformValue->length())
    101101            continue;

  • trunk/Source/WebCore/css/WebKitCSSArrayFunctionValue.h

    r155060 r156379  
    5656};
    5757
     58inline WebKitCSSArrayFunctionValue* toWebKitCSSArrayFunctionValue(CSSValue* value)
     59{
     60    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSArrayFunctionValue());
     61    return static_cast<WebKitCSSArrayFunctionValue*>(value);
     62}
     63
    5864} // namespace WebCore
    5965

  • trunk/Source/WebCore/css/WebKitCSSFilterValue.h

    r155060 r156379  
    7878};
    7979
     80inline WebKitCSSFilterValue* toWebKitCSSFilterValue(CSSValue* value)
     81{
     82    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSFilterValue());
     83    return static_cast<WebKitCSSFilterValue*>(value);
     84}
     85
    8086}
    8187

  • trunk/Source/WebCore/css/WebKitCSSMatFunctionValue.h

    r155060 r156379  
    5656};
    5757
     58inline WebKitCSSMatFunctionValue* toWebKitCSSMatFunctionValue(CSSValue* value)
     59{
     60    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSMatFunctionValue());
     61    return static_cast<WebKitCSSMatFunctionValue*>(value);
     62}
     63
    5864} // namespace WebCore
    5965

  • trunk/Source/WebCore/css/WebKitCSSMixFunctionValue.h

    r155060 r156379  
    5555    WebKitCSSMixFunctionValue(const WebKitCSSMixFunctionValue& cloneFrom);
    5656};
     57
     58inline WebKitCSSMixFunctionValue* toWebKitCSSMixFunctionValue(CSSValue* value)
     59{
     60    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSMixFunctionValue());
     61    return static_cast<WebKitCSSMixFunctionValue*>(value);
     62}
    5763   
    5864} // namespace WebCore

  • trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h

    r155060 r156379  
    5555};
    5656
     57inline WebKitCSSSVGDocumentValue* toWebKitCSSSVGDocumentValue(CSSValue* value)
     58{
     59    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSSVGDocumentValue());
     60    return static_cast<WebKitCSSSVGDocumentValue*>(value);
     61}
     62
    5763} // namespace WebCore
    5864

  • trunk/Source/WebCore/css/WebKitCSSShaderValue.h

    r155060 r156379  
    7272inline WebKitCSSShaderValue* toWebKitCSSShaderValue(CSSValue* value)
    7373{
     74    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSShaderValue());
    7475    return value->isWebKitCSSShaderValue() ? static_cast<WebKitCSSShaderValue*>(value) : 0;
    7576}

  • trunk/Source/WebCore/css/WebKitCSSTransformValue.h

    r155060 r156379  
    8383};
    8484
     85inline WebKitCSSTransformValue* toWebKitCSSTransformValue(CSSValue* value)
     86{
     87    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSTransformValue());
     88    return static_cast<WebKitCSSTransformValue*>(value);
     89}
     90
    8591}
    8692
Note: See TracChangeset for help on using the changeset viewer.