Commit 4f38a5bc authored by haraken's avatar haraken Committed by Commit bot

Remove ContextClient from DOMWindowCrypto

It's not needed.

BUG=610176

Review-Url: https://codereview.chromium.org/2611163003
Cr-Commit-Position: refs/heads/master@{#441900}
parent 97c98f16
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
namespace blink { namespace blink {
DOMWindowCrypto::DOMWindowCrypto(LocalDOMWindow& window) DOMWindowCrypto::DOMWindowCrypto(LocalDOMWindow& window)
: ContextClient(window.frame()) {} : Supplement<LocalDOMWindow>(window) {}
const char* DOMWindowCrypto::supplementName() { const char* DOMWindowCrypto::supplementName() {
return "DOMWindowCrypto"; return "DOMWindowCrypto";
...@@ -57,7 +57,7 @@ Crypto* DOMWindowCrypto::crypto(DOMWindow& window) { ...@@ -57,7 +57,7 @@ Crypto* DOMWindowCrypto::crypto(DOMWindow& window) {
} }
Crypto* DOMWindowCrypto::crypto() const { Crypto* DOMWindowCrypto::crypto() const {
if (!m_crypto && frame()) if (!m_crypto)
m_crypto = Crypto::create(); m_crypto = Crypto::create();
return m_crypto.get(); return m_crypto.get();
} }
...@@ -65,7 +65,6 @@ Crypto* DOMWindowCrypto::crypto() const { ...@@ -65,7 +65,6 @@ Crypto* DOMWindowCrypto::crypto() const {
DEFINE_TRACE(DOMWindowCrypto) { DEFINE_TRACE(DOMWindowCrypto) {
visitor->trace(m_crypto); visitor->trace(m_crypto);
Supplement<LocalDOMWindow>::trace(visitor); Supplement<LocalDOMWindow>::trace(visitor);
ContextClient::trace(visitor);
} }
} // namespace blink } // namespace blink
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#ifndef DOMWindowCrypto_h #ifndef DOMWindowCrypto_h
#define DOMWindowCrypto_h #define DOMWindowCrypto_h
#include "core/dom/ContextLifecycleObserver.h"
#include "core/frame/LocalDOMWindow.h" #include "core/frame/LocalDOMWindow.h"
#include "platform/Supplementable.h" #include "platform/Supplementable.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
...@@ -43,8 +42,7 @@ class DOMWindow; ...@@ -43,8 +42,7 @@ class DOMWindow;
class LocalDOMWindow; class LocalDOMWindow;
class DOMWindowCrypto final : public GarbageCollected<DOMWindowCrypto>, class DOMWindowCrypto final : public GarbageCollected<DOMWindowCrypto>,
public Supplement<LocalDOMWindow>, public Supplement<LocalDOMWindow> {
public ContextClient {
USING_GARBAGE_COLLECTED_MIXIN(DOMWindowCrypto); USING_GARBAGE_COLLECTED_MIXIN(DOMWindowCrypto);
public: public:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment