summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 3f4b1969 to masterSteve Block2010-01-2049-147/+316
|\
| * am 070350dd: Merge changes I61cfea19,Ib2fe7793 into eclair-mr2Steve Block2010-01-2049-147/+316
| |\
| | * Merge changes I61cfea19,Ib2fe7793 into eclair-mr2Steve Block2010-01-2049-147/+316
| | |\
| | | * Cherry-pick WebKit change 53449 to move JSC-specific implementation of JavaSt...Steve Block2010-01-195-41/+141
| | | * Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/b...Steve Block2010-01-1946-106/+175
* | | | Refactor our touch event code to use the version submitted to webkit.org by t...Ben Murdoch2010-01-2037-457/+778
* | | | am 2ba2794f: am 4d667d7f: Exit the fullscreen mode when the PluginWidget is d...Grace Kloba2010-01-192-1/+9
|\ \ \ \ | |/ / /
| * | | am 4d667d7f: Exit the fullscreen mode when the PluginWidget is destroyed.Grace Kloba2010-01-192-1/+9
| |\ \ \ | | |/ /
| | * | Exit the fullscreen mode when the PluginWidget isGrace Kloba2010-01-192-1/+9
| | |/
* | | am f83060e8: am be164dbc: Cherry-pick WebKit change 53443 to move jni_class t...Steve Block2010-01-197-15/+33
|\ \ \ | |/ /
| * | am be164dbc: Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSCSteve Block2010-01-197-15/+33
| |\ \ | | |/
| | * Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSCSteve Block2010-01-197-15/+33
* | | resolved conflicts for merge of acf4a21d to masterSteve Block2010-01-198-173/+195
|\ \ \ | |/ /
| * | am 7fb686e7: Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSCSteve Block2010-01-198-169/+191
| |\ \ | | |/
| | * Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSCSteve Block2010-01-198-169/+191
* | | resolved conflicts for merge of df644d06 to masterSteve Block2010-01-199-18/+38
|\ \ \ | |/ /
| * | am eeada71d: Merge "Cherry-pick WebKit change 53412 to move jni_instance to J...Steve Block2010-01-199-18/+38
| |\ \ | | |/
| | * Merge "Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJS...Steve Block2010-01-199-18/+38
| | |\
| | | * Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-199-18/+38
* | | | Change LOGE to LOGV.Patrick Scott2010-01-191-1/+1
* | | | am 9611825c: am 6a5a35ed: Merge "Should check the enable plugin settings befo...Grace Kloba2010-01-191-1/+4
|\ \ \ \ | |/ / /
| * | | am 6a5a35ed: Merge "Should check the enable plugin settings before accepting ...Grace Kloba2010-01-191-1/+4
| |\ \ \ | | |/ /
| | * | Merge "Should check the enable plugin settings before accepting the plugin mi...Grace Kloba2010-01-181-1/+4
| | |\ \
| | | * | Should check the enable plugin settings before acceptingGrace Kloba2010-01-181-1/+4
* | | | | am 1a318d00: am 336f436c: Don\'t call setNPWindowRect unless the plugin has s...Grace Kloba2010-01-191-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 336f436c: Don\'t call setNPWindowRect unless the plugin has started. Other...Grace Kloba2010-01-191-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Don't call setNPWindowRect unless the plugin hasGrace Kloba2010-01-181-1/+1
| | |/ /
* | | | am 4b178ce7: (-s ours) am f48712a0: DO NOT MERGE.Grace Kloba2010-01-190-0/+0
|\ \ \ \
| * \ \ \ am f48712a0: DO NOT MERGE.Grace Kloba2010-01-131-25/+28
| |\ \ \ \
| | * | | | DO NOT MERGE.Grace Kloba2010-01-131-25/+28
* | | | | | Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-1831-38/+784
* | | | | | Add navigator.networkType to allow apps to detect the connection type.Andrei Popescu2010-01-1515-0/+217
* | | | | | Merge "Removes a superfluous call to GeoNotifier::m_timer::stop() when Geoloc...Steve Block2010-01-151-1/+0
|\ \ \ \ \ \
| * | | | | | Removes a superfluous call to GeoNotifier::m_timer::stop() when Geolocation c...Steve Block2010-01-151-1/+0
* | | | | | | Fix for setting layers opacity through CSS (bug http://b/2376455)Nicolas Roard2010-01-151-0/+1
* | | | | | | Merge "Check for the absence of a frame. This crashes in the situation where ...Leon Clarke2010-01-151-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Check for the absence of a frame.Leon Clarke2010-01-141-1/+2
| |/ / / / / /
* | | | | | | am 8a2903f5: am b8a54826: Don\'t use static jclass unless we hold a reference.Grace Kloba2010-01-141-14/+9
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am b8a54826: Don\'t use static jclass unless we hold a reference.Grace Kloba2010-01-141-14/+9
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Don't use static jclass unless we hold a reference.Grace Kloba2010-01-141-14/+9
* | | | | | | am 93f808ab: am 388e461f: Add proper support for fixed position elementsNicolas Roard2010-01-144-26/+65
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 388e461f: Add proper support for fixed position elementsNicolas Roard2010-01-144-26/+65
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add proper support for fixed position elementsNicolas Roard2010-01-144-26/+65
* | | | | | | am 459f6c34: am 29b325cb: Fix \'disappearing layers\' bug (see http://b/2371053)Nicolas Roard2010-01-141-3/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | am 29b325cb: Fix \'disappearing layers\' bug (see http://b/2371053)Nicolas Roard2010-01-141-3/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix 'disappearing layers' bug (see http://b/2371053)Nicolas Roard2010-01-141-3/+0
* | | | | | am 594a3479: am 44364d80: Merge "Update jni_runtime.cpp with the latest chang...Steve Block2010-01-141-5/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 44364d80: Merge "Update jni_runtime.cpp with the latest changes to appendC...Steve Block2010-01-141-5/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Update jni_runtime.cpp with the latest changes to appendClassName." in...Steve Block2010-01-141-5/+10
| | |\ \ \ \
| | | * | | | Update jni_runtime.cpp with the latest changes to appendClassName.Steve Block2010-01-141-5/+10