Merge 128263

Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

Index: Source/WebKit/chromium/src/WebWorkerClientImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebWorkerClientImpl.cpp	(revision 128924)
+++ Source/WebKit/chromium/src/WebWorkerClientImpl.cpp	(working copy)
@@ -57,6 +57,7 @@
 
 #include "FrameLoaderClientImpl.h"
 #include "PlatformMessagePortChannel.h"
+#include "WebFileSystemCallbacks.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
 #include "WebKit.h"
@@ -210,7 +211,11 @@
 void WebWorkerClientImpl::openFileSystem(WebFileSystem::Type type, long long size, bool create, 
                                          WebFileSystemCallbacks* callbacks)
 {
-     m_webFrame->client()->openFileSystem(m_webFrame, type, size, create, callbacks);
+    if (!m_webFrame->client()) {
+        callbacks->didFail(WebFileErrorAbort);
+        return;
+    }
+    m_webFrame->client()->openFileSystem(m_webFrame, type, size, create, callbacks);
 }
 
 bool WebWorkerClientImpl::allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize)