diff options
| author | Steve Block <steveblock@google.com> | 2011-09-22 02:54:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-22 02:54:14 -0700 |
| commit | 10a44388d0f291ac0aa1af1a0ef9fa99c98c842c (patch) | |
| tree | 92e9f778f986afd16a51cedf53f16fac66e9dcbd /Source/WebKit/android/jni/ViewStateSerializer.cpp | |
| parent | fac4d0e0a1de0ea57842ca6008801287286c88c5 (diff) | |
| parent | 06ab37f33e994114ce0ec9fbb35fe48249ed6dbc (diff) | |
| download | external_webkit-10a44388d0f291ac0aa1af1a0ef9fa99c98c842c.zip external_webkit-10a44388d0f291ac0aa1af1a0ef9fa99c98c842c.tar.gz external_webkit-10a44388d0f291ac0aa1af1a0ef9fa99c98c842c.tar.bz2 | |
Merge "Clean up style and add some comments in Layer"
Diffstat (limited to 'Source/WebKit/android/jni/ViewStateSerializer.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/ViewStateSerializer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp index 794c118..b3556c3 100644 --- a/Source/WebKit/android/jni/ViewStateSerializer.cpp +++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp @@ -257,7 +257,7 @@ void serializeLayer(LayerAndroid* layer, SkWStream* stream) stream->write8(type); // Start with Layer fields - stream->writeBool(layer->isInheritFromRootTransform()); + stream->writeBool(layer->shouldInheritFromRootTransform()); stream->writeScalar(layer->getOpacity()); stream->writeScalar(layer->getSize().width()); stream->writeScalar(layer->getSize().height()); @@ -338,7 +338,7 @@ LayerAndroid* deserializeLayer(SkStream* stream) } // Layer fields - layer->setInheritFromRootTransform(stream->readBool()); + layer->setShouldInheritFromRootTransform(stream->readBool()); layer->setOpacity(stream->readScalar()); layer->setSize(stream->readScalar(), stream->readScalar()); layer->setPosition(stream->readScalar(), stream->readScalar()); |