| 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 #include "Window_android.h" | 8 #include "Window_android.h" |
| 9 | 9 |
| 10 #include "VulkanWindowContext_android.h" | 10 #include "VulkanWindowContext_android.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 // fWindowContext doesn't exist because we haven't | 34 // fWindowContext doesn't exist because we haven't |
| 35 // initDisplay yet. | 35 // initDisplay yet. |
| 36 return fDisplayParams; | 36 return fDisplayParams; |
| 37 } | 37 } |
| 38 } | 38 } |
| 39 | 39 |
| 40 void Window_android::setTitle(const char* title) { | 40 void Window_android::setTitle(const char* title) { |
| 41 fSkiaAndroidApp->setTitle(title); | 41 fSkiaAndroidApp->setTitle(title); |
| 42 } | 42 } |
| 43 | 43 |
| 44 void Window_android::setUIState(const Json::Value& state) { | |
| 45 fSkiaAndroidApp->setUIState(state); | |
| 46 } | |
| 47 | |
| 48 bool Window_android::attach(BackendType attachType, const DisplayParams& params)
{ | 44 bool Window_android::attach(BackendType attachType, const DisplayParams& params)
{ |
| 49 if (kVulkan_BackendType != attachType) { | 45 if (kVulkan_BackendType != attachType) { |
| 50 return false; | 46 return false; |
| 51 } | 47 } |
| 52 | 48 |
| 53 fDisplayParams = params; | 49 fDisplayParams = params; |
| 54 | 50 |
| 55 // We delay the creation of fTestContext until Android informs us that | 51 // We delay the creation of fTestContext until Android informs us that |
| 56 // the native window is ready to use. | 52 // the native window is ready to use. |
| 57 return true; | 53 return true; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 74 | 70 |
| 75 void Window_android::paintIfNeeded() { | 71 void Window_android::paintIfNeeded() { |
| 76 if (fWindowContext) { // Check if initDisplay has already been called | 72 if (fWindowContext) { // Check if initDisplay has already been called |
| 77 onPaint(); | 73 onPaint(); |
| 78 } else { | 74 } else { |
| 79 markInvalProcessed(); | 75 markInvalProcessed(); |
| 80 } | 76 } |
| 81 } | 77 } |
| 82 | 78 |
| 83 } // namespace sk_app | 79 } // namespace sk_app |
| OLD | NEW |