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