Title: [126118] trunk
- Revision
- 126118
- Author
- macpher...@chromium.org
- Date
- 2012-08-20 19:00:42 -0700 (Mon, 20 Aug 2012)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (126117 => 126118)
--- trunk/LayoutTests/ChangeLog 2012-08-21 01:59:26 UTC (rev 126117)
+++ trunk/LayoutTests/ChangeLog 2012-08-21 02:00:42 UTC (rev 126118)
@@ -1,3 +1,15 @@
+2012-08-20 Luke Macpherson <macpher...@chromium.org>
+
+ 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.
+
+ Fix paths to included _javascript_ and enable tests by default on Chromium port.
+
+ * inspector/styles/variables/css-variables.html:
+ * platform/chromium/TestExpectations:
+
2012-08-20 Kenneth Russell <k...@google.com>
Unreviewed. Fixed lint errors in TestExpectations after r126110.
Modified: trunk/LayoutTests/inspector/styles/variables/css-variables.html (126117 => 126118)
--- trunk/LayoutTests/inspector/styles/variables/css-variables.html 2012-08-21 01:59:26 UTC (rev 126117)
+++ trunk/LayoutTests/inspector/styles/variables/css-variables.html 2012-08-21 02:00:42 UTC (rev 126118)
@@ -10,8 +10,8 @@
}
</style>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
<script>
function test()
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (126117 => 126118)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-21 01:59:26 UTC (rev 126117)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-21 02:00:42 UTC (rev 126118)
@@ -152,9 +152,6 @@
// The intent tag is not yet enabled.
BUGGBILLOCK SKIP : webintents/intent-tag.html = PASS
-// CSS Variables are not yet enabled.
-BUGWK85580 SKIP : inspector/styles/variables = PASS
-
// CSS image-resolution is not yet enabled.
BUGWK85262 SKIP : fast/css/image-resolution = PASS
Modified: trunk/Source/WebCore/ChangeLog (126117 => 126118)
--- trunk/Source/WebCore/ChangeLog 2012-08-21 01:59:26 UTC (rev 126117)
+++ trunk/Source/WebCore/ChangeLog 2012-08-21 02:00:42 UTC (rev 126118)
@@ -1,3 +1,17 @@
+2012-08-20 Luke Macpherson <macpher...@chromium.org>
+
+ 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.
+
+ 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):
+
2012-08-20 Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com>
Cancel the outstanding vibration pattern if the pattern is 0 or an empty list
Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (126117 => 126118)
--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2012-08-21 01:59:26 UTC (rev 126117)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2012-08-21 02:00:42 UTC (rev 126118)
@@ -127,7 +127,7 @@
}
void PropertySetCSSStyleDeclaration::deref()
-{
+{
m_propertySet->deref();
}
@@ -148,7 +148,7 @@
{
if (i >= m_propertySet->propertyCount())
return "";
- return getPropertyNameString(m_propertySet->propertyAt(i).id());
+ return m_propertySet->propertyAt(i).cssName();
}
String PropertySetCSSStyleDeclaration::cssText() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
