Changeset 87686 in webkit


Ignore:
Timestamp:
May 30, 2011 7:50:13 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-30 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r87683.
http://trac.webkit.org/changeset/87683
https://bugs.webkit.org/show_bug.cgi?id=61729

Breaks inspector tests on Chromium (Requested by apavlov on
#webkit).

  • http/tests/inspector/inspect-iframe-from-different-domain.html:
  • inspector/elements/elements-delete-inline-style.html:
  • inspector/elements/elements-panel-styles.html:
  • inspector/styles/styles-iframe.html:
  • inspector/styles/styles-update-from-js-expected.txt:
  • inspector/styles/styles-update-from-js.html:
  • inspector/styles/styles-url-linkify.html:

2011-05-30 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r87683.
http://trac.webkit.org/changeset/87683
https://bugs.webkit.org/show_bug.cgi?id=61729

Breaks inspector tests on Chromium (Requested by apavlov on
#webkit).

  • inspector/front-end/StylesSidebarPane.js: (WebInspector.StylesSidebarPane.prototype.update):
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r87684 r87686  
     12011-05-30  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r87683.
     4        http://trac.webkit.org/changeset/87683
     5        https://bugs.webkit.org/show_bug.cgi?id=61729
     6
     7        Breaks inspector tests on Chromium (Requested by apavlov on
     8        #webkit).
     9
     10        * http/tests/inspector/inspect-iframe-from-different-domain.html:
     11        * inspector/elements/elements-delete-inline-style.html:
     12        * inspector/elements/elements-panel-styles.html:
     13        * inspector/styles/styles-iframe.html:
     14        * inspector/styles/styles-update-from-js-expected.txt:
     15        * inspector/styles/styles-update-from-js.html:
     16        * inspector/styles/styles-url-linkify.html:
     17
    1182011-05-30  Gabor Rapcsanyi  <rgabor@webkit.org>
    219
  • trunk/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html

    r87683 r87686  
    1717function test()
    1818{
    19     InspectorTest.selectNodeWithId("iframe-body");
    20     InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
     19    InspectorTest.selectNodeWithId("iframe-body", step1);
    2120
    2221    function step1()
  • trunk/LayoutTests/inspector/elements/elements-delete-inline-style.html

    r87683 r87686  
    88{
    99    WebInspector.showPanel("elements");
    10     InspectorTest.selectNodeWithId("inspected");
    11     InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
     10    InspectorTest.selectNodeWithId("inspected", step1);
    1211
    1312    function step1(node)
     
    1615        InspectorTest.dumpSelectedElementStyles(true);
    1716        node.removeAttribute("style");
    18         InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
     17        InspectorTest.runAfterPendingDispatches(step2);
    1918    }
    2019
  • trunk/LayoutTests/inspector/elements/elements-panel-styles.html

    r87683 r87686  
    99function test()
    1010{
    11     InspectorTest.selectNodeWithId("foo");
    12     InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
     11    InspectorTest.selectNodeWithId("foo", step1);
    1312
    1413    function step1()
  • trunk/LayoutTests/inspector/styles/styles-iframe.html

    r87683 r87686  
    3131        InspectorTest.addResult("Main frame style:");
    3232        InspectorTest.dumpSelectedElementStyles(true, false, true);
    33         InspectorTest.selectNodeWithId("iframeBody");
    34         InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
     33        InspectorTest.selectNodeWithId("iframeBody", step2);
    3534    }
    3635
  • trunk/LayoutTests/inspector/styles/styles-update-from-js-expected.txt

    r87683 r87686  
    11Tests that changes to an inline style from JavaScript are reflected in the Styles pane and Elements tree.
    22
    3 Modified "style" attribute
     3
     4Running: testInit
     5
     6Running: testSetStyleAttribute
    47<div id="container" style="color: #daC0DE; border: 1px solid black;"></div>
    58[expanded] element.style { ()
     
    2023
    2124
    22 Modified cssText
     25
     26Running: testSetStyleCSSText
    2327<div id="container" style="color: rgb(192, 255, 238); "></div>
    2428[expanded] element.style { ()
     
    2630
    2731
    28 Modified parsed attributes
     32
     33Running: testSetViaParsedAttributes
    2934<div id="container" style="color: rgb(192, 255, 238); border-top-style: dashed; border-right-style: dashed; border-bottom-style: dashed; border-left-style: dashed; border-top-color: green; border-right-color: green; border-bottom-color: green; border-left-color: green; border-top-width: 3px; border-right-width: 3px; border-bottom-width: 3px; border-left-width: 3px; "></div>
    3035[expanded] element.style { ()
  • trunk/LayoutTests/inspector/styles/styles-update-from-js.html

    r87683 r87686  
    2323function test()
    2424{
    25     var sniffCount = 0;
     25    InspectorTest.runTestSuite([
    2626
    27     InspectorTest.selectNodeWithId("container", installSniffer);
     27        function testInit(next)
     28        {
     29            InspectorTest.selectNodeWithId("container", next);
     30        },
    2831
    29     function installSniffer()
    30     {
    31         InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", snifferCallback, true);
    32         InspectorTest.evaluateInPage("modifyStyleAttribute()");
    33     }
     32        function testSetStyleAttribute(next)
     33        {
     34            var updateCount = 0;
     35            function callback()
     36            {
     37                // Expect two updates while setting attribute.
     38                if (++updateCount === 2) {
     39                    dumpAttributeAndStyles();
     40                    next();
     41                }
     42            }
     43            InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", callback, true);
     44            InspectorTest.evaluateInPage("modifyStyleAttribute()");
     45        },
    3446
    35     function snifferCallback()
    36     {
    37         switch (++sniffCount) {
    38             case 1:
    39                 InspectorTest.addResult("Modified \"style\" attribute");
     47        function testSetStyleCSSText(next)
     48        {
     49            var updateCount = 0;
     50            function callback()
     51            {
     52                // Expect two updates while setting css text.
     53                if (++updateCount === 2) {
     54                    dumpAttributeAndStyles();
     55                    next();
     56                }
     57            }
     58            InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", callback, true);
     59            InspectorTest.evaluateInPage("modifyCSSText()", callback);
     60        },
     61
     62        function testSetViaParsedAttributes(next)
     63        {
     64            function callback()
     65            {
    4066                dumpAttributeAndStyles();
    41                 InspectorTest.evaluateInPage("modifyCSSText()");
    42                 break;
    43             case 2:
    44                 InspectorTest.addResult("Modified cssText");
    45                 dumpAttributeAndStyles();
    46                 InspectorTest.evaluateInPage("modifyParsedAttributes()");
    47                 break;
    48             case 3:
    49                 InspectorTest.addResult("Modified parsed attributes");
    50                 dumpAttributeAndStyles();
    51                 InspectorTest.completeTest();
    52                 break;
     67                next();
     68            }
     69            InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", callback);
     70            InspectorTest.evaluateInPage("modifyParsedAttributes()");
    5371        }
    54     }
     72    ]);
    5573
    5674    function dumpAttributeAndStyles()
  • trunk/LayoutTests/inspector/styles/styles-url-linkify.html

    r87683 r87686  
    5353        InspectorTest.addResult("Link for a URI from CSS document:");
    5454        dumpHref();
    55         InspectorTest.selectNodeWithId("iframed");
    56         InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
    57 
     55        InspectorTest.selectNodeWithId("iframed", step2);
    5856    }
    5957
  • trunk/Source/WebCore/ChangeLog

    r87683 r87686  
     12011-05-30  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r87683.
     4        http://trac.webkit.org/changeset/87683
     5        https://bugs.webkit.org/show_bug.cgi?id=61729
     6
     7        Breaks inspector tests on Chromium (Requested by apavlov on
     8        #webkit).
     9
     10        * inspector/front-end/StylesSidebarPane.js:
     11        (WebInspector.StylesSidebarPane.prototype.update):
     12
    1132011-05-25  Alexander Pavlov  <apavlov@chromium.org>
    214
  • trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js

    r87683 r87686  
    236236        }
    237237
    238         function reloadAllStyles()
    239         {
    240             delete this._reloadAllStylesTimer;
    241             WebInspector.cssModel.getStylesAsync(this._allStylesNodeId, stylesCallback.bind(this))
    242         }
    243 
    244238        if (refresh)
    245239            WebInspector.cssModel.getComputedStyleAsync(node.id, computedStyleCallback.bind(this));
    246         else {
    247             // Always refresh the node to request styles for.
    248             this._allStylesNodeId = node.id;
    249             if ("_reloadAllStylesTimer" in this)
    250                 return;
    251             this._reloadAllStylesTimer = setTimeout(reloadAllStyles.bind(this), 0);
    252         }
     240        else
     241            WebInspector.cssModel.getStylesAsync(node.id, stylesCallback.bind(this));
    253242    },
    254243
Note: See TracChangeset for help on using the changeset viewer.