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

Unified Diff: third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp

Issue 2795783004: Move core MediaControls implementation to modules/media_controls/. (Closed)
Patch Set: rebase Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp
index 6a5bb29e7668a9a2cd564c226738bf238e1f6e98..04726261fd234ea88ef683632a445229f05f04f9 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp
@@ -37,7 +37,7 @@
#include "core/events/MouseEvent.h"
#include "core/html/HTMLLabelElement.h"
#include "core/html/HTMLMediaElement.h"
-#include "core/html/shadow/MediaControls.h"
+#include "core/html/media/MediaControls.h"
#include "core/layout/LayoutObject.h"
#include "platform/text/PlatformLocale.h"
@@ -148,7 +148,7 @@ DEFINE_TRACE(MediaControlElement) {
MediaControlDivElement::MediaControlDivElement(
MediaControls& mediaControls,
MediaControlElementType displayType)
- : HTMLDivElement(mediaControls.document()),
+ : HTMLDivElement(mediaControls.ownerDocument()),
MediaControlElement(mediaControls, displayType, this) {}
DEFINE_TRACE(MediaControlDivElement) {
@@ -161,7 +161,7 @@ DEFINE_TRACE(MediaControlDivElement) {
MediaControlInputElement::MediaControlInputElement(
MediaControls& mediaControls,
MediaControlElementType displayType)
- : HTMLInputElement(mediaControls.document(), false),
+ : HTMLInputElement(mediaControls.ownerDocument(), false),
MediaControlElement(mediaControls, displayType, this) {}
bool MediaControlInputElement::isMouseFocusable() const {
@@ -177,11 +177,11 @@ HTMLElement* MediaControlInputElement::createOverflowElement(
// We don't want the button visible within the overflow menu.
button->setIsWanted(false);
- m_overflowMenuText =
- Text::create(mediaControls.document(), button->getOverflowMenuString());
+ m_overflowMenuText = Text::create(mediaControls.ownerDocument(),
+ button->getOverflowMenuString());
HTMLLabelElement* element =
- HTMLLabelElement::create(mediaControls.document());
+ HTMLLabelElement::create(mediaControls.ownerDocument());
element->setShadowPseudoId(
AtomicString("-internal-media-controls-overflow-menu-list-item"));
// Appending a button to a label element ensures that clicks on the label

Powered by Google App Engine
This is Rietveld 408576698