Android Git Automerger ce41050023 resolved conflicts for merge of 4d4229e4 to master

2009-07-29 16:42:09 -07:00

..

gears

Fix for the new webkit. Now "expires" takes the string instead of int.

2009-06-25 09:48:39 -07:00

BrowserFrame.java

Fix 1986313. WebKit assumes things happened in a certain order. In this case, we can't call LoadListener's nativeError until BrowserFrame's startLoadingResource returns. Otherwise, the failed request will not be removed from the DocLoader's request list. So the page will never finish loading.

2009-07-17 20:39:25 -07:00

ByteArrayBuilder.java

Change addCertificate to take byte[] instead of String as we don't know the encoding.

2009-06-19 15:09:34 -07:00

CacheLoader.java

Add content-disposition into the cache header as it is needed by Flash.

2009-06-29 14:49:10 -07:00

CacheManager.java

Add content-disposition into the cache header as it is needed by Flash.

2009-06-29 14:49:10 -07:00

CallbackProxy.java

Adds the Java side of the system to show the Geolocation permissions prompt.

2009-07-29 17:02:37 +01:00

ContentLoader.java

…

CookieManager.java

…

CookieSyncManager.java

…

DataLoader.java

…

DateSorter.java

…

DebugFlags.java

Remove the web text view if the key cannot be handled

2009-06-29 09:30:42 -04:00

DownloadListener.java

…

FileLoader.java

…

FrameLoader.java

Remove all our old high priority knowledge since WebCore will manage it.

2009-07-15 15:48:02 -04:00

GeolocationPermissions.java

Adds the Java side of the system to show the Geolocation permissions prompt.

2009-07-29 17:02:37 +01:00

HTML5VideoViewProxy.java

Add fullscreen support back in.

2009-07-08 17:01:59 +01:00

HttpAuthHandler.java

…

HttpDateTime.java

Make HttpDateTime public (but hidden), so the rest of us can use it

2009-07-23 16:38:50 -07:00

JsPromptResult.java

…

JsResult.java

…

JWebCoreJavaBridge.java

am 4492bcb8: Merge change 6081 into donut

2009-07-06 11:22:11 -07:00

LoadListener.java

resolved conflicts for merge of 4d4229e4 to master

2009-07-29 16:42:09 -07:00

MimeTypeMap.java

resolved conflicts for merge of 4d4229e4 to master

2009-07-29 16:42:09 -07:00

Network.java

Remove all our old high priority knowledge since WebCore will manage it.

2009-07-15 15:48:02 -04:00

package.html

…

PerfChecker.java

…

Plugin.java

…

PluginContentLoader.java

…

PluginData.java

…

PluginList.java

…

PluginManager.java

…

SslErrorHandler.java

…

StreamLoader.java

…

UrlInterceptHandler.java

…

UrlInterceptRegistry.java

…

URLUtil.java

resolved conflicts for merge of 21d769da to master

2009-07-15 14:38:20 -07:00

ViewManager.java

Add fullscreen support back in.

2009-07-08 17:01:59 +01:00

WebBackForwardList.java

…

WebChromeClient.java

Adds the Java side of the system to show the Geolocation permissions prompt.

2009-07-29 17:02:37 +01:00

WebHistoryItem.java

…

WebIconDatabase.java

…

WebSettings.java

Enforce app cache maximum size

2009-07-22 16:54:16 +01:00

WebStorage.java

Wire in the AppCache out-of-space callback

2009-07-29 11:07:44 +01:00

WebSyncManager.java

…

WebTextView.java

Improvements to dragging on the WebTextView.

2009-07-23 16:32:38 -04:00

WebView.java

Re-add double tap to the Browser. It only works if WebView uses wide viewport.

2009-07-28 13:17:12 -07:00

WebViewClient.java

…

WebViewCore.java

Adds the Java side of the system to show the Geolocation permissions prompt.

2009-07-29 17:02:37 +01:00

WebViewDatabase.java

Add content-disposition into the cache header as it is needed by Flash.

2009-06-29 14:49:10 -07:00