summaryrefslogtreecommitdiffstats
path: root/WebCore/dom
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2032-349/+309
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0940-211/+1040
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Fix conflictsKristian Monsen2010-07-022-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | V8Proxy.cpp http://trac.webkit.org/changeset/61499 npapi.h: http://trac.webkit.org/changeset/61277 Document.cpp http://trac.webkit.org/changeset/61787 XMLDocumentParser.h: http://trac.webkit.org/changeset/61663 HTMLLinkElement.*: http://trac.webkit.org/changeset/61424 HTMLTableCellElement.cpp http://trac.webkit.org/changeset/61630 ResourceHandleAndroid.cpp: http://trac.webkit.org/changeset/61768 Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0234-238/+729
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1632-444/+487
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0817-58/+121
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-2741-519/+1349
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2522-86/+222
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Update Android to reflect upstreamed code to avoid Geolocation leaksSteve Block2010-05-241-2/+1
| | | | | | | | | | This is a cherry-pick of WebKit change http://trac.webkit.org/changeset/60069 This releases references to JS callbacks in the page and allows the Frame and thus the Geolocation object to be cleaned up. This change allows us to remove the Android-specific code which achieved the same through an unload listener. Bug: 2169518 Change-Id: I1ed97d40d7f69ec94a58eaa21bfa4979737cc84d
* Remove a superfluous ANDROID-only include from Node.cpp that has not been ↵Ben Murdoch2010-05-171-4/+0
| | | | | | | | upstreamed. Diff -=4! :) Change-Id: Iafac0c2529bb66808e15efac63e75c63966d9673
* Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-141-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to recently upstreamed change http://trac.webkit.org/changeset/58110 Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can be removed post-merge. Fix conflict: WebCore/platform/ScrollView.cpp Fix conflict: WebCore/platform/ScrollView.h Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove ScrollView::platformProhibitsScrolling and ScrollView::scrollRectIntoViewRecursively as they have been removed upstream in http://trac.webkit.org/changeset/58428, http://trac.webkit.org/changeset/58445 and http://trac.webkit.org/changeset/58611. platformProhibitsScrolling was an Android specific function called only from scrollRectIntoViewRecursively. Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both (we have an Android specific addition). Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs, our fix has been upstreamed in http://trac.webkit.org/changeset/58490. Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs. See http://trac.webkit.org/changeset/58177 Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android specific addition). Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific addition). Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs. see http://trac.webkit.org/changeset/58775 Fix conflict: FileSystemAndroid.cpp: Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been upstreamed but beyond 58596. See http://trac.webkit.org/changeset/59226 Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1449-384/+837
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* No longer consider a semi-colon to be a separator character when parsing the ↵Steve Block2010-05-121-12/+0
| | | | | | | | | | | | | | | | | | | | | meta-tag The Android meta-tag parsing code was originally copied from the iPhone implementation. A later change added the semi-colon to the list of separator characters, motivated by Reader. See http://b/issue?id=1416841 and https://mondrian.corp.google.com/changelist/115656-p9 Meta-tag support has since been added to WebKit in http://trac.webkit.org/changeset/57775. The upstream parsing code does not consider the semi-colon to be a separator. The upstream parsing code was merged into Android as part of the merge to WebKit r58033 in https://android-git.corp.google.com/g/#change,50648 This change removes the Android-specific changes so the semi-colon is no longer considered a separator. This brings Android back into line with iPhone and other browsers. Change-Id: Id4cbbadb414d0508a89006d9beb91c56fa1f8daf
* Merge webkit.org at r58033 : Make use of part of upstream meta support codeSteve Block2010-05-111-52/+18
| | | | | | See http://trac.webkit.org/changeset/57775 Change-Id: I2ab1caa2a90e4583afbf6a07ed68bdb360e9fb15
* 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
generated by cgit v1.1 at 2024-12-27 22:23:51 +0000