diff options
| author | Chris Craik <ccraik@google.com> | 2011-06-30 11:40:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-30 11:40:45 -0700 |
| commit | beb5d5b7abfe05ecd6dccd281a0885e7a9526286 (patch) | |
| tree | 761965532996e8d98990526797a891a02410eecf /Source/WebKit | |
| parent | 9b88bdd41654176617bd7e72524601b6aea75748 (diff) | |
| parent | 76152fd25512ebff27cf7977c65ddcf694a6570d (diff) | |
| download | external_webkit-beb5d5b7abfe05ecd6dccd281a0885e7a9526286.zip external_webkit-beb5d5b7abfe05ecd6dccd281a0885e7a9526286.tar.gz external_webkit-beb5d5b7abfe05ecd6dccd281a0885e7a9526286.tar.bz2 | |
Merge "Refactoring: Moved 'SkLayer' to 'Layer' class in webkit"
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/ViewStateSerializer.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit/android/nav/CachedLayer.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp index 7ec77ed..794c118 100644 --- a/Source/WebKit/android/jni/ViewStateSerializer.cpp +++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp @@ -27,10 +27,10 @@ #include "BaseLayerAndroid.h" #include "CreateJavaOutputStreamAdaptor.h" +#include "Layer.h" #include "LayerAndroid.h" #include "PictureSet.h" #include "ScrollableLayerAndroid.h" -#include "SkLayer.h" #include "SkPicture.h" #include <JNIUtility.h> @@ -256,7 +256,7 @@ void serializeLayer(LayerAndroid* layer, SkWStream* stream) : LTLayerAndroid; stream->write8(type); - // Start with SkLayer fields + // Start with Layer fields stream->writeBool(layer->isInheritFromRootTransform()); stream->writeScalar(layer->getOpacity()); stream->writeScalar(layer->getSize().width()); @@ -337,7 +337,7 @@ LayerAndroid* deserializeLayer(SkStream* stream) return 0; } - // SkLayer fields + // Layer fields layer->setInheritFromRootTransform(stream->readBool()); layer->setOpacity(stream->readScalar()); layer->setSize(stream->readScalar(), stream->readScalar()); diff --git a/Source/WebKit/android/nav/CachedLayer.cpp b/Source/WebKit/android/nav/CachedLayer.cpp index 299f2d1..f6dfb88 100644 --- a/Source/WebKit/android/nav/CachedLayer.cpp +++ b/Source/WebKit/android/nav/CachedLayer.cpp @@ -102,7 +102,7 @@ IntRect CachedLayer::adjustBounds(const LayerAndroid* root, FloatPoint CachedLayer::getGlobalPosition(const LayerAndroid* aLayer) const { SkPoint result = aLayer->getPosition(); - const SkLayer* parent = aLayer->getParent(); + const Layer* parent = aLayer->getParent(); while (parent) { result += parent->getPosition(); DBG_NAV_LOGV("result=(%g,%g) parent=%p [%d]", result.fX, result.fY, |