| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "ExternalPopupMenu.h" | 32 #include "ExternalPopupMenu.h" |
| 33 | 33 |
| 34 #include "FrameView.h" | 34 #include "FrameView.h" |
| 35 #include "PopupMenuClient.h" | |
| 36 #include "WebExternalPopupMenu.h" | 35 #include "WebExternalPopupMenu.h" |
| 37 #include "WebMenuItemInfo.h" | 36 #include "WebMenuItemInfo.h" |
| 38 #include "WebPopupMenuInfo.h" | 37 #include "WebPopupMenuInfo.h" |
| 39 #include "WebViewClient.h" | 38 #include "WebViewClient.h" |
| 39 #include "core/platform/PopupMenuClient.h" |
| 40 #include "core/platform/graphics/IntPoint.h" | 40 #include "core/platform/graphics/IntPoint.h" |
| 41 #include "core/platform/text/TextDirection.h" | 41 #include "core/platform/text/TextDirection.h" |
| 42 #include <public/WebVector.h> | 42 #include <public/WebVector.h> |
| 43 | 43 |
| 44 using namespace WebCore; | 44 using namespace WebCore; |
| 45 | 45 |
| 46 namespace WebKit { | 46 namespace WebKit { |
| 47 | 47 |
| 48 ExternalPopupMenu::ExternalPopupMenu(PopupMenuClient* popupMenuClient, | 48 ExternalPopupMenu::ExternalPopupMenu(PopupMenuClient* popupMenuClient, |
| 49 WebViewClient* webViewClient) | 49 WebViewClient* webViewClient) |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 183 |
| 184 info->itemHeight = m_popupMenuClient->menuStyle().font().fontMetrics().heigh
t(); | 184 info->itemHeight = m_popupMenuClient->menuStyle().font().fontMetrics().heigh
t(); |
| 185 info->itemFontSize = static_cast<int>(m_popupMenuClient->menuStyle().font().
size()); | 185 info->itemFontSize = static_cast<int>(m_popupMenuClient->menuStyle().font().
size()); |
| 186 info->selectedIndex = m_popupMenuClient->selectedIndex(); | 186 info->selectedIndex = m_popupMenuClient->selectedIndex(); |
| 187 info->rightAligned = m_popupMenuClient->menuStyle().textDirection() == WebCo
re::RTL; | 187 info->rightAligned = m_popupMenuClient->menuStyle().textDirection() == WebCo
re::RTL; |
| 188 info->allowMultipleSelection = m_popupMenuClient->multiple(); | 188 info->allowMultipleSelection = m_popupMenuClient->multiple(); |
| 189 info->items.swap(items); | 189 info->items.swap(items); |
| 190 } | 190 } |
| 191 | 191 |
| 192 } | 192 } |
| OLD | NEW |