Merge 76429 - 2011-01-21 Yury Semikhatsky <yurys@chromium.org>...

Source/WebCore/dom/ScriptExecutionContext.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 276 matching lines @@
     }
     m_pendingExceptions.clear();
 }
 
 bool ScriptExecutionContext::dispatchErrorEvent(const String& errorMessage, int lineNumber, const String& sourceURL)
 {
     EventTarget* target = errorEventTarget();
     if (!target)
         return false;
 
+    String message;
+    int line;
+    String sourceName;
+    KURL targetUrl = completeURL(sourceURL);
+    if (securityOrigin()->canRequest(targetUrl)) {
+        message = errorMessage;
+        line = lineNumber;
+        sourceName = sourceURL;
+    } else {
+        message = "Script error.";
+        sourceName = String();
+        line = 0;
+    }
+
     ASSERT(!m_inDispatchErrorEvent);
     m_inDispatchErrorEvent = true;
-    RefPtr<ErrorEvent> errorEvent = ErrorEvent::create(errorMessage, sourceURL, lineNumber);
+    RefPtr<ErrorEvent> errorEvent = ErrorEvent::create(message, sourceName, line);
     target->dispatchEvent(errorEvent);
     m_inDispatchErrorEvent = false;
     return errorEvent->defaultPrevented();
 }
 
 void ScriptExecutionContext::addTimeout(int timeoutId, DOMTimer* timer)
 {
     ASSERT(!m_timeouts.contains(timeoutId));
     m_timeouts.set(timeoutId, timer);
 }
@@ skipping 54 matching lines @@
     if (isWorkerContext())
         return static_cast<WorkerContext*>(this)->script()->globalData();
 #endif
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 #endif
 
 } // namespace WebCore