| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #include "SkDisplayInput.h" | 10 #include "SkDisplayInput.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 SK_MEMBER(string, String) | 23 SK_MEMBER(string, String) |
| 24 }; | 24 }; |
| 25 | 25 |
| 26 #endif | 26 #endif |
| 27 | 27 |
| 28 DEFINE_GET_MEMBER(SkInput); | 28 DEFINE_GET_MEMBER(SkInput); |
| 29 | 29 |
| 30 SkInput::SkInput() : fInt((int) SK_NaN32), fFloat(SK_ScalarNaN) {} | 30 SkInput::SkInput() : fInt((int) SK_NaN32), fFloat(SK_ScalarNaN) {} |
| 31 | 31 |
| 32 SkDisplayable* SkInput::contains(const SkString& string) { | 32 SkDisplayable* SkInput::contains(const SkString& string) { |
| 33 return string.equals(name) ? this : NULL; | 33 return string.equals(name) ? this : nullptr; |
| 34 } | 34 } |
| 35 | 35 |
| 36 bool SkInput::enable(SkAnimateMaker & ) { | 36 bool SkInput::enable(SkAnimateMaker & ) { |
| 37 return true; | 37 return true; |
| 38 } | 38 } |
| 39 | 39 |
| 40 bool SkInput::getProperty(int index, SkScriptValue* value) const { | 40 bool SkInput::getProperty(int index, SkScriptValue* value) const { |
| 41 switch (index) { | 41 switch (index) { |
| 42 case SK_PROPERTY(initialized): | 42 case SK_PROPERTY(initialized): |
| 43 value->fType = SkType_Boolean; | 43 value->fType = SkType_Boolean; |
| 44 value->fOperand.fS32 = fInt != (int) SK_NaN32 || | 44 value->fOperand.fS32 = fInt != (int) SK_NaN32 || |
| 45 SkScalarIsNaN(fFloat) == false || string.size() > 0; | 45 SkScalarIsNaN(fFloat) == false || string.size() > 0; |
| 46 break; | 46 break; |
| 47 default: | 47 default: |
| 48 return false; | 48 return false; |
| 49 } | 49 } |
| 50 return true; | 50 return true; |
| 51 } | 51 } |
| 52 | 52 |
| 53 bool SkInput::hasEnable() const { | 53 bool SkInput::hasEnable() const { |
| 54 return true; | 54 return true; |
| 55 } | 55 } |
| OLD | NEW |