diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
| commit | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (patch) | |
| tree | 5298ee7f87a0f97f06d5b2e66c37dedd88238ccf /WebKit/android/nav/CacheBuilder.h | |
| parent | ad9f76210e4cbae75d762b7a65b39af424879b6b (diff) | |
| parent | 36747fa778285f57f2f53c047028be83e9d8776d (diff) | |
| download | external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.zip external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.gz external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.bz2 | |
Merge commit 'goog/master' into webkit_merge
Resolved conflicts:
WebCore/Android.mk
WebCore/storage/LocalStorageArea.h
WebCore/storage/SessionStorageArea.cpp
WebCore/storage/StorageEvent.cpp
Diffstat (limited to 'WebKit/android/nav/CacheBuilder.h')
| -rw-r--r-- | WebKit/android/nav/CacheBuilder.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebKit/android/nav/CacheBuilder.h b/WebKit/android/nav/CacheBuilder.h index 3990cab..35bd623 100644 --- a/WebKit/android/nav/CacheBuilder.h +++ b/WebKit/android/nav/CacheBuilder.h @@ -88,7 +88,8 @@ public: mAllowableTypes & ~EMAIL_CACHEDNODETYPE); } void disallowPhoneDetection() { mAllowableTypes = (CachedNodeType) ( mAllowableTypes & ~PHONE_CACHEDNODETYPE); } - static FoundState FindAddress(const UChar* , unsigned length, int* start, int* end); + static FoundState FindAddress(const UChar* , unsigned length, int* start, + int* end, bool caseInsensitive); static void GetGlobalOffset(Frame* , int* x, int * y); static void GetGlobalOffset(Node* , int* x, int * y); static bool validNode(Frame* startFrame, void* framePtr, void* nodePtr); @@ -163,6 +164,7 @@ private: bool mOpenParen; bool mInitialized; bool mContinuationNode; + bool mCaseInsensitive; }; struct ClipColumnTracker { IntRect mBounds; |