BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 17 insertions, 11 deletions

diff --git a/chromium/third_party/WebKit/Source/web/PageWidgetDelegate.cpp b/chromium/third_party/WebKit/Source/web/PageWidgetDelegate.cpp
index a0723ebf497..15ec0acc9ce 100644
--- a/chromium/third_party/WebKit/Source/web/PageWidgetDelegate.cpp
+++ b/chromium/third_party/WebKit/Source/web/PageWidgetDelegate.cpp
@@ -35,7 +35,7 @@
 #include "core/frame/LocalFrame.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutView.h"
-#include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
+#include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/Page.h"
 #include "core/paint/TransformRecorder.h"
@@ -46,17 +46,13 @@
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "platform/transforms/AffineTransform.h"
 #include "public/web/WebInputEvent.h"
-#include "web/PageOverlayList.h"
 #include "web/WebInputEventConversion.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
-void PageWidgetDelegate::animate(Page& page, double monotonicFrameBeginTime, LocalFrame& root)
+void PageWidgetDelegate::animate(Page& page, double monotonicFrameBeginTime)
 {
-    RefPtrWillBeRawPtr<FrameView> view = root.view();
-    if (!view)
-        return;
     page.autoscrollController().animate(monotonicFrameBeginTime);
     page.animator().serviceScriptedAnimations(monotonicFrameBeginTime);
 }
@@ -66,8 +62,8 @@ void PageWidgetDelegate::layout(Page& page, LocalFrame& root)
     page.animator().updateLayoutAndStyleForPainting(&root);
 }
 
-void PageWidgetDelegate::paint(Page& page, PageOverlayList* overlays, WebCanvas* canvas,
-    const WebRect& rect, LocalFrame& root)
+static void paintInternal(Page& page, WebCanvas* canvas,
+    const WebRect& rect, LocalFrame& root, const GlobalPaintFlags globalPaintFlags)
 {
     if (rect.isEmpty())
         return;
@@ -91,9 +87,7 @@ void PageWidgetDelegate::paint(Page& page, PageOverlayList* overlays, WebCanvas*
         if (view) {
             ClipRecorder clipRecorder(paintContext, root, DisplayItem::PageWidgetDelegateClip, LayoutRect(dirtyRect));
 
-            view->paint(&paintContext, dirtyRect);
-            if (overlays)
-                overlays->paintWebFrame(paintContext);
+            view->paint(&paintContext, globalPaintFlags, dirtyRect);
         } else if (!DrawingRecorder::useCachedDrawingIfPossible(paintContext, root, DisplayItem::PageWidgetDelegateBackgroundFallback)) {
             DrawingRecorder drawingRecorder(paintContext, root, DisplayItem::PageWidgetDelegateBackgroundFallback, dirtyRect);
             paintContext.fillRect(dirtyRect, Color::white);
@@ -102,6 +96,18 @@ void PageWidgetDelegate::paint(Page& page, PageOverlayList* overlays, WebCanvas*
     pictureBuilder.endRecording()->playback(canvas);
 }
 
+void PageWidgetDelegate::paint(Page& page, WebCanvas* canvas,
+    const WebRect& rect, LocalFrame& root)
+{
+    paintInternal(page, canvas, rect, root, GlobalPaintNormalPhase);
+}
+
+void PageWidgetDelegate::paintIgnoringCompositing(Page& page, WebCanvas* canvas,
+    const WebRect& rect, LocalFrame& root)
+{
+    paintInternal(page, canvas, rect, root, GlobalPaintFlattenCompositingLayers);
+}
+
 bool PageWidgetDelegate::handleInputEvent(PageWidgetEventHandler& handler, const WebInputEvent& event, LocalFrame* root)
 {
     switch (event.type) {