| Index: Source/web/PageWidgetDelegate.cpp
|
| diff --git a/Source/web/PageWidgetDelegate.cpp b/Source/web/PageWidgetDelegate.cpp
|
| index 86268fd5532f6ec8f671a40772035f4ee2c2c4e7..101d50a09d83749e35c611eb6f561070d4a503b9 100644
|
| --- a/Source/web/PageWidgetDelegate.cpp
|
| +++ b/Source/web/PageWidgetDelegate.cpp
|
| @@ -46,7 +46,7 @@
|
| #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"
|
|
|
| @@ -66,7 +66,7 @@ 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())
|
| @@ -97,8 +97,8 @@ static void paintInternal(Page& page, PageOverlayList* overlays, WebCanvas* canv
|
| 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)) {
|
| @@ -109,16 +109,16 @@ static void paintInternal(Page& page, PageOverlayList* overlays, WebCanvas* canv
|
| 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)
|
|
|