Changeset 70046 in webkit


Ignore:
Timestamp:
Oct 19, 2010 3:38:27 AM (14 years ago)
Author:
pfeldman@chromium.org
Message:

2010-10-19 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: migrate from legacy Object.properties to Object.keys, remove dead code.
​https://bugs.webkit.org/show_bug.cgi?id=47890

  • inspector/front-end/ConsoleView.js: (WebInspector.ConsoleView.prototype._reportCompletions):
  • inspector/front-end/ElementsPanel.js: (WebInspector.ElementsPanel):
  • inspector/front-end/ExtensionServer.js: (WebInspector.ExtensionServer.prototype._onGetResources):
  • inspector/front-end/HAREntry.js: (WebInspector.HARLog.prototype.build):
  • inspector/front-end/StylesSidebarPane.js: (WebInspector.StylePropertyTreeElement.prototype.): (WebInspector.StylePropertyTreeElement.prototype):
  • inspector/front-end/utilities.js:
Location:
trunk/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r70045 r70046  
     12010-10-19  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: migrate from legacy Object.properties to Object.keys, remove dead code.
     6        https://bugs.webkit.org/show_bug.cgi?id=47890
     7
     8        * inspector/front-end/ConsoleView.js:
     9        (WebInspector.ConsoleView.prototype._reportCompletions):
     10        * inspector/front-end/ElementsPanel.js:
     11        (WebInspector.ElementsPanel):
     12        * inspector/front-end/ExtensionServer.js:
     13        (WebInspector.ExtensionServer.prototype._onGetResources):
     14        * inspector/front-end/HAREntry.js:
     15        (WebInspector.HARLog.prototype.build):
     16        * inspector/front-end/StylesSidebarPane.js:
     17        (WebInspector.StylePropertyTreeElement.prototype.):
     18        (WebInspector.StylePropertyTreeElement.prototype):
     19        * inspector/front-end/utilities.js:
     20
    1212010-10-19  Pavel Feldman  <pfeldman@chromium.org>
    222

  • trunk/WebCore/inspector/Inspector.idl

    r69948 r70046  
    208208        [handler=DOM] void getStyleSheet(in long styleSheetId, out Object styleSheet);
    209209        [handler=DOM] void getStyleSourceData(in long styleSheetId, out Object styleSourceData);
    210         [handler=DOM] void applyStyleText(in long styleId, in String styleText, in String propertyName, out boolean success, out Value style, out Array changedProperties);
     210        [handler=DOM] void applyStyleText(in long styleId, in String styleText, in String propertyName, out boolean success, out Value style);
    211211        [handler=DOM] void setStyleText(in long styleId, in String styleText, out boolean success);
    212212        [handler=DOM] void setStyleProperty(in long styleId, in String name, in String value, out boolean success);

  • trunk/WebCore/inspector/InspectorDOMAgent.cpp

    r69868 r70046  
    13591359}
    13601360
    1361 void InspectorDOMAgent::applyStyleText(long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedPropertiesArray)
     1361void InspectorDOMAgent::applyStyleText(long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject)
    13621362{
    13631363    CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
    … …  
    13961396    // Notify caller that the property was successfully deleted.
    13971397    if (!styleTextLength) {
    1398         (*changedPropertiesArray)->pushString(propertyName);
    13991398        *success = true;
    14001399        return;
    … …  
    14071406    // add them to the real style declaration. We take care to move shorthands.
    14081407    HashSet<String> foundShorthands;
    1409     Vector<String> changedProperties;
    14101408
    14111409    for (unsigned i = 0; i < tempStyle->length(); ++i) {
    … …  
    14341432        if (disabledStyle)
    14351433            disabledStyle->remove(name);
    1436         changedProperties.append(name);
    14371434    }
    14381435    *success = true;
    14391436    *styleObject = buildObjectForStyle(style, true);
    1440     *changedPropertiesArray = toArray(changedProperties);
    14411437}
    14421438

  • trunk/WebCore/inspector/InspectorDOMAgent.h

    r69567 r70046  
    132132        void getStyleSheet(long styleSheetId, RefPtr<InspectorObject>* styleSheetObject);
    133133        void getStyleSourceData(long styleId, RefPtr<InspectorObject>* dataObject);
    134         void applyStyleText(long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedProperties);
     134        void applyStyleText(long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject);
    135135        void setStyleText(long styleId, const String& cssText, bool* success);
    136136        void setStyleProperty(long styleId, const String& name, const String& value, bool* success);

  • trunk/WebCore/inspector/front-end/CSSStyleModel.js

    r66087 r70046  
    9797    applyStyleText: function(styleId, styleText, propertyName, successCallback, failureCallback)
    9898    {
    99         function callback(success, newPayload, changedProperties)
     99        function callback(success, newPayload)
    100100        {
    101101            if (!success)
    … …  
    103103            else {
    104104                var newStyle = newPayload ? WebInspector.CSSStyleDeclaration.parseStyle(newPayload) : null;
    105                 successCallback(newStyle, changedProperties);
     105                successCallback(newStyle);
    106106            }
    107107        }

  • trunk/WebCore/inspector/front-end/ConsoleView.js

    r69662 r70046  
    361361
    362362        var results = [];
    363         var properties = Object.sortedProperties(result);
     363        var properties = Object.keys(result).sort();
    364364
    365365        for (var i = 0; i < properties.length; ++i) {

  • trunk/WebCore/inspector/front-end/ElementsPanel.js

    r68256 r70046  
    108108
    109109    this._registerShortcuts();
    110     this._changedStyles = {};
    111110
    112111    this.reset();
    … …  
    345344    {
    346345        // TODO: Implement Shifting the oldSelector, and its contents to a newSelector
    347     },
    348 
    349     addStyleChange: function(identifier, style, property)
    350     {
    351         if (!style.parentRule)
    352             return;
    353 
    354         var selector = style.parentRule.selectorText;
    355         if (!this._changedStyles[identifier])
    356             this._changedStyles[identifier] = {};
    357 
    358         if (!this._changedStyles[identifier][selector])
    359             this._changedStyles[identifier][selector] = {};
    360 
    361         if (!this._changedStyles[identifier][selector][property])
    362             WebInspector.styleChanges += 1;
    363 
    364         this._changedStyles[identifier][selector][property] = style.getPropertyValue(property);
    365     },
    366 
    367     removeStyleChange: function(identifier, style, property)
    368     {
    369         if (!style.parentRule)
    370             return;
    371 
    372         var selector = style.parentRule.selectorText;
    373         if (!this._changedStyles[identifier] || !this._changedStyles[identifier][selector])
    374             return;
    375 
    376         if (this._changedStyles[identifier][selector][property]) {
    377             delete this._changedStyles[identifier][selector][property];
    378             WebInspector.styleChanges -= 1;
    379         }
    380     },
    381 
    382     generateStylesheet: function()
    383     {
    384         if (!WebInspector.styleChanges)
    385             return;
    386 
    387         // Merge Down to Just Selectors
    388         var mergedSelectors = {};
    389         for (var identifier in this._changedStyles) {
    390             for (var selector in this._changedStyles[identifier]) {
    391                 if (!mergedSelectors[selector])
    392                     mergedSelectors[selector] = this._changedStyles[identifier][selector];
    393                 else { // merge on selector
    394                     var merge = {};
    395                     for (var property in mergedSelectors[selector])
    396                         merge[property] = mergedSelectors[selector][property];
    397                     for (var property in this._changedStyles[identifier][selector]) {
    398                         if (!merge[property])
    399                             merge[property] = this._changedStyles[identifier][selector][property];
    400                         else { // merge on property within a selector, include comment to notify user
    401                             var value1 = merge[property];
    402                             var value2 = this._changedStyles[identifier][selector][property];
    403 
    404                             if (value1 === value2)
    405                                 merge[property] = [value1];
    406                             else if (value1 instanceof Array)
    407                                 merge[property].push(value2);
    408                             else
    409                                 merge[property] = [value1, value2];
    410                         }
    411                     }
    412                     mergedSelectors[selector] = merge;
    413                 }
    414             }
    415         }
    416 
    417         var builder = [];
    418         builder.push("/**");
    419         builder.push(" * Inspector Generated Stylesheet"); // UIString?
    420         builder.push(" */\n");
    421 
    422         var indent = "  ";
    423         function displayProperty(property, value, comment) {
    424             if (comment)
    425                 return indent + "/* " + property + ": " + value + "; */";
    426             else
    427                 return indent + property + ": " + value + ";";
    428         }
    429 
    430         for (var selector in mergedSelectors) {
    431             var psuedoStyle = mergedSelectors[selector];
    432             var properties = Object.properties(psuedoStyle);
    433             if (properties.length) {
    434                 builder.push(selector + " {");
    435                 for (var i = 0; i < properties.length; ++i) {
    436                     var property = properties[i];
    437                     var value = psuedoStyle[property];
    438                     if (!(value instanceof Array))
    439                         builder.push(displayProperty(property, value));
    440                     else {
    441                         if (value.length === 1)
    442                             builder.push(displayProperty(property, value) + " /* merged from equivalent edits */"); // UIString?
    443                         else {                       
    444                             builder.push(indent + "/* There was a Conflict... There were Multiple Edits for '" + property + "' */"); // UIString?
    445                             for (var j = 0; j < value.length; ++j)
    446                                 builder.push(displayProperty(property, value, true));
    447                         }
    448                     }
    449                 }
    450                 builder.push("}\n");
    451             }
    452         }
    453 
    454         WebInspector.showConsole();
    455         WebInspector.console.addMessage(WebInspector.ConsoleMessage.createTextMessage(builder.join("\n")));
    456346    },
    457347

  • trunk/WebCore/inspector/front-end/ExtensionServer.js

    r69948 r70046  
    264264            response = WebInspector.resources[request.id] ? resourceWrapper(request.id) : this._status.E_NOTFOUND(request.id);
    265265        else
    266             response = Object.properties(WebInspector.resources).map(resourceWrapper);
     266            response = Object.keys(WebInspector.resources).map(resourceWrapper);
    267267        return response;
    268268    },

  • trunk/WebCore/inspector/front-end/HAREntry.js

    r68887 r70046  
    182182            },
    183183            pages: this._buildPages(),
    184             entries: Object.properties(WebInspector.resources).map(this._convertResource)
     184            entries: Object.keys(WebInspector.resources).map(this._convertResource)
    185185        }
    186186    },

  • trunk/WebCore/inspector/front-end/StylesSidebarPane.js

    r67191 r70046  
    16961696        }
    16971697
    1698         function successCallback(newStyle, changedProperties)
     1698        function successCallback(newStyle)
    16991699        {
    1700             elementsPanel.removeStyleChange(section.identifier, self.style, self.name);
    1701 
    17021700            if (!styleTextLength) {
    17031701                // Do remove ourselves from UI when the property removal is confirmed.
    … …  
    17051703            } else {
    17061704                self.style = newStyle;
    1707                 for (var i = 0; i < changedProperties.length; ++i)
    1708                     elementsPanel.addStyleChange(section.identifier, self.style, changedProperties[i]);
    17091705                self._styleRule.style = self.style;
    17101706            }

  • trunk/WebCore/inspector/front-end/utilities.js

    r69947 r70046  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 
    29 Object.properties = function(obj)
    30 {
    31     var properties = [];
    32     for (var prop in obj)
    33         properties.push(prop);
    34     return properties;
    35 }
    36 
    37 Object.sortedProperties = function(obj, sortFunc)
    38 {
    39     return Object.properties(obj).sort(sortFunc);
    40 }
    4128
    4229Function.prototype.bind = function(thisObject)
Note: See TracChangeset for help on using the changeset viewer.