Chromium Code Reviews| Index: Source/core/events/NavigatorEvents.cpp |
| diff --git a/Source/modules/serviceworkers/ServiceWorker.cpp b/Source/core/events/NavigatorEvents.cpp |
| similarity index 84% |
| copy from Source/modules/serviceworkers/ServiceWorker.cpp |
| copy to Source/core/events/NavigatorEvents.cpp |
| index e731dbe21ddb21bab318b0a4c04758a550f6259a..b5c3dd07c927854258062a04887b02a83ee393d0 100644 |
| --- a/Source/modules/serviceworkers/ServiceWorker.cpp |
| +++ b/Source/core/events/NavigatorEvents.cpp |
| @@ -29,15 +29,18 @@ |
| */ |
| #include "config.h" |
| -#include "ServiceWorker.h" |
| +#include "core/events/NavigatorEvents.h" |
| -#include "wtf/PassOwnPtr.h" |
| +#include "core/frame/Frame.h" |
| +#include "core/frame/Navigator.h" |
| +#include "core/page/Page.h" |
| +#include "core/page/Settings.h" |
| namespace WebCore { |
| -ServiceWorker::ServiceWorker(PassOwnPtr<WebKit::WebServiceWorker> worker) |
| - : m_outerWorker(worker) |
| +long NavigatorEvents::maxTouchPoints(Navigator* navigator) |
| { |
| + return navigator->frame()->page()->settings().maxTouchPoints(); |
|
abarth-chromium
2013/10/19 00:08:48
You need to null-check both frame() and page() on
|
| } |
| } // namespace WebCore |