Index: Source/web/WebPagePopupImpl.h |
diff --git a/Source/web/WebPagePopupImpl.h b/Source/web/WebPagePopupImpl.h |
index ca4991104ee7f3d737bc1758a55b4445cfc8b87d..39793dc77880f5d2e46de817eb301532fba66e1a 100644 |
--- a/Source/web/WebPagePopupImpl.h |
+++ b/Source/web/WebPagePopupImpl.h |
@@ -38,15 +38,12 @@ |
#include "wtf/RefCounted.h" |
namespace blink { |
+ |
class GraphicsLayer; |
class Page; |
+class PagePopupChromeClient; |
class PagePopupClient; |
class PlatformKeyboardEvent; |
-} |
- |
-namespace blink { |
- |
-class PagePopupChromeClient; |
class WebLayerTreeView; |
class WebLayer; |
class WebViewImpl; |
@@ -54,15 +51,15 @@ class WebViewImpl; |
class WebPagePopupImpl FINAL |
: public WebPagePopup |
, public PageWidgetEventHandler |
- , public blink::PagePopup |
+ , public PagePopup |
, public RefCounted<WebPagePopupImpl> { |
WTF_MAKE_NONCOPYABLE(WebPagePopupImpl); |
WTF_MAKE_FAST_ALLOCATED; |
public: |
virtual ~WebPagePopupImpl(); |
- bool initialize(WebViewImpl*, blink::PagePopupClient*, const blink::IntRect& originBoundsInRootView); |
- bool handleKeyEvent(const blink::PlatformKeyboardEvent&); |
+ bool initialize(WebViewImpl*, PagePopupClient*, const IntRect& originBoundsInRootView); |
+ bool handleKeyEvent(const PlatformKeyboardEvent&); |
void closePopup(); |
WebWidgetClient* widgetClient() const { return m_widgetClient; } |
bool hasSamePopupClient(WebPagePopupImpl* other) { return other && m_popupClient == other->m_popupClient; } |
@@ -89,20 +86,20 @@ private: |
explicit WebPagePopupImpl(WebWidgetClient*); |
bool initializePage(); |
void destroyPage(); |
- void setRootGraphicsLayer(blink::GraphicsLayer*); |
+ void setRootGraphicsLayer(GraphicsLayer*); |
void setIsAcceleratedCompositingActive(bool enter); |
WebWidgetClient* m_widgetClient; |
WebRect m_windowRectInScreen; |
WebViewImpl* m_webView; |
- OwnPtrWillBePersistent<blink::Page> m_page; |
+ OwnPtrWillBePersistent<Page> m_page; |
OwnPtr<PagePopupChromeClient> m_chromeClient; |
- blink::PagePopupClient* m_popupClient; |
+ PagePopupClient* m_popupClient; |
bool m_closing; |
WebLayerTreeView* m_layerTreeView; |
WebLayer* m_rootLayer; |
- blink::GraphicsLayer* m_rootGraphicsLayer; |
+ GraphicsLayer* m_rootGraphicsLayer; |
bool m_isAcceleratedCompositingActive; |
friend class WebPagePopup; |
@@ -110,9 +107,9 @@ private: |
}; |
DEFINE_TYPE_CASTS(WebPagePopupImpl, WebWidget, widget, widget->isPagePopup(), widget.isPagePopup()); |
-// WebPagePopupImpl is the only implementation of blink::PagePopup, so no |
+// WebPagePopupImpl is the only implementation of PagePopup, so no |
// further checking required. |
-DEFINE_TYPE_CASTS(WebPagePopupImpl, blink::PagePopup, popup, true, true); |
+DEFINE_TYPE_CASTS(WebPagePopupImpl, PagePopup, popup, true, true); |
} // namespace blink |
#endif // WebPagePopupImpl_h |