Changeset 87115 in webkit


Ignore:
Timestamp:
May 23, 2011 6:52:11 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

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

Unreviewed, rolling out r87007.
​http://trac.webkit.org/changeset/87007
​https://bugs.webkit.org/show_bug.cgi?id=61329

patch unnecessarily breaks HTML5 compatibility (Requested by
estes on #webkit).

  • fast/replaced/object-with-non-empty-classid-triggers-fallback-expected.txt:
  • fast/replaced/object-with-non-empty-classid-triggers-fallback.html:

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

Unreviewed, rolling out r87007.
​http://trac.webkit.org/changeset/87007
​https://bugs.webkit.org/show_bug.cgi?id=61329

patch unnecessarily breaks HTML5 compatibility (Requested by
estes on #webkit).

  • html/HTMLObjectElement.cpp: (WebCore::HTMLObjectElement::hasValidClassId):
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r87114 r87115  
     12011-05-23  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r87007.
     4        http://trac.webkit.org/changeset/87007
     5        https://bugs.webkit.org/show_bug.cgi?id=61329
     6
     7        patch unnecessarily breaks HTML5 compatibility (Requested by
     8        estes on #webkit).
     9
     10        * fast/replaced/object-with-non-empty-classid-triggers-fallback-expected.txt:
     11        * fast/replaced/object-with-non-empty-classid-triggers-fallback.html:
     12
    1132011-05-23  Julien Chaffraix  <jchaffraix@codeaurora.org>
    214

  • trunk/LayoutTests/fast/replaced/object-with-non-empty-classid-triggers-fallback-expected.txt

    r87007 r87115  
    22
    33object with classid attribute but no type attribute renders fallback: PASS
    4 object with classid and type attributes renders fallback: PASS
    5 object with classid and type attribute loads when the object has no fallback content: PASS
    6 
     4object with classid and type attributes renders fallback: PASS

  • trunk/LayoutTests/fast/replaced/object-with-non-empty-classid-triggers-fallback.html

    r87007 r87115  
    1 <!DOCTYPE html>
    21<script>
    3     if (window.layoutTestController) {
     2    if (window.layoutTestController)
    43        layoutTestController.dumpAsText();
    5         layoutTestController.waitUntilDone();
    6     }
    7 
    8     function runTest()
    9     {
    10         var pluginObject = document.getElementById("obj3");
    11         var consoleDiv = document.getElementById("console");
    12 
    13         if (pluginObject && pluginObject.testCallback)
    14             consoleDiv.innerHTML += "PASS";
    15         else
    16             consoleDiv.innerHTML += "FAIL";
    17 
    18         if (window.layoutTestController)
    19             layoutTestController.notifyDone();
    20     }
    214</script>
    22 <body onload="runTest()">
    235<p>This tests that fallback content is rendered for objects with non-empty classid attributes. The test passes if two lines are printed below containing the work 'PASS'.</p>
    24 <object id="obj1" classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000">
     6<object id="obj" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
    257    object with classid attribute but no type attribute renders fallback: PASS
    268</object>
    279<br>
    28 <object id="obj2" classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" type="application/x-webkit-test-netscape">
     10<object id="obj" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" type=application/x-webkit-test-netscape">
    2911    object with classid and type attributes renders fallback: PASS
    3012</object>
    31 <br>
    32 <div id="console">object with classid and type attribute loads when the object has no fallback content: </div>
    33 <object id="obj3" classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" type="application/x-webkit-test-netscape">
    34 </object>
    3513

  • trunk/Source/WebCore/ChangeLog

    r87114 r87115  
     12011-05-23  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r87007.
     4        http://trac.webkit.org/changeset/87007
     5        https://bugs.webkit.org/show_bug.cgi?id=61329
     6
     7        patch unnecessarily breaks HTML5 compatibility (Requested by
     8        estes on #webkit).
     9
     10        * html/HTMLObjectElement.cpp:
     11        (WebCore::HTMLObjectElement::hasValidClassId):
     12
    1132011-05-23  Julien Chaffraix  <jchaffraix@codeaurora.org>
    214

  • trunk/Source/WebCore/html/HTMLObjectElement.cpp

    r87007 r87115  
    248248    // HTML5 says that fallback content should be rendered if a non-empty
    249249    // classid is specified for which the UA can't find a suitable plug-in.
    250     // However, in the case where an object tag with a classid also has a valid
    251     // MIME type and no fallback content is present, it makes sense to ignore
    252     // the classid and attempt to load the object rather than fall back to
    253     // nothing.
    254     return classId().isEmpty() || !hasFallbackContent();
     250    return classId().isEmpty();
    255251}
    256252
Note: See TracChangeset for help on using the changeset viewer.