diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:21:08 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:56 +0000 |
| commit | 5277f3a59aa76c1a40995a47261b9710c284f877 (patch) | |
| tree | 4af391b09e0239b6935e6062ebbb53e51e31ad7a /WebKit/mac/WebView | |
| parent | e5261c62245272b7442a8c5135a2bf85202de0a4 (diff) | |
| download | external_webkit-5277f3a59aa76c1a40995a47261b9710c284f877.zip external_webkit-5277f3a59aa76c1a40995a47261b9710c284f877.tar.gz external_webkit-5277f3a59aa76c1a40995a47261b9710c284f877.tar.bz2 | |
Merge webkit.org at r54127 : Resolve Geolocation conflicts.
Keep ours for maximumAge code.
Take theirs for client-based Geolocation code.
Change-Id: I72baa0026b1cd1bec617843a992dfb6008ca774d
Diffstat (limited to 'WebKit/mac/WebView')
| -rw-r--r-- | WebKit/mac/WebView/WebView.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm index 6dcbfb4..e583bb5 100644 --- a/WebKit/mac/WebView/WebView.mm +++ b/WebKit/mac/WebView/WebView.mm @@ -623,16 +623,12 @@ static bool shouldEnableLoadDeferring() didOneTimeInitialization = true; } -<<<<<<< HEAD - _private->page = new Page(new WebChromeClient(self), new WebContextMenuClient(self), new WebEditorClient(self), new WebDragClient(self), new WebInspectorClient(self), new WebPluginHalterClient(self), 0); -======= #if ENABLE(CLIENT_BASED_GEOLOCATION) WebGeolocationControllerClient* geolocationControllerClient = new WebGeolocationControllerClient(self); #else WebGeolocationControllerClient* geolocationControllerClient = 0; #endif _private->page = new Page(new WebChromeClient(self), new WebContextMenuClient(self), new WebEditorClient(self), new WebDragClient(self), new WebInspectorClient(self), new WebPluginHalterClient(self), geolocationControllerClient); ->>>>>>> webkit.org at r54127 _private->page->settings()->setLocalStorageDatabasePath([[self preferences] _localStorageDatabasePath]); |