Chromium Code Reviews| Index: Source/core/events/TouchEvent.cpp |
| diff --git a/Source/core/events/TouchEvent.cpp b/Source/core/events/TouchEvent.cpp |
| index f05a6819042abb805b59fb967054efc7b5e313eb..c5308607efb407fab7d55ccca12b4fd2d870e330 100644 |
| --- a/Source/core/events/TouchEvent.cpp |
| +++ b/Source/core/events/TouchEvent.cpp |
| @@ -96,8 +96,8 @@ void TouchEvent::preventDefault() |
| // A common developer error is to wait too long before attempting to stop |
| // scrolling by consuming a touchmove event. Generate a warning if this |
| // event is uncancelable. |
| - if (!cancelable() && view() && view()->frame()) { |
| - view()->frame()->console().addMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, |
| + if (!cancelable() && view() && view()->frame() && view()->frame()->isLocalFrame()) { |
|
haraken
2014/11/08 09:17:25
Nit: Can we check view()->isLocalWindow() instead
dcheng
2014/11/08 23:59:56
Done.
|
| + toLocalFrame(view()->frame())->console().addMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, |
| "Ignored attempt to cancel a " + type() + " event with cancelable=false, for example because scrolling is in progress and cannot be interrupted.")); |
| } |
| } |