summaryrefslogtreecommitdiffstats
path: root/WebCore/dom/Node.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-3069/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101-33/+42
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-161-1/+17
| | | | | | http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
* Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-071-2/+15
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-221-1/+1
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-66/+59
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-2/+2
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-150/+92
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge Webkit at r68651 : Fix conflicts.Kristian Monsen2010-10-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChromeClient.h: Conflict due to ANDROID_INSTALLABLE_WEB_APPS http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h CSSParser.cpp: Conflict due to ANDROID_INSTRUMENT http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp Node.cpp: Conflict due to ANDROID_DOM_LOGGING http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp npapi.h: Conflicts due to various #ifdef ANDROID http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h PlatformTouchEvent.h: PlatformTouchEventAndroid.cpp: PlatformTouchPoint.h: Conflicts due to new BREWMP code next to changed Android code Initial webkit CL: http://trac.webkit.org/changeset/68499 Later fix after merge revision, so cherry-picked: http://trac.webkit.org/changeset/69034 RenderBox.cpp: Several changes, conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68238#file2 http://trac.webkit.org/changeset/68239#file3 http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp The correct resolution here is unclear. A closer investiagtion by somebdoy more familiar with the code is tracked with b/3071198 RenderBox.h: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h RenderIFrame.cpp: Conflicts due to ANDROID_FLATTEN_IFRAME http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp RenderTable.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp RenderView.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp Settings.cpp: Settings.h: Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL http://trac.webkit.org/changeset/68166 Widget.cpp: http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-0/+7
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-39/+19
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-85/+47
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-16/+3
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-5/+0
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-091-3/+7
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-2/+1
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-10/+40
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-1/+6
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-0/+15
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-1/+1
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-8/+44
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-10/+5
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-3/+4
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* 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-141-141/+143
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-20/+46
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-17/+12
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* 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 : Initial merge by gitSteve Block2010-02-041-44/+199
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Stop forwarding touch events from Java when the top level document is ↵Ben Murdoch2010-01-271-12/+0
| | | | | | | | | | | 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
* Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-201-16/+16
| | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-17/+33
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* 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
* fix instrumentation. The new WebKit has CachedResourceClientGrace Kloba2009-10-281-6/+18
| | | | derived from FastAllocBase which has overload operator new. So we need to override it again to avoid ambiguous.
* Merge webkit.org at R49305 : Use new macros to define Android touch event ↵Steve Block2009-10-201-42/+0
| | | | | | | | listeners for Node and DOMWindow. See http://trac.webkit.org/changeset/48701 Change-Id: I160099dd16b222e016c3414f2ce06adf5cf52573
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-415/+14
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-266/+193
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Removes superfluous unload event getter and setter methods from Node. Do not ↵Steve Block2009-10-131-10/+0
| | | | | | | | | 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.
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-82/+11
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-11/+82
|
* Fix left over maunal mergesAndrei Popescu2009-08-131-10/+0
|
* dom, html and loader mergesAndrei Popescu2009-08-121-3/+0
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-90/+107
|
* Get WebKit r44544.Feng Qian2009-06-171-217/+250
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-26/+1232
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-74/+296
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+1968
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-1968/+0
|
generated by cgit v1.1 at 2024-09-09 10:48:50 +0000