third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp - Issue 1858163002: Rename inDocument() to inShadowIncludingDocument()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1858163002: Rename inDocument() to inShadowIncludingDocument() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 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

« no previous file with comments | « third_party/WebKit/Source/core/html/imports/LinkImport.cpp ('k') | third_party/WebKit/Source/core/input/EventHandler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp

diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp

index 98196c1bdb4c979ce8cd17657584bf909f4c3015..8abd84b258199c91dc3f920ced137688a0319299 100644

--- a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp

+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp

@@ -397,7 +397,7 @@ void MediaControlTimelineElement::defaultEventHandler(Event* event)

if (event->isMouseEvent() && toMouseEvent(event)->button() != LeftButton)

return;

- if (!inDocument() || !document().isActive())

+ if (!inShadowIncludingDocument() || !document().isActive())

return;

if (event->type() == EventTypeNames::mousedown)

@@ -426,7 +426,7 @@ void MediaControlTimelineElement::defaultEventHandler(Event* event)

bool MediaControlTimelineElement::willRespondToMouseClickEvents()

{

- return inDocument() && document().isActive();

+ return inShadowIncludingDocument() && document().isActive();

}

void MediaControlTimelineElement::setPosition(double currentTime)

@@ -473,7 +473,7 @@ void MediaControlVolumeSliderElement::defaultEventHandler(Event* event)

if (event->isMouseEvent() && toMouseEvent(event)->button() != LeftButton)

return;

- if (!inDocument() || !document().isActive())

+ if (!inShadowIncludingDocument() || !document().isActive())

return;

MediaControlInputElement::defaultEventHandler(event);

@@ -488,7 +488,7 @@ void MediaControlVolumeSliderElement::defaultEventHandler(Event* event)

bool MediaControlVolumeSliderElement::willRespondToMouseMoveEvents()

{

- if (!inDocument() || !document().isActive())

+ if (!inShadowIncludingDocument() || !document().isActive())

return false;

return MediaControlInputElement::willRespondToMouseMoveEvents();

@@ -496,7 +496,7 @@ bool MediaControlVolumeSliderElement::willRespondToMouseMoveEvents()

bool MediaControlVolumeSliderElement::willRespondToMouseClickEvents()

{

- if (!inDocument() || !document().isActive())

+ if (!inShadowIncludingDocument() || !document().isActive())

return false;

return MediaControlInputElement::willRespondToMouseClickEvents();