Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1944)

Unified Diff: Source/web/WebViewImpl.h

Issue 1264483002: PageOverlays: Remove PageOverlayList (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/PageOverlayTest.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.h
diff --git a/Source/web/WebViewImpl.h b/Source/web/WebViewImpl.h
index 0a4cc277d778ea9cc189e0c6264537e5fce635c4..ee7d8ed792cd6a15ec7bf325d2c67e728b75d6e4 100644
--- a/Source/web/WebViewImpl.h
+++ b/Source/web/WebViewImpl.h
@@ -55,7 +55,6 @@
#include "web/DragClientImpl.h"
#include "web/EditorClientImpl.h"
#include "web/MediaKeysClientImpl.h"
-#include "web/PageOverlayList.h"
#include "web/PageWidgetDelegate.h"
#include "web/SpellCheckerClientImpl.h"
#include "web/StorageClientImpl.h"
@@ -73,6 +72,7 @@ class FullscreenController;
class InspectorOverlay;
class InspectorOverlayImpl;
class LinkHighlightImpl;
+class PageOverlay;
class PageScaleConstraintsSet;
class DeprecatedPaintLayerCompositor;
class TopControls;
@@ -261,9 +261,7 @@ public:
void showContextMenu() override;
void extractSmartClipData(WebRect, WebString&, WebString&, WebRect&) override;
void hidePopups() override;
- void addPageOverlay(WebPageOverlay*, int /* zOrder */) override;
void setPageOverlayColor(WebColor) override;
- void removePageOverlay(WebPageOverlay*) override;
void transferActiveWheelFlingAnimation(const WebActiveWheelFlingParameters&) override;
bool endActiveFlingAnimation() override;
void setShowPaintRects(bool) override;
@@ -298,8 +296,6 @@ public:
WebColor backgroundColorOverride() const { return m_backgroundColorOverride; }
- PageOverlayList* pageOverlays() const { return m_pageOverlays.get(); }
-
void setOverlayLayer(GraphicsLayer*);
const WebPoint& lastMouseDownPoint() const
@@ -620,6 +616,7 @@ private:
void disablePopupMouseWheelEventListener();
void cancelPagePopup();
+ void updatePageOverlays();
WebViewClient* m_client; // Can be 0 (e.g. unittests, shared workers, etc.)
WebSpellCheckClient* m_spellCheckClient;
@@ -713,7 +710,7 @@ private:
OwnPtrWillBePersistent<InspectorOverlayImpl> m_inspectorOverlay;
OwnPtrWillBePersistent<DevToolsEmulator> m_devToolsEmulator;
- OwnPtr<PageOverlayList> m_pageOverlays;
+ OwnPtr<PageOverlay> m_pageColorOverlay;
// Whether the webview is rendering transparently.
bool m_isTransparent;
@@ -760,7 +757,6 @@ private:
FloatSize m_elasticOverscroll;
RefPtrWillBePersistent<EventListener> m_popupMouseWheelEventListener;
- OwnPtr<WebPageOverlay> m_pageColorOverlay;
};
DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.isWebView());
« no previous file with comments | « Source/web/PageOverlayTest.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698