summaryrefslogtreecommitdiffstats
path: root/WebCore/dom
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-112-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-1159-416/+1562
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-274-18/+29
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Document can be detached when CachedFrame is destroyed.Grace Kloba2010-04-061-11/+9
| | | | | | | | | So we can't use it to reset the needTouch flag. Move the logic to removeAllEventListeners(). This is based on the current code where removeAllEventListeners() is called in CachedFrame::destroy() before it sets pageCache to be false. Fix http://b/issue?id=2576132
* Only call plugin touch code if it is in full screenLeon Scroggins2010-03-093-23/+0
| | | | | | | | | | | | | mode or it is the document focused node. Remove Android special code added to support prevent default for double tap and long press. Long press and double tap needs to call preventDefault if it is needed. Remove Android special code added to pass event time. Need a separate CL for android_npapi.
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-169-29/+26
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-154-29/+145
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Fix final trivial mergesSteve Block2010-02-044-19/+0
| | | | Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
* Merge webkit.org at r54127 : Fix conflicts in touchevents IDL files as ↵Steve Block2010-02-043-14/+0
| | | | | | | | GenerateConstructor is no longer required See http://trac.webkit.org/changeset/52537 Change-Id: Id985ac707e30ce100dd06d8e57826af6184c10e6
* Merge webkit.org at r54127 : Merge conflicts due to longpress and doubletap ↵Steve Block2010-02-043-12/+0
| | | | | | | touchevents Keep ours as this code has not yet been upstreamed. Change-Id: Ia05ab6c8c36b2d332fec2fe4c16ceacff2933382
* Merge webkit.org at r54127 : Take theirs for refactoring in Node.cppSteve Block2010-02-041-11/+0
| | | | | | | | This isn't a genuine conflict. It looks like git got confused due to changes made to Android for touch events. See https://android-git.corp.google.com/g/#change,38141 and http://trac.webkit.org/changeset/53564 Change-Id: I8f45a2be90f10b3718ea977430d3bfa65433c373
* Merge webkit.org at r54127 : Merge in Node.cpp due to Android instrumentationSteve Block2010-02-041-15/+13
| | | | | | See http://trac.webkit.org/changeset/52341 Change-Id: I0aa44a36bea6f04f2fd1c91907339f6630321132
* Merge webkit.org at r54127 : Take theirs for extra layout delay.Steve Block2010-02-041-6/+0
| | | | | | See http://trac.webkit.org/changeset/52919 and http://trac.webkit.org/changeset/53027 Change-Id: I0a5d442520651184b23ac30cf78b3c0d220c619b
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0497-677/+1089
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Pass touch event time from Java to WebKitGrace Kloba2010-02-031-0/+4
| | | merge from https://android-git.corp.google.com/g/#change,39356
* Update to Android to reflect final version submitted to webkit.org when ↵Steve Block2010-02-011-3/+3
| | | | | | | | adding ChromeClient::needTouchEvents See http://trac.webkit.org/changeset/54069 Change-Id: Ie42af496d701863682c52e03613248815b7d7b4f
* Merge "Cherry pick the diff after going through review on webkit.org bug for ↵Ben Murdoch2010-01-291-0/+2
|\ | | | | | | 34215 (implementing ChromeClient::needTouchEvents). Landed as r54069. We just needed to add an ifdef guard."
| * Cherry pick the diff after going through review on webkit.org bug for 34215 ↵Ben Murdoch2010-01-291-0/+2
| | | | | | | | | | | | (implementing ChromeClient::needTouchEvents). Landed as r54069. We just needed to add an ifdef guard. Change-Id: If3fa0398e756508a718d5d3d93a5dd322a5e3f01
* | Merge changes I0ab68eac,Ide43a042,I0c11519b,I1ef80088Steve Block2010-01-271-0/+1
|\ \ | |/ |/| | | | | | | | | | | * changes: Update Android to reflect final version submitted to webkit.org for ScriptController Update Android to reflect final version submitted to webkit.org for touch events. Update Android to reflect final version submitted to webkit.org for V8 TODOs Update Android to reflect final version submitted to webkit.org for adding NetworkStateNotifier::networkStateChange
| * Update Android to reflect final version submitted to webkit.org for touch ↵Steve Block2010-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | events. See https://android-git.corp.google.com/g/#change,37040 http://trac.webkit.org/changeset/51981 and http://trac.webkit.org/changeset/53548 Change-Id: Ide43a0425cff940bfd07022d8e9bb72e3d12ce96
* | Stop forwarding touch events from Java when the top level document is ↵Ben Murdoch2010-01-272-12/+11
| | | | | | | | | | | | | | | | | | | | | | detached rather than when eventHandlers are cleared for a frame. Also no longer keep track of the number of touch event handlers that a page has registered. If a page requests touch events, always send them from Java until a new page is loaded. This simplifies the logic when dealing with the page cache as otherwise as well as restoring the forwarding of touch events when a page is restored from the page cache, we would need to restore the number of touch handlers that have been registered. Change-Id: I0269e1632a37ccbf105bac658c2cb7f1d5cd3052
* | Remove dead code attached to the Touch object. This is no longer called, and ↵Ben Murdoch2010-01-262-18/+3
|/ | | | | | keeping a ref to a child frame can cause a crash during GC if the event is the last ref and causes the Frame to be destructed. Change-Id: Ic41adfa3e8b4a901887c87b8196360947ef9692c
* Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-2017-216/+203
| | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* 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
* Updates Document::setExtraLayoutDelay to reflect recent submission to ↵Steve Block2010-01-072-14/+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
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-6/+4
| | | | | | | | | | | | | | | 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-1763-376/+852
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Enable longpress and doubletap to WebKit as touchGrace Kloba2009-12-093-0/+15
| | | | event if it is requested.
* Pull down change 51321 from webkit.org.Patrick Scott2009-12-091-2/+3
| | | | | Calls to EventNames() was causing multiple copies of the event names to be created. This could cause false negatives in hash map lookups.
* Removes WebCorePrefixAndroid.h to aid WebKit upstreaming.Steve Block2009-11-121-3/+3
| | | | | | | | | | | | | | | | Content from WebCorePrefixAndroid.h has been moved to WebCorePrefix.h and the Android Makefiles modified to use that file. - Enabler flags have been moved to WebCore/config.h. - flex_XXX_T types are defined in WebCore/css/maketokenizer - Most system includes are alreay present in WebCorePrefix.h - Some includes have been moved directly to the source files that require them. - The following includes seem not to be required so have been dropped. - #include <limits.h> - #include <math.h> - #include <stdint.h> - #include <unistd.h> Change-Id: I8eba4d0a606463503554955e113d57bdf76a7136
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-5/+2
| | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1027-172/+351
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* fix instrumentation. The new WebKit has CachedResourceClientGrace Kloba2009-10-284-8/+52
| | | | derived from FastAllocBase which has overload operator new. So we need to override it again to avoid ambiguous.
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-223-1/+3
| | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
* Merge webkit.org at R49305 : Update Geolocation to use new EventListener ↵Steve Block2009-10-201-1/+2
| | | | | | | | methods. See http://trac.webkit.org/changeset/48402, http://trac.webkit.org/changeset/48701 and http://trac.webkit.org/changeset/48767 Change-Id: Id32d80c62f71c98c6677d7cbe11ee2ffbdaeeff1
* Merge webkit.org at R49305 : Use new macros to define Android touch event ↵Steve Block2009-10-202-50/+4
| | | | | | | | listeners for Node and DOMWindow. See http://trac.webkit.org/changeset/48701 Change-Id: I160099dd16b222e016c3414f2ce06adf5cf52573
* Merge webkit.org at R49305 : Pull WebKit change ↵Steve Block2009-10-201-1/+1
| | | | | | http://trac.webkit.org/changeset/49428 to fix build with ENABLE_INSPECTOR = 0. Change-Id: Id5cf30ed4a1753dc0659f405286fc66a76cae3c8
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-202-518/+14
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2087-1773/+2604
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fixes a bunch of WebKit whitespace discrepancies between Android and ↵Steve Block2009-10-142-2/+2
| | | | | | | | webkit.org. Do not merge. This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch.
* Removes superfluous unload event getter and setter methods from Node. Do not ↵Steve Block2009-10-132-12/+1
| | | | | | | | | merge. These were removed from webkit.org in http://trac.webkit.org/changeset/44944. This should have been picked up in https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=d227fc870c7a697500a3c900c31baf05fb9a8524, which syncs to webkit.org R47420. This has already been submitted to master branch.
* When detach the top Document, clean up the touch listeners and resetGrace Kloba2009-09-251-0/+11
| | | | | | needTouchEvents. Fix http://b/issue?id=2145333
* Add more null checking to avoid the crash.Grace Kloba2009-09-111-4/+5
|
* Move mobile doctype check from HTMLDocument to Document so that it will ↵Grace Kloba2009-09-081-0/+9
| | | | | cover xhtml case like http://us.m1.yahoo.com. Fix http://b/issue?id=2102284
* We lost ontouchxxx with the new WK. Bring them back.Grace Kloba2009-08-272-0/+12
|
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-1942-737/+824
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Revert "Compilation and link error fixes for new webkit r47420."Andrei Popescu2009-08-191-0/+13
| | | | This reverts commit 632f4508222c2a617e6820e9388867c0f4821db8.
* Compilation and link error fixes for new webkit r47420.Ben Murdoch2009-08-181-13/+0
|
* Merge WebKit r47420Ben Murdoch2009-08-1842-824/+737
|
* Fix the last of the linker errors !Ben Murdoch2009-08-171-2/+2
|
generated by cgit v1.1 at 2024-07-04 20:01:12 +0000