Changeset 148425 in webkit

Timestamp:

Apr 15, 2013 3:11:36 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Filesystem callback notifyCreateSnapshotFileAndReadMetadata can be called on the wring thread
​https://bugs.webkit.org/show_bug.cgi?id=114610

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2013-04-15
Reviewed by Xan Lopez.

Override notifyCreateSnapshotFileAndReadMetadata to make sure the
callback is called on the right thread.

Fixes a crash in several fast/filesystem test in debug builds.

• platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.cpp:

(WebCore::WorkerPlatformAsyncFileSystemCallbacks::notifyCreateSnapshotFileAndReadMetadata):
(WebCore::WorkerPlatformAsyncFileSystemCallbacks::notifyCreateSnapshotFileAndReadMetadataOnWorkerThread):

• platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.cpp (modified) (2 diffs)
• platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [BlackBerry] Filesystem callback notifyCreateSnapshotFileAndReadMetadata can be called on the wring thread
+        https://bugs.webkit.org/show_bug.cgi?id=114610
+
+        Reviewed by Xan Lopez.
+
+        Override notifyCreateSnapshotFileAndReadMetadata to make sure the
+        callback is called on the right thread.
+
+        Fixes a crash in several fast/filesystem test in debug builds.
+
+        * platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.cpp:
+        (WebCore::WorkerPlatformAsyncFileSystemCallbacks::notifyCreateSnapshotFileAndReadMetadata):
+        (WebCore::WorkerPlatformAsyncFileSystemCallbacks::notifyCreateSnapshotFileAndReadMetadataOnWorkerThread):
+        * platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.h:
+
 2013-04-15  Arvid Nilsson  <anilsson@rim.com>
 

trunk/Source/WebCore/platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.cpp

@@ -131 +131 @@
 }
 
+void WorkerPlatformAsyncFileSystemCallbacks::notifyCreateSnapshotFileAndReadMetadata(const BlackBerry::Platform::WebFileInfo& fileInfo)
+{
+    m_mutex.lock();
+    if (!m_context) {
+        m_mutex.unlock();
+        PlatformAsyncFileSystemCallbacks::deleteMe();
+        return;
+    }
+
+    postTaskToWorkerThread(createCallbackTask(&notifyCreateSnapshotFileAndReadMetadataOnWorkerThread, this, fileInfo));
+    m_mutex.unlock();
+}
+
 void WorkerPlatformAsyncFileSystemCallbacks::notifyReadDirectory(const std::vector<BlackBerry::Platform::WebFileSystemEntry>& entries, bool hasMore)
 {
@@ -201 +214 @@
 }
 
+void WorkerPlatformAsyncFileSystemCallbacks::notifyCreateSnapshotFileAndReadMetadataOnWorkerThread(ScriptExecutionContext*, WorkerPlatformAsyncFileSystemCallbacks* callbacks, const BlackBerry::Platform::WebFileInfo& fileInfo)
+{
+    callbacks->PlatformAsyncFileSystemCallbacks::notifyCreateSnapshotFileAndReadMetadata(fileInfo);
+}
+
 void WorkerPlatformAsyncFileSystemCallbacks::notifyReadDirectoryEntryOnWorkerThread(ScriptExecutionContext*, WorkerPlatformAsyncFileSystemCallbacks* callbacks, const std::vector<BlackBerry::Platform::WebFileSystemEntry>& entries, bool hasMore)
 {

trunk/Source/WebCore/platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.h

@@ -85 +85 @@
     virtual void notifyFail(BlackBerry::Platform::WebFileError);
     virtual void notifyReadMetadata(const BlackBerry::Platform::WebFileInfo&);
+    virtual void notifyCreateSnapshotFileAndReadMetadata(const BlackBerry::Platform::WebFileInfo&);
     virtual void notifyReadDirectory(const std::vector<BlackBerry::Platform::WebFileSystemEntry>& entries, bool hasMore);
     virtual void notifyCreateFileWriter(BlackBerry::Platform::WebFileWriter* platformWriter, long long length);
@@ -98 +99 @@
     static void notifyFailOnWorkerThread(ScriptExecutionContext*, WorkerPlatformAsyncFileSystemCallbacks*, BlackBerry::Platform::WebFileError);
     static void notifyReadMetadataOnWorkerThread(ScriptExecutionContext*, WorkerPlatformAsyncFileSystemCallbacks*, const BlackBerry::Platform::WebFileInfo&);
+    static void notifyCreateSnapshotFileAndReadMetadataOnWorkerThread(ScriptExecutionContext*, WorkerPlatformAsyncFileSystemCallbacks*, const BlackBerry::Platform::WebFileInfo&);
     static void notifyReadDirectoryEntryOnWorkerThread(ScriptExecutionContext*, WorkerPlatformAsyncFileSystemCallbacks*, const std::vector<BlackBerry::Platform::WebFileSystemEntry>& entries, bool hasMore);
     static void notifyCreateFileWriterOnWorkerThread(ScriptExecutionContext*, WorkerPlatformAsyncFileSystemCallbacks*, BlackBerry::Platform::WebFileWriter* platformWriter, long long length);