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

Unified Diff: cc/layers/heads_up_display_layer_impl.h

Issue 1939143002: Remove all uses of skia::RefPtr and stale includes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad rebase Created 4 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
« no previous file with comments | « cc/layers/heads_up_display_layer.cc ('k') | cc/layers/heads_up_display_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/heads_up_display_layer_impl.h
diff --git a/cc/layers/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h
index ac32edf9224ab132cba517002cc8c36c6eab9883..174d1bfda7ec907a8c5d75a97b8dafbfa80490cf 100644
--- a/cc/layers/heads_up_display_layer_impl.h
+++ b/cc/layers/heads_up_display_layer_impl.h
@@ -17,6 +17,7 @@
#include "cc/layers/layer_impl.h"
#include "cc/resources/memory_history.h"
#include "cc/resources/scoped_resource.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
class SkCanvas;
class SkPaint;
@@ -52,7 +53,7 @@ class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
bool IsAnimatingHUDContents() const { return fade_step_ > 0; }
- void SetHUDTypeface(const skia::RefPtr<SkTypeface>& typeface);
+ void SetHUDTypeface(sk_sp<SkTypeface> typeface);
// LayerImpl overrides.
void PushPropertiesTo(LayerImpl* layer) override;
@@ -134,7 +135,7 @@ class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
std::vector<std::unique_ptr<ScopedResource>> resources_;
sk_sp<SkSurface> hud_surface_;
- skia::RefPtr<SkTypeface> typeface_;
+ sk_sp<SkTypeface> typeface_;
float internal_contents_scale_;
gfx::Size internal_content_bounds_;
« no previous file with comments | « cc/layers/heads_up_display_layer.cc ('k') | cc/layers/heads_up_display_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698