Chromium Code Reviews| Index: Source/modules/pointerevents/NavigatorPointerEvents.cpp |
| diff --git a/Source/modules/donottrack/NavigatorDoNotTrack.cpp b/Source/modules/pointerevents/NavigatorPointerEvents.cpp |
| similarity index 65% |
| copy from Source/modules/donottrack/NavigatorDoNotTrack.cpp |
| copy to Source/modules/pointerevents/NavigatorPointerEvents.cpp |
| index 5fee3b5536ae29b0637a6b4b389cf8727490f158..5a01ee6ef64050bd73b52e9a2976e2902b2d0ff0 100644 |
| --- a/Source/modules/donottrack/NavigatorDoNotTrack.cpp |
| +++ b/Source/modules/pointerevents/NavigatorPointerEvents.cpp |
| @@ -29,7 +29,7 @@ |
| */ |
| #include "config.h" |
| -#include "modules/donottrack/NavigatorDoNotTrack.h" |
| +#include "modules/pointerevents/NavigatorPointerEvents.h" |
| #include "core/loader/FrameLoader.h" |
| #include "core/loader/FrameLoaderClient.h" |
| @@ -39,38 +39,52 @@ |
| namespace WebCore { |
| -NavigatorDoNotTrack::NavigatorDoNotTrack(Frame* frame) |
| +NavigatorPointerEvents::NavigatorPointerEvents(Frame* frame) |
| : DOMWindowProperty(frame) |
| { |
| } |
| -NavigatorDoNotTrack::~NavigatorDoNotTrack() |
| +NavigatorPointerEvents::~NavigatorPointerEvents() |
| { |
| } |
| -const char* NavigatorDoNotTrack::supplementName() |
| +const char* NavigatorPointerEvents::supplementName() |
| { |
| - return "NavigatorDoNotTrack"; |
| + return "NavigatorPointerEvents"; |
| } |
| -NavigatorDoNotTrack* NavigatorDoNotTrack::from(Navigator* navigator) |
| +NavigatorPointerEvents* NavigatorPointerEvents::from(Navigator* navigator) |
| { |
| - NavigatorDoNotTrack* supplement = static_cast<NavigatorDoNotTrack*>(Supplement<Navigator>::from(navigator, supplementName())); |
| + NavigatorPointerEvents* supplement = static_cast<NavigatorPointerEvents*>(Supplement<Navigator>::from(navigator, supplementName())); |
| if (!supplement) { |
| - supplement = new NavigatorDoNotTrack(navigator->frame()); |
| + supplement = new NavigatorPointerEvents(navigator->frame()); |
| provideTo(navigator, supplementName(), adoptPtr(supplement)); |
| } |
| return supplement; |
| } |
| -String NavigatorDoNotTrack::doNotTrack(Navigator* navigator) |
| +bool NavigatorPointerEvents::pointerEnabled(Navigator* navigator) |
| { |
| - return NavigatorDoNotTrack::from(navigator)->doNotTrack(); |
| + return NavigatorPointerEvents::from(navigator)->pointerEnabled(); |
|
Rick Byers
2013/08/07 13:46:51
As discussed, I wouldn't put pointerEnabled in her
|
| } |
| -String NavigatorDoNotTrack::doNotTrack() |
| +bool NavigatorPointerEvents::pointerEnabled() |
| { |
| - return frame() ? frame()->loader()->client()->doNotTrackValue() : String(); |
| + return false; |
| +} |
| + |
| +long NavigatorPointerEvents::maxTouchPoints(Navigator* navigator) |
| +{ |
| + return NavigatorPointerEvents::from(navigator)->maxTouchPoints(); |
| +} |
| + |
| +long NavigatorPointerEvents::maxTouchPoints() |
| +{ |
| +#if OS(WINDOWS) |
| + return GetSystemMetrics(SM_MAXIMUMTOUCHES); |
|
Rick Byers
2013/08/07 13:46:51
I suspect this won't work in the sandbox, and it r
|
| +#else |
| + return 0; |
|
Rick Byers
2013/08/07 13:46:51
On platforms where we don't know the answer it's b
|
| +#endif |
| } |
| } // namespace WebCore |