Merge 107174

Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp

 /*
  * Copyright (C) 2011 Google 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
@@ skipping 165 matching lines @@
 void IDBFactoryBackendProxy::openFromWorker(const String& name, IDBCallbacks* callbacks, PassRefPtr<SecurityOrigin> prpOrigin, WorkerContext* context, const String& dataDir)
 {
 #if ENABLE(WORKERS)
     WebSecurityOrigin origin(prpOrigin);
     if (!allowIDBFromWorkerThread(context, name, origin)) {
         callbacks->onError(WebIDBDatabaseError(0, "The user denied permission to access the database."));
         return;
     }
     WorkerLoaderProxy* workerLoaderProxy = &context->thread()->workerLoaderProxy();
     WebWorkerBase* webWorker = static_cast<WebWorkerBase*>(workerLoaderProxy);
-    WebFrame* webFrame = webWorker->view()->mainFrame();
+    WebView* webView = webWorker->view();
+    if (!webView) {
+        // Frame is closed, worker is terminaring.
+        return;
+    }
+    WebFrame* webFrame = webView->mainFrame();
     m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir);
 #endif
 }
 
 void IDBFactoryBackendProxy::open(const String& name, IDBCallbacks* callbacks, PassRefPtr<SecurityOrigin> prpOrigin, Frame* frame, const String& dataDir)
 {
     WebSecurityOrigin origin(prpOrigin);
     WebFrameImpl* webFrame = WebFrameImpl::fromFrame(frame);
     WebViewImpl* webView = webFrame->viewImpl();
     if (webView->permissionClient() && !webView->permissionClient()->allowIndexedDB(webFrame, name, origin)) {
@@ skipping 13 matching lines @@
         callbacks->onError(WebIDBDatabaseError(0, "The user denied permission to access the database."));
         return;
     }
 
     m_webIDBFactory->deleteDatabase(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir);
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(INDEXED_DATABASE)