Changeset 126118 in webkit


Ignore:
Timestamp:
Aug 20, 2012 7:00:42 PM (12 years ago)
Author:
macpherson@chromium.org
Message:

Fix inspector with variables enabled and enable inspector variables tests by default.
https://bugs.webkit.org/show_bug.cgi?id=94296

Reviewed by Hajime Morita.

Source/WebCore:

Change from using getPropertyName static function to CSSProperty::cssName(), which can resolve variables if needed.

Covered by inspector/styles/variables.

  • css/PropertySetCSSStyleDeclaration.cpp:

(WebCore::PropertySetCSSStyleDeclaration::item):

LayoutTests:

Fix paths to included javascript and enable tests by default on Chromium port.

  • inspector/styles/variables/css-variables.html:
  • platform/chromium/TestExpectations:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r126117 r126118  
     12012-08-20  Luke Macpherson   <macpherson@chromium.org>
     2
     3        Fix inspector with variables enabled and enable inspector variables tests by default.
     4        https://bugs.webkit.org/show_bug.cgi?id=94296
     5
     6        Reviewed by Hajime Morita.
     7
     8        Fix paths to included javascript and enable tests by default on Chromium port.
     9
     10        * inspector/styles/variables/css-variables.html:
     11        * platform/chromium/TestExpectations:
     12
    1132012-08-20  Kenneth Russell  <kbr@google.com>
    214
  • trunk/LayoutTests/inspector/styles/variables/css-variables.html

    r121874 r126118  
    1111
    1212</style>
    13 <script src="../../http/tests/inspector/inspector-test.js"></script>
    14 <script src="../../http/tests/inspector/elements-test.js"></script>
     13<script src="../../../http/tests/inspector/inspector-test.js"></script>
     14<script src="../../../http/tests/inspector/elements-test.js"></script>
    1515<script>
    1616
  • trunk/LayoutTests/platform/chromium/TestExpectations

    r126117 r126118  
    152152// The intent tag is not yet enabled.
    153153BUGGBILLOCK SKIP : webintents/intent-tag.html = PASS
    154 
    155 // CSS Variables are not yet enabled.
    156 BUGWK85580 SKIP : inspector/styles/variables = PASS
    157154
    158155// CSS image-resolution is not yet enabled.
  • trunk/Source/WebCore/ChangeLog

    r126116 r126118  
     12012-08-20  Luke Macpherson   <macpherson@chromium.org>
     2
     3        Fix inspector with variables enabled and enable inspector variables tests by default.
     4        https://bugs.webkit.org/show_bug.cgi?id=94296
     5
     6        Reviewed by Hajime Morita.
     7
     8        Change from using getPropertyName static function to CSSProperty::cssName(), which can resolve variables if needed.
     9
     10        Covered by inspector/styles/variables.
     11
     12        * css/PropertySetCSSStyleDeclaration.cpp:
     13        (WebCore::PropertySetCSSStyleDeclaration::item):
     14
    1152012-08-20  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
    216
  • trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp

    r125934 r126118  
    128128
    129129void PropertySetCSSStyleDeclaration::deref()
    130 { 
     130{
    131131    m_propertySet->deref();
    132132}
     
    149149    if (i >= m_propertySet->propertyCount())
    150150        return "";
    151     return getPropertyNameString(m_propertySet->propertyAt(i).id());
     151    return m_propertySet->propertyAt(i).cssName();
    152152}
    153153
Note: See TracChangeset for help on using the changeset viewer.