diff options
| author | Cary Clark <cary@android.com> | 2011-03-23 08:43:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-23 08:43:23 -0700 |
| commit | 1e47f60c2155bbbf3a85b530963d3033f79ddacb (patch) | |
| tree | 1d8791be969c8a062b6e88dd6e9c50684ed8ff95 /WebKit/android | |
| parent | 96437ad269ab8d40b94d11ce5407715b7c04fd95 (diff) | |
| parent | f58a40bf15e13380b82713b5b229a9bf57fe4b0e (diff) | |
| download | external_webkit-1e47f60c2155bbbf3a85b530963d3033f79ddacb.zip external_webkit-1e47f60c2155bbbf3a85b530963d3033f79ddacb.tar.gz external_webkit-1e47f60c2155bbbf3a85b530963d3033f79ddacb.tar.bz2 | |
am f58a40bf: am ef25442f: don\'t call bounder when uninitialized
* commit 'f58a40bf15e13380b82713b5b229a9bf57fe4b0e':
don't call bounder when uninitialized
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/nav/CachedRoot.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp index f5f8a71..64bf19a 100644 --- a/WebKit/android/nav/CachedRoot.cpp +++ b/WebKit/android/nav/CachedRoot.cpp @@ -89,6 +89,8 @@ public: return doIRect(mUnion); } + bool isEmpty() { return mUnion.isEmpty(); } + bool joinGlyphs(const SkIRect& rect) { bool isGlyph = mType == kDrawGlyph_Type; if (isGlyph) @@ -188,7 +190,8 @@ public: mBounder.setEmpty(); mBounder.setType(CommonCheck::kDrawGlyph_Type); INHERITED::drawPosText(text, byteLength, pos, paint); - mBounder.doRect(CommonCheck::kDrawPosText_Type); + if (!mBounder.isEmpty()) + mBounder.doRect(CommonCheck::kDrawPosText_Type); } virtual void drawPosTextH(const void* text, size_t byteLength, |