Use SkLayerDrawLooper::Builder to construct SkLayerDrawLooper.

Source/platform/graphics/DrawLooper.cpp

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 #include "platform/graphics/DrawLooper.h"
 
 #include "platform/geometry/FloatSize.h"
 #include "platform/graphics/Color.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
-#include "third_party/skia/include/effects/SkLayerDrawLooper.h"
 
 namespace WebCore {
 
-DrawLooper::DrawLooper() : m_skDrawLooper(adoptRef(new SkLayerDrawLooper)) { }
+DrawLooper::DrawLooper(SkDrawLooper* looper) : m_skDrawLooper(adoptRef(looper)) { }

[jbroman, 2014/02/24 17:47:44]

Nit (see what schenney thinks):

My preference would be to accept a PassRefPtr<SkDrawLooper> here. Currently, the
only call site of this (private) constructor is below, but otherwise I wouldn't
expect something that takes a Foo* to adopt ownership; I'd expect to explicitly
release it then.

If you do this, you'll need to move the adoptRef call from here to the call
site.

[Dominik Grewe, 2014/02/24 18:34:39]

Done.

 
 DrawLooper::~DrawLooper() { }
 
 SkDrawLooper* DrawLooper::skDrawLooper() const
 {
     return m_skDrawLooper.get();
 }
 
-void DrawLooper::addUnmodifiedContent()
+void DrawLooper::Builder::addUnmodifiedContent()
 {
     SkLayerDrawLooper::LayerInfo info;
-    m_skDrawLooper->addLayerOnTop(info);
+    m_skDrawLooperBuilder.addLayerOnTop(info);
 }
 
-void DrawLooper::addShadow(const FloatSize& offset, float blur, const Color& color,
+void DrawLooper::Builder::addShadow(const FloatSize& offset, float blur, const Color& color,
     ShadowTransformMode shadowTransformMode, ShadowAlphaMode shadowAlphaMode)
 {
     // Detect when there's no effective shadow.
     if (!color.alpha())
         return;
 
     SkColor skColor = color.rgb();
 
     SkLayerDrawLooper::LayerInfo info;
 
     switch (shadowAlphaMode) {
     case ShadowRespectsAlpha:
         info.fColorMode = SkXfermode::kDst_Mode;
         break;
     case ShadowIgnoresAlpha:
         info.fColorMode = SkXfermode::kSrc_Mode;
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 
     if (blur)
         info.fPaintBits |= SkLayerDrawLooper::kMaskFilter_Bit; // our blur
     info.fPaintBits |= SkLayerDrawLooper::kColorFilter_Bit;
     info.fOffset.set(offset.width(), offset.height());
     info.fPostTranslate = (shadowTransformMode == ShadowIgnoresTransforms);
 
-    SkPaint* paint = m_skDrawLooper->addLayerOnTop(info);
+    SkPaint* paint = m_skDrawLooperBuilder.addLayerOnTop(info);
 
     if (blur) {
         uint32_t mfFlags = SkBlurMaskFilter::kHighQuality_BlurFlag;
         if (shadowTransformMode == ShadowIgnoresTransforms)
             mfFlags |= SkBlurMaskFilter::kIgnoreTransform_BlurFlag;
         RefPtr<SkMaskFilter> mf = adoptRef(SkBlurMaskFilter::Create(
             (double)blur / 2.0, SkBlurMaskFilter::kNormal_BlurStyle, mfFlags));
         paint->setMaskFilter(mf.get());
     }
 
     RefPtr<SkColorFilter> cf = adoptRef(SkColorFilter::CreateModeFilter(skColor, SkXfermode::kSrcIn_Mode));
     paint->setColorFilter(cf.get());
 }
 
+PassRefPtr<DrawLooper> DrawLooper::Builder::detachDrawLooper()
+{
+    return adoptRef(new DrawLooper(m_skDrawLooperBuilder.detachLooper()));
+}
+
 } // namespace WebCore