summaryrefslogtreecommitdiffstats
path: root/WebCore/dom
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-122-1221/+0
| | | | | | | | | | | | | This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12311-49300/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-1040-290/+707
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* am bcc07753: Cherry-pick change Ibaa52a6b (webkit security patch)Bart Sears2011-03-131-2/+6
|\ | | | | | | | | * commit 'bcc077531734eca7eb8663a76ab8d4c15721672c': Cherry-pick change Ibaa52a6b (webkit security patch)
| * Cherry-pick change Ibaa52a6b (webkit security patch)Bart Sears2011-03-131-2/+6
| | | | | | | | | | | | | | Apply webit security patch bug: 4089100 Change-Id: I80069fe6ec12a03fce88128be0ce90fee410911c
* | Merge WebKit at Chromium 9.0.597.106: Initial merge by GitSteve Block2011-02-165-8/+11
|/ | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78455 on the 597 release branch. Change-Id: I72375d9b61a767449086f0c9dc4105b2a6b62ddc
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-162-36/+61
| | | | | | 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-0710-14/+86
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-0612-97/+89
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-2225-117/+209
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0243-315/+749
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* use style ignoring pending style sheetsCary Clark2010-11-241-1/+1
| | | | | | | | | | | | | | | | | If the style is not yet computed, attempting to compute the style may blow up (e.g., the font points to zero and is dereferenced). The webkit way around this appears to be to ignore pending style sheets, even though six lines down from this change, the regular webkit makes the original styleForElement call. This does fix sfgate.com, so it's not a bad thing to do, and the real style change should retrigger this code path later on. bug:3194102 Change-Id: Ia558e3d49c94ed817d69d528b9e914f906f62a66
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-179-87/+239
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Ratchet back style changes that rebuild nav cachesCary Clark2010-11-101-1/+14
| | | | | | | | | | | | | | | Many style changes do not visibly affect the way links are detected -- so limit the rebuild to style changes that either move the size the style, or changes that edit the style's display property. Styles appearing or disappearing (i.e., one is 0) is not treated as a style version change since these events accompany dom edits which are detected outside of this change. bug:3181683 Change-Id: Ie62ef524a956fcd9298ce5878b632645a22e461a
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-0921-93/+346
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* update dom version on style changeCary Clark2010-11-083-0/+14
| | | | | | | | | | | | | | | | | The DOM version number is used to know when the nav cache is out of date. Webkit changes the version when DOM attributes change, but not when the CSS style property changes. Tracking the style version fixes Google properties like the 'Options' menu that is available on mobile devices after a search. Additionally, fix a crash if the root layer doesn't exist. And, rebuild the nav cache always on touch. bug:2628448 Change-Id: I50aa258c1b057ac7deed00f6eca37c0ee323efcf
* Fix for simulator buildKristian Monsen2010-10-271-0/+1
| | | | | | Added include in non-upstreamed section Change-Id: I16556b1e46b43c509de04078487f13af2a9a3b72
* Fix a layering violation in Document.Ben Murdoch2010-10-261-6/+1
| | | | | | PlatformBridge already has the necessary functionality. Change-Id: I67a5d68890d3976da69cff0c20f7b48931366b1d
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-2666-543/+721
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Fix Webkit review comments for document.createTouchBen Murdoch2010-10-183-5/+11
| | | | | | | See WebKit bug https://bugs.webkit.org/show_bug.cgi?id=47676 for details. Change-Id: I232445c78d59ed3d13c9bcd86b9fa9590ffae552
* Implement the document.createTouch and document.createTouchList APIsBen Murdoch2010-10-153-0/+35
| | | | | | | | | | | | | | | | These are Apple extensions to the document object present on iOS and are used by several sites to detect touch event support. See http://developer.apple.com/library/safari/#documentation/UserExperience/Reference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html for Apple's documentation. Upstreaming to webkit being tracked in https://bugs.webkit.org/show_bug.cgi?id=47676 Bug: 2996106 Change-Id: I761b1494af60b5095ad9c47d54eb7240d47ae985
* Merge WebKit at r68651 : Add ANDROID guardsKristian Monsen2010-10-071-0/+4
| | | | | | | m_axObjectCache is not used for Android, so adding guards like in similar functions. Change-Id: I6179bb23fce275095b9521680282eb4ba8b3d29e
* 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-0730-202/+286
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Fix conflictsSteve Block2010-09-291-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace difference in config.h - http://trac.webkit.org/changeset/67323 - WebCore/config.h Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882 - WebCore/css/CSSComputedStyleDeclaration.cpp Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704 - WebCore/css/CSSParser.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667 - WebCore/css/CSSParser.cpp - WebCore/css/CSSStyleSelector.cpp Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292 - WebCore/dom/Document.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903 - WebCore/html/HTMLInputElement.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198 - WebCore/loader/DocumentLoader.cpp - WebCore/loader/FrameLoader.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253 - WebCore/loader/FrameLoader.cpp Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762 - WebCore/page/DOMWindow.cpp Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890 - WebCore/page/Settings.cpp - WebCore/page/Settings.h Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375 - WebCore/platform/MIMETypeRegistry.cpp Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325 - WebCore/plugins/PluginView.cpp Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBox.h - WebCore/rendering/RenderTable.cpp Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862 - WebCore/rendering/RenderTableCell.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667 - WebCore/rendering/style/RenderStyle.h Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c fix conflicts Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-2931-266/+608
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1626-145/+215
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge Webkit at r66666 : Fix conflicts.Kristian Monsen2010-09-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | css/CSSParser.cpp Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery): http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp dom/Document.cpp Removed a function call next to an Android specific change: http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp html/HTMLPlugInElement.cpp Removed a function next to an Android change: http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp page/Settings.h Whitespace change in this CL: http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h svg/SVGFontFaceUriElement.h Small change next to an Android change: http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-1124-210/+436
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Fix conflictsSteve Block2010-09-022-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | - WebCore/dom/Document.cpp Conflict due to Android guards around m_axObjectCache See http://trac.webkit.org/changeset/65787 - WebCore/dom/Document.h Conflict due to Android guards around m_axObjectCache whitespace diff See http://trac.webkit.org/changeset/65787 and http://trac.webkit.org/changeset/66037 - WebCore/html/HTMLDocumentParser.cpp Conflict due to ANDROID_INSTRUMENT See http://trac.webkit.org/changeset/65692 - WebCore/platform/image-decoders/ImageDecoder.cpp Conflict due to Android not implementing ImageDecoder::create() See http://trac.webkit.org/changeset/66039 - WebCore/plugins/PluginView.h Conflict due to PLUGIN_SCHEDULE_TIMER See http://trac.webkit.org/changeset/65697 Change-Id: I5dc94bad471ea566dbabf965425938b732735d02
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0227-768/+1039
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2336-102/+229
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-1249-394/+1272
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-0913-41/+183
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0413-39/+242
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2719-74/+283
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* 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
generated by cgit v1.1 at 2024-07-02 17:44:50 +0000