Index: sky/engine/core/painting/Rect.cpp |
diff --git a/sky/engine/core/painting/Rect.cpp b/sky/engine/core/painting/Rect.cpp |
index 4a0c643cc8bd09ed69f8c0e8da2e3fda36bd3ad7..2dbd02739a604f9025463ea5ea51b567a4a5f472 100644 |
--- a/sky/engine/core/painting/Rect.cpp |
+++ b/sky/engine/core/painting/Rect.cpp |
@@ -11,42 +11,42 @@ |
namespace blink { |
-// Convert dart_rect._value[0...3] ==> SkRect. |
+// Convert dartRect._value[0...3] ==> SkRect. |
Rect DartConverter<Rect, void>::FromArgumentsWithNullCheck( |
Dart_NativeArguments args, |
int index, |
Dart_Handle& exception) { |
Rect result; |
- result.is_null = true; |
+ result.isNull = true; |
- Dart_Handle dart_rect = Dart_GetNativeArgument(args, index); |
- DCHECK(!LogIfError(dart_rect)); |
+ Dart_Handle dartRect = Dart_GetNativeArgument(args, index); |
+ DCHECK(!LogIfError(dartRect)); |
- Dart_Handle value = Dart_GetField(dart_rect, |
+ Dart_Handle value = Dart_GetField(dartRect, |
Dart_NewStringFromCString("_value")); |
abarth-chromium
2015/05/27 02:17:36
Same caching point here. We should cache in https
|
if (Dart_IsNull(value)) |
return result; |
Dart_TypedData_Type type; |
float* data = nullptr; |
- intptr_t num_elements = 0; |
+ intptr_t numElements = 0; |
Dart_TypedDataAcquireData( |
- value, &type, reinterpret_cast<void**>(&data), &num_elements); |
+ value, &type, reinterpret_cast<void**>(&data), &numElements); |
DCHECK(!LogIfError(value)); |
- ASSERT(type == Dart_TypedData_kFloat32 && num_elements == 4); |
+ ASSERT(type == Dart_TypedData_kFloat32 && numElements == 4); |
SkScalar* dest[] = { |
- &result.sk_rect.fLeft, |
- &result.sk_rect.fTop, |
- &result.sk_rect.fRight, |
- &result.sk_rect.fBottom |
+ &result.skRect.fLeft, |
+ &result.skRect.fTop, |
+ &result.skRect.fRight, |
+ &result.skRect.fBottom |
}; |
for (intptr_t i = 0; i < 4; ++i) |
*dest[i] = data[i]; |
Dart_TypedDataReleaseData(value); |
- result.is_null = false; |
+ result.isNull = false; |
return result; |
} |