Changeset 89824 in webkit


Ignore:
Timestamp:
Jun 27, 2011 8:51:54 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-27 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r89822.
​http://trac.webkit.org/changeset/89822
​https://bugs.webkit.org/show_bug.cgi?id=63461

Broken builds (Requested by apavlov on #webkit).

  • inspector/styles/get-set-stylesheet-text.html:
  • inspector/styles/styles-new-API.html:
  • inspector/styles/styles-source-offsets.html:

2011-06-27 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r89822.
​http://trac.webkit.org/changeset/89822
​https://bugs.webkit.org/show_bug.cgi?id=63461

Broken builds (Requested by apavlov on #webkit).

  • inspector/Inspector.json:
  • inspector/InspectorCSSAgent.cpp: (WebCore::InspectorCSSAgent::getStylesForNode):
  • inspector/InspectorCSSAgent.h:
  • inspector/front-end/AuditRules.js: (WebInspector.AuditRules.ImageDimensionsRule.prototype.doRun.getStyles):
  • inspector/front-end/CSSStyleModel.js: (WebInspector.CSSStyleModel.prototype.getStylesAsync):
  • inspector/front-end/StylesSidebarPane.js: (WebInspector.StylesSidebarPane.prototype.update):
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r89822 r89824  
     12011-06-27  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89822.
     4        http://trac.webkit.org/changeset/89822
     5        https://bugs.webkit.org/show_bug.cgi?id=63461
     6
     7        Broken builds (Requested by apavlov on #webkit).
     8
     9        * inspector/styles/get-set-stylesheet-text.html:
     10        * inspector/styles/styles-new-API.html:
     11        * inspector/styles/styles-source-offsets.html:
     12
    1132011-06-27  Alexander Pavlov  <apavlov@chromium.org>
    214

  • trunk/LayoutTests/inspector/styles/get-set-stylesheet-text.html

    r89822 r89824  
    7171        function nodeCallback(node)
    7272        {
    73             CSSAgent.getStylesForNode(node.id, undefined, callback);
     73            CSSAgent.getStylesForNode(node.id, callback);
    7474        }
    7575

  • trunk/LayoutTests/inspector/styles/styles-new-API.html

    r89822 r89824  
    5555        {
    5656            bodyId = node.id;
    57             CSSAgent.getStylesForNode(bodyId, undefined, callback);
     57            CSSAgent.getStylesForNode(bodyId, callback);
    5858        }
    5959        InspectorTest.selectNodeWithId("mainBody", nodeCallback);
    … …  
    8080        function nodeCallback(node)
    8181        {
    82             CSSAgent.getStylesForNode(node.id, undefined, callback);
     82            CSSAgent.getStylesForNode(node.id, callback);
    8383        }
    8484        InspectorTest.nodeWithId("thetable", nodeCallback);
    … …  
    175175                return;
    176176            }
    177             CSSAgent.getStylesForNode(bodyId, undefined, didGetStyles);
     177            CSSAgent.getStylesForNode(bodyId, didGetStyles);
    178178        }
    179179
    … …  
    243243        function nodeCallback(node)
    244244        {
    245             CSSAgent.getStylesForNode(node.id, undefined, stylesCallback);
     245            CSSAgent.getStylesForNode(node.id, stylesCallback);
    246246        }
    247247        InspectorTest.nodeWithId("toggle", nodeCallback);

  • trunk/LayoutTests/inspector/styles/styles-source-offsets.html

    r89822 r89824  
    3838    function step1(node)
    3939    {
    40         CSSAgent.getStylesForNode(node.id, undefined, step2);
     40        CSSAgent.getStylesForNode(node.id, step2);
    4141    }
    4242

  • trunk/Source/WebCore/ChangeLog

    r89823 r89824  
     12011-06-27  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89822.
     4        http://trac.webkit.org/changeset/89822
     5        https://bugs.webkit.org/show_bug.cgi?id=63461
     6
     7        Broken builds (Requested by apavlov on #webkit).
     8
     9        * inspector/Inspector.json:
     10        * inspector/InspectorCSSAgent.cpp:
     11        (WebCore::InspectorCSSAgent::getStylesForNode):
     12        * inspector/InspectorCSSAgent.h:
     13        * inspector/front-end/AuditRules.js:
     14        (WebInspector.AuditRules.ImageDimensionsRule.prototype.doRun.getStyles):
     15        * inspector/front-end/CSSStyleModel.js:
     16        (WebInspector.CSSStyleModel.prototype.getStylesAsync):
     17        * inspector/front-end/StylesSidebarPane.js:
     18        (WebInspector.StylesSidebarPane.prototype.update):
     19
    1202011-06-27  Noel Gordon  <noel.gordon@gmail.com>
    221

  • trunk/Source/WebCore/inspector/Inspector.json

    r89822 r89824  
    12241224                "name": "getStylesForNode",
    12251225                "parameters": [
    1226                     { "name": "nodeId", "type": "integer" },
    1227                     { "name": "forcedPseudoClasses", "type": "array", "items": { "type": "string", "enum": ["active", "focus", "hover", "visited"] }, "optional": true, "description": "Element pseudo classes to force when computing applicable style rules." }
     1226                    { "name": "nodeId", "type": "integer" }
    12281227                ],
    12291228                "returns": [

  • trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp

    r89822 r89824  
    131131namespace WebCore {
    132132
    133 static unsigned computePseudoClassMask(InspectorArray* pseudoClassArray)
    134 {
    135     DEFINE_STATIC_LOCAL(String, active, ("active"));
    136     DEFINE_STATIC_LOCAL(String, hover, ("hover"));
    137     DEFINE_STATIC_LOCAL(String, focus, ("focus"));
    138     DEFINE_STATIC_LOCAL(String, visited, ("visited"));
    139     if (!pseudoClassArray || !pseudoClassArray->length())
    140         return CSSStyleSelector::DoNotForcePseudoClassMask;
    141 
    142     unsigned result = CSSStyleSelector::ForceNone;
    143     for (size_t i = 0; i < pseudoClassArray->length(); ++i) {
    144         RefPtr<InspectorValue> pseudoClassValue = pseudoClassArray->get(i);
    145         String pseudoClass;
    146         bool success = pseudoClassValue->asString(&pseudoClass);
    147         if (!success)
    148             continue;
    149         if (pseudoClass == active)
    150             result |= CSSStyleSelector::ForceActive;
    151         else if (pseudoClass == hover)
    152             result |= CSSStyleSelector::ForceHover;
    153         else if (pseudoClass == focus)
    154             result |= CSSStyleSelector::ForceFocus;
    155         else if (pseudoClass == visited)
    156             result |= CSSStyleSelector::ForceVisited;
    157     }
    158 
    159     return result;
    160 }
    161 
    162133// static
    163134CSSStyleSheet* InspectorCSSAgent::parentStyleSheet(StyleBase* styleBase)
    … …  
    212183}
    213184
    214 void InspectorCSSAgent::getStylesForNode(ErrorString* errorString, int nodeId, const PassRefPtr<InspectorArray>* forcedPseudoClasses, PassRefPtr<InspectorObject>* result)
     185void InspectorCSSAgent::getStylesForNode(ErrorString* errorString, int nodeId, RefPtr<InspectorObject>* result)
    215186{
    216187    Element* element = elementForId(errorString, nodeId);
    … …  
    228199    resultObject->setObject("computedStyle", computedInspectorStyle->buildObjectForStyle());
    229200
    230     unsigned forcePseudoClassMask = computePseudoClassMask(forcedPseudoClasses->get());
    231201    CSSStyleSelector* selector = element->ownerDocument()->styleSelector();
    232     RefPtr<CSSRuleList> matchedRules = selector->styleRulesForElement(element, CSSStyleSelector::AllCSSRules, forcePseudoClassMask);
     202    RefPtr<CSSRuleList> matchedRules = selector->styleRulesForElement(element, CSSStyleSelector::AllCSSRules);
    233203    resultObject->setArray("matchedCSSRules", buildArrayForRuleList(matchedRules.get()));
    234204
    … …  
    237207    RefPtr<InspectorArray> pseudoElements = InspectorArray::create();
    238208    for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId < AFTER_LAST_INTERNAL_PSEUDOID; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
    239         RefPtr<CSSRuleList> matchedRules = selector->pseudoStyleRulesForElement(element, pseudoId, CSSStyleSelector::AllCSSRules, forcePseudoClassMask);
     209        RefPtr<CSSRuleList> matchedRules = selector->pseudoStyleRulesForElement(element, pseudoId, CSSStyleSelector::AllCSSRules);
    240210        if (matchedRules && matchedRules->length()) {
    241211            RefPtr<InspectorObject> pseudoStyles = InspectorObject::create();

  • trunk/Source/WebCore/inspector/InspectorCSSAgent.h

    r89822 r89824  
    6262
    6363    void reset();
    64     void getStylesForNode(ErrorString*, int nodeId, const PassRefPtr<InspectorArray>* forcedPseudoClasses, PassRefPtr<InspectorObject>* result);
     64    void getStylesForNode(ErrorString*, int nodeId, RefPtr<InspectorObject>* result);
    6565    void getInlineStyleForNode(ErrorString*, int nodeId, RefPtr<InspectorObject>* style);
    6666    void getComputedStyleForNode(ErrorString*, int nodeId, RefPtr<InspectorObject>* style);

  • trunk/Source/WebCore/inspector/front-end/AuditRules.js

    r89822 r89824  
    713713        {
    714714            for (var i = 0; nodeIds && i < nodeIds.length; ++i)
    715                 WebInspector.cssModel.getStylesAsync(nodeIds[i], undefined, imageStylesReady.bind(this, nodeIds[i], i === nodeIds.length - 1));
     715                WebInspector.cssModel.getStylesAsync(nodeIds[i], imageStylesReady.bind(this, nodeIds[i], i === nodeIds.length - 1));
    716716        }
    717717

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

    r89822 r89824  
    4747
    4848WebInspector.CSSStyleModel.prototype = {
    49     getStylesAsync: function(nodeId, forcedPseudoClasses, userCallback)
     49    getStylesAsync: function(nodeId, userCallback)
    5050    {
    5151        function callback(userCallback, error, payload)
    … …  
    9292        }
    9393
    94         CSSAgent.getStylesForNode(nodeId, forcedPseudoClasses || [], callback.bind(null, userCallback));
     94        CSSAgent.getStylesForNode(nodeId, callback.bind(null, userCallback));
    9595    },
    9696

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

    r89822 r89824  
    245245            WebInspector.cssModel.getComputedStyleAsync(node.id, computedStyleCallback.bind(this));
    246246        else
    247             WebInspector.cssModel.getStylesAsync(node.id, undefined, stylesCallback.bind(this));
     247            WebInspector.cssModel.getStylesAsync(node.id, stylesCallback.bind(this));
    248248    },
    249249
Note: See TracChangeset for help on using the changeset viewer.