diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp index 7242d4f..940cb95 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp @@ -81,7 +81,7 @@ Vector<WebPopupItem> WebPopupMenu::populateItems() for (size_t i = 0; i < size; ++i) { if (m_popupClient->itemIsSeparator(i)) - items.append(WebPopupItem(WebPopupItem::Seperator)); + items.append(WebPopupItem(WebPopupItem::Separator)); else { // FIXME: Add support for styling the font. // FIXME: Add support for styling the foreground and background colors. @@ -126,6 +126,13 @@ void WebPopupMenu::hide() void WebPopupMenu::updateFromElement() { +#if PLATFORM(WIN) + if (!m_page || !m_popupClient) + return; + + int selectedIndex = m_popupClient->selectedIndex(); + WebProcess::shared().connection()->send(Messages::WebPageProxy::SetPopupMenuSelectedIndex(selectedIndex), m_page->pageID()); +#endif } } // namespace WebKit |