diff options
Diffstat (limited to 'Source/WebKit/android')
| -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, |