Remove all uses of skia::RefPtr and stale includes

Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org,pkasting@chromium.org
BUG=skia:5077, 604716
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation;tryserver.blink:linux_blink_rel

Committed: https://crrev.com/399950bed153c2a0db48d5d69fca31fcb15aeee2
Cr-Commit-Position: refs/heads/master@{#392894}

[tomhudson, 2016-05-02 15:46:44]

Description was changed from

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org
BUG=skia:5077,chrome:604716
==========

to

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org
BUG=skia:5077,chrome:604716
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
==========

[tomhudson, 2016-05-02 15:46:47]

The CQ bit was checked by tomhudson@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-05-02 15:47:00]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1939143002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1939143002/1

[commit-bot: I haz the power, 2016-05-02 16:02:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-02 16:02:55]

Dry run: Try jobs failed on following builders:
  android_compile_dbg on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_comp...)
  mac_chromium_gn_rel on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_r...)

[tomhudson, 2016-05-02 19:04:25]

Description was changed from

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org
BUG=skia:5077,chrome:604716
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
==========

to

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org,pkasting@chromium.org
BUG=skia:5077,chrome:604716
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
==========

[tomhudson, 2016-05-02 19:04:25]

tomhudson@google.com changed reviewers:
+ pkasting@chromium.org

[tomhudson, 2016-05-02 19:10:46]

Description was changed from

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org,pkasting@chromium.org
BUG=skia:5077,chrome:604716
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
==========

to

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org,pkasting@chromium.org
BUG=skia:5077,604716
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
==========

[tomhudson, 2016-05-04 14:12:21]

The CQ bit was checked by tomhudson@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-05-04 14:12:42]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1939143002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1939143002/40001

[tomhudson, 2016-05-04 15:35:30]

fmalita@: Skia reviewer.
danakj@: Please review cc/, ui/compositor/, ui/gfx/.
pkasting@: Please review the *one file* in ui/native_theme/ that I had to touch
because of include-what-you-use shortcomings.

[f(malita), 2016-05-04 15:49:58]

Non-owner LGTM % some missing moves.

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_li...
File ui/gfx/platform_font_linux.cc (right):

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_li...
ui/gfx/platform_font_linux.cc:156: return Font(new PlatformFontLinux(typeface,
new_family, new_size, style,
std::move(typeface)

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_li...
ui/gfx/platform_font_linux.cc:220: InitFromDetails(typeface, family,
size_pixels, style, render_params);
std::move(typeface)

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_li...
ui/gfx/platform_font_linux.cc:234: typeface_ = typeface ? typeface :
CreateSkTypeface(style, &font_family_);
std::move(typeface)

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_wi...
File ui/gfx/platform_font_win.cc (right):

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_wi...
ui/gfx/platform_font_win.cc:603: paint.setTypeface(skia_face);
std::move(skia_face)

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/skbitmap_operati...
File ui/gfx/skbitmap_operations.cc (right):

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/skbitmap_operati...
ui/gfx/skbitmap_operations.cc:17: #include
"third_party/skia/include/core/SkRefCnt.h"
Nit: I don't think we handle sk_sps explicitly in this file, so we probably
don't need this header.

[commit-bot: I haz the power, 2016-05-04 16:00:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-04 16:00:21]

Dry run: This issue passed the CQ dry run.

[tomhudson, 2016-05-04 16:51:54]

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_li...
File ui/gfx/platform_font_linux.cc (right):

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_li...
ui/gfx/platform_font_linux.cc:156: return Font(new PlatformFontLinux(typeface,
new_family, new_size, style,
On 2016/05/04 15:49:57, f(malita) wrote:
> std::move(typeface)

Done.

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_li...
ui/gfx/platform_font_linux.cc:220: InitFromDetails(typeface, family,
size_pixels, style, render_params);
On 2016/05/04 15:49:57, f(malita) wrote:
> std::move(typeface)

Done.

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_li...
ui/gfx/platform_font_linux.cc:234: typeface_ = typeface ? typeface :
CreateSkTypeface(style, &font_family_);
On 2016/05/04 15:49:57, f(malita) wrote:
> std::move(typeface)

Done.

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_wi...
File ui/gfx/platform_font_win.cc (right):

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/platform_font_wi...
ui/gfx/platform_font_win.cc:603: paint.setTypeface(skia_face);
On 2016/05/04 15:49:57, f(malita) wrote:
> std::move(skia_face)

Done.

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/skbitmap_operati...
File ui/gfx/skbitmap_operations.cc (right):

https://codereview.chromium.org/1939143002/diff/40001/ui/gfx/skbitmap_operati...
ui/gfx/skbitmap_operations.cc:17: #include
"third_party/skia/include/core/SkRefCnt.h"
On 2016/05/04 15:49:58, f(malita) wrote:
> Nit: I don't think we handle sk_sps explicitly in this file, so we probably
> don't need this header.

Done. (At one intermediate stage we had sk_sp<SkImageFilter>, but yeah, style
says fold that into the setter when possible and I was able to here.)

[Peter Kasting, 2016-05-04 19:05:55]

LGTM

[danakj, 2016-05-04 19:44:53]

LGTM

https://codereview.chromium.org/1939143002/diff/60001/ui/gfx/canvas.cc
File ui/gfx/canvas.cc (right):

https://codereview.chromium.org/1939143002/diff/60001/ui/gfx/canvas.cc#newcode60
ui/gfx/canvas.cc:60: Canvas::Canvas(const sk_sp<SkCanvas> canvas, float
image_scale)
remove const

[tomhudson, 2016-05-04 19:59:52]

https://codereview.chromium.org/1939143002/diff/60001/ui/gfx/canvas.cc
File ui/gfx/canvas.cc (right):

https://codereview.chromium.org/1939143002/diff/60001/ui/gfx/canvas.cc#newcode60
ui/gfx/canvas.cc:60: Canvas::Canvas(const sk_sp<SkCanvas> canvas, float
image_scale)
On 2016/05/04 19:44:53, danakj wrote:
> remove const

Oops, good catch.
Done.

[tomhudson, 2016-05-04 19:59:53]

https://codereview.chromium.org/1939143002/diff/60001/ui/gfx/canvas.cc
File ui/gfx/canvas.cc (right):

https://codereview.chromium.org/1939143002/diff/60001/ui/gfx/canvas.cc#newcode60
ui/gfx/canvas.cc:60: Canvas::Canvas(const sk_sp<SkCanvas> canvas, float
image_scale)
On 2016/05/04 19:44:53, danakj wrote:
> remove const

Oops, good catch.
Done.

[tomhudson, 2016-05-04 20:00:12]

The CQ bit was checked by tomhudson@google.com

[tomhudson, 2016-05-04 20:00:13]

The patchset sent to the CQ was uploaded after l-g-t-m from
fmalita@chromium.org, danakj@chromium.org, pkasting@chromium.org
Link to the patchset: https://codereview.chromium.org/1939143002/#ps80001
(title: "Dana's fix")

[commit-bot: I haz the power, 2016-05-04 20:00:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1939143002/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1939143002/80001

[commit-bot: I haz the power, 2016-05-04 20:38:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-04 20:38:13]

Try jobs failed on following builders:
  linux_chromium_gn_chromeos_rel on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[tomhudson, 2016-05-10 17:38:57]

The CQ bit was checked by tomhudson@google.com

[commit-bot: I haz the power, 2016-05-10 17:39:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1939143002/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1939143002/80001

[commit-bot: I haz the power, 2016-05-10 18:10:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-10 18:10:13]

Try jobs failed on following builders:
  cast_shell_linux on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/cast_shell_linu...)

[tomhudson, 2016-05-10 19:36:12]

The CQ bit was checked by tomhudson@google.com

[tomhudson, 2016-05-10 19:36:12]

The patchset sent to the CQ was uploaded after l-g-t-m from danakj@chromium.org,
fmalita@chromium.org, pkasting@chromium.org
Link to the patchset: https://codereview.chromium.org/1939143002/#ps100001
(title: "I really don't like the side effect of std::move()")

[commit-bot: I haz the power, 2016-05-10 19:36:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1939143002/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1939143002/100001

[commit-bot: I haz the power, 2016-05-10 21:45:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-10 21:45:43]

Failed to apply patch for ui/gfx/platform_font_win.cc:
While running git apply --index -3 -p1;
  error: patch failed: ui/gfx/platform_font_win.cc:25
  Falling back to three-way merge...
  Applied patch to 'ui/gfx/platform_font_win.cc' with conflicts.
  U ui/gfx/platform_font_win.cc

Patch:       ui/gfx/platform_font_win.cc
Index: ui/gfx/platform_font_win.cc
diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc
index
e48bca270efaf4942a72650cb3469ab0c942682d..e36fe9d59e44871c9bac20d429c24b56140bd829
100644
--- a/ui/gfx/platform_font_win.cc
+++ b/ui/gfx/platform_font_win.cc
@@ -25,6 +25,7 @@
 #include "base/win/scoped_hdc.h"
 #include "base/win/scoped_select_object.h"
 #include "base/win/win_util.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
@@ -583,7 +584,7 @@ PlatformFontWin::HFontRef*
PlatformFontWin::CreateHFontRefFromSkia(
   DWRITE_FONT_METRICS dwrite_font_metrics = {0};
   dwrite_font->GetMetrics(&dwrite_font_metrics);
 
-  skia::RefPtr<SkTypeface> skia_face = skia::AdoptRef(
+  sk_sp<SkTypeface> skia_face(
       SkTypeface::CreateFromName(
           base::SysWideToUTF8(font_info.lfFaceName).c_str(),
                               static_cast<SkTypeface::Style>(skia_style)));
@@ -599,7 +600,7 @@ PlatformFontWin::HFontRef*
PlatformFontWin::CreateHFontRefFromSkia(
 
   SkPaint paint;
   paint.setAntiAlias(font_params.antialiasing);
-  paint.setTypeface(skia_face.get());
+  paint.setTypeface(std::move(skia_face));
   paint.setTextSize(-font_info.lfHeight);
   SkPaint::FontMetrics skia_metrics;
   paint.getFontMetrics(&skia_metrics);

[commit-bot: I haz the power, 2016-05-10 21:46:10]

The CQ bit was unchecked by commit-bot@chromium.org

[tomhudson, 2016-05-11 09:48:06]

Description was changed from

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org,pkasting@chromium.org
BUG=skia:5077,604716
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
==========

to

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org,pkasting@chromium.org
BUG=skia:5077,604716
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation;tryserver.blink:linux_blink_rel
==========

[tomhudson, 2016-05-11 09:55:09]

Patchset #7 (id:120001) has been deleted

[tomhudson, 2016-05-11 10:00:47]

The CQ bit was checked by tomhudson@google.com

[tomhudson, 2016-05-11 10:00:48]

The patchset sent to the CQ was uploaded after l-g-t-m from danakj@chromium.org,
fmalita@chromium.org, pkasting@chromium.org
Link to the patchset: https://codereview.chromium.org/1939143002/#ps140001
(title: "fix bad rebase")

[commit-bot: I haz the power, 2016-05-11 10:01:06]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1939143002/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1939143002/140001

[commit-bot: I haz the power, 2016-05-11 11:00:29]

Committed patchset #7 (id:140001)

[commit-bot: I haz the power, 2016-05-11 11:01:51]

Description was changed from

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org,pkasting@chromium.org
BUG=skia:5077,604716
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation;tryserver.blink:linux_blink_rel
==========

to

==========
Remove all uses of skia::RefPtr and stale includes

This CL is the cc/, ui/compositor/, and ui/gfx/-specific sections
of the change.

Remove long-unused ScopedSkRegion.

Finish deprecating skia::RefPtr in favor of sk_sp<>.
This should significantly reduce the amount of manual reference
management Chromium and Blink authors need to do for Skia objects.

We still have some APIs vending raw pointers to ref-counted Skia
objects which will need to be wrapped in sk_sp<>, but that should
be easier and more predictable. This CL does *not* try to remove
all cases of raw pointers to Skia objects in Chromium.

R=fmalita@chromium.org,danakj@chromium.org,pkasting@chromium.org
BUG=skia:5077,604716
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation;tryserver.blink:linux_blink_rel

Committed: https://crrev.com/399950bed153c2a0db48d5d69fca31fcb15aeee2
Cr-Commit-Position: refs/heads/master@{#392894}
==========

[commit-bot: I haz the power, 2016-05-11 11:01:53]

Patchset 7 (id:??) landed as
https://crrev.com/399950bed153c2a0db48d5d69fca31fcb15aeee2
Cr-Commit-Position: refs/heads/master@{#392894}