Title: [120855] trunk/Source/WebCore
- Revision
- 120855
- Author
- [email protected]
- Date
- 2012-06-20 13:23:51 -0700 (Wed, 20 Jun 2012)
Log Message
SecurityOrigin::canDisplay() should return true when m_universalAccess is true
https://bugs.webkit.org/show_bug.cgi?id=84865
Patch by Yong Li <[email protected]> on 2012-06-20
Reviewed by Adam Barth.
Add an early return (true) in canDisplay() for if (m_universalAccess),
as we did for canAccess() and canRequest().
No new tests. We should be good as long as this change doesn't break existing
tests, which means the contents supposed to be blocked are still blocked when
m_universalAccess is false.
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::canDisplay):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120854 => 120855)
--- trunk/Source/WebCore/ChangeLog 2012-06-20 20:16:41 UTC (rev 120854)
+++ trunk/Source/WebCore/ChangeLog 2012-06-20 20:23:51 UTC (rev 120855)
@@ -1,3 +1,20 @@
+2012-06-20 Yong Li <[email protected]>
+
+ SecurityOrigin::canDisplay() should return true when m_universalAccess is true
+ https://bugs.webkit.org/show_bug.cgi?id=84865
+
+ Reviewed by Adam Barth.
+
+ Add an early return (true) in canDisplay() for if (m_universalAccess),
+ as we did for canAccess() and canRequest().
+
+ No new tests. We should be good as long as this change doesn't break existing
+ tests, which means the contents supposed to be blocked are still blocked when
+ m_universalAccess is false.
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::canDisplay):
+
2012-06-20 Erik Arvidsson <[email protected]>
[V8] Use v8::V8::AddImplicitReferences instead of SetHiddenValue
Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (120854 => 120855)
--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2012-06-20 20:16:41 UTC (rev 120854)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2012-06-20 20:23:51 UTC (rev 120855)
@@ -368,6 +368,9 @@
bool SecurityOrigin::canDisplay(const KURL& url) const
{
+ if (m_universalAccess)
+ return true;
+
String protocol = url.protocol().lower();
if (isFeedWithNestedProtocolInHTTPFamily(url))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
