Upstream version 7.35.144.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / devtools / front_end / CSSMetadata.js

diff --git a/src/third_party/WebKit/Source/devtools/front_end/CSSMetadata.js b/src/third_party/WebKit/Source/devtools/front_end/CSSMetadata.js
index e638c5b..74dc4c4 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/CSSMetadata.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/CSSMetadata.js
@@ -32,7 +32,7 @@
 
 /**
  * @constructor
- * @param {!Array.<!CSSAgent.CSSPropertyInfo|string>} properties
+ * @param {!Array.<!{name: string, longhands: !Array.<string>}|string>} properties
  */
 WebInspector.CSSMetadata = function(properties)
 {
@@ -45,7 +45,6 @@ WebInspector.CSSMetadata = function(properties)
             this._values.push(property);
             continue;
         }
-
         var propertyName = property.name;
         this._values.push(propertyName);
 
@@ -107,7 +106,9 @@ WebInspector.CSSMetadata.canonicalPropertyName = function(name)
     if (!name || name.length < 9 || name.charAt(0) !== "-")
         return name.toLowerCase();
     var match = name.match(/(?:-webkit-)(.+)/);
-    if (!match)
+    var propertiesSet = WebInspector.CSSMetadata.cssPropertiesMetainfoKeySet();
+    var hasSupportedProperties = WebInspector.CSSMetadata.cssPropertiesMetainfo._values.length > 0;
+    if (!match || (hasSupportedProperties && !propertiesSet.hasOwnProperty(match[1].toLowerCase())))
         return name.toLowerCase();
     return match[1].toLowerCase();
 }
@@ -251,6 +252,9 @@ WebInspector.CSSMetadata._propertyDataMap = {
     "border-width": { values: [
         "medium", "thick", "thin"
     ] },
+    "border-style": { values: [
+        "none", "hidden", "inset", "groove", "ridge", "outset", "dotted", "dashed", "solid", "double"
+    ] },
     "size": { values: [
         "a3", "a4", "a5", "b4", "b5", "landscape", "ledger", "legal", "letter", "portrait"
     ] },
@@ -661,8 +665,8 @@ WebInspector.CSSMetadata._propertyDataMap = {
     "color": { m: "color", a: "foreground" },
     "counter-increment": { m: "generate" },
     "counter-reset": { m: "generate" },
-    "grid-definition-columns": { m: "grid" },
-    "grid-definition-rows": { m: "grid" },
+    "grid-template-columns": { m: "grid" },
+    "grid-template-rows": { m: "grid" },
     "height": { m: "box" },
     "image-orientation": { m: "images" },
     "left": { m: "visuren" },
@@ -720,14 +724,9 @@ WebInspector.CSSMetadata.descriptor = function(propertyName)
     return entry || null;
 }
 
-WebInspector.CSSMetadata.requestCSSShorthandData = function()
+WebInspector.CSSMetadata.initializeWithSupportedProperties = function(properties)
 {
-    function propertyNamesCallback(error, properties)
-    {
-        if (!error)
-            WebInspector.CSSMetadata.cssPropertiesMetainfo = new WebInspector.CSSMetadata(properties);
-    }
-    CSSAgent.getSupportedCSSProperties(propertyNamesCallback);
+    WebInspector.CSSMetadata.cssPropertiesMetainfo = new WebInspector.CSSMetadata(properties);
 }
 
 WebInspector.CSSMetadata.cssPropertiesMetainfoKeySet = function()
@@ -998,3 +997,5 @@ WebInspector.CSSMetadata.prototype = {
         return this._shorthands[longhand];
     }
 }
+
+WebInspector.CSSMetadata.initializeWithSupportedProperties([]);