| 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 23 matching lines...) Expand all Loading... |
| 34 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
| 35 #include "platform/Cursor.h" | 35 #include "platform/Cursor.h" |
| 36 #include "platform/NotImplemented.h" | 36 #include "platform/NotImplemented.h" |
| 37 #include "platform/PlatformGestureEvent.h" | 37 #include "platform/PlatformGestureEvent.h" |
| 38 #include "platform/PlatformKeyboardEvent.h" | 38 #include "platform/PlatformKeyboardEvent.h" |
| 39 #include "platform/PlatformMouseEvent.h" | 39 #include "platform/PlatformMouseEvent.h" |
| 40 #include "platform/PlatformWheelEvent.h" | 40 #include "platform/PlatformWheelEvent.h" |
| 41 #include "platform/geometry/IntRect.h" | 41 #include "platform/geometry/IntRect.h" |
| 42 #include "platform/graphics/GraphicsContext.h" | 42 #include "platform/graphics/GraphicsContext.h" |
| 43 #include "platform/graphics/skia/SkiaUtils.h" | 43 #include "platform/graphics/skia/SkiaUtils.h" |
| 44 #include "platform/scroll/FramelessScrollView.h" | |
| 45 #include "public/platform/Platform.h" | 44 #include "public/platform/Platform.h" |
| 46 #include "public/platform/WebCompositorSupport.h" | 45 #include "public/platform/WebCompositorSupport.h" |
| 47 #include "public/platform/WebContentLayer.h" | 46 #include "public/platform/WebContentLayer.h" |
| 48 #include "public/platform/WebFloatRect.h" | 47 #include "public/platform/WebFloatRect.h" |
| 49 #include "public/platform/WebLayerTreeView.h" | 48 #include "public/platform/WebLayerTreeView.h" |
| 50 #include "public/platform/WebRect.h" | 49 #include "public/platform/WebRect.h" |
| 51 #include "public/web/WebInputEvent.h" | 50 #include "public/web/WebInputEvent.h" |
| 52 #include "public/web/WebRange.h" | 51 #include "public/web/WebRange.h" |
| 53 #include "public/web/WebViewClient.h" | 52 #include "public/web/WebViewClient.h" |
| 54 #include "public/web/WebWidgetClient.h" | 53 #include "public/web/WebWidgetClient.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 82 { | 81 { |
| 83 if (m_widget) | 82 if (m_widget) |
| 84 m_widget->setClient(0); | 83 m_widget->setClient(0); |
| 85 } | 84 } |
| 86 | 85 |
| 87 void WebPopupMenuImpl::willCloseLayerTreeView() | 86 void WebPopupMenuImpl::willCloseLayerTreeView() |
| 88 { | 87 { |
| 89 m_layerTreeView = 0; | 88 m_layerTreeView = 0; |
| 90 } | 89 } |
| 91 | 90 |
| 92 void WebPopupMenuImpl::initialize(FramelessScrollView* widget, const WebRect& bo
unds) | 91 void WebPopupMenuImpl::initialize(PopupContainer* widget, const WebRect& bounds) |
| 93 { | 92 { |
| 94 m_widget = widget; | 93 m_widget = widget; |
| 95 m_widget->setClient(this); | 94 m_widget->setClient(this); |
| 96 | 95 |
| 97 if (!m_client) | 96 if (!m_client) |
| 98 return; | 97 return; |
| 99 m_client->setWindowRect(bounds); | 98 m_client->setWindowRect(bounds); |
| 100 m_client->show(WebNavigationPolicy()); // Policy is ignored. | 99 m_client->show(WebNavigationPolicy()); // Policy is ignored. |
| 101 | 100 |
| 102 m_client->initializeLayerTreeView(); | 101 m_client->initializeLayerTreeView(); |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 { | 389 { |
| 391 notImplemented(); | 390 notImplemented(); |
| 392 return IntRect(); | 391 return IntRect(); |
| 393 } | 392 } |
| 394 | 393 |
| 395 WebScreenInfo WebPopupMenuImpl::screenInfo() const | 394 WebScreenInfo WebPopupMenuImpl::screenInfo() const |
| 396 { | 395 { |
| 397 return WebScreenInfo(); | 396 return WebScreenInfo(); |
| 398 } | 397 } |
| 399 | 398 |
| 400 //----------------------------------------------------------------------------- | 399 void WebPopupMenuImpl::popupClosed(PopupContainer* widget) |
| 401 // FramelessScrollViewClient | |
| 402 | |
| 403 void WebPopupMenuImpl::popupClosed(FramelessScrollView* widget) | |
| 404 { | 400 { |
| 405 ASSERT(widget == m_widget); | 401 ASSERT(widget == m_widget); |
| 406 if (m_widget) { | 402 if (m_widget) { |
| 407 m_widget->setClient(0); | 403 m_widget->setClient(0); |
| 408 m_widget = 0; | 404 m_widget = 0; |
| 409 } | 405 } |
| 410 if (m_client) | 406 if (m_client) |
| 411 m_client->closeWidgetSoon(); | 407 m_client->closeWidgetSoon(); |
| 412 } | 408 } |
| 413 | 409 |
| 414 } // namespace blink | 410 } // namespace blink |
| OLD | NEW |