diff options
| author | Mike Reed <reed@google.com> | 2010-02-25 17:07:06 -0500 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2010-02-25 17:07:06 -0500 |
| commit | d9975bf008036e4a597df404b62d0722645ba75c (patch) | |
| tree | 67ffa98cb70d3a4238383a7215fda8183b252b75 /WebCore/platform | |
| parent | 24f7fb9130250d850bf040efd1021c97e179a299 (diff) | |
| download | external_webkit-d9975bf008036e4a597df404b62d0722645ba75c.zip external_webkit-d9975bf008036e4a597df404b62d0722645ba75c.tar.gz external_webkit-d9975bf008036e4a597df404b62d0722645ba75c.tar.bz2 | |
make methods private (or static local) if possible to reduce surface area of API
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 10 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.h | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp index 0dedd64..9bd5a78 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -197,11 +197,11 @@ void LayerAndroid::bounds(SkRect* rect) const rect->fBottom = rect->fTop + size.height(); } -bool LayerAndroid::boundsIsUnique(SkTDArray<SkRect>* region, - const SkRect& local) const +static bool boundsIsUnique(const SkTDArray<SkRect>& region, + const SkRect& local) { - for (int i = 0; i < region->count(); i++) { - if ((*region)[i].contains(local)) + for (int i = 0; i < region.count(); i++) { + if (region[i].contains(local)) return false; } return true; @@ -223,7 +223,7 @@ void LayerAndroid::clipInner(SkTDArray<SkRect>* region, localBounds.intersect(local); if (localBounds.isEmpty()) return; - if (m_recordingPicture && boundsIsUnique(region, localBounds)) + if (m_recordingPicture && boundsIsUnique(*region, localBounds)) *region->append() = localBounds; for (int i = 0; i < countChildren(); i++) getChild(i)->clipInner(region, m_haveClip ? localBounds : local); diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h index 4f8a5fe..940c4d6 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.h +++ b/WebCore/platform/graphics/android/LayerAndroid.h @@ -130,7 +130,6 @@ public: */ void updatePositions(const SkRect& viewPort); - void bounds(SkRect* ) const; void clipArea(SkTDArray<SkRect>* region) const; const LayerAndroid* find(int x, int y) const; const LayerAndroid* findById(int uniqueID) const; @@ -144,8 +143,8 @@ protected: virtual void onDraw(SkCanvas*, SkScalar opacity); private: + void bounds(SkRect* ) const; bool prepareContext(bool force = false); - bool boundsIsUnique(SkTDArray<SkRect>* region, const SkRect& local) const; void clipInner(SkTDArray<SkRect>* region, const SkRect& local) const; bool m_isRootLayer; |