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

Unified Diff: cc/layers/heads_up_display_layer.h

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
« no previous file with comments | « no previous file | cc/layers/heads_up_display_layer.cc » ('j') | cc/layers/heads_up_display_layer_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/heads_up_display_layer.h
diff --git a/cc/layers/heads_up_display_layer.h b/cc/layers/heads_up_display_layer.h
index 7ca09925102e757981be06eee4cf4f37dac3730f..f85d7a694f6befad81e1e0d12edcdfd9df837c0c 100644
--- a/cc/layers/heads_up_display_layer.h
+++ b/cc/layers/heads_up_display_layer.h
@@ -15,7 +15,7 @@ namespace cc {
class CC_EXPORT HeadsUpDisplayLayer : public ContentsScalingLayer {
public:
- static scoped_refptr<HeadsUpDisplayLayer> Create();
+ static scoped_refptr<HeadsUpDisplayLayer> Create(SkTypeface* typeface);
void PrepareForCalculateDrawProperties(
const gfx::Size& device_viewport, float device_scale_factor);
@@ -23,12 +23,14 @@ class CC_EXPORT HeadsUpDisplayLayer : public ContentsScalingLayer {
scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
protected:
- HeadsUpDisplayLayer();
+ explicit HeadsUpDisplayLayer(SkTypeface* typeface);
bool HasDrawableContent() const override;
private:
~HeadsUpDisplayLayer() override;
+ SkTypeface* typeface_;
+
DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayer);
};
« no previous file with comments | « no previous file | cc/layers/heads_up_display_layer.cc » ('j') | cc/layers/heads_up_display_layer_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698