diff options
| author | Cary Clark <cary@android.com> | 2010-04-06 13:17:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-06 13:17:25 -0700 |
| commit | e5b1750d38ff2208c180fe357355bf7e23e1d97d (patch) | |
| tree | 01ae1fd1409f0aaa4cadf43663535e278274feb6 /WebKit/android/nav/CachedFrame.h | |
| parent | 3dc27326d844c3fb48cdd88fd22b1c85e0abd0c0 (diff) | |
| parent | be312690095b3ccc1f52336b69c11bf42d4eb9e5 (diff) | |
| download | external_webkit-e5b1750d38ff2208c180fe357355bf7e23e1d97d.zip external_webkit-e5b1750d38ff2208c180fe357355bf7e23e1d97d.tar.gz external_webkit-e5b1750d38ff2208c180fe357355bf7e23e1d97d.tar.bz2 | |
Merge "keep frames associated with regular hits and direct hits" into froyo
Diffstat (limited to 'WebKit/android/nav/CachedFrame.h')
| -rw-r--r-- | WebKit/android/nav/CachedFrame.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/nav/CachedFrame.h b/WebKit/android/nav/CachedFrame.h index f7276c1..ed76583 100644 --- a/WebKit/android/nav/CachedFrame.h +++ b/WebKit/android/nav/CachedFrame.h @@ -92,7 +92,8 @@ public: const CachedNode* document() const { return mCachedNodes.begin(); } bool empty() const { return mCachedNodes.size() < 2; } // must have 1 past doc const CachedNode* findBestAt(const WebCore::IntRect& , int* best, - bool* inside, const CachedNode** , const CachedFrame** , int* x, + bool* inside, const CachedNode** , const CachedFrame** directFrame, + const CachedFrame** resultFrame, int* x, int* y, bool checkForHidden) const; const CachedFrame* findBestFrameAt(int x, int y) const; const CachedNode* findBestHitAt(const WebCore::IntRect& , |