Merge WebKit at r64523 : Initial merge by git.

Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4

1 files changed, 7 insertions, 7 deletions

diff --git a/WebCore/html/FileThread.cpp b/WebCore/html/FileThread.cpp
index 02b1718..3a3413c 100644
--- a/WebCore/html/FileThread.cpp
+++ b/WebCore/html/FileThread.cpp
@@ -61,7 +61,7 @@ bool FileThread::start()
 
 void FileThread::stop()
 {
-    return m_queue.kill();
+    m_queue.kill();
 }
 
 void FileThread::postTask(PassOwnPtr<Task> task)
@@ -69,17 +69,17 @@ void FileThread::postTask(PassOwnPtr<Task> task)
     m_queue.append(task);
 }
 
-class SameFilePredicate {
+class SameInstancePredicate {
 public:
-    SameFilePredicate(const FileStream* stream) : m_stream(stream) { }
-    bool operator()(FileThread::Task* task) const { return task->stream() == m_stream; }
+    SameInstancePredicate(const void* instance) : m_instance(instance) { }
+    bool operator()(FileThread::Task* task) const { return task->instance() == m_instance; }
 private:
-    const FileStream* m_stream;
+    const void* m_instance;
 };
 
-void FileThread::unscheduleTasks(const FileStream* stream)
+void FileThread::unscheduleTasks(const void* instance)
 {
-    SameFilePredicate predicate(stream);
+    SameInstancePredicate predicate(instance);
     m_queue.removeIf(predicate);
 }