Rename paint data structures

third_party/WebKit/Source/web/LinkHighlightImpl.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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 27 matching lines @@
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/animation/CompositorAnimationCurve.h"
 #include "platform/animation/CompositorFloatAnimationCurve.h"
 #include "platform/animation/CompositorTargetProperty.h"
 #include "platform/animation/TimingFunction.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/CompositorElementId.h"
 #include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintRecorder.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebSize.h"
 #include "public/web/WebKit.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/rect.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 #include "web/WebViewImpl.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/Vector.h"
 #include <memory>
 
 namespace blink {
@@ skipping 198 matching lines @@
   return gfx::Rect(0, 0, contentLayer()->layer()->bounds().width,
                    contentLayer()->layer()->bounds().height);
 }
 
 void LinkHighlightImpl::paintContents(
     WebDisplayItemList* webDisplayItemList,
     WebContentLayerClient::PaintingControlSetting paintingControl) {
   if (!m_node || !m_node->layoutObject())
     return;
 
-  SkPictureRecorder recorder;
+  PaintRecorder recorder;
   gfx::Rect visualRect = paintableRegion();
-  SkCanvas* canvas =
+  PaintCanvas* canvas =
       recorder.beginRecording(visualRect.width(), visualRect.height());
 
-  SkPaint paint;
-  paint.setStyle(SkPaint::kFill_Style);
-  paint.setFlags(SkPaint::kAntiAlias_Flag);
+  PaintFlags paint;
+  paint.setStyle(PaintFlags::kFill_Style);
+  paint.setAntiAlias(true);
   paint.setColor(m_node->layoutObject()->style()->tapHighlightColor().rgb());
   canvas->drawPath(m_path.getSkPath(), paint);
 
   webDisplayItemList->appendDrawingItem(
       WebRect(visualRect.x(), visualRect.y(), visualRect.width(),
               visualRect.height()),
       recorder.finishRecordingAsPicture());
 }
 
 void LinkHighlightImpl::startHighlightAnimationIfNeeded() {
@@ skipping 105 matching lines @@
 
 WebLayer* LinkHighlightImpl::layer() {
   return clipLayer();
 }
 
 CompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const {
   return m_compositorPlayer.get();
 }
 
 }  // namespace blink