Chromium Code Reviews| Index: Source/modules/crypto/CryptoResultImpl.h |
| diff --git a/Source/modules/crypto/CryptoResultImpl.h b/Source/modules/crypto/CryptoResultImpl.h |
| index b8e3089e8d5ef5f9a6ec64c65d79012f91f2672e..f091758787b937084b4ede3439e1f73f93c2b1c1 100644 |
| --- a/Source/modules/crypto/CryptoResultImpl.h |
| +++ b/Source/modules/crypto/CryptoResultImpl.h |
| @@ -57,7 +57,7 @@ class CryptoResultImpl final : public CryptoResult { |
| public: |
| ~CryptoResultImpl(); |
| - static PassRefPtr<CryptoResultImpl> create(ScriptState*); |
| + static PassRefPtrWillBeRawPtr<CryptoResultImpl> create(ScriptState*); |
| virtual void completeWithError(WebCryptoErrorType, const WebString&) override; |
| virtual void completeWithBuffer(const void* bytes, unsigned bytesSize) override; |
| @@ -73,6 +73,7 @@ public: |
| private: |
| class Resolver; |
| + ScriptPromiseResolver* resolver(); |
| explicit CryptoResultImpl(ScriptState*); |
| void clearResolver(); |
| @@ -80,7 +81,11 @@ private: |
| // FIXME: ScriptPromiseResolver should not be exported. |
| // Instead, use ScriptPromise. |
| +#if !ENABLE(OILPAN) |
| ScriptPromiseResolver* m_resolver; |
| +#else |
| + OwnPtr<Persistent<ScriptPromiseResolver>> m_resolver; |
|
haraken
2014/12/16 09:43:29
I guess this is not safe for the same reason why w
tasak
2014/12/16 11:54:28
Done.
|
| +#endif |
| volatile int m_cancelled; |
| }; |