*/
#include "config.h"
-#include "ExternalPopupMenu.h"
-
-#include "WebExternalPopupMenu.h"
-#include "WebMenuItemInfo.h"
-#include "WebPopupMenuInfo.h"
-#include "WebViewClient.h"
-#include "WebViewImpl.h"
-#include "core/frame/Frame.h"
+#include "web/ExternalPopupMenu.h"
+
#include "core/frame/FrameView.h"
+#include "core/frame/LocalFrame.h"
#include "platform/PopupMenuClient.h"
#include "platform/geometry/FloatQuad.h"
#include "platform/geometry/IntPoint.h"
#include "platform/text/TextDirection.h"
#include "public/platform/WebVector.h"
-
-using namespace WebCore;
+#include "public/web/WebExternalPopupMenu.h"
+#include "public/web/WebMenuItemInfo.h"
+#include "public/web/WebPopupMenuInfo.h"
+#include "public/web/WebViewClient.h"
+#include "web/WebViewImpl.h"
namespace blink {
-ExternalPopupMenu::ExternalPopupMenu(Frame& frame, PopupMenuClient* popupMenuClient, WebViewImpl& webView)
+ExternalPopupMenu::ExternalPopupMenu(LocalFrame& frame, PopupMenuClient* popupMenuClient, WebViewImpl& webView)
: m_popupMenuClient(popupMenuClient)
, m_frameView(frame.view())
, m_webView(webView)
void ExternalPopupMenu::show(const FloatQuad& controlPosition, const IntSize&, int index)
{
IntRect rect(controlPosition.enclosingBoundingBox());
- // WebCore reuses the PopupMenu of a page.
+ // WebCore reuses the PopupMenu of an element.
// For simplicity, we do recreate the actual external popup everytime.
- hide();
+ if (m_webExternalPopupMenu) {
+ m_webExternalPopupMenu->close();
+ m_webExternalPopupMenu = 0;
+ }
WebPopupMenuInfo info;
- getPopupMenuInfo(&info);
+ getPopupMenuInfo(info, *m_popupMenuClient);
if (info.items.isEmpty())
return;
m_webExternalPopupMenu = m_webView.client()->createExternalPopupMenu(info, this);
m_syntheticEvent = adoptPtr(new WebMouseEvent);
*m_syntheticEvent = *static_cast<const WebMouseEvent*>(currentEvent);
m_syntheticEvent->type = WebInputEvent::MouseUp;
- m_dispatchEventTimer.startOneShot(0);
+ m_dispatchEventTimer.startOneShot(0, FROM_HERE);
// FIXME: show() is asynchronous. If preparing a popup is slow and
// a user released the mouse button before showing the popup,
// mouseup and click events are correctly dispatched. Dispatching
void ExternalPopupMenu::didChangeSelection(int index)
{
if (m_popupMenuClient)
- m_popupMenuClient->selectionChanged(index);
+ m_popupMenuClient->selectionChanged(toPopupMenuItemIndex(index, *m_popupMenuClient));
}
void ExternalPopupMenu::didAcceptIndex(int index)
// Calling methods on the PopupMenuClient might lead to this object being
// derefed. This ensures it does not get deleted while we are running this
// method.
+ int popupMenuItemIndex = toPopupMenuItemIndex(index, *m_popupMenuClient);
RefPtr<ExternalPopupMenu> guard(this);
if (m_popupMenuClient) {
- m_popupMenuClient->valueChanged(index);
- // The call to valueChanged above might have lead to a call to
- // disconnectClient, so we might not have a PopupMenuClient anymore.
- if (m_popupMenuClient)
- m_popupMenuClient->popupDidHide();
+ m_popupMenuClient->popupDidHide();
+ m_popupMenuClient->valueChanged(popupMenuItemIndex);
}
m_webExternalPopupMenu = 0;
}
RefPtr<ExternalPopupMenu> protect(this);
if (!indices.size())
- m_popupMenuClient->valueChanged(-1, true);
+ m_popupMenuClient->valueChanged(static_cast<unsigned>(-1), true);
else {
for (size_t i = 0; i < indices.size(); ++i)
- m_popupMenuClient->listBoxSelectItem(indices[i], (i > 0), false, (i == indices.size() - 1));
+ m_popupMenuClient->listBoxSelectItem(toPopupMenuItemIndex(indices[i], *m_popupMenuClient), (i > 0), false, (i == indices.size() - 1));
}
// The call to valueChanged above might have lead to a call to
m_webExternalPopupMenu = 0;
}
-void ExternalPopupMenu::getPopupMenuInfo(WebPopupMenuInfo* info)
+void ExternalPopupMenu::getPopupMenuInfo(WebPopupMenuInfo& info, PopupMenuClient& popupMenuClient)
{
- int itemCount = m_popupMenuClient->listSize();
- WebVector<WebMenuItemInfo> items(static_cast<size_t>(itemCount));
+ int itemCount = popupMenuClient.listSize();
+ int count = 0;
+ Vector<WebMenuItemInfo> items(static_cast<size_t>(itemCount));
for (int i = 0; i < itemCount; ++i) {
- WebMenuItemInfo& popupItem = items[i];
- popupItem.label = m_popupMenuClient->itemText(i);
- popupItem.toolTip = m_popupMenuClient->itemToolTip(i);
- if (m_popupMenuClient->itemIsSeparator(i))
+ PopupMenuStyle style = popupMenuClient.itemStyle(i);
+ if (style.isDisplayNone())
+ continue;
+
+ WebMenuItemInfo& popupItem = items[count++];
+ popupItem.label = popupMenuClient.itemText(i);
+ popupItem.toolTip = popupMenuClient.itemToolTip(i);
+ if (popupMenuClient.itemIsSeparator(i))
popupItem.type = WebMenuItemInfo::Separator;
- else if (m_popupMenuClient->itemIsLabel(i))
+ else if (popupMenuClient.itemIsLabel(i))
popupItem.type = WebMenuItemInfo::Group;
else
popupItem.type = WebMenuItemInfo::Option;
- popupItem.enabled = m_popupMenuClient->itemIsEnabled(i);
- popupItem.checked = m_popupMenuClient->itemIsSelected(i);
- PopupMenuStyle style = m_popupMenuClient->itemStyle(i);
- if (style.textDirection() == WebCore::RTL)
- popupItem.textDirection = WebTextDirectionRightToLeft;
- else
- popupItem.textDirection = WebTextDirectionLeftToRight;
+ popupItem.enabled = popupMenuClient.itemIsEnabled(i);
+ popupItem.checked = popupMenuClient.itemIsSelected(i);
+ popupItem.textDirection = toWebTextDirection(style.textDirection());
popupItem.hasTextDirectionOverride = style.hasTextDirectionOverride();
}
- info->itemHeight = m_popupMenuClient->menuStyle().font().fontMetrics().height();
- info->itemFontSize = static_cast<int>(m_popupMenuClient->menuStyle().font().fontDescription().computedSize());
- info->selectedIndex = m_popupMenuClient->selectedIndex();
- info->rightAligned = m_popupMenuClient->menuStyle().textDirection() == WebCore::RTL;
- info->allowMultipleSelection = m_popupMenuClient->multiple();
- info->items.swap(items);
+ info.itemHeight = popupMenuClient.menuStyle().font().fontMetrics().height();
+ info.itemFontSize = static_cast<int>(popupMenuClient.menuStyle().font().fontDescription().computedSize());
+ info.selectedIndex = toExternalPopupMenuItemIndex(popupMenuClient.selectedIndex(), popupMenuClient);
+ info.rightAligned = popupMenuClient.menuStyle().textDirection() == RTL;
+ info.allowMultipleSelection = popupMenuClient.multiple();
+ if (count < itemCount)
+ items.shrink(count);
+ info.items = items;
+
}
+int ExternalPopupMenu::toPopupMenuItemIndex(int externalPopupMenuItemIndex, PopupMenuClient& popupMenuClient)
+{
+ if (externalPopupMenuItemIndex < 0)
+ return externalPopupMenuItemIndex;
+
+ int itemCount = popupMenuClient.listSize();
+ int indexTracker = 0;
+ for (int i = 0; i < itemCount ; ++i) {
+ if (popupMenuClient.itemStyle(i).isDisplayNone())
+ continue;
+ if (indexTracker++ == externalPopupMenuItemIndex)
+ return i;
+ }
+ return -1;
}
+
+int ExternalPopupMenu::toExternalPopupMenuItemIndex(int popupMenuItemIndex, PopupMenuClient& popupMenuClient)
+{
+ if (popupMenuItemIndex < 0)
+ return popupMenuItemIndex;
+
+ int itemCount = popupMenuClient.listSize();
+ int indexTracker = 0;
+ for (int i = 0; i < itemCount; ++i) {
+ if (popupMenuClient.itemStyle(i).isDisplayNone())
+ continue;
+ if (popupMenuItemIndex == i)
+ return indexTracker;
+ ++indexTracker;
+ }
+ return -1;
+}
+
+} // namespace blink
projects / platform / framework / web / crosswalk.git / blobdiff