Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: third_party/WebKit/Source/modules/compositorworker/WindowAnimationWorklet.cpp

Issue 2212003002: Check that the local frame is not null before instantiating AnimationWorklet. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
(...skipping 21 matching lines...) Expand all
32 } 32 }
33 33
34 // static 34 // static
35 Worklet* WindowAnimationWorklet::animationWorklet(DOMWindow& window) 35 Worklet* WindowAnimationWorklet::animationWorklet(DOMWindow& window)
36 { 36 {
37 return from(toLocalDOMWindow(window)).animationWorklet(); 37 return from(toLocalDOMWindow(window)).animationWorklet();
38 } 38 }
39 39
40 AnimationWorklet* WindowAnimationWorklet::animationWorklet() 40 AnimationWorklet* WindowAnimationWorklet::animationWorklet()
41 { 41 {
42 if (!m_animationWorklet) 42 if (!m_animationWorklet && frame())
43 m_animationWorklet = AnimationWorklet::create(frame()); 43 m_animationWorklet = AnimationWorklet::create(frame());
44 return m_animationWorklet.get(); 44 return m_animationWorklet.get();
45 } 45 }
46 46
47 DEFINE_TRACE(WindowAnimationWorklet) 47 DEFINE_TRACE(WindowAnimationWorklet)
48 { 48 {
49 visitor->trace(m_animationWorklet); 49 visitor->trace(m_animationWorklet);
50 Supplement<LocalDOMWindow>::trace(visitor); 50 Supplement<LocalDOMWindow>::trace(visitor);
51 DOMWindowProperty::trace(visitor); 51 DOMWindowProperty::trace(visitor);
52 } 52 }
53 53
54 } // namespace blink 54 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698