diff options
| author | Cary Clark <cary@android.com> | 2010-11-17 07:35:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-17 07:35:32 -0800 |
| commit | 681bac951a4196fe5130cd22d4d052e6ef1e9b38 (patch) | |
| tree | a8f1e0586a6965550100f6deef46f39eca4b18ff /WebCore/platform/graphics/android | |
| parent | 4126bb43f3dd92c3b66efcc907e01f575a11d8e6 (diff) | |
| parent | 91b159c20557186e81f8964800fb878c11256058 (diff) | |
| download | external_webkit-681bac951a4196fe5130cd22d4d052e6ef1e9b38.zip external_webkit-681bac951a4196fe5130cd22d4d052e6ef1e9b38.tar.gz external_webkit-681bac951a4196fe5130cd22d4d052e6ef1e9b38.tar.bz2 | |
Merge "make helper class private"
Diffstat (limited to 'WebCore/platform/graphics/android')
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 8 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.h | 4 |
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; |