diff options
| author | Steve Block <steveblock@google.com> | 2010-02-15 09:07:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-15 09:07:35 -0800 |
| commit | 4b9fb0fdd6d505b554e2d53c4a5f403c5e44fe96 (patch) | |
| tree | 72a273abbb8e2bf9f2da19246f3d1de7a39b248d /WebCore | |
| parent | 4f8c82c5d2dcae236b058be4be79c988e0e98e2a (diff) | |
| parent | 8b47809d88a4616acb86b1c54fdeb48fdf046bf7 (diff) | |
| download | external_webkit-4b9fb0fdd6d505b554e2d53c4a5f403c5e44fe96.zip external_webkit-4b9fb0fdd6d505b554e2d53c4a5f403c5e44fe96.tar.gz external_webkit-4b9fb0fdd6d505b554e2d53c4a5f403c5e44fe96.tar.bz2 | |
Merge "Fix Mac build"
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/WebCore.xcodeproj/project.pbxproj | 8 | ||||
| -rw-r--r-- | WebCore/storage/Database.cpp | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index f4b8b02..9135a97 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -1136,6 +1136,8 @@ 59EE122E1106080F00885116 /* JNIUtilityPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EE122D1106080F00885116 /* JNIUtilityPrivate.h */; }; 59EE12301106081F00885116 /* JNIUtility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59EE122F1106081F00885116 /* JNIUtility.cpp */; }; 59EE12321106082900885116 /* JNIUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EE12311106082900885116 /* JNIUtility.h */; }; + 59FD5B8B1129B29100DB6D96 /* GeolocationPositionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59FD5B8A1129B29100DB6D96 /* GeolocationPositionCache.cpp */; }; + 59FD5B8D1129B29F00DB6D96 /* GeolocationPositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 59FD5B8C1129B29F00DB6D96 /* GeolocationPositionCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5D15E3AB0F9E6AC1009E0E3F /* XMLTokenizerScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D15E3A90F9E6AC1009E0E3F /* XMLTokenizerScope.cpp */; }; 5D15E3AC0F9E6AC1009E0E3F /* XMLTokenizerScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D15E3AA0F9E6AC1009E0E3F /* XMLTokenizerScope.h */; }; 5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */; }; @@ -6530,6 +6532,8 @@ 59EE122D1106080F00885116 /* JNIUtilityPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JNIUtilityPrivate.h; path = jsc/JNIUtilityPrivate.h; sourceTree = "<group>"; }; 59EE122F1106081F00885116 /* JNIUtility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JNIUtility.cpp; sourceTree = "<group>"; }; 59EE12311106082900885116 /* JNIUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JNIUtility.h; sourceTree = "<group>"; }; + 59FD5B8A1129B29100DB6D96 /* GeolocationPositionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationPositionCache.cpp; sourceTree = "<group>"; }; + 59FD5B8C1129B29F00DB6D96 /* GeolocationPositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPositionCache.h; sourceTree = "<group>"; }; 5D15E3A90F9E6AC1009E0E3F /* XMLTokenizerScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTokenizerScope.cpp; sourceTree = "<group>"; }; 5D15E3AA0F9E6AC1009E0E3F /* XMLTokenizerScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTokenizerScope.h; sourceTree = "<group>"; }; 5D925B650F64D4DD00B847F0 /* ScrollBehavior.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollBehavior.cpp; sourceTree = "<group>"; }; @@ -11408,6 +11412,8 @@ 65BF02180974806300C43196 /* page */ = { isa = PBXGroup; children = ( + 59FD5B8C1129B29F00DB6D96 /* GeolocationPositionCache.h */, + 59FD5B8A1129B29100DB6D96 /* GeolocationPositionCache.cpp */, 316FE1060E6E1D8400BF6088 /* animation */, 93C09A820B064F05005ABD4D /* mac */, 8538F0000AD71770006A81D1 /* AbstractView.idl */, @@ -18505,6 +18511,7 @@ B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */, 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */, 9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */, + 59FD5B8D1129B29F00DB6D96 /* GeolocationPositionCache.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -20683,6 +20690,7 @@ 84D0C4041115F1D40018AA34 /* AffineTransform.cpp in Sources */, B776D43D1104527500BEB0EC /* PrintContext.cpp in Sources */, 9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */, + 59FD5B8B1129B29100DB6D96 /* GeolocationPositionCache.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp index bbdce87..619c3ce 100644 --- a/WebCore/storage/Database.cpp +++ b/WebCore/storage/Database.cpp @@ -73,10 +73,9 @@ const String& Database::databaseInfoTableName() #if ENABLE(DATABASE) -#if PLATFORM(ANDROID) +// ANDROID // This should default to true, to match the behavior with JSC static bool isDatabaseAvailable = true; -#endif void Database::setIsAvailable(bool available) { |