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

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

Issue 2905233002: Remove the lifetime hack in ImageLoader where it keeps its assoc element alive (Closed)
Patch Set: Rebase Created 3 years, 6 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 return video; 88 return video;
89 } 89 }
90 90
91 DEFINE_TRACE(HTMLVideoElement) { 91 DEFINE_TRACE(HTMLVideoElement) {
92 visitor->Trace(image_loader_); 92 visitor->Trace(image_loader_);
93 visitor->Trace(custom_controls_fullscreen_detector_); 93 visitor->Trace(custom_controls_fullscreen_detector_);
94 visitor->Trace(remoting_interstitial_); 94 visitor->Trace(remoting_interstitial_);
95 HTMLMediaElement::Trace(visitor); 95 HTMLMediaElement::Trace(visitor);
96 } 96 }
97 97
98 bool HTMLVideoElement::HasPendingActivity() const {
99 return HTMLMediaElement::HasPendingActivity() ||
100 (image_loader_ && image_loader_->HasPendingActivity());
101 }
102
98 Node::InsertionNotificationRequest HTMLVideoElement::InsertedInto( 103 Node::InsertionNotificationRequest HTMLVideoElement::InsertedInto(
99 ContainerNode* insertion_point) { 104 ContainerNode* insertion_point) {
100 if (insertion_point->isConnected() && custom_controls_fullscreen_detector_) 105 if (insertion_point->isConnected() && custom_controls_fullscreen_detector_)
101 custom_controls_fullscreen_detector_->Attach(); 106 custom_controls_fullscreen_detector_->Attach();
102 107
103 return HTMLMediaElement::InsertedInto(insertion_point); 108 return HTMLMediaElement::InsertedInto(insertion_point);
104 } 109 }
105 110
106 void HTMLVideoElement::RemovedFrom(ContainerNode* insertion_point) { 111 void HTMLVideoElement::RemovedFrom(ContainerNode* insertion_point) {
107 HTMLMediaElement::RemovedFrom(insertion_point); 112 HTMLMediaElement::RemovedFrom(insertion_point);
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 } 524 }
520 525
521 void HTMLVideoElement::DisableMediaRemoting() { 526 void HTMLVideoElement::DisableMediaRemoting() {
522 if (GetWebMediaPlayer()) 527 if (GetWebMediaPlayer())
523 GetWebMediaPlayer()->RequestRemotePlaybackDisabled(true); 528 GetWebMediaPlayer()->RequestRemotePlaybackDisabled(true);
524 media_remoting_status_ = MediaRemotingStatus::kDisabled; 529 media_remoting_status_ = MediaRemotingStatus::kDisabled;
525 MediaRemotingStopped(); 530 MediaRemotingStopped();
526 } 531 }
527 532
528 } // namespace blink 533 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLVideoElement.h ('k') | third_party/WebKit/Source/core/html/HTMLVideoElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698