Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / WheelController.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/WheelController.cpp b/src/third_party/WebKit/Source/core/dom/WheelController.cpp
index 85b3c47..d560aa5 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/WheelController.cpp
+++ b/src/third_party/WebKit/Source/core/dom/WheelController.cpp
@@ -54,7 +54,7 @@ WheelController* WheelController::from(Document& document)
     WheelController* controller = static_cast<WheelController*>(DocumentSupplement::from(document, supplementName()));
     if (!controller) {
         controller = new WheelController(document);
-        DocumentSupplement::provideTo(document, supplementName(), adoptPtr(controller));
+        DocumentSupplement::provideTo(document, supplementName(), adoptPtrWillBeNoop(controller));
     }
     return controller;
 }
@@ -69,11 +69,7 @@ static void wheelEventHandlerCountChanged(Document& document)
     if (!scrollingCoordinator)
         return;
 
-    FrameView* frameView = document.view();
-    if (!frameView)
-        return;
-
-    scrollingCoordinator->frameViewWheelEventHandlerCountChanged(frameView);
+    scrollingCoordinator->updateHaveWheelEventHandlers();
 }
 
 void WheelController::didAddWheelEventHandler(Document& document)