| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 #include "core/page/Page.h" | 44 #include "core/page/Page.h" |
| 45 #include "core/page/PagePopupClient.h" | 45 #include "core/page/PagePopupClient.h" |
| 46 #include "platform/TraceEvent.h" | 46 #include "platform/TraceEvent.h" |
| 47 #include "public/platform/WebCursorInfo.h" | 47 #include "public/platform/WebCursorInfo.h" |
| 48 #include "public/web/WebViewClient.h" | 48 #include "public/web/WebViewClient.h" |
| 49 #include "public/web/WebWidgetClient.h" | 49 #include "public/web/WebWidgetClient.h" |
| 50 #include "web/WebInputEventConversion.h" | 50 #include "web/WebInputEventConversion.h" |
| 51 #include "web/WebSettingsImpl.h" | 51 #include "web/WebSettingsImpl.h" |
| 52 #include "web/WebViewImpl.h" | 52 #include "web/WebViewImpl.h" |
| 53 | 53 |
| 54 using namespace WebCore; | 54 using namespace blink; |
| 55 | 55 |
| 56 namespace blink { | 56 namespace blink { |
| 57 | 57 |
| 58 class PagePopupChromeClient : public EmptyChromeClient { | 58 class PagePopupChromeClient : public EmptyChromeClient { |
| 59 WTF_MAKE_NONCOPYABLE(PagePopupChromeClient); | 59 WTF_MAKE_NONCOPYABLE(PagePopupChromeClient); |
| 60 WTF_MAKE_FAST_ALLOCATED; | 60 WTF_MAKE_FAST_ALLOCATED; |
| 61 | 61 |
| 62 public: | 62 public: |
| 63 explicit PagePopupChromeClient(WebPagePopupImpl* popup) | 63 explicit PagePopupChromeClient(WebPagePopupImpl* popup) |
| 64 : m_popup(popup) | 64 : m_popup(popup) |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 virtual void* webView() const OVERRIDE | 120 virtual void* webView() const OVERRIDE |
| 121 { | 121 { |
| 122 return m_popup->m_webView; | 122 return m_popup->m_webView; |
| 123 } | 123 } |
| 124 | 124 |
| 125 virtual FloatSize minimumWindowSize() const OVERRIDE | 125 virtual FloatSize minimumWindowSize() const OVERRIDE |
| 126 { | 126 { |
| 127 return FloatSize(0, 0); | 127 return FloatSize(0, 0); |
| 128 } | 128 } |
| 129 | 129 |
| 130 virtual void setCursor(const WebCore::Cursor& cursor) OVERRIDE | 130 virtual void setCursor(const blink::Cursor& cursor) OVERRIDE |
| 131 { | 131 { |
| 132 if (m_popup->m_webView->client()) | 132 if (m_popup->m_webView->client()) |
| 133 m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor))
; | 133 m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor))
; |
| 134 } | 134 } |
| 135 | 135 |
| 136 virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE | 136 virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE |
| 137 { | 137 { |
| 138 m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents); | 138 m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents); |
| 139 } | 139 } |
| 140 | 140 |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 // A WebPagePopupImpl instance usually has two references. | 394 // A WebPagePopupImpl instance usually has two references. |
| 395 // - One owned by the instance itself. It represents the visible widget. | 395 // - One owned by the instance itself. It represents the visible widget. |
| 396 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the | 396 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
| 397 // WebPagePopupImpl to close. | 397 // WebPagePopupImpl to close. |
| 398 // We need them because the closing operation is asynchronous and the widget | 398 // We need them because the closing operation is asynchronous and the widget |
| 399 // can be closed while the WebViewImpl is unaware of it. | 399 // can be closed while the WebViewImpl is unaware of it. |
| 400 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 400 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
| 401 } | 401 } |
| 402 | 402 |
| 403 } // namespace blink | 403 } // namespace blink |
| OLD | NEW |