Title: [128925] branches/chromium/1229
- Revision
- 128925
- Author
- [email protected]
- Date
- 2012-09-18 13:34:26 -0700 (Tue, 18 Sep 2012)
Log Message
Merge 128263
BUG=147592
Review URL: https://codereview.chromium.org/10948013
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1229/LayoutTests/fast/filesystem/workers/detached-frame-crash-expected.txt (from rev 128263, trunk/LayoutTests/fast/filesystem/workers/detached-frame-crash-expected.txt) (0 => 128925)
--- branches/chromium/1229/LayoutTests/fast/filesystem/workers/detached-frame-crash-expected.txt (rev 0)
+++ branches/chromium/1229/LayoutTests/fast/filesystem/workers/detached-frame-crash-expected.txt 2012-09-18 20:34:26 UTC (rev 128925)
@@ -0,0 +1 @@
+PASS
Copied: branches/chromium/1229/LayoutTests/fast/filesystem/workers/detached-frame-crash.html (from rev 128263, trunk/LayoutTests/fast/filesystem/workers/detached-frame-crash.html) (0 => 128925)
--- branches/chromium/1229/LayoutTests/fast/filesystem/workers/detached-frame-crash.html (rev 0)
+++ branches/chromium/1229/LayoutTests/fast/filesystem/workers/detached-frame-crash.html 2012-09-18 20:34:26 UTC (rev 128925)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- http://crbug.com/147592
+ http://webkit.org/b/96354 -->
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+document.addEventListener("DOMContentLoaded", runTest);
+
+function runTest()
+{
+ addEventListener("message", clear);
+}
+
+function clear(event)
+{
+ document.body.innerText = "";
+ setTimeout(done, 0);
+}
+
+function done()
+{
+ document.body.innerText = "PASS";
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+<iframe id="frame" src=""
Modified: branches/chromium/1229/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (128924 => 128925)
--- branches/chromium/1229/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2012-09-18 20:07:18 UTC (rev 128924)
+++ branches/chromium/1229/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2012-09-18 20:34:26 UTC (rev 128925)
@@ -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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
