Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

examples/ui/noodles/noodles_view.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXAMPLES_UI_NOODLES_NOODLES_VIEW_H_
 #define EXAMPLES_UI_NOODLES_NOODLES_VIEW_H_
 
 #include <memory>
 #include <mutex>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "mojo/ui/base_view.h"
 #include "mojo/ui/choreographer.h"
-#include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 
 class SkPicture;
 
 namespace examples {
 
 class Frame;
 class Rasterizer;
 
 class NoodlesView : public mojo::ui::BaseView,
                     public mojo::ui::ChoreographerDelegate {
@@ skipping 46 matching lines @@
 
   // |BaseView|:
   void OnPropertiesChanged(uint32_t old_scene_version,
                            mojo::ui::ViewPropertiesPtr old_properties) override;
 
   // |ChoreographerDelegate|:
   void OnDraw(const mojo::gfx::composition::FrameInfo& frame_info,
               const base::TimeDelta& time_delta) override;
 
   void UpdateFrame();
-  skia::RefPtr<SkPicture> CreatePicture();
+  sk_sp<SkPicture> CreatePicture();
 
   mojo::ui::Choreographer choreographer_;
 
   std::shared_ptr<FrameQueue> frame_queue_;
 
   scoped_ptr<RasterizerDelegate> rasterizer_delegate_;  // can't use unique_ptr
                                                         // here due to
                                                         // base::Bind (sadness)
   std::unique_ptr<base::Thread> rasterizer_thread_;
   scoped_refptr<base::SingleThreadTaskRunner> rasterizer_task_runner_;
 
   double alpha_ = 0.0;
   int wx_ = 2;
   int wy_ = 3;
 
   DISALLOW_COPY_AND_ASSIGN(NoodlesView);
 };
 
 }  // namespace examples
 
 #endif  // EXAMPLES_UI_NOODLES_NOODLES_VIEW_H_