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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLVideoElement.cpp

Issue 2743573003: Fix an issue in fullscreen detector when context is destroyed (Closed)
Patch Set: addressed nits Created 3 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 video->suspendIfNeeded(); 69 video->suspendIfNeeded();
70 return video; 70 return video;
71 } 71 }
72 72
73 DEFINE_TRACE(HTMLVideoElement) { 73 DEFINE_TRACE(HTMLVideoElement) {
74 visitor->trace(m_imageLoader); 74 visitor->trace(m_imageLoader);
75 visitor->trace(m_customControlsFullscreenDetector); 75 visitor->trace(m_customControlsFullscreenDetector);
76 HTMLMediaElement::trace(visitor); 76 HTMLMediaElement::trace(visitor);
77 } 77 }
78 78
79 void HTMLVideoElement::contextDestroyed(ExecutionContext* context) {
80 m_customControlsFullscreenDetector->contextDestroyed();
81 HTMLMediaElement::contextDestroyed(context);
82 }
83
79 bool HTMLVideoElement::layoutObjectIsNeeded(const ComputedStyle& style) { 84 bool HTMLVideoElement::layoutObjectIsNeeded(const ComputedStyle& style) {
80 return HTMLElement::layoutObjectIsNeeded(style); 85 return HTMLElement::layoutObjectIsNeeded(style);
81 } 86 }
82 87
83 LayoutObject* HTMLVideoElement::createLayoutObject(const ComputedStyle&) { 88 LayoutObject* HTMLVideoElement::createLayoutObject(const ComputedStyle&) {
84 return new LayoutVideo(this); 89 return new LayoutVideo(this);
85 } 90 }
86 91
87 void HTMLVideoElement::attachLayoutTree(const AttachContext& context) { 92 void HTMLVideoElement::attachLayoutTree(const AttachContext& context) {
88 HTMLMediaElement::attachLayoutTree(context); 93 HTMLMediaElement::attachLayoutTree(context);
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 return ScriptPromise(); 382 return ScriptPromise();
378 if (!ImageBitmap::isResizeOptionValid(options, exceptionState)) 383 if (!ImageBitmap::isResizeOptionValid(options, exceptionState))
379 return ScriptPromise(); 384 return ScriptPromise();
380 return ImageBitmapSource::fulfillImageBitmap( 385 return ImageBitmapSource::fulfillImageBitmap(
381 scriptState, 386 scriptState,
382 ImageBitmap::create(this, cropRect, 387 ImageBitmap::create(this, cropRect,
383 eventTarget.toLocalDOMWindow()->document(), options)); 388 eventTarget.toLocalDOMWindow()->document(), options));
384 } 389 }
385 390
386 } // namespace blink 391 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698