summaryrefslogtreecommitdiffstats
path: root/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 3f4b1969 to masterSteve Block2010-01-2045-145/+296
|\ | | | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
| * Cherry-pick WebKit change 53449 to move JSC-specific implementation of ↵Steve Block2010-01-195-41/+141
| | | | | | | | | | | | | | | | | | JavaString to a private implementation class See http://trac.webkit.org/changeset/53449 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I61cfea194d679d506d92ca3951032531d6908965
| * Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-1942-104/+155
| | | | | | | | | | | | | | | | | | | | | | | | WebCore/bridge/Bridge See http://trac.webkit.org/changeset/53464 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in PluginView.cpp to add a temporary ANDROID guard. Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
* | Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-2032-440/+696
| | | | | | | | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* | am f83060e8: am be164dbc: Cherry-pick WebKit change 53443 to move jni_class ↵Steve Block2010-01-197-15/+33
|\ \ | |/ | | | | | | | | | | | | | | to JavaClassJSC Merge commit 'f83060e89e8ba30d0321f33164a0c4819f837a03' * commit 'f83060e89e8ba30d0321f33164a0c4819f837a03': Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
| * Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSCSteve Block2010-01-197-15/+33
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53443 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I0f2b0581e0850694953f79d45242c44d16bbf5fa
* | resolved conflicts for merge of acf4a21d to masterSteve Block2010-01-195-160/+182
|\ \ | |/ | | | | Change-Id: If8bb4335848f51919608d28a30ee610acb120ae7
| * Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSCSteve Block2010-01-195-160/+182
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53436 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that changes to the following were required as a result of this cherry-pick. - WebCoreFrameBridge.cpp - updated to use JavaInstance::m_instance - V8Binding/jni/jni_instance - Updated to rename the V8 version of JavaInstance::_instance to JavaInstance::m_instance to allow the same code path to be used in WebCoreFrameBridge. Change-Id: I6884f7424c8a0917095f828bda4ca62452e527b5
* | resolved conflicts for merge of df644d06 to masterSteve Block2010-01-198-17/+37
|\ \ | |/ | | | | Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
| * Merge "Cherry-pick WebKit change 53412 to move jni_instance to ↵Steve Block2010-01-198-17/+37
| |\ | | | | | | | | | JavaInstanceJSC" into eclair-mr2
| | * Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-198-17/+37
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53412 Note that changes to WebCoreFrameBridge.cpp cpp were required as a result of this cherry-pick. Change-Id: I0a6f6fafc5b0d5d9337ef4e339c6a0c5dd188eb9
* | | am 1a318d00: am 336f436c: Don\'t call setNPWindowRect unless the plugin has ↵Grace Kloba2010-01-191-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | started. Otherwise the plugin won\'t get the rect later as it thinks it is not changed. Merge commit '1a318d002f30c34f2a43bbd33897398ea2966f9c' * commit '1a318d002f30c34f2a43bbd33897398ea2966f9c': Don't call setNPWindowRect unless the plugin has
| * | Don't call setNPWindowRect unless the plugin hasGrace Kloba2010-01-181-1/+1
| | | | | | | | | | | | started. Otherwise the plugin won't get the rect later as it thinks it is not changed.
* | | Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-1819-31/+690
| | | | | | | | | | | | | | | | | | | | | | | | This is required to ease the process of upstreaming the Geolocation maximumAge handling code. Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this. Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3
* | | Add navigator.networkType to allow apps to detect the connection type.Andrei Popescu2010-01-1514-0/+188
| | | | | | | | | | | | | | | | | | The online event is fired when the networkType changes. Bug: 2368650
* | | Merge "Removes a superfluous call to GeoNotifier::m_timer::stop() when ↵Steve Block2010-01-151-1/+0
|\ \ \ | | | | | | | | | | | | Geolocation calls back with a position fix."
| * | | Removes a superfluous call to GeoNotifier::m_timer::stop() when Geolocation ↵Steve Block2010-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calls back with a position fix. This call was removed in https://android-git.corp.google.com/g/#change,21293 but inadvertantly added back in https://android-git.corp.google.com/g/#change,21677 See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=e0330ac957b8434cd2c9c7b5447aaa0faabe77ec This call is not present in webkit.org. Change-Id: I712b5d29871e8bda54340e510c2bd7bc411728ee
* | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | the XHR responseXML method is being called on a document with meta tags. http://b/issue?id=2346028"
| * | | | Check for the absence of a frame.Leon Clarke2010-01-141-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. http://b/issue?id=2346028
* | | | am 93f808ab: am 388e461f: Add proper support for fixed position elementsNicolas Roard2010-01-143-23/+61
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '93f808abccaf6f09c5c0226c01942c3be445031a' * commit '93f808abccaf6f09c5c0226c01942c3be445031a': Add proper support for fixed position elements
| * | | Add proper support for fixed position elementsNicolas Roard2010-01-143-23/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this is two-part change, see http://android-git.corp.google.com/g/#change,37092 for the java counterpart. This CL implements fixed position elements (css position: fixed) using layers, supporting pixels and percent lengths. It addresses http://b/1914365
* | | | am 459f6c34: am 29b325cb: Fix \'disappearing layers\' bug (see http://b/2371053)Nicolas Roard2010-01-141-3/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | Merge commit '459f6c347256a4d9fe815793302130fe06bd8f83' * commit '459f6c347256a4d9fe815793302130fe06bd8f83': Fix 'disappearing layers' bug (see http://b/2371053)
| * | Fix 'disappearing layers' bug (see http://b/2371053)Nicolas Roard2010-01-141-3/+0
| | | | | | | | | | | | | | | | | | The removed code was needed in the previous implementation, but not so anymore as we recopy the layers to the UI. It causes the bug, as webkit deallocate the tree asynchronously, which ends up resetting the root layer to zero after the new page was loaded...
* | | am 594a3479: am 44364d80: Merge "Update jni_runtime.cpp with the latest ↵Steve Block2010-01-141-5/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | changes to appendClassName." into eclair-mr2 Merge commit '594a347941318556ae40d521e6f5c23fd9cf66b4' * commit '594a347941318556ae40d521e6f5c23fd9cf66b4': Update jni_runtime.cpp with the latest changes to appendClassName.
| * | Merge "Update jni_runtime.cpp with the latest changes to appendClassName." ↵Steve Block2010-01-141-5/+10
| |\ \ | | | | | | | | | | | | into eclair-mr2
| | * | Update jni_runtime.cpp with the latest changes to appendClassName.Steve Block2010-01-141-5/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit change http://trac.webkit.org/changeset/53193 updated appendClassName to use JSC::StringBuilder, rather than JSC-specific types. This allows this method to be used with V8 as well as JSC. A clean cherry-pick of this change would require changes 52026, 52028, 52075 and 52329 to be cherry-picked also. To avoid this churn, we simply update jni_runtime.cpp to reflect the version at change 53193. Change-Id: I6602469aeea59d8146ab1e72f312888b77522406
* | | am e4771f1b: am 6916255e: Call into MimeTypeMap to get the mime type for an ↵Patrick Scott2010-01-131-7/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | extension. Merge commit 'e4771f1b95589eff8479702dfbf5ef03c267c5c3' * commit 'e4771f1b95589eff8479702dfbf5ef03c267c5c3': Call into MimeTypeMap to get the mime type for an extension.
| * | Call into MimeTypeMap to get the mime type for an extension.Patrick Scott2010-01-131-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the default method to obtain the content type of a plugin. Implement extension to mime type by calling into the java map. Requires a small change to the webkit package. Bug: 2368893
* | | resolved conflicts for merge of e0286f66 to masterSteve Block2010-01-122-2/+10
|\ \ \ | | | | | | | | | | | | Change-Id: I6efcacf082170506048d0a2caf3d669796fc4253
| * | | When starting the Geolocation service provider, check that the WebView is ↵Steve Block2010-01-122-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not already paused. This fixes the following scenario ... - The browser back stack contains a page which calls Geolocation::watchPosition form its onload handler. - User presses the back button quickly and repeatedly until the browser goes to the background. - The browser calls WebViewCore::Pause when it goes into the background, which suspends any Geolocation services in use. However, this call is made before the page which calls Geolocation::watchPosition has been loaded. WebKit later loads this page, which creates a new Geolocation object which is never paused. With this fix, the new Geolocation object is not started when it is first created. It does nothing until it is resumed when the Browser is brought back to the foreground. Bug: 2363338
* | | | Merge "Implement timeupdate events for video tag."Andrei Popescu2010-01-121-0/+2
|\ \ \ \
| * | | | Implement timeupdate events for video tag.Andrei Popescu2010-01-121-0/+2
| | | | | | | | | | | | | | | | | | | | Fix http://b/issue?id=2210105
* | | | | Cherry pick from Webkit for fix for ↵Ben Murdoch2010-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=31539. Restore the default state of a textarea correctly. Change-Id: Id182817b7cd229e12676fd5ef55657ff6a963a4f
* | | | | resolved conflicts for merge of ab89d1aa to masterDerek Sollenberger2010-01-111-1/+7
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | consolidating to only use one surface per plugin. give plugin access to java ↵Derek Sollenberger2010-01-111-1/+7
| | |/ | |/| | | | | | | | | | | | | context. There is a companion commit in frameworks/base.
* | | Merge "Update v8/bindings to remove the ANDROID #ifdefs and confirm that ↵Andrei Popescu2010-01-113-6/+5
|\ \ \ | | | | | | | | | | | | DOMData now officially has a virtual dtor."
| * | | Update v8/bindings to remove the ANDROID #ifdefs and confirmAndrei Popescu2010-01-113-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | that DOMData now officially has a virtual dtor. Changes upstreamed in https://bugs.webkit.org/show_bug.cgi?id=33390
* | | | am 43342a27: am ee0e4a35: Merge "Updates the use of weak references in the ↵Steve Block2010-01-081-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | script-to-Java bridge for V8." into eclair-mr2 Merge commit '43342a276dcdb9e1f8c677f5077d151cd5d6ad07' * commit '43342a276dcdb9e1f8c677f5077d151cd5d6ad07': Updates the use of weak references in the script-to-Java bridge for V8.
| * | Merge "Updates the use of weak references in the script-to-Java bridge for ↵Steve Block2010-01-081-1/+1
| |\ \ | | | | | | | | | | | | V8." into eclair-mr2
| | * | Updates the use of weak references in the script-to-Java bridge for V8.Steve Block2010-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, V8 uses weak references to the Java object owned by JObjectWrapper. This is in contrast to JSC, which uses strong references in JObjectWrapper. However, for the special-case where JObjectWrapper is used in JavaInstance in WebCoreFrameBridge, JSC uses WeakJavaInstance to swap the strong references for weak references. This change updates the V8 version of JObjectWrapper to use strong references to match the JSC version. To maintain the weak reference behavior where JObjectWrapper is used in JavaInstance in WebCoreFrameBridge, V8 now make use of WeakJavaInstance too. This requires changes to jni_npobject to call the necessary methods on JavaInstance to swap the references when the object is accessed. Change-Id: I3724d7e6437588feb0268a2670b02a93b52e54f0
* | | | Update WebCore/platform/network with changes upstreamed inAndrei Popescu2010-01-083-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=32871 https://bugs.webkit.org/show_bug.cgi?id=32873 This will be submitted once the above changes land upstream.
* | | | Reverts Android-specific change to avoid adding history items for fragment ↵Steve Block2010-01-072-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrolls initiated by script. Bug: 2360542 Change-Id: I4a60840dfb89753b4f56f96b5017269bfcf99392
* | | | Merge "Updates Document::setExtraLayoutDelay to reflect recent submission to ↵Steve Block2010-01-075-27/+13
|\ \ \ \ | | | | | | | | | | | | | | | webkit.org."
| * | | | Updates Document::setExtraLayoutDelay to reflect recent submission to ↵Steve Block2010-01-075-27/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webkit.org. setExtraLayoutDelay was an Android addition and was upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32875 Removes Document::extraLayoutDelay by incorporating the extra delay in Document::minimumLayoutDelay. Removes ANDROID_MOBILE guards, as this extra code is not inhernetly specific to Android, and is a no-op if Document::setExtraLayoutDelay is not called. This removes the last uses of ANDROID_MOBILE. Change-Id: I1e18a994f32b29558dcf9a5c76aefab62e9fc13d
* | | | | Disable "fit to screen" if line height < font size.Shimeng (Simon) Wang2010-01-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2289376 modified: WebCore/rendering/RenderBlockLineLayout.cpp
* | | | | Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-0519-56/+52
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
* | | | am 3703e41d: am 3bacb88b: Revert to ENABLE_ORIENTATION_EVENTS=1Nicolas Roard2010-01-041-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '3703e41d68a5747ef178cd5fc4361ee7c9e38249' * commit '3703e41d68a5747ef178cd5fc4361ee7c9e38249': Revert to ENABLE_ORIENTATION_EVENTS=1
| * | | Revert to ENABLE_ORIENTATION_EVENTS=1Nicolas Roard2010-01-041-1/+1
| | | |
| * | | webkit layers supportNicolas Roard2010-01-0412-2/+2029
| |/ /
generated by cgit v1.1 at 2025-02-10 01:07:03 +0000