Revert of compositor-worker: Refactor CompositorWorkerManager

content/child/blink_platform_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
 #define CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/threading/thread_local_storage.h"
@@ skipping 12 matching lines @@
 #elif defined(OS_WIN)
 #include "content/child/webthemeengine_impl_win.h"
 #elif defined(OS_MACOSX)
 #include "content/child/webthemeengine_impl_mac.h"
 #elif defined(OS_ANDROID)
 #include "content/child/webthemeengine_impl_android.h"
 #endif
 
 namespace base {
 class MessageLoop;
-class WaitableEvent;
-}
-
-namespace scheduler {
-class WebThreadBase;
 }
 
 namespace content {
 class BackgroundSyncProvider;
 class FlingCurveConfiguration;
 class NotificationDispatcher;
 class PermissionDispatcher;
 class PushDispatcher;
 class ThreadSafeSender;
 class WebCryptoImpl;
@@ skipping 117 matching lines @@
   blink::WebString queryLocalizedString(
       blink::WebLocalizedString::Name name,
       const blink::WebString& value1,
       const blink::WebString& value2) override;
   void suddenTerminationChanged(bool enabled) override {}
   double currentTimeSeconds() override;
   double monotonicallyIncreasingTimeSeconds() override;
   double systemTraceTime() override;
   void cryptographicallyRandomValues(unsigned char* buffer,
                                      size_t length) override;
-  blink::WebThread* compositorThread() const override;
   blink::WebGestureCurve* createFlingAnimationCurve(
       blink::WebGestureDevice device_source,
       const blink::WebFloatPoint& velocity,
       const blink::WebSize& cumulative_scroll) override;
   void didStartWorkerRunLoop() override;
   void didStopWorkerRunLoop() override;
   blink::WebCrypto* crypto() override;
   blink::WebGeofencingProvider* geofencingProvider() override;
   blink::WebNotificationManager* notificationManager() override;
   blink::WebPushProvider* pushProvider() override;
   blink::WebServicePortProvider* createServicePortProvider(
       blink::WebServicePortProviderClient*) override;
   blink::WebPermissionClient* permissionClient() override;
   blink::WebSyncProvider* backgroundSyncProvider() override;
 
   blink::WebString domCodeStringFromEnum(int dom_code) override;
   int domEnumFromCodeString(const blink::WebString& codeString) override;
   blink::WebString domKeyStringFromEnum(int dom_key) override;
   int domKeyEnumFromString(const blink::WebString& key_string) override;
 
-  scoped_ptr<scheduler::WebThreadBase> createThreadWithOptions(
-      const char* name,
-      base::Thread::Options);
-
-  // This class does *not* own |compositor_thread|. It is the responsibility of
-  // the caller to ensure that the compositor thread is cleared before it is
-  // destructed.
-  void set_compositor_thread(scheduler::WebThreadBase* compositor_thread) {
-    compositor_thread_ = compositor_thread;
-  }
-
  private:
   void InternalInit();
-  void UpdateWebThreadTLS(blink::WebThread* thread, base::WaitableEvent* event);
+  void UpdateWebThreadTLS(blink::WebThread* thread);
 
   bool IsMainThread() const;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   WebThemeEngineImpl native_theme_engine_;
   WebFallbackThemeEngineImpl fallback_theme_engine_;
   base::ThreadLocalStorage::Slot current_thread_slot_;
   webcrypto::WebCryptoImpl web_crypto_;
   scoped_ptr<WebGeofencingProviderImpl> geofencing_provider_;
   base::ScopedPtrHashMap<blink::WebMemoryDumpProvider*,
                          scoped_ptr<WebMemoryDumpProviderAdapter>>
       memory_dump_providers_;
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_refptr<NotificationDispatcher> notification_dispatcher_;
   scoped_refptr<PushDispatcher> push_dispatcher_;
   scoped_ptr<PermissionDispatcher> permission_client_;
   scoped_ptr<BackgroundSyncProvider> main_thread_sync_provider_;
-
-  scheduler::WebThreadBase* compositor_thread_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_