Title: [123838] trunk/Source/WebCore
- Revision
- 123838
- Author
- [email protected]
- Date
- 2012-07-26 22:53:00 -0700 (Thu, 26 Jul 2012)
Log Message
[Qt] Build fix for Qt after r123811
https://bugs.webkit.org/show_bug.cgi?id=92460
Reviewed by Ryosuke Niwa.
This change explicitly converts from AtomicString to String to avoid ambiguities
when compiling HTMLAppletWidget.cpp on Qt.
No new tests because it is a build fix.
* html/HTMLAppletElement.cpp:
(WebCore::HTMLAppletElement::updateWidget):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (123837 => 123838)
--- trunk/Source/WebCore/ChangeLog 2012-07-27 04:32:08 UTC (rev 123837)
+++ trunk/Source/WebCore/ChangeLog 2012-07-27 05:53:00 UTC (rev 123838)
@@ -1,3 +1,18 @@
+2012-07-26 Hironori Bono <[email protected]>
+
+ [Qt] Build fix for Qt after r123811
+ https://bugs.webkit.org/show_bug.cgi?id=92460
+
+ Reviewed by Ryosuke Niwa.
+
+ This change explicitly converts from AtomicString to String to avoid ambiguities
+ when compiling HTMLAppletWidget.cpp on Qt.
+
+ No new tests because it is a build fix.
+
+ * html/HTMLAppletElement.cpp:
+ (WebCore::HTMLAppletElement::updateWidget):
+
2012-07-26 Mike Lawther <[email protected]>
Make transitions work between different Length types
Modified: trunk/Source/WebCore/html/HTMLAppletElement.cpp (123837 => 123838)
--- trunk/Source/WebCore/html/HTMLAppletElement.cpp 2012-07-27 04:32:08 UTC (rev 123837)
+++ trunk/Source/WebCore/html/HTMLAppletElement.cpp 2012-07-27 05:53:00 UTC (rev 123838)
@@ -111,19 +111,19 @@
const AtomicString& codeBase = ""
if (!codeBase.isNull()) {
paramNames.append("codeBase");
- paramValues.append(codeBase);
+ paramValues.append(codeBase.string());
}
const AtomicString& name = document()->isHTMLDocument() ? getNameAttribute() : getIdAttribute();
if (!name.isNull()) {
paramNames.append("name");
- paramValues.append(name);
+ paramValues.append(name.string());
}
const AtomicString& archive = getAttribute(archiveAttr);
if (!archive.isNull()) {
paramNames.append("archive");
- paramValues.append(archive);
+ paramValues.append(archive.string());
}
paramNames.append("baseURL");
@@ -132,7 +132,7 @@
const AtomicString& mayScript = getAttribute(mayscriptAttr);
if (!mayScript.isNull()) {
paramNames.append("mayScript");
- paramValues.append(mayScript);
+ paramValues.append(mayScript.string());
}
for (Node* child = firstChild(); child; child = child->nextSibling()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
