diff options
| author | Steve Block <steveblock@google.com> | 2010-02-16 11:44:48 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:33 +0000 |
| commit | bbd750d5835fa1fcef2c3d076723d1305e045c39 (patch) | |
| tree | 475b3ba808374e22f6524a17d6e52c1045b9db8f /WebKit/chromium | |
| parent | 48b7cc16e8edd7abbf40cbe17b1abbc8cf273929 (diff) | |
| download | external_webkit-bbd750d5835fa1fcef2c3d076723d1305e045c39.zip external_webkit-bbd750d5835fa1fcef2c3d076723d1305e045c39.tar.gz external_webkit-bbd750d5835fa1fcef2c3d076723d1305e045c39.tar.bz2 | |
Merge webkit.org at r54731 : Fix remaining merge conflicts
- AutoFillPopupMenuClient.h - Take theirs, git got confused
- PluginView.h - Conflict due to new OS macro
- Gradient.cpp - Conflict due to new argument due to setPlatformGradientSpaceTransform
- Android.derived.v8bindings.mk - Keep ours
- DragImage.h - Take both
- V8DocumentCustom.cpp - Take theirs
- XCode project - Take both to keep Android-addition of GeolocationPositionCache
Change-Id: I3f294a71af93fb4e02b57e0169bd25143132df15
Diffstat (limited to 'WebKit/chromium')
| -rw-r--r-- | WebKit/chromium/src/AutoFillPopupMenuClient.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/WebKit/chromium/src/AutoFillPopupMenuClient.h b/WebKit/chromium/src/AutoFillPopupMenuClient.h index fe11334..1912fa3 100644 --- a/WebKit/chromium/src/AutoFillPopupMenuClient.h +++ b/WebKit/chromium/src/AutoFillPopupMenuClient.h @@ -63,18 +63,6 @@ private: Vector<WebCore::String> m_labels; }; -<<<<<<< HEAD:WebCore/bindings/v8/RuntimeEnabledFeatures.cpp -bool RuntimeEnabledFeatures::isLocalStorageEnabled = true; -bool RuntimeEnabledFeatures::isSessionStorageEnabled = true; -bool RuntimeEnabledFeatures::isNotificationsEnabled = false; -#if PLATFORM(ANDROID) -// These should default to true, to match the behavior with JSC -bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true; -bool RuntimeEnabledFeatures::isGeolocationEnabled = true; -#endif -bool RuntimeEnabledFeatures::isIndexedDatabaseEnabled = false; -======= } // namespace WebKit ->>>>>>> webkit.org at r54731:WebKit/chromium/src/AutoFillPopupMenuClient.h #endif |