Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/compositorworker/WindowAnimationWorklet.h" | 5 #include "modules/compositorworker/WindowAnimationWorklet.h" |
| 6 | 6 |
| 7 #include "core/frame/LocalDOMWindow.h" | 7 #include "core/frame/LocalDOMWindow.h" |
| 8 #include "core/frame/LocalFrame.h" | 8 #include "core/frame/LocalFrame.h" |
| 9 #include "modules/compositorworker/AnimationWorklet.h" | 9 #include "modules/compositorworker/AnimationWorklet.h" |
| 10 | 10 |
| 11 namespace blink { | 11 namespace blink { |
| 12 | 12 |
| 13 WindowAnimationWorklet::WindowAnimationWorklet(LocalDOMWindow& window) | 13 WindowAnimationWorklet::WindowAnimationWorklet(LocalDOMWindow& window) {} |
| 14 : DOMWindowProperty(window.frame()) {} | |
| 15 | 14 |
| 16 const char* WindowAnimationWorklet::supplementName() { | 15 const char* WindowAnimationWorklet::supplementName() { |
| 17 return "WindowAnimationWorklet"; | 16 return "WindowAnimationWorklet"; |
| 18 } | 17 } |
| 19 | 18 |
| 20 // static | 19 // static |
| 21 WindowAnimationWorklet& WindowAnimationWorklet::from(LocalDOMWindow& window) { | 20 WindowAnimationWorklet& WindowAnimationWorklet::from(LocalDOMWindow& window) { |
| 22 WindowAnimationWorklet* supplement = static_cast<WindowAnimationWorklet*>( | 21 WindowAnimationWorklet* supplement = static_cast<WindowAnimationWorklet*>( |
| 23 Supplement<LocalDOMWindow>::from(window, supplementName())); | 22 Supplement<LocalDOMWindow>::from(window, supplementName())); |
| 24 if (!supplement) { | 23 if (!supplement) { |
| 25 supplement = new WindowAnimationWorklet(window); | 24 supplement = new WindowAnimationWorklet(window); |
| 26 provideTo(window, supplementName(), supplement); | 25 provideTo(window, supplementName(), supplement); |
| 27 } | 26 } |
| 28 return *supplement; | 27 return *supplement; |
| 29 } | 28 } |
| 30 | 29 |
| 31 // static | 30 // static |
| 32 Worklet* WindowAnimationWorklet::animationWorklet(DOMWindow& window) { | 31 Worklet* WindowAnimationWorklet::animationWorklet(DOMWindow& window) { |
| 33 return from(toLocalDOMWindow(window)).animationWorklet(); | 32 return from(toLocalDOMWindow(window)) |
| 33 .animationWorklet(toLocalDOMWindow(window)); | |
| 34 } | 34 } |
| 35 | 35 |
| 36 AnimationWorklet* WindowAnimationWorklet::animationWorklet() { | 36 AnimationWorklet* WindowAnimationWorklet::animationWorklet( |
| 37 if (!m_animationWorklet && frame()) | 37 LocalDOMWindow& window) { |
| 38 m_animationWorklet = AnimationWorklet::create(frame()); | 38 if (!m_animationWorklet) |
| 39 m_animationWorklet = AnimationWorklet::create(window.frame()); | |
| 39 return m_animationWorklet.get(); | 40 return m_animationWorklet.get(); |
| 40 } | 41 } |
| 41 | 42 |
| 42 void WindowAnimationWorklet::frameDestroyed() { | |
|
nhiroki
2016/12/13 09:49:01
This was added to fix memory leak:
https://coderev
| |
| 43 m_animationWorklet.clear(); | |
| 44 DOMWindowProperty::frameDestroyed(); | |
| 45 } | |
| 46 | |
| 47 DEFINE_TRACE(WindowAnimationWorklet) { | 43 DEFINE_TRACE(WindowAnimationWorklet) { |
| 48 visitor->trace(m_animationWorklet); | 44 visitor->trace(m_animationWorklet); |
| 49 Supplement<LocalDOMWindow>::trace(visitor); | 45 Supplement<LocalDOMWindow>::trace(visitor); |
| 50 DOMWindowProperty::trace(visitor); | |
| 51 } | 46 } |
| 52 | 47 |
| 53 } // namespace blink | 48 } // namespace blink |
| OLD | NEW |