WebWaitableEvent: implement new API with ResetPolicy and InitialState arguments

content/child/blink_platform_impl.cc

 // 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.
 
 #include "content/child/blink_platform_impl.h"
 
 #include <math.h>
 
 #include <vector>
 
@@ skipping 72 matching lines @@
 using blink::WebURL;
 using blink::WebURLError;
 using blink::WebURLLoader;
 
 namespace content {
 
 namespace {
 
 class WebWaitableEventImpl : public blink::WebWaitableEvent {
  public:
-  WebWaitableEventImpl() : impl_(new base::WaitableEvent(false, false)) {}
-  virtual ~WebWaitableEventImpl() {}
+  WebWaitableEventImpl(Reset reset, InitialState state) {
+    bool manual_reset = reset == Reset::Manual;
+    bool initially_signaled = state == InitialState::Signaled;
+    impl_.reset(new base::WaitableEvent(manual_reset, initially_signaled));
+  }
+  ~WebWaitableEventImpl() override {}
 
-  virtual void wait() { impl_->Wait(); }
-  virtual void signal() { impl_->Signal(); }
+  void reset() override { impl_->Reset(); }

[Takashi Toyoshima, 2015/07/09 08:18:32]

Oh, I should not use override in blink API.
I'll revert this part.

+  void wait() override { impl_->Wait(); }
+  void signal() override { impl_->Signal(); }
 
   base::WaitableEvent* impl() {
     return impl_.get();
   }
 
  private:
   scoped_ptr<base::WaitableEvent> impl_;
   DISALLOW_COPY_AND_ASSIGN(WebWaitableEventImpl);
 };
 
@@ skipping 424 matching lines @@
 }
 
 blink::WebThread* BlinkPlatformImpl::currentThread() {
   return static_cast<blink::WebThread*>(current_thread_slot_.Get());
 }
 
 void BlinkPlatformImpl::yieldCurrentThread() {
   base::PlatformThread::YieldCurrentThread();
 }
 
+// TODO(toyoshim): Remove no arguments version after the transition.
 blink::WebWaitableEvent* BlinkPlatformImpl::createWaitableEvent() {
-  return new WebWaitableEventImpl();
+  return new WebWaitableEventImpl(
+    blink::WebWaitableEvent::Reset::Auto,
+    blink::WebWaitableEvent::InitialState::NonSignaled);
+}
+
+blink::WebWaitableEvent* BlinkPlatformImpl::createWaitableEvent(
+    blink::WebWaitableEvent::Reset reset,
+    blink::WebWaitableEvent::InitialState state) {
+  return new WebWaitableEventImpl(reset, state);
 }
 
 blink::WebWaitableEvent* BlinkPlatformImpl::waitMultipleEvents(
     const blink::WebVector<blink::WebWaitableEvent*>& web_events) {
   std::vector<base::WaitableEvent*> events;
   for (size_t i = 0; i < web_events.size(); ++i)
     events.push_back(static_cast<WebWaitableEventImpl*>(web_events[i])->impl());
   size_t idx = base::WaitableEvent::WaitMany(
       vector_as_array(&events), events.size());
   DCHECK_LT(idx, web_events.size());
@@ skipping 819 matching lines @@
   return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString(
       static_cast<ui::DomCode>(dom_code)));
 }
 
 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) {
   return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode(
       code.utf8().data()));
 }
 
 }  // namespace content