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

Unified Diff: cc/layers/heads_up_display_layer.cc

Issue 900063002: Fixes for two different HUD issues related to win32k lockdown (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: i am a plumber Created 5 years, 10 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
Index: cc/layers/heads_up_display_layer.cc
diff --git a/cc/layers/heads_up_display_layer.cc b/cc/layers/heads_up_display_layer.cc
index 5dd4bd24d52c0489ce3d0a490cd19f7104f6be5d..e85a54aed72abb051ff4f134435ade55a45e6863 100644
--- a/cc/layers/heads_up_display_layer.cc
+++ b/cc/layers/heads_up_display_layer.cc
@@ -12,11 +12,13 @@
namespace cc {
-scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create() {
- return make_scoped_refptr(new HeadsUpDisplayLayer());
+scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create(
+ SkTypeface* typeface) {
+ return make_scoped_refptr(new HeadsUpDisplayLayer(typeface));
}
-HeadsUpDisplayLayer::HeadsUpDisplayLayer() {
+HeadsUpDisplayLayer::HeadsUpDisplayLayer(SkTypeface* typeface)
+ : typeface_(typeface) {
SetIsDrawable(true);
UpdateDrawsContent(HasDrawableContent());
}
@@ -56,7 +58,7 @@ bool HeadsUpDisplayLayer::HasDrawableContent() const {
scoped_ptr<LayerImpl> HeadsUpDisplayLayer::CreateLayerImpl(
LayerTreeImpl* tree_impl) {
- return HeadsUpDisplayLayerImpl::Create(tree_impl, layer_id_);
+ return HeadsUpDisplayLayerImpl::Create(tree_impl, layer_id_, typeface_);
}
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698