diff options
| author | Cary Clark <cary@android.com> | 2010-04-22 13:25:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 13:25:51 -0700 |
| commit | 29189dc45bb2dde89f388b2fb8fbd2e996c92cd1 (patch) | |
| tree | c1ebe614b491d909b0be110eb275ef1a62531433 | |
| parent | 68b8e349574b5d6db35108cbb5236133b99eeaa6 (diff) | |
| parent | 6ec27fea860849da854f5c3bcfd7b4798b08efc0 (diff) | |
| download | external_webkit-29189dc45bb2dde89f388b2fb8fbd2e996c92cd1.zip external_webkit-29189dc45bb2dde89f388b2fb8fbd2e996c92cd1.tar.gz external_webkit-29189dc45bb2dde89f388b2fb8fbd2e996c92cd1.tar.bz2 | |
am 6ec27fea: am 5076efcd: don\'t hide transparent nodes
Merge commit '6ec27fea860849da854f5c3bcfd7b4798b08efc0' into kraken
* commit '6ec27fea860849da854f5c3bcfd7b4798b08efc0':
don't hide transparent nodes
| -rw-r--r-- | WebKit/android/nav/CachedRoot.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp index 115a0f9..2d37a2a 100644 --- a/WebKit/android/nav/CachedRoot.cpp +++ b/WebKit/android/nav/CachedRoot.cpp @@ -1083,7 +1083,7 @@ WebCore::String CachedRoot::imageURI(int x, int y) const bool CachedRoot::maskIfHidden(BestData* best) const { const CachedNode* bestNode = best->mNode; - if (bestNode->isUnclipped()) + if (bestNode->isUnclipped() || bestNode->isTransparent()) return false; const CachedFrame* frame = best->mFrame; SkPicture* picture = frame->picture(bestNode); |