[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kinuko at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit a93ba02a22f9ab6ba88bd72e563d9c0eab7b3acc
Author: kinuko at chromium.org <kinuko at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 01:54:53 2010 +0000

    2010-09-23  Kinuko Yasuda  <kinuko at chromium.org>
    
            Unreviewed; build fix attempt.
    
            * src/WebWorkerBase.cpp:
            (WebKit::WebWorkerBase::openFileSystem):
            * src/WorkerFileSystemCallbacksBridge.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68225 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3bf713e..55ba896 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-23  Kinuko Yasuda  <kinuko at chromium.org>
 
+        Unreviewed; build fix attempt.
+
+        * src/WebWorkerBase.cpp:
+        (WebKit::WebWorkerBase::openFileSystem):
+        * src/WorkerFileSystemCallbacksBridge.h:
+
+2010-09-23  Kinuko Yasuda  <kinuko at chromium.org>
+
         Reviewed by David Levin.
 
         Add Worker support for FileSystem API
diff --git a/WebKit/chromium/src/WebWorkerBase.cpp b/WebKit/chromium/src/WebWorkerBase.cpp
index a69aada..135e058 100644
--- a/WebKit/chromium/src/WebWorkerBase.cpp
+++ b/WebKit/chromium/src/WebWorkerBase.cpp
@@ -238,7 +238,6 @@ bool WebWorkerBase::allowDatabase(WebFrame*, const WebString& name, const WebStr
 
 void WebWorkerBase::openFileSystem(WebFileSystem::Type type, long long size, WebFileSystemCallbacks* callbacks)
 {
-    WorkerRunLoop& runLoop = m_workerThread->runLoop();
     WorkerScriptController* controller = WorkerScriptController::controllerForContext();
     WorkerContext* workerContext = controller->workerContext();
 
diff --git a/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h b/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h
index cbfc690..b5d25ba 100644
--- a/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h
+++ b/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h
@@ -70,6 +70,7 @@ public:
     {
         return WTF::adoptRef(new WorkerFileSystemCallbacksBridge(worker, workerContext, callbacks));
     }
+    ~WorkerFileSystemCallbacksBridge();
 
     // WorkerContext::Observer method.
     virtual void notifyStop()
@@ -88,9 +89,6 @@ public:
 
 private:
     WorkerFileSystemCallbacksBridge(WebWorkerBase*, WebCore::ScriptExecutionContext*, WebFileSystemCallbacks*);
-    ~WorkerFileSystemCallbacksBridge();
-
-    friend class ThreadSafeShared<WorkerFileSystemCallbacksBridge>;
 
     // Method that is to be called on the main thread.
     static void openFileSystemOnMainThread(WebCore::ScriptExecutionContext*, WebCommonWorkerClient*, WebFileSystem::Type, long long size, WorkerFileSystemCallbacksBridge*, const String& mode);

-- 
WebKit Debian packaging