Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91

1 files changed, 17 insertions, 1 deletions

diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 2442846..36313b4 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -530,6 +530,21 @@ static NSString *createUserVisibleWebKitVersionString()
     return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X %@; %@) AppleWebKit/%@ (KHTML, like Gecko)", osVersion, language, webKitVersion];
 }
 
++ (void)_reportException:(JSValueRef)exception inContext:(JSContextRef)context
+{
+    if (!exception || !context)
+        return;
+
+    JSLock lock(SilenceAssertionsOnly);
+    JSC::ExecState* execState = toJS(context);
+
+    // Make sure the context has a DOMWindow global object, otherwise this context didn't originate from a WebView.
+    if (!toJSDOMWindow(execState->lexicalGlobalObject()))
+        return;
+
+    reportException(execState, toJS(execState, exception));
+}
+
 static void WebKitInitializeApplicationCachePathIfNecessary()
 {
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -1084,8 +1099,9 @@ static bool fastDocumentTeardownEnabled()
     // Deleteing the WebCore::Page will clear the page cache so we call destroy on 
     // all the plug-ins in the page cache to break any retain cycles.
     // See comment in HistoryItem::releaseAllPendingPageCaches() for more information.
-    delete _private->page;
+    Page* page = _private->page;
     _private->page = 0;
+    delete page;
 
     if (_private->hasSpellCheckerDocumentTag) {
         [[NSSpellChecker sharedSpellChecker] closeSpellDocumentWithTag:_private->spellCheckerDocumentTag];