Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1391)

Unified Diff: Source/core/svg/graphics/SVGImage.cpp

Issue 1129793005: Replace OwnPtr with WTF::Optional for optional recorders. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: merge with master Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/svg/graphics/SVGImage.cpp
diff --git a/Source/core/svg/graphics/SVGImage.cpp b/Source/core/svg/graphics/SVGImage.cpp
index 97cefd764a5b0a1b2301fd7340c5261e8b6a236d..90c04e3a287ca0c4e3ffe5d7d966b10fd8d064ba 100644
--- a/Source/core/svg/graphics/SVGImage.cpp
+++ b/Source/core/svg/graphics/SVGImage.cpp
@@ -59,6 +59,7 @@
#include "platform/graphics/paint/DrawingRecorder.h"
#include "platform/graphics/paint/SkPictureBuilder.h"
#include "third_party/skia/include/core/SkPicture.h"
+#include "wtf/Optional.h"
#include "wtf/PassRefPtr.h"
namespace blink {
@@ -290,9 +291,9 @@ void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const Fl
ClipRecorder clipRecorder(paintContext, *this, DisplayItem::ClipNodeImage, LayoutRect(enclosingIntRect(dstRect)));
bool hasCompositing = compositeOp != SkXfermode::kSrcOver_Mode;
- OwnPtr<CompositingRecorder> compositingRecorder;
+ Optional<CompositingRecorder> compositingRecorder;
if (hasCompositing || opacity < 1)
- compositingRecorder = adoptPtr(new CompositingRecorder(paintContext, *this, compositeOp, opacity));
+ compositingRecorder.emplace(paintContext, *this, compositeOp, opacity);
// We can only draw the entire frame, clipped to the rect we want. So compute where the top left
// of the image would be if we were drawing without clipping, and translate accordingly.

Powered by Google App Engine
This is Rietveld 408576698