Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/ozone/platform/drm/gpu/drm_surface_unittest.cc

 // Copyright 2014 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.
 
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
@@ skipping 87 matching lines @@
   SkPaint paint;
   paint.setColor(SK_ColorWHITE);
   SkRect rect =
       SkRect::MakeWH(kDefaultMode.hdisplay / 2, kDefaultMode.vdisplay / 2);
   surface_->GetSurface()->getCanvas()->drawRect(rect, paint);
   surface_->PresentCanvas(
       gfx::Rect(0, 0, kDefaultMode.hdisplay / 2, kDefaultMode.vdisplay / 2));
   drm_->RunCallbacks();
 
   SkBitmap image;
-  std::vector<skia::RefPtr<SkSurface>> framebuffers;
+  std::vector<sk_sp<SkSurface>> framebuffers;
   for (const auto& buffer : drm_->buffers()) {
     // Skip cursor buffers.
     if (buffer->width() == kDefaultCursorSize &&
         buffer->height() == kDefaultCursorSize)
       continue;
 
     framebuffers.push_back(buffer);
   }
 
   // Buffer 0 is the modesetting buffer, buffer 1 is the frontbuffer and buffer
@@ skipping 31 matching lines @@
 
   paint.setColor(SK_ColorRED);
   rect.SetRect(0, kDefaultMode.vdisplay / 2, kDefaultMode.hdisplay / 2,
                kDefaultMode.vdisplay / 2);
   surface_->GetSurface()->getCanvas()->drawRect(RectToSkRect(rect), paint);
   surface_->PresentCanvas(rect);
 
   drm_->RunCallbacks();
 
   SkBitmap image;
-  std::vector<skia::RefPtr<SkSurface>> framebuffers;
+  std::vector<sk_sp<SkSurface>> framebuffers;
   for (const auto& buffer : drm_->buffers()) {
     // Skip cursor buffers.
     if (buffer->width() == kDefaultCursorSize &&
         buffer->height() == kDefaultCursorSize)
       continue;
 
     framebuffers.push_back(buffer);
   }
 
   // Buffer 0 is the modesetting buffer, buffer 1 is the backbuffer and buffer
@@ skipping 11 matching lines @@
     for (int j = 0; j < image.width(); ++j) {
       if (j < kDefaultMode.hdisplay / 2 && i < kDefaultMode.vdisplay / 2)
         EXPECT_EQ(SK_ColorWHITE, image.getColor(j, i));
       else if (j < kDefaultMode.hdisplay / 2)
         EXPECT_EQ(SK_ColorRED, image.getColor(j, i));
       else
         EXPECT_EQ(SK_ColorBLACK, image.getColor(j, i));
     }
   }
 }