Title: [87115] trunk
- Revision
- 87115
- Author
- [email protected]
- Date
- 2011-05-23 18:52:11 -0700 (Mon, 23 May 2011)
Log Message
2011-05-23 Sheriff Bot <[email protected]>
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 <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (87114 => 87115)
--- trunk/LayoutTests/ChangeLog 2011-05-24 01:17:11 UTC (rev 87114)
+++ trunk/LayoutTests/ChangeLog 2011-05-24 01:52:11 UTC (rev 87115)
@@ -1,3 +1,15 @@
+2011-05-23 Sheriff Bot <[email protected]>
+
+ 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 Julien Chaffraix <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/LayoutTests/fast/replaced/object-with-non-empty-classid-triggers-fallback-expected.txt (87114 => 87115)
--- trunk/LayoutTests/fast/replaced/object-with-non-empty-classid-triggers-fallback-expected.txt 2011-05-24 01:17:11 UTC (rev 87114)
+++ trunk/LayoutTests/fast/replaced/object-with-non-empty-classid-triggers-fallback-expected.txt 2011-05-24 01:52:11 UTC (rev 87115)
@@ -1,6 +1,4 @@
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'.
object with classid attribute but no type attribute renders fallback: PASS
-object with classid and type attributes renders fallback: PASS
-object with classid and type attribute loads when the object has no fallback content: PASS
-
+object with classid and type attributes renders fallback: PASS
Modified: trunk/LayoutTests/fast/replaced/object-with-non-empty-classid-triggers-fallback.html (87114 => 87115)
--- trunk/LayoutTests/fast/replaced/object-with-non-empty-classid-triggers-fallback.html 2011-05-24 01:17:11 UTC (rev 87114)
+++ trunk/LayoutTests/fast/replaced/object-with-non-empty-classid-triggers-fallback.html 2011-05-24 01:52:11 UTC (rev 87115)
@@ -1,35 +1,13 @@
-<!DOCTYPE html>
<script>
- if (window.layoutTestController) {
+ if (window.layoutTestController)
layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- function runTest()
- {
- var pluginObject = document.getElementById("obj3");
- var consoleDiv = document.getElementById("console");
-
- if (pluginObject && pluginObject.testCallback)
- consoleDiv.innerHTML += "PASS";
- else
- consoleDiv.innerHTML += "FAIL";
-
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }
</script>
-<body _onload_="runTest()">
<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>
-<object id="obj1" classid=""
+<object id="obj" classid=""
object with classid attribute but no type attribute renders fallback: PASS
</object>
<br>
-<object id="obj2" classid="" type="application/x-webkit-test-netscape">
+<object id="obj" classid="" type=application/x-webkit-test-netscape">
object with classid and type attributes renders fallback: PASS
</object>
-<br>
-<div id="console">object with classid and type attribute loads when the object has no fallback content: </div>
-<object id="obj3" classid="" type="application/x-webkit-test-netscape">
-</object>
Modified: trunk/Source/WebCore/ChangeLog (87114 => 87115)
--- trunk/Source/WebCore/ChangeLog 2011-05-24 01:17:11 UTC (rev 87114)
+++ trunk/Source/WebCore/ChangeLog 2011-05-24 01:52:11 UTC (rev 87115)
@@ -1,3 +1,15 @@
+2011-05-23 Sheriff Bot <[email protected]>
+
+ 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):
+
2011-05-23 Julien Chaffraix <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (87114 => 87115)
--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2011-05-24 01:17:11 UTC (rev 87114)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2011-05-24 01:52:11 UTC (rev 87115)
@@ -247,11 +247,7 @@
// HTML5 says that fallback content should be rendered if a non-empty
// classid is specified for which the UA can't find a suitable plug-in.
- // However, in the case where an object tag with a classid also has a valid
- // MIME type and no fallback content is present, it makes sense to ignore
- // the classid and attempt to load the object rather than fall back to
- // nothing.
- return classId().isEmpty() || !hasFallbackContent();
+ return classId().isEmpty();
}
// FIXME: This should be unified with HTMLEmbedElement::updateWidget and
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
