PageOverlays: Remove PageOverlayList

Source/web/PageWidgetDelegate.cpp

 /*
  * Copyright (C) 2012 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 28 matching lines @@
 #include "core/page/AutoscrollController.h"
 #include "core/page/Page.h"
 #include "core/paint/TransformRecorder.h"
 #include "platform/Logging.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipRecorder.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "platform/transforms/AffineTransform.h"
 #include "public/web/WebInputEvent.h"
-#include "web/PageOverlayList.h"
+#include "web/PageOverlay.h"
 #include "web/WebInputEventConversion.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
 void PageWidgetDelegate::animate(Page& page, double monotonicFrameBeginTime, LocalFrame& root)
 {
     RefPtrWillBeRawPtr<FrameView> view = root.view();
     if (!view)
         return;
     page.autoscrollController().animate(monotonicFrameBeginTime);
     page.animator().serviceScriptedAnimations(monotonicFrameBeginTime);
 }
 
 void PageWidgetDelegate::layout(Page& page, LocalFrame& root)
 {
     page.animator().updateLayoutAndStyleForPainting(&root);
 }
 
-static void paintInternal(Page& page, PageOverlayList* overlays, WebCanvas* canvas,
+static void paintInternal(Page& page, PageOverlay* overlay, WebCanvas* canvas,
     const WebRect& rect, LocalFrame& root, const GlobalPaintFlags globalPaintFlags)
 {
     if (rect.isEmpty())
         return;
 
     IntRect intRect(rect);
     SkPictureBuilder pictureBuilder(intRect);
     {
         GraphicsContext& paintContext = pictureBuilder.context();
 
@@ skipping 10 matching lines @@
         FrameView* view = root.view();
         if (view) {
             ClipRecorder clipRecorder(paintContext, root, DisplayItem::PageWidgetDelegateClip, LayoutRect(dirtyRect));
 
             // TODO(jchaffraix): Remove this scaffolding code once we have migrated all the code to GlobalPaintFlags.
             PaintBehavior oldPaintBehavior = view->paintBehavior();
             if (globalPaintFlags & GlobalPaintFlattenCompositingLayers)
                 view->setPaintBehavior(oldPaintBehavior | PaintBehaviorFlattenCompositingLayers);
 
             view->paint(&paintContext, globalPaintFlags, dirtyRect);
-            if (overlays)
-                overlays->paintWebFrame(paintContext);
+            if (overlay)
+                overlay->paintWebFrame(paintContext);
 
             view->setPaintBehavior(oldPaintBehavior);
         } else if (!DrawingRecorder::useCachedDrawingIfPossible(paintContext, root, DisplayItem::PageWidgetDelegateBackgroundFallback)) {
             DrawingRecorder drawingRecorder(paintContext, root, DisplayItem::PageWidgetDelegateBackgroundFallback, dirtyRect);
             paintContext.fillRect(dirtyRect, Color::white);
         }
     }
     pictureBuilder.endRecording()->playback(canvas);
 }
 
-void PageWidgetDelegate::paint(Page& page, PageOverlayList* overlays, WebCanvas* canvas,
+void PageWidgetDelegate::paint(Page& page, PageOverlay* overlay, WebCanvas* canvas,
     const WebRect& rect, LocalFrame& root)
 {
-    paintInternal(page, overlays, canvas, rect, root, GlobalPaintNormalPhase);
+    paintInternal(page, overlay, canvas, rect, root, GlobalPaintNormalPhase);
 }
 
-void PageWidgetDelegate::paintIgnoringCompositing(Page& page, PageOverlayList* overlays, WebCanvas* canvas,
+void PageWidgetDelegate::paintIgnoringCompositing(Page& page, PageOverlay* overlay, WebCanvas* canvas,
     const WebRect& rect, LocalFrame& root)
 {
-    paintInternal(page, overlays, canvas, rect, root, GlobalPaintFlattenCompositingLayers);
+    paintInternal(page, overlay, canvas, rect, root, GlobalPaintFlattenCompositingLayers);
 }
 
 bool PageWidgetDelegate::handleInputEvent(PageWidgetEventHandler& handler, const WebInputEvent& event, LocalFrame* root)
 {
     switch (event.type) {
 
     // FIXME: WebKit seems to always return false on mouse events processing
     // methods. For now we'll assume it has processed them (as we are only
     // interested in whether keyboard events are processed).
     // FIXME: Why do we return true when there is no root or the root is
@@ skipping 92 matching lines @@
 {
     return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(mainFrame.view(), event));
 }
 
 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTouchEvent& event)
 {
     return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(mainFrame.view(), event));
 }
 
 } // namespace blink