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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "public/platform/Platform.h" 84 #include "public/platform/Platform.h"
85 #include "public/platform/WebAudioSourceProvider.h" 85 #include "public/platform/WebAudioSourceProvider.h"
86 #include "public/platform/WebContentDecryptionModule.h" 86 #include "public/platform/WebContentDecryptionModule.h"
87 #include "public/platform/WebInbandTextTrack.h" 87 #include "public/platform/WebInbandTextTrack.h"
88 #include "public/platform/WebMediaPlayerSource.h" 88 #include "public/platform/WebMediaPlayerSource.h"
89 #include "public/platform/WebMediaStream.h" 89 #include "public/platform/WebMediaStream.h"
90 #include "public/platform/modules/remoteplayback/WebRemotePlaybackClient.h" 90 #include "public/platform/modules/remoteplayback/WebRemotePlaybackClient.h"
91 #include "public/platform/modules/remoteplayback/WebRemotePlaybackState.h" 91 #include "public/platform/modules/remoteplayback/WebRemotePlaybackState.h"
92 #include "wtf/CurrentTime.h" 92 #include "wtf/CurrentTime.h"
93 #include "wtf/MathExtras.h" 93 #include "wtf/MathExtras.h"
94 #include "wtf/PtrUtil.h"
95 #include "wtf/text/CString.h" 94 #include "wtf/text/CString.h"
96 #include <limits> 95 #include <limits>
97 96
98 #define MEDIA_LOG DVLOG(3) 97 #define MEDIA_LOG DVLOG(3)
99 98
100 #ifndef LOG_MEDIA_EVENTS 99 #ifndef LOG_MEDIA_EVENTS
101 // Default to not logging events because so many are generated they can overwhel m the rest of 100 // Default to not logging events because so many are generated they can overwhel m the rest of
102 // the logging. 101 // the logging.
103 #define LOG_MEDIA_EVENTS 0 102 #define LOG_MEDIA_EVENTS 0
104 #endif 103 #endif
(...skipping 3501 matching lines...) Expand 10 before | Expand all | Expand 10 after
3606 3605
3607 if (m_webLayer) 3606 if (m_webLayer)
3608 GraphicsLayer::unregisterContentsLayer(m_webLayer); 3607 GraphicsLayer::unregisterContentsLayer(m_webLayer);
3609 m_webLayer = webLayer; 3608 m_webLayer = webLayer;
3610 if (m_webLayer) 3609 if (m_webLayer)
3611 GraphicsLayer::registerContentsLayer(m_webLayer); 3610 GraphicsLayer::registerContentsLayer(m_webLayer);
3612 } 3611 }
3613 3612
3614 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) 3613 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource)
3615 { 3614 {
3616 m_mediaSource->setWebMediaSourceAndOpen(wrapUnique(webMediaSource)); 3615 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource));
3617 } 3616 }
3618 3617
3619 bool HTMLMediaElement::isInteractiveContent() const 3618 bool HTMLMediaElement::isInteractiveContent() const
3620 { 3619 {
3621 return fastHasAttribute(controlsAttr); 3620 return fastHasAttribute(controlsAttr);
3622 } 3621 }
3623 3622
3624 void HTMLMediaElement::defaultEventHandler(Event* event) 3623 void HTMLMediaElement::defaultEventHandler(Event* event)
3625 { 3624 {
3626 if (event->type() == EventTypeNames::focusin) { 3625 if (event->type() == EventTypeNames::focusin) {
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
3986 3985
3987 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst 3986 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst
3988 { 3987 {
3989 IntRect result; 3988 IntRect result;
3990 if (LayoutObject* object = m_element->layoutObject()) 3989 if (LayoutObject* object = m_element->layoutObject())
3991 result = object->absoluteBoundingBoxRect(); 3990 result = object->absoluteBoundingBoxRect();
3992 return result; 3991 return result;
3993 } 3992 }
3994 3993
3995 } // namespace blink 3994 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLMediaElement.h ('k') | third_party/WebKit/Source/core/html/HTMLMediaSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698