Move didChangeCursor calls from WebViewClient to WebWidgetClient.

third_party/WebKit/Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 714 matching lines @@
     // If the enumeration can't happen, call the callback with an empty list.
     if (!client->enumerateChosenDirectory(fileChooser->settings().selectedFiles[0], chooserCompletion))
         chooserCompletion->didChooseFile(WebVector<WebString>());
 }
 
 Cursor ChromeClientImpl::lastSetCursorForTesting() const
 {
     return m_lastSetMouseCursorForTesting;
 }
 
-void ChromeClientImpl::setCursor(const Cursor& cursor, LocalFrame* localRoot)
+void ChromeClientImpl::setCursor(const Cursor& cursor, LocalFrame* localFrame)
 {
     m_lastSetMouseCursorForTesting = cursor;
-    setCursor(WebCursorInfo(cursor), localRoot);
+    setCursor(WebCursorInfo(cursor), localFrame);
 }
 
-void ChromeClientImpl::setCursor(const WebCursorInfo& cursor, LocalFrame* localRoot)
+void ChromeClientImpl::setCursor(const WebCursorInfo& cursor, LocalFrame* localFrame)
 {
     if (m_cursorOverridden)
         return;
 
 #if OS(MACOSX)
     // On Mac the mousemove event propagates to both the popup and main window.
     // If a popup is open we don't want the main window to change the cursor.
     if (m_webView->hasOpenedPopup())
         return;
 #endif
-    if (!m_webView->client())
-        return;
-    // TODO(kenrb, dcheng): For top-level frames we still use the WebView as
-    // a WebWidget. This special case will be removed when top-level frames
-    // get WebFrameWidgets.
-    if (localRoot->isMainFrame()) {
-        m_webView->client()->didChangeCursor(cursor);
-    } else {
-        WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(localRoot);
-        DCHECK(webFrame);
-        DCHECK(webFrame->frameWidget());
-        if (toWebFrameWidgetImpl(webFrame->frameWidget())->client())
-            toWebFrameWidgetImpl(webFrame->frameWidget())->client()->didChangeCursor(cursor);
-    }
+
+    LocalFrame* localRoot = localFrame->localFrameRoot();
+    if (WebFrameWidget* widget = WebLocalFrameImpl::fromFrame(localRoot)->frameWidget())
+        widget->client()->didChangeCursor(cursor);
 }
 
-void ChromeClientImpl::setCursorForPlugin(const WebCursorInfo& cursor, LocalFrame* localRoot)
+void ChromeClientImpl::setCursorForPlugin(const WebCursorInfo& cursor, LocalFrame* localFrame)
 {
-    setCursor(cursor, localRoot);
+    setCursor(cursor, localFrame);
 }
 
 void ChromeClientImpl::setCursorOverridden(bool overridden)
 {
     m_cursorOverridden = overridden;
 }
 
 void ChromeClientImpl::postAccessibilityNotification(AXObject* obj, AXObjectCache::AXNotification notification)
 {
     // Alert assistive technology about the accessibility object notification.
@@ skipping 308 matching lines @@
 {
     return wrapUnique(m_webView->scheduler()->createFrameScheduler(blameContext).release());
 }
 
 double ChromeClientImpl::lastFrameTimeMonotonic() const
 {
     return m_webView->lastFrameTimeMonotonic();
 }
 
 } // namespace blink