Changeset 88021 in webkit

Timestamp:

Jun 3, 2011 9:00:25 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-03 Naoki Takano <​takano.naoki@gmail.com>

Reviewed by Eric Seidel.

[Chromium] Call setToolTipText() in WebPopupMenuImpl mouse move handler to show tool tip in select popup window.
​https://bugs.webkit.org/show_bug.cgi?id=61260
​http://code.google.com/p/chromium/issues/detail?id=12721

Manual test: select-popup-tooltip-test.html

• manual-tests/select-popup-tooltip-test.html: Added.
• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupContainer::getSelectedItemToolTip): Get selected item tooltip string according to hovering mouse position.
• platform/chromium/PopupMenuChromium.h: Add getSelectedItemToolTip() declaration.

2011-06-03 Naoki Takano <​takano.naoki@gmail.com>

Reviewed by Eric Seidel.

[Chromium] Call setToolTipText() in WebPopupMenuImpl mouse move handler to show tool tip in select popup window.
​https://bugs.webkit.org/show_bug.cgi?id=61260
​http://code.google.com/p/chromium/issues/detail?id=12721

• public/WebMenuItemInfo.h: Add toolTip.
• public/WebViewClient.h: Remove setToolTipText().
• public/WebWidgetClient.h: Add setTooTipText(). (WebKit::WebWidgetClient::setToolTipText):
• src/ExternalPopupMenu.cpp: (WebKit::ExternalPopupMenu::getPopupMenuInfo): Add popupItem.toolTip set.
• src/WebPopupMenuImpl.cpp: (WebKit::WebPopupMenuImpl::MouseMove): Call setToolTipText().

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/manual-tests/select-popup-tooltip-test.html (added)
• WebCore/platform/chromium/PopupMenuChromium.cpp (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebMenuItemInfo.h (modified) (1 diff)
• WebKit/chromium/public/WebViewClient.h (modified) (1 diff)
• WebKit/chromium/public/WebWidgetClient.h (modified) (2 diffs)
• WebKit/chromium/src/ExternalPopupMenu.cpp (modified) (1 diff)
• WebKit/chromium/src/WebPopupMenuImpl.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-03  Naoki Takano  <takano.naoki@gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Call setToolTipText() in WebPopupMenuImpl mouse move handler to show tool tip in select popup window.
+        https://bugs.webkit.org/show_bug.cgi?id=61260
+        http://code.google.com/p/chromium/issues/detail?id=12721
+
+        Manual test: select-popup-tooltip-test.html
+
+        * manual-tests/select-popup-tooltip-test.html: Added.
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupContainer::getSelectedItemToolTip): Get selected item tooltip string according to hovering mouse position.
+        * platform/chromium/PopupMenuChromium.h: Add getSelectedItemToolTip() declaration.
+
 2011-06-03  Rob Buis  <rbuis@rim.com>
 

trunk/Source/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -615 +615 @@
 {
     return m_listBox->items();
+}
+
+String PopupContainer::getSelectedItemToolTip()
+{
+    // We cannot use m_popupClient->selectedIndex() to choose tooltip message,
+    // because the selectedIndex() might return final selected index, not hovering selection.
+    return listBox()->m_popupClient->itemToolTip(listBox()->m_selectedIndex);
 }
 

trunk/Source/WebCore/platform/chromium/PopupMenuChromium.h

@@ -168 +168 @@
     PopupType popupType() const { return m_popupType; }
 
+    // While hovering popup menu window, we want to show tool tip message.
+    String getSelectedItemToolTip();
+
 private:
     friend class WTF::RefCounted<PopupContainer>;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-03  Naoki Takano  <takano.naoki@gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Call setToolTipText() in WebPopupMenuImpl mouse move handler to show tool tip in select popup window.
+        https://bugs.webkit.org/show_bug.cgi?id=61260
+        http://code.google.com/p/chromium/issues/detail?id=12721
+
+        * public/WebMenuItemInfo.h: Add toolTip.
+        * public/WebViewClient.h: Remove setToolTipText().
+        * public/WebWidgetClient.h: Add setTooTipText().
+        (WebKit::WebWidgetClient::setToolTipText):
+        * src/ExternalPopupMenu.cpp:
+        (WebKit::ExternalPopupMenu::getPopupMenuInfo): Add popupItem.toolTip set.
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::MouseMove): Call setToolTipText().
+
 2011-06-03  Hans Wennborg  <hans@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebMenuItemInfo.h

@@ -58 +58 @@
 
     WebString label;
+    WebString toolTip;
     Type type;
     unsigned action;

trunk/Source/WebKit/chromium/public/WebViewClient.h

@@ -228 +228 @@
     virtual void setKeyboardFocusURL(const WebURL&) { }
 
-    // Called when a tooltip should be shown at the current cursor position.
-    virtual void setToolTipText(const WebString&, WebTextDirection hint) { }
-
     // Shows a context menu with commands relevant to a specific element on
     // the given frame. Additional context data is supplied.

trunk/Source/WebKit/chromium/public/WebWidgetClient.h

@@ -39 +39 @@
 namespace WebKit {
 
+class WebString;
 class WebWidget;
 struct WebCursorInfo;
@@ -82 +83 @@
     virtual void setWindowRect(const WebRect&) { }
 
+    // Called when a tooltip should be shown at the current cursor position.
+    virtual void setToolTipText(const WebString&, WebTextDirection hint) { }
+
     // Called to get the position of the resizer rect in window coordinates.
     virtual WebRect windowResizerRect() { return WebRect(); }

trunk/Source/WebKit/chromium/src/ExternalPopupMenu.cpp

@@ -134 +134 @@
         WebMenuItemInfo& popupItem = items[i];
         popupItem.label = m_popupMenuClient->itemText(i);
+        popupItem.toolTip = m_popupMenuClient->itemToolTip(i);
         if (m_popupMenuClient->itemIsSeparator(i))
             popupItem.type = WebMenuItemInfo::Separator;

trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp

@@ -41 +41 @@
 #include "PlatformMouseEvent.h"
 #include "PlatformWheelEvent.h"
+#include "PopupMenuChromium.h"
 #include "SkiaUtils.h"
 
@@ -47 +48 @@
 #include "WebRange.h"
 #include "WebRect.h"
+#include "WebViewClient.h"
 #include "WebWidgetClient.h"
 
@@ -96 +98 @@
         m_lastMousePosition = WebPoint(event.x, event.y);
         m_widget->handleMouseMoveEvent(PlatformMouseEventBuilder(m_widget, event));
+
+        // We cannot call setToolTipText() in PopupContainer, because PopupContainer is in WebCore, and we cannot refer to WebKit from Webcore.
+        WebCore::PopupContainer* container = static_cast<WebCore::PopupContainer*>(m_widget);
+        client()->setToolTipText(container->getSelectedItemToolTip(), container->menuStyle().textDirection() == WebCore::RTL ? WebTextDirectionRightToLeft : WebTextDirectionLeftToRight);
     }
 }