PageOverlays: Remove PageOverlayList

Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 37 matching lines @@
 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"
 #include "public/web/WebInputEvent.h"
 #include "public/web/WebNavigationPolicy.h"
 #include "public/web/WebView.h"
 #include "web/ChromeClientImpl.h"
 #include "web/ContextMenuClientImpl.h"
 #include "web/DragClientImpl.h"
 #include "web/EditorClientImpl.h"
 #include "web/MediaKeysClientImpl.h"
-#include "web/PageOverlayList.h"
+#include "web/PageOverlay.h"

[dgozman, 2015/07/30 10:17:31]

Forward-declare it.

[sergeyv, 2015/07/30 11:42:37]

Done.

 #include "web/PageWidgetDelegate.h"
 #include "web/SpellCheckerClientImpl.h"
 #include "web/StorageClientImpl.h"
 #include "wtf/HashSet.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
@@ skipping 182 matching lines @@
     void disableDeviceEmulation() override;
     WebAXObject accessibilityObject() override;
     void setSelectionColors(unsigned activeBackgroundColor,
                                     unsigned activeForegroundColor,
                                     unsigned inactiveBackgroundColor,
                                     unsigned inactiveForegroundColor) override;
     void performCustomContextMenuAction(unsigned action) override;
     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;
     void setShowDebugBorders(bool);
     void setShowFPSCounter(bool) override;
     void setContinuousPaintingEnabled(bool) override;
     void setShowScrollBottleneckRects(bool) override;
     void acceptLanguagesChanged() override;
 
     // WebViewImpl
@@ skipping 14 matching lines @@
     void setBackgroundColorOverride(WebColor);
     void setZoomFactorOverride(float);
     void updateShowFPSCounterAndContinuousPainting();
     void setCompositorDeviceScaleFactorOverride(float);
     void setRootLayerTransform(const WebSize& offset, float scale);
 
     Color baseBackgroundColor() const { return m_baseBackgroundColor; }
 
     WebColor backgroundColorOverride() const { return m_backgroundColorOverride; }
 
-    PageOverlayList* pageOverlays() const { return m_pageOverlays.get(); }
-
     void setOverlayLayer(GraphicsLayer*);
 
     const WebPoint& lastMouseDownPoint() const
     {
         return m_lastMouseDownPoint;
     }
 
     Frame* focusedCoreFrame() const;
 
     // Returns the currently focused Element or null if no element has focus.
@@ skipping 393 matching lines @@
     // The current drag operation as negotiated by the source and destination.
     // When not equal to DragOperationNone, the drag data can be dropped onto the
     // current drop target in this WebView (the drop target can accept the drop).
     WebDragOperation m_dragOperation;
 
     // The popup associated with an input/select element.
     RefPtr<WebPagePopupImpl> m_pagePopup;
 
     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;
 
     // Whether the user can press tab to focus links.
     bool m_tabsToLinks;
 
     // If set, the (plugin) node which has mouse capture.
     RefPtrWillBePersistent<Node> m_mouseCaptureNode;
     RefPtr<UserGestureToken> m_mouseCaptureGestureToken;
@@ skipping 26 matching lines @@
     WebColor m_baseBackgroundColor;
     WebColor m_backgroundColorOverride;
     float m_zoomFactorOverride;
 
     bool m_userGestureObserved;
     WebDisplayMode m_displayMode;
 
     FloatSize m_elasticOverscroll;
 
     RefPtrWillBePersistent<EventListener> m_popupMouseWheelEventListener;
-    OwnPtr<WebPageOverlay> m_pageColorOverlay;
 };
 
 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.isWebView());
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 } // namespace blink
 
 #endif