Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2016 Google Inc. | 2 * Copyright 2016 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef Window_android_DEFINED | 8 #ifndef Window_android_DEFINED |
| 9 #define Window_android_DEFINED | 9 #define Window_android_DEFINED |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 public: | 24 public: |
| 25 Window_android() : Window() {} | 25 Window_android() : Window() {} |
| 26 ~Window_android() override {} | 26 ~Window_android() override {} |
| 27 | 27 |
| 28 bool init(android_app* app_state); | 28 bool init(android_app* app_state); |
| 29 void initDisplay(ANativeWindow* window); | 29 void initDisplay(ANativeWindow* window); |
| 30 | 30 |
| 31 void setTitle(const char*) override; | 31 void setTitle(const char*) override; |
| 32 void show() override {} | 32 void show() override {} |
| 33 | 33 |
| 34 bool attach(BackEndType attachType, int msaaSampleCount, bool deepColor) ove rride; | 34 bool attach(BackEndType attachType, int msaaSampleCount, bool srgb) override ; |
|
Brian Osman
2016/05/06 18:05:33
I posit that this code didn't compile before.
jvanverth1
2016/05/06 18:27:55
Probably not.
| |
| 35 void inval() override; | 35 void inval() override; |
| 36 | 36 |
| 37 void paintIfNeeded(); | 37 void paintIfNeeded(); |
| 38 | 38 |
| 39 bool scaleContentToFit() const override { return true; } | 39 bool scaleContentToFit() const override { return true; } |
| 40 bool supportsContentRect() const override { return true; } | 40 bool supportsContentRect() const override { return true; } |
| 41 SkRect getContentRect() override { return mContentRect; } | 41 SkRect getContentRect() override { return mContentRect; } |
| 42 void setContentRect(int l, int t, int r, int b) { mContentRect.set(l,t,r,b); } | 42 void setContentRect(int l, int t, int r, int b) { mContentRect.set(l,t,r,b); } |
| 43 | 43 |
| 44 private: | 44 private: |
| 45 android_app* mApp = nullptr; | 45 android_app* mApp = nullptr; |
| 46 SkRect mContentRect; | 46 SkRect mContentRect; |
| 47 int mSampleCount = 0; | 47 int mSampleCount = 0; |
| 48 bool mSRGB; | |
|
jvanverth1
2016/05/06 18:27:55
This should be fSRGB (despite what the other membe
| |
| 48 }; | 49 }; |
| 49 | 50 |
| 50 } // namespace sk_app | 51 } // namespace sk_app |
| 51 | 52 |
| 52 #endif | 53 #endif |
| OLD | NEW |