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

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/encryptedmedia/HTMLMediaElementEncryptedMedia.h" 5 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
6 6
7 #include "bindings/core/v8/ExceptionState.h" 7 #include "bindings/core/v8/ExceptionState.h"
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "bindings/core/v8/ScriptState.h" 10 #include "bindings/core/v8/ScriptState.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 initializer.setCancelable(false); 350 initializer.setCancelable(false);
351 351
352 return MediaEncryptedEvent::create(EventTypeNames::encrypted, initializer); 352 return MediaEncryptedEvent::create(EventTypeNames::encrypted, initializer);
353 } 353 }
354 354
355 void HTMLMediaElementEncryptedMedia::encrypted(WebEncryptedMediaInitDataType ini tDataType, const unsigned char* initData, unsigned initDataLength) 355 void HTMLMediaElementEncryptedMedia::encrypted(WebEncryptedMediaInitDataType ini tDataType, const unsigned char* initData, unsigned initDataLength)
356 { 356 {
357 WTF_LOG(Media, "HTMLMediaElementEncryptedMedia::encrypted"); 357 WTF_LOG(Media, "HTMLMediaElementEncryptedMedia::encrypted");
358 358
359 RefPtrWillBeRawPtr<Event> event; 359 RefPtrWillBeRawPtr<Event> event;
360 if (m_mediaElement->isMediaDataCORSSameOrigin(m_mediaElement->executionConte xt()->securityOrigin())) { 360 if (m_mediaElement->isMediaDataCORSSameOrigin(m_mediaElement->getExecutionCo ntext()->getSecurityOrigin())) {
361 event = createEncryptedEvent(initDataType, initData, initDataLength); 361 event = createEncryptedEvent(initDataType, initData, initDataLength);
362 } else { 362 } else {
363 // Current page is not allowed to see content from the media file, 363 // Current page is not allowed to see content from the media file,
364 // so don't return the initData. However, they still get an event. 364 // so don't return the initData. However, they still get an event.
365 event = createEncryptedEvent(WebEncryptedMediaInitDataType::Unknown, nul lptr, 0); 365 event = createEncryptedEvent(WebEncryptedMediaInitDataType::Unknown, nul lptr, 0);
366 } 366 }
367 367
368 event->setTarget(m_mediaElement); 368 event->setTarget(m_mediaElement);
369 m_mediaElement->scheduleEvent(event.release()); 369 m_mediaElement->scheduleEvent(event.release());
370 } 370 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 } 410 }
411 411
412 DEFINE_TRACE(HTMLMediaElementEncryptedMedia) 412 DEFINE_TRACE(HTMLMediaElementEncryptedMedia)
413 { 413 {
414 visitor->trace(m_mediaElement); 414 visitor->trace(m_mediaElement);
415 visitor->trace(m_mediaKeys); 415 visitor->trace(m_mediaKeys);
416 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor); 416 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor);
417 } 417 }
418 418
419 } // namespace blink 419 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698