summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-11-17 09:47:19 -0500
committerCary Clark <cary@android.com>2010-11-17 09:47:19 -0500
commit91b159c20557186e81f8964800fb878c11256058 (patch)
tree50efbca3f23296488f13af19917294782e4523fb
parent283cbf40ef1279a6c444458b69a653410b82ca7a (diff)
downloadexternal_webkit-91b159c20557186e81f8964800fb878c11256058.zip
external_webkit-91b159c20557186e81f8964800fb878c11256058.tar.gz
external_webkit-91b159c20557186e81f8964800fb878c11256058.tar.bz2
make helper class private
Confusion on my part about nested classes prevented me from getting this right the first time. Thanks to Pat for setting me straight. bug:3114609 Change-Id: If6551ec98c08c45e0bbd84a51a3a48bda0e55619
-rw-r--r--WebCore/platform/graphics/android/LayerAndroid.cpp8
-rw-r--r--WebCore/platform/graphics/android/LayerAndroid.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index e37b083..f443004 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -292,11 +292,11 @@ public:
}
};
-class LayerAndroidFindState {
+class LayerAndroid::FindState {
public:
static const int TOUCH_SLOP = 10;
- LayerAndroidFindState(int x, int y)
+ FindState(int x, int y)
: m_x(x)
, m_y(y)
, m_best(0)
@@ -332,7 +332,7 @@ protected:
FindCanvas m_checker;
};
-void LayerAndroid::findInner(LayerAndroidFindState& state) const
+void LayerAndroid::findInner(LayerAndroid::FindState& state) const
{
int x = state.x();
int y = state.y();
@@ -353,7 +353,7 @@ void LayerAndroid::findInner(LayerAndroidFindState& state) const
const LayerAndroid* LayerAndroid::find(int x, int y, SkPicture* root) const
{
- LayerAndroidFindState state(x, y);
+ FindState state(x, y);
SkRect rootBounds;
rootBounds.setEmpty();
if (root && state.drew(root, rootBounds) && state.drewText())
diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h
index fb6d78c..939c95c 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.h
+++ b/WebCore/platform/graphics/android/LayerAndroid.h
@@ -72,7 +72,6 @@ struct SkLength {
namespace WebCore {
class AndroidAnimation;
-class LayerAndroidFindState;
class LayerAndroid : public SkLayer {
@@ -201,11 +200,12 @@ protected:
virtual void onDraw(SkCanvas*, SkScalar opacity);
private:
+ class FindState;
#if DUMP_NAV_CACHE
friend class CachedLayer::Debug; // debugging access only
#endif
- void findInner(LayerAndroidFindState& ) const;
+ void findInner(FindState& ) const;
bool prepareContext(bool force = false);
void clipInner(SkTDArray<SkRect>* region, const SkRect& local) const;