Index: Source/core/page/DOMWindow.cpp |
diff --git a/Source/core/page/DOMWindow.cpp b/Source/core/page/DOMWindow.cpp |
index 3f7c41ec7805317c1677ab8bb42941d739753e1f..c9b7b5c3920e7b184c1598e9a3e9a1b7b982beca 100644 |
--- a/Source/core/page/DOMWindow.cpp |
+++ b/Source/core/page/DOMWindow.cpp |
@@ -1576,27 +1576,6 @@ void DOMWindow::printErrorMessage(const String& message) |
pageConsole()->addMessage(JSMessageSource, ErrorMessageLevel, message); |
} |
-// FIXME: Once we're throwing exceptions for cross-origin access violations, we will always sanitize the target |
-// frame details, so we can safely combine 'crossDomainAccessErrorMessage' with this method after considering |
-// exactly which details may be exposed to JavaScript. |
-// |
-// http://crbug.com/17325 |
-String DOMWindow::sanitizedCrossDomainAccessErrorMessage(DOMWindow* activeWindow) |
-{ |
- const KURL& activeWindowURL = activeWindow->document()->url(); |
- if (activeWindowURL.isNull()) |
- return String(); |
- |
- ASSERT(!activeWindow->document()->securityOrigin()->canAccess(document()->securityOrigin())); |
- |
- SecurityOrigin* activeOrigin = activeWindow->document()->securityOrigin(); |
- String message = "Blocked a frame with origin \"" + activeOrigin->toString() + "\" from accessing a cross-origin frame."; |
- |
- // FIXME: Evaluate which details from 'crossDomainAccessErrorMessage' may safely be reported to JavaScript. |
- |
- return message; |
-} |
- |
String DOMWindow::crossDomainAccessErrorMessage(DOMWindow* activeWindow) |
{ |
const KURL& activeWindowURL = activeWindow->document()->url(); |