Back PaintRecord with PaintOpBuffer instead of SkPicture

third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 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 1242 matching lines @@
 
   m_canvas->scale(WebCoreFloatToSkScalar(x), WebCoreFloatToSkScalar(y));
 }
 
 void GraphicsContext::setURLForRect(const KURL& link, const IntRect& destRect) {
   if (contextDisabled())
     return;
   DCHECK(m_canvas);
 
   sk_sp<SkData> url(SkData::MakeWithCString(link.getString().utf8().data()));
-  PaintCanvasAnnotateRectWithURL(m_canvas, destRect, url.get());
+  m_canvas->Annotate(PaintCanvas::AnnotationType::URL, destRect,
+                     std::move(url));
 }
 
 void GraphicsContext::setURLFragmentForRect(const String& destName,
                                             const IntRect& rect) {
   if (contextDisabled())
     return;
   DCHECK(m_canvas);
 
   sk_sp<SkData> skDestName(SkData::MakeWithCString(destName.utf8().data()));
-  PaintCanvasAnnotateLinkToDestination(m_canvas, rect, skDestName.get());
+  m_canvas->Annotate(PaintCanvas::AnnotationType::LINK_TO_DESTINATION, rect,
+                     std::move(skDestName));
 }
 
 void GraphicsContext::setURLDestinationLocation(const String& name,
                                                 const IntPoint& location) {
   if (contextDisabled())
     return;
   DCHECK(m_canvas);
 
+  SkRect rect = SkRect::MakeXYWH(location.x(), location.y(), 0, 0);
   sk_sp<SkData> skName(SkData::MakeWithCString(name.utf8().data()));
-  PaintCanvasAnnotateNamedDestination(
-      m_canvas, SkPoint::Make(location.x(), location.y()), skName.get());
+  m_canvas->Annotate(PaintCanvas::AnnotationType::NAMED_DESTINATION, rect,
+                     std::move(skName));
 }
 
 void GraphicsContext::concatCTM(const AffineTransform& affine) {
   concat(affineTransformToSkMatrix(affine));
 }
 
 void GraphicsContext::fillRectWithRoundedHole(
     const FloatRect& rect,
     const FloatRoundedRect& roundedHoleRect,
     const Color& color) {
@@ skipping 52 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
 
   return nullptr;
 }
 
 }  // namespace blink