Index: content/child/blink_platform_impl.cc |
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc |
index e7a7be110b634835886a6c1dd799371179966b58..c1ffa56b033c463340991b0f02c8d40f08b92dc0 100644 |
--- a/content/child/blink_platform_impl.cc |
+++ b/content/child/blink_platform_impl.cc |
@@ -90,11 +90,16 @@ 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 r
|
+ void wait() override { impl_->Wait(); } |
+ void signal() override { impl_->Signal(); } |
base::WaitableEvent* impl() { |
return impl_.get(); |
@@ -539,8 +544,17 @@ 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( |