summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/v8/V8DOMWrapper.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-111-78/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-127/+81
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Fix merge conflictsSteve Block2010-04-271-18/+1
| | | | | | | | | | - Android.v8bindings.mk - Keep ours, conflict due to upstreaming of using DerivedSourcesAllInOne.cpp - V8Index.h - Keep ours, conflict due to upstreaming of touch events - GeolocationService.h - Take both, conflict due to Android-specific change for pausing service - PluginView.cpp - Take both, conflict due to Android-specific change to guard JSC headers - V8DOMWrapper.cpp - Keep ours, conflict due to addition of WORKERS guards Change-Id: Ib640e64caecbb8cb31272dbfbc18d95f32f9d126
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-3/+24
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* compile fix for V8 with debug buildsKristian Monsen2010-03-241-0/+2
| | | | Change-Id: Icffc7b0d5f9a9b2da66dca37c0c8d084c11491b7
* Add missing WORKERS guards to V8 bindingsSteve Block2010-03-171-0/+8
| | | | | | | | | | | | The motivation for this change is to allow us to disable workers on Android, because V8 on Android does not have the required locking. This change will not be upstreamed because the code has been refactored in tip-of-tree WebKit. See http://trac.webkit.org/changeset/55096 Change-Id: I23ce1e5aecc2897da240b5229585b8e6617d8ebf
* Cherry-pick WebKit change 56112 to add WORKERS guards to V8 bindingsSteve Block2010-03-171-0/+4
| | | | | | | | | The motivation for this change is to allow us to disable workers on Android, because V8 on Android does not have the required locking. See http://trac.webkit.org/changeset/56112 Change-Id: Ieee214f4765af3188bbdc51c56f14883f6a6779c
* Cherry-pick WebKit change 55084 to add SHARED_WORKERS guard in V8 ↵Steve Block2010-03-171-0/+2
| | | | | | | | | | | globalObjectPrototypeIsDOMWindow The motivation for this change is to allow us to disable workers on Android, because V8 on Android does not have the required locking. See http://trac.webkit.org/changeset/55084 Change-Id: If72cb478fb7dad6be44eaa2c1ca19e9790a9dda0
* Cherry-pick WebKit change 54972 to merge DOMWindow and WorkerContext object ↵Steve Block2010-03-171-14/+28
| | | | | | | | | | | | | | | | | | | | wrapping in V8 bindings The motivation for this change is to disable workers on Android, because V8 on Android does not have the required locking. The current version of WebKit in Android (54731) uses workers features without ENABLE(WORKERS) guards in the V8 bindings. In particular, V8DOMWrapper::instantiateV8ObjectInWorkerContext is used from generated code without guards. Fixing the code generator would be difficult and would be wasted effort as V8DOMWrapper::instantiateV8ObjectInWorkerContext no longer exists in tip-of-tree WebKit. Instead, we cherry-pick the WebKit change which removes this method. See http://trac.webkit.org/changeset/54972 Change-Id: Ie6365073d7a4d92aa7c1553d87a7e1c1ed514118
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-20/+28
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Fix merge conflictsSteve Block2010-02-151-362/+0
| | | | | | | | | | | | - Take both for Android makefiles, other than typo for JavaNPObjectV8 upstream - Take theirs for XCode project file and ChangeLog - Fix trivial header conflict in V8DocumentCustom - Keep ours for fix in JNIUtilityPrivate.cpp - Take theirs for V8DOMWrapper.cpp. Conflict is due to Android addition of TouchEvents, which conflicts with http://trac.webkit.org/changeset/54259 - Take both for Android addition of applicationInstalledCallback - Take both for Android JSC JIT changes in Platform.h Change-Id: Ib1a748f204a07a7e736feeee6a0f30f7453754a7
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-612/+37
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Fix final trivial mergesSteve Block2010-02-041-3/+0
| | | | Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
* Merge webkit.org at r54127 : Resolve conflicts in V8 touch events bindings.Steve Block2010-02-041-362/+0
| | | | | | | The V8 touch event bindings weren't upstreamed, but this code has now all been deleted in favour of auto-generation. See http://trac.webkit.org/changeset/52663 for the change that removes the indexed getters used for touch events Change-Id: Ie59c504d7efcb408c18f76d085db63bc1c4a96c4
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-91/+128
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Remove Android-specific TODOs as the changes have been upstreamed inAndrei Popescu2010-01-221-9/+0
| | | | https://bugs.webkit.org/show_bug.cgi?id=33944
* Adds notes to upstream feature guards added in V8DOMWrapper.cpp.Steve Block2009-12-171-5/+6
| | | | Change-Id: Id7659cfcab17f24e48958086b4206b1906562d74
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-8/+0
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-67/+190
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-19/+29
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.Steve Block2009-10-201-0/+9
| | | | Change-Id: Ia05aafa843b1f9aaf3d4f43cad7d664bf9d497e6
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-5/+1
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-27/+206
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fix the DOM storage layout tests when running with V8. Change the custom ↵Ben Murdoch2009-09-021-0/+4
| | | | bindings to ignore requests for the length attribute and update the event handling code to create Storage Events properly.
* Add TouchEvent check.Feng Qian2009-08-201-0/+5
| | | | It is left out by the last webkit merge.
* Fix V8DOMWrapper.cppAndrei Popescu2009-08-141-1/+3
|
* More V8 compliation fixesAndrei Popescu2009-08-141-2/+7
|
* r47029: Merge V8Index and V8Proxy.Ben Murdoch2009-08-121-0/+7
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-0/+1465
generated by cgit v1.1 at 2025-06-10 02:38:25 +0000