Revert 113010 - Implement WebThread::{add,remove}TaskObserver.

Depends on http://trac.webkit.org/changeset/101418

Review URL: http://codereview.chromium.org/8586038

TBR=adamk@chromium.org
Review URL: http://codereview.chromium.org/8805026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113014 0039d316-1c4b-4281-b951-d872f2087c98

webkit/glue/webthread_impl.cc

@@ -10,45 +10,9 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
-#include "base/threading/platform_thread.h"
 
 namespace webkit_glue {
 
-class WebThreadBase::TaskObserverAdapter : public MessageLoop::TaskObserver {
-public:
-  TaskObserverAdapter(WebThread::TaskObserver* observer)
-      : observer_(observer) { }
-
-  // WebThread::TaskObserver does not have a willProcessTask method.
-  virtual void WillProcessTask(base::TimeTicks) OVERRIDE { }
-
-  virtual void DidProcessTask(base::TimeTicks) OVERRIDE {
-    observer_->didProcessTask();
-  }
-
-private:
-  WebThread::TaskObserver* observer_;
-};
-
-void WebThreadBase::addTaskObserver(TaskObserver* observer) {
-  CHECK(IsCurrentThread());
-  std::pair<TaskObserverMap::iterator, bool> result = task_observer_map_.insert(
-      std::make_pair(observer, static_cast<TaskObserverAdapter*>(NULL)));
-  if (result.second)
-    result.first->second = new TaskObserverAdapter(observer);
-  MessageLoop::current()->AddTaskObserver(result.first->second);
-}
-
-void WebThreadBase::removeTaskObserver(TaskObserver* observer) {
-  CHECK(IsCurrentThread());
-  TaskObserverMap::iterator iter = task_observer_map_.find(observer);
-  if (iter == task_observer_map_.end())
-    return;
-  MessageLoop::current()->RemoveTaskObserver(iter->second);
-  delete iter->second;
-  task_observer_map_.erase(iter);
-}
-
 WebThreadImpl::WebThreadImpl(const char* name)
     : thread_(new base::Thread(name)) {
   thread_->Start();
@@ -58,7 +22,6 @@ void WebThreadImpl::postTask(Task* task) {
   thread_->message_loop()->PostTask(
       FROM_HERE, base::Bind(&WebKit::WebThread::Task::run, base::Owned(task)));
 }
-
 void WebThreadImpl::postDelayedTask(
     Task* task, long long delay_ms) {
   thread_->message_loop()->PostDelayedTask(
@@ -67,10 +30,6 @@ void WebThreadImpl::postDelayedTask(
       delay_ms);
 }
 
-bool WebThreadImpl::IsCurrentThread() const {
-  return thread_->thread_id() == base::PlatformThread::CurrentId();
-}
-
 WebThreadImpl::~WebThreadImpl() {
   thread_->Stop();
 }
@@ -93,10 +52,6 @@ void WebThreadImplForMessageLoop::postDelayedTask(
       delay_ms);
 }
 
-bool WebThreadImplForMessageLoop::IsCurrentThread() const {
-  return message_loop_->BelongsToCurrentThread();
-}
-
 WebThreadImplForMessageLoop::~WebThreadImplForMessageLoop() {
 }
 

webkit/glue/webthread_impl.h

@@ -4,8 +4,6 @@
 #ifndef WEBKIT_GLUE_WEBTHREAD_IMPL_H_
 #define WEBKIT_GLUE_WEBTHREAD_IMPL_H_
 
-#include <map>
-
 #include "base/threading/thread.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebThread.h"
@@ -13,23 +11,9 @@
 
 namespace webkit_glue {
 
-class WebThreadBase : public WebKit::WebThread {
+class WebThreadImpl : public WebKit::WebThread {
  public:
-  virtual void addTaskObserver(TaskObserver* observer);
-  virtual void removeTaskObserver(TaskObserver* observer);
-
- protected:
-  virtual bool IsCurrentThread() const = 0;
-
- private:
-  class TaskObserverAdapter;
-  typedef std::map<TaskObserver*, TaskObserverAdapter*> TaskObserverMap;
-  TaskObserverMap task_observer_map_;
-};
-
-class WebThreadImpl : public WebThreadBase {
- public:
-  WEBKIT_GLUE_EXPORT explicit WebThreadImpl(const char* name);
+  WEBKIT_GLUE_EXPORT WebThreadImpl(const char* name);
   WEBKIT_GLUE_EXPORT virtual ~WebThreadImpl();
 
   virtual void postTask(Task* task) OVERRIDE;
@@ -38,24 +22,18 @@ class WebThreadImpl : public WebThreadBase {
   MessageLoop* message_loop() const { return thread_->message_loop(); }
 
  protected:
-  virtual bool IsCurrentThread() const;
-
- private:
   scoped_ptr<base::Thread> thread_;
 };
 
-class WebThreadImplForMessageLoop : public WebThreadBase {
+class WebThreadImplForMessageLoop : public WebKit::WebThread {
  public:
-  explicit WebThreadImplForMessageLoop(base::MessageLoopProxy* message_loop);
+  WebThreadImplForMessageLoop(base::MessageLoopProxy* message_loop);
   virtual ~WebThreadImplForMessageLoop();
 
   virtual void postTask(Task* task) OVERRIDE;
   virtual void postDelayedTask(Task* task, long long delay_ms) OVERRIDE;
 
  protected:
-  virtual bool IsCurrentThread() const;
-
- private:
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 };