summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Keep ours for PlatformBridge.Steve Block2010-02-041-6/+0
* Merge webkit.org at r54127 : Take theirs for extra layout delay.Steve Block2010-02-041-6/+0
* Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROIDSteve Block2010-02-044-29/+8
* Merge webkit.org at r54127 : Take theirs for changes to JavaScript string add...Steve Block2010-02-044-58/+84
* Merge webkit.org at r54127 : Resolve Geolocation conflicts.Steve Block2010-02-048-96/+0
* Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridgeSteve Block2010-02-047-63/+0
* Merge webkit.org at r54127 : Take theirs for ChangeLogs and build files for o...Steve Block2010-02-0410-24435/+0
* Merge webkit.org at r54127 : Keep ours for Makefiles.Steve Block2010-02-042-67/+0
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-042849-128355/+242855
* Merge "Renames a variable in AddJavascriptInterface which shadows a parameter...Steve Block2010-02-041-3/+3
|\
| * Renames a variable in AddJavascriptInterface which shadows a parameter of the...Steve Block2010-02-041-3/+3
* | Merge "Fix a bug when converting double and float types from NP variants to J...Steve Block2010-02-041-4/+10
|\ \ | |/
| * Fix a bug when converting double and float types from NP variants to JNI type...Steve Block2010-02-041-4/+10
* | Forward the console message level from WebCore to Java land.Ben Murdoch2010-02-043-6/+6
|/
* Enable database and appcache for V8Steve Block2010-02-031-3/+9
* Pass touch event time from Java to WebKitGrace Kloba2010-02-0310-12/+45
* Merge "Guard the new Navigator connection property with a temporary ENABLE_CO...Steve Block2010-02-033-2/+4
|\
| * Guard the new Navigator connection property with a temporary ENABLE_CONNECTIO...Steve Block2010-02-033-2/+4
* | Merge changes I83856763,Ib434e467Steve Block2010-02-031-18/+38
|\ \ | |/
| * Adds new GeolocationPositionCache files to XCode projectSteve Block2010-02-031-0/+8
| * Fix XCode project to allow us to build Android WebKit on MacSteve Block2010-02-031-18/+30
* | resolved conflicts for merge of a82364c2 to masterBen Murdoch2010-02-030-0/+0
|\ \ | |/ |/|
| * am 5b9b4d4e: Pass touch event time from Java to WebKitGrace Kloba2010-02-029-8/+26
| |\
| | * Pass touch event time from Java to WebKitGrace Kloba2010-02-029-8/+26
* | | Merge "Update V8 JNI bridge code to match final version submitted to webkit.org"Steve Block2010-02-0213-83/+74
|\ \ \
| * | | Update V8 JNI bridge code to match final version submitted to webkit.orgSteve Block2010-02-0213-83/+74
* | | | Merge "Cherry pick of WebKit revision r54138 (http://trac.webkit.org/changese...Ben Murdoch2010-02-021-2/+3
|\ \ \ \
| * | | | Cherry pick of WebKit revision r54138 (http://trac.webkit.org/changeset/54138...Ben Murdoch2010-02-021-2/+3
| |/ / /
* | | | Implement V8 counter supportAndrei Popescu2010-02-025-0/+206
|/ / /
* | | Add ANDROID tags to some touchevents changes that have yet to be upstreamedSteve Block2010-02-011-1/+8
* | | Update Android to reflect final version submitted to webkit.org when changing...Steve Block2010-02-011-8/+4
* | | Update Android to reflect final version submitted to webkit.org when adding t...Steve Block2010-02-011-3/+3
* | | Update to Android to reflect final version submitted to webkit.org when addin...Steve Block2010-02-011-3/+3
* | | Cherry-pick WebKit change 54096 for client-based GeolocationSteve Block2010-02-012-3/+19
* | | Cherry-pick WebKit change 54080 for client-based GeolocationSteve Block2010-02-012-1/+8
* | | Cherry-pick WebKit change 54079 for client-based GeolocationSteve Block2010-02-013-6/+48
* | | Cherry-pick WebKit change 53708 for client-based GeolocationSteve Block2010-02-012-0/+15
* | | Merge "Anchor the page at top left corner when webView size changed."Shimeng (Simon) Wang2010-01-291-35/+17
|\ \ \
| * | | Anchor the page at top left corner when webView size changed.Shimeng (Simon) Wang2010-01-291-35/+17
* | | | Merge "Cherry pick the diff after going through review on webkit.org bug for ...Ben Murdoch2010-01-291-0/+2
|\ \ \ \
| * | | | Cherry pick the diff after going through review on webkit.org bug for 34215 (...Ben Murdoch2010-01-291-0/+2
* | | | | Merge "Fix Geolocation to make use of the startUpdating helper method"Steve Block2010-01-291-1/+1
|\ \ \ \ \
| * | | | | Fix Geolocation to make use of the startUpdating helper methodSteve Block2010-01-291-1/+1
* | | | | | Merge "Changes to make Bridge.h script-engine independent are complete"Steve Block2010-01-281-5/+0
|\ \ \ \ \ \
| * | | | | | Changes to make Bridge.h script-engine independent are completeSteve Block2010-01-271-5/+0
| |/ / / / /
* | | | | | Add request header support for the Browser/WebView.Grace Kloba2010-01-271-2/+41
| |_|/ / / |/| | | |
* | | | | Merge "No text wrapping in FitToScreen mode when text has background image."Shimeng (Simon) Wang2010-01-271-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | No text wrapping in FitToScreen mode when text has background image.Shimeng (Simon) Wang2010-01-271-1/+3
* | | | | V8 can now use WebCore/bridge/jni/JNIBridge.cppSteve Block2010-01-273-158/+1
* | | | | V8 can now use WebCore/bridge/jni/JNIBridge.hSteve Block2010-01-2711-128/+13