Title: [92912] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92911 => 92912)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-12 04:09:42 UTC (rev 92911)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-12 04:10:00 UTC (rev 92912)
@@ -1,5 +1,20 @@
2011-08-11 Lucas Forschler <[email protected]>
+ Merged 87875
+
+ 2011-06-01 Abhishek Arya <[email protected]>
+
+ Unreviewed.
+
+ Coding style nit. Move ec=0 initialization, change
+ recommended by Alexey in bug.
+ https://bugs.webkit.org/show_bug.cgi?id=60831
+
+ * dom/Document.cpp:
+ (WebCore::Document::setBody):
+
+2011-08-11 Lucas Forschler <[email protected]>
+
Merged 87863
2011-06-01 Abhishek Arya <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/dom/Document.cpp (92911 => 92912)
--- branches/safari-534.51-branch/Source/WebCore/dom/Document.cpp 2011-08-12 04:09:42 UTC (rev 92911)
+++ branches/safari-534.51-branch/Source/WebCore/dom/Document.cpp 2011-08-12 04:10:00 UTC (rev 92912)
@@ -2016,14 +2016,13 @@
void Document::setBody(PassRefPtr<HTMLElement> newBody, ExceptionCode& ec)
{
- ec = 0;
-
if (!newBody || !documentElement() || !newBody->hasTagName(bodyTag)) {
ec = HIERARCHY_REQUEST_ERR;
return;
}
if (newBody->document() && newBody->document() != this) {
+ ec = 0;
RefPtr<Node> node = importNode(newBody.get(), true, ec);
if (ec)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
