Title: [100102] trunk/Source/WebCore
- Revision
- 100102
- Author
- [email protected]
- Date
- 2011-11-13 23:57:10 -0800 (Sun, 13 Nov 2011)
Log Message
Document::initSecurityOrigin should return earlier more often
https://bugs.webkit.org/show_bug.cgi?id=72244
Reviewed by Eric Seidel.
This minor tweak was suggested by Darin to make the subsequent patches
easier to read.
* dom/Document.cpp:
(WebCore::Document::initSecurityContext):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (100101 => 100102)
--- trunk/Source/WebCore/ChangeLog 2011-11-14 07:53:27 UTC (rev 100101)
+++ trunk/Source/WebCore/ChangeLog 2011-11-14 07:57:10 UTC (rev 100102)
@@ -1,5 +1,18 @@
2011-11-13 Adam Barth <[email protected]>
+ Document::initSecurityOrigin should return earlier more often
+ https://bugs.webkit.org/show_bug.cgi?id=72244
+
+ Reviewed by Eric Seidel.
+
+ This minor tweak was suggested by Darin to make the subsequent patches
+ easier to read.
+
+ * dom/Document.cpp:
+ (WebCore::Document::initSecurityContext):
+
+2011-11-13 Adam Barth <[email protected]>
+
SecurityPolicy should refer to isUnique rather than isEmpty
https://bugs.webkit.org/show_bug.cgi?id=72242
Modified: trunk/Source/WebCore/dom/Document.cpp (100101 => 100102)
--- trunk/Source/WebCore/dom/Document.cpp 2011-11-14 07:53:27 UTC (rev 100101)
+++ trunk/Source/WebCore/dom/Document.cpp 2011-11-14 07:57:10 UTC (rev 100102)
@@ -4450,14 +4450,15 @@
if (!ownerFrame)
ownerFrame = m_frame->loader()->opener();
- if (ownerFrame) {
- m_cookieURL = ownerFrame->document()->cookieURL();
- // We alias the SecurityOrigins to match Firefox, see Bug 15313
- // https://bugs.webkit.org/show_bug.cgi?id=15313
- ScriptExecutionContext::setSecurityOrigin(ownerFrame->document()->securityOrigin());
- // FIXME: Consider moving m_contentSecurityPolicy into SecurityOrigin.
- ScriptExecutionContext::setContentSecurityPolicy(ownerFrame->document()->contentSecurityPolicy());
- }
+ if (!ownerFrame)
+ return;
+
+ m_cookieURL = ownerFrame->document()->cookieURL();
+ // We alias the SecurityOrigins to match Firefox, see Bug 15313
+ // https://bugs.webkit.org/show_bug.cgi?id=15313
+ ScriptExecutionContext::setSecurityOrigin(ownerFrame->document()->securityOrigin());
+ // FIXME: Consider moving m_contentSecurityPolicy into SecurityOrigin.
+ ScriptExecutionContext::setContentSecurityPolicy(ownerFrame->document()->contentSecurityPolicy());
}
void Document::setSecurityOrigin(SecurityOrigin* securityOrigin)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
