OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 13 matching lines...) Expand all Loading... |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
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 "WebPopupMenuImpl.h" | 32 #include "WebPopupMenuImpl.h" |
33 | 33 |
34 #include <skia/ext/platform_canvas.h> | 34 #include "PopupContainer.h" |
| 35 #include "PopupMenuChromium.h" |
35 #include "WebInputEvent.h" | 36 #include "WebInputEvent.h" |
36 #include "WebInputEventConversion.h" | 37 #include "WebInputEventConversion.h" |
37 #include "WebRange.h" | 38 #include "WebRange.h" |
38 #include "WebViewClient.h" | 39 #include "WebViewClient.h" |
39 #include "WebWidgetClient.h" | 40 #include "WebWidgetClient.h" |
40 #include "core/page/FrameView.h" | 41 #include "core/page/FrameView.h" |
41 #include "core/platform/Cursor.h" | 42 #include "core/platform/Cursor.h" |
42 #include "core/platform/NotImplemented.h" | 43 #include "core/platform/NotImplemented.h" |
43 #include "core/platform/PlatformGestureEvent.h" | 44 #include "core/platform/PlatformGestureEvent.h" |
44 #include "core/platform/PlatformKeyboardEvent.h" | 45 #include "core/platform/PlatformKeyboardEvent.h" |
45 #include "core/platform/PlatformMouseEvent.h" | 46 #include "core/platform/PlatformMouseEvent.h" |
46 #include "core/platform/PlatformWheelEvent.h" | 47 #include "core/platform/PlatformWheelEvent.h" |
47 #include "core/platform/chromium/FramelessScrollView.h" | 48 #include "core/platform/chromium/FramelessScrollView.h" |
48 #include "core/platform/chromium/PopupContainer.h" | |
49 #include "core/platform/chromium/PopupMenuChromium.h" | |
50 #include "core/platform/graphics/GraphicsContext.h" | 49 #include "core/platform/graphics/GraphicsContext.h" |
51 #include "core/platform/graphics/IntRect.h" | 50 #include "core/platform/graphics/IntRect.h" |
52 #include "core/platform/graphics/skia/SkiaUtils.h" | 51 #include "core/platform/graphics/skia/SkiaUtils.h" |
53 #include <public/WebRect.h> | 52 #include <public/WebRect.h> |
| 53 #include <skia/ext/platform_canvas.h> |
54 | 54 |
55 using namespace WebCore; | 55 using namespace WebCore; |
56 | 56 |
57 namespace WebKit { | 57 namespace WebKit { |
58 | 58 |
59 // WebPopupMenu --------------------------------------------------------------- | 59 // WebPopupMenu --------------------------------------------------------------- |
60 | 60 |
61 WebPopupMenu* WebPopupMenu::create(WebWidgetClient* client) | 61 WebPopupMenu* WebPopupMenu::create(WebWidgetClient* client) |
62 { | 62 { |
63 // Pass the WebPopupMenuImpl's self-reference to the caller. | 63 // Pass the WebPopupMenuImpl's self-reference to the caller. |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 ASSERT(widget == m_widget); | 391 ASSERT(widget == m_widget); |
392 if (m_widget) { | 392 if (m_widget) { |
393 m_widget->setClient(0); | 393 m_widget->setClient(0); |
394 m_widget = 0; | 394 m_widget = 0; |
395 } | 395 } |
396 if (m_client) | 396 if (m_client) |
397 m_client->closeWidgetSoon(); | 397 m_client->closeWidgetSoon(); |
398 } | 398 } |
399 | 399 |
400 } // namespace WebKit | 400 } // namespace WebKit |
OLD | NEW |