diff options
| author | Cary Clark <cary@android.com> | 2009-12-04 10:38:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 10:38:17 -0800 |
| commit | 083dd9ba642850ce340338a4ed960164afe73171 (patch) | |
| tree | 6f6f8cb687e829ffcb8d2e2a2861b27df54087e4 /WebKit/android/nav/CacheBuilder.h | |
| parent | ba96ef8c08d3ad087bacac0e78349d988efac667 (diff) | |
| parent | 021228f27b1399df5a45f3f1e7f1f12126e86e3c (diff) | |
| download | external_webkit-083dd9ba642850ce340338a4ed960164afe73171.zip external_webkit-083dd9ba642850ce340338a4ed960164afe73171.tar.gz external_webkit-083dd9ba642850ce340338a4ed960164afe73171.tar.bz2 | |
am 021228f2: am 1d330120: move input-related fields out of CachedNode to expand
Merge commit '021228f27b1399df5a45f3f1e7f1f12126e86e3c'
* commit '021228f27b1399df5a45f3f1e7f1f12126e86e3c':
move input-related fields out of CachedNode to expand
Diffstat (limited to 'WebKit/android/nav/CacheBuilder.h')
| -rw-r--r-- | WebKit/android/nav/CacheBuilder.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/WebKit/android/nav/CacheBuilder.h b/WebKit/android/nav/CacheBuilder.h index 0c12699..6cf1817 100644 --- a/WebKit/android/nav/CacheBuilder.h +++ b/WebKit/android/nav/CacheBuilder.h @@ -77,17 +77,17 @@ public: FOUND_COMPLETE }; CacheBuilder(); - void allowAllTextDetection() { mAllowableTypes = ALL_CACHEDNODETYPES; } + void allowAllTextDetection() { mAllowableTypes = ALL_CACHEDNODE_BITS; } void buildCache(CachedRoot* root); static bool ConstructPartRects(Node* node, const IntRect& bounds, IntRect* focusBounds, int x, int y, WTF::Vector<IntRect>* result); Node* currentFocus() const; - void disallowAddressDetection() { mAllowableTypes = (CachedNodeType) ( - mAllowableTypes & ~ADDRESS_CACHEDNODETYPE); } - void disallowEmailDetection() { mAllowableTypes = (CachedNodeType) ( - mAllowableTypes & ~EMAIL_CACHEDNODETYPE); } - void disallowPhoneDetection() { mAllowableTypes = (CachedNodeType) ( - mAllowableTypes & ~PHONE_CACHEDNODETYPE); } + void disallowAddressDetection() { mAllowableTypes = (CachedNodeBits) ( + mAllowableTypes & ~ADDRESS_CACHEDNODE_BIT); } + void disallowEmailDetection() { mAllowableTypes = (CachedNodeBits) ( + mAllowableTypes & ~EMAIL_CACHEDNODE_BIT); } + void disallowPhoneDetection() { mAllowableTypes = (CachedNodeBits) ( + mAllowableTypes & ~PHONE_CACHEDNODE_BIT); } static FoundState FindAddress(const UChar* , unsigned length, int* start, int* end, bool caseInsensitive); static void GetGlobalOffset(Frame* , int* x, int * y); @@ -126,7 +126,6 @@ private: BoundsPart mPart; WTF::Vector<BoundsPart> mParts; char mStore[NAVIGATION_MAX_PHONE_LENGTH + 1]; - CachedNodeType mStoreType; int mPartIndex; Node* mNode; Node* mFinalNode; @@ -241,7 +240,7 @@ private: bool setData(CachedFrame* ); Node* tryFocus(Direction direction); Node* trySegment(Direction direction, int mainStart, int mainEnd); - CachedNodeType mAllowableTypes; + CachedNodeBits mAllowableTypes; #if DUMP_NAV_CACHE public: class Debug { |