summaryrefslogtreecommitdiffstats
path: root/WebCore/html
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12515-70973/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Fix conflicts.Ben Murdoch2011-05-102-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .gitignore - keep ours Android.mk http://trac.webkit.org/changeset/74431 Parser.cpp http://trac.webkit.org/changeset/74377 ImageDecoder.cpp http://trac.webkit.org/changeset/73819 GraphicsContext.cpp http://trac.webkit.org/changeset/73729 ContextMenuItem.h http://trac.webkit.org/changeset/74028 SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493 RenderView.h http://trac.webkit.org/changeset/74524 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 InlineTextBox.cpp http://trac.webkit.org/changeset/73548 SliderThumbElement.cpp RenderSlider.cpp http://trac.webkit.org/changeset/74044 StyleRareInheritedData.cpp|h CSSStyleSelector.cpp CSSParser.cpp http://trac.webkit.org/changeset/73219 RenderBox.h http://trac.webkit.org/changeset/73385 FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426 ResourceLoader.cpp http://trac.webkit.org/changeset/74453 DOMWindow.cpp|h http://trac.webkit.org/changeset/73829 HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476 V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 Remove loader.cpp http://trac.webkit.org/changeset/74049 Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-10120-751/+2393
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Add the touch event handling for the slider.Teng-Hui Zhu2011-05-042-1/+12
| | | | | | bug:4232704 Change-Id: Ia3ac8a6003c1ff7b06d2a226b3206a3be0f8c6b5
* Merge WebKit at Chromium 9.0.597.106: Initial merge by GitSteve Block2011-02-164-5/+22
| | | | | | | | | 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
* Use ListBoxPopupMenuClient for listboxes.Leon Scroggins2011-02-031-12/+0
| | | | | | | | Bug:2754767 Enables us to remove some layering violations. Change-Id: Iea184c7946bca9d840c708918f545a9d9b436254
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-166-50/+73
| | | | | | 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-078-20/+85
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-0634-384/+246
| | | | | | | 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-2279-319/+1025
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Fix crash with meta data settingsPatrick Scott2010-12-131-0/+1
| | | | | Bug: 3275740 Change-Id: I6a65bdd52a3d044ee9a18c690930ca884a1baec1
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0271-392/+891
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Fix conflicts.Teng-Hui Zhu2010-11-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/loader/FrameLoader.cpp http://trac.webkit.org/changeset/70960 http://trac.webkit.org/changeset/70971 WebCore/css/CSSStyleSelector.cpp http://trac.webkit.org/changeset/71218 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71218 WebCore/html/HTMLLinkElement.cpp http://trac.webkit.org/changeset/71159 WebCore/platform/android/PlatformBridge.h http://trac.webkit.org/changeset/71484 WebCore/platform/android/TemporaryLinkStubs.cpp http://trac.webkit.org/changeset/71484 WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/71382 http://trac.webkit.org/changeset/71251 WebCore/rendering/RenderLayer.cpp http://trac.webkit.org/changeset/71536 WebCore/rendering/RenderTable.cpp http://trac.webkit.org/changeset/71382 WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71515 WebCore/bindings/scripts/CodeGeneratorV8.pm http://trac.webkit.org/changeset/71227 http://trac.webkit.org/changeset/71230 Change-Id: I3ad8c6bc6e36c90aedebedf915a8614b2c786550
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-1727-228/+1319
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-0961-580/+1172
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge Webkit at r70209: Fix conflictsBen Murdoch2010-10-263-251/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-26139-1171/+2145
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Fix WebCore/WebKit layering violation.Ben Murdoch2010-10-082-5/+5
| | | | | | | | | | | Move the call to WebViewCore::updateTextfield() to the PlatformBridge so that WebCore code does not depend on WebKit code to compile. In addition to being a layering violation, the inclusion of WebViewCore.h includes WebCoreJni.h, which in a future change causes LOG to get #undefined when using the chromium net stack. Change-Id: Id88d332624323e03ce82120ef55db200cbabe63b
* Fix a WebCore/WebKit layering violationBen Murdoch2010-10-082-4/+4
| | | | | | | | | | | | Move the call to WebViewCore::updateViewport() from HTMLBodyElement and HTMLMetaElement to the PlatformBridge so that WebCore code does not depend on WebKit code to compile. In addition to being a layering violation, the inclusion of WebViewCore.h includes WebCoreJni.h, which in a future change causes LOG to get #undefined when using the chromium net stack. Change-Id: I1a9fd0b545080c9c0d9d26a3e5eb3b986c3986eb
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-0792-321/+3614
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Fix conflictsSteve Block2010-09-291-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2944-764/+967
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Remove a superfluous comment from HTMLInputElement.cppSteve Block2010-09-221-1/+0
| | | | | | This is an Android addition Change-Id: I2784049bd97d970c5a21a08b256a2eb528700cd1
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1651-169/+2654
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge Webkit at r66666 : Fix conflicts.Kristian Monsen2010-09-111-8/+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-11133-12069/+3289
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Fix conflictsSteve Block2010-09-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | - 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-02151-3806/+1106
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2376-5010/+1923
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge Webkit at r65072 : Fix conflicts.Ben Murdoch2010-08-131-3/+0
| | | | | | | | | | | | HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616 TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021 GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584 Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798 Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-1285-5672/+5994
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Fix other conflictsSteve Block2010-08-091-4/+0
| | | | | | | | | | | | | | | | | | | | | - WebCore/Android.mk Conflict due to error introduced upstream. See http://trac.webkit.org/changeset/64344/trunk/WebCore/Android.mk and http://trac.webkit.org/changeset/60228/trunk/WebCore/Android.mk - WebCore/html/HTMLFrameSetElement.cpp Conflict due to ANDROID_FLATTEN_FRAMESET See http://trac.webkit.org/changeset/64383 - WebCore/page/Navigator.h Conflict due to APPLICATION_INSTALLED See http://trac.webkit.org/changeset/64371 - WebCore/rendering/SVGResourcesCycleSolver.cpp Conflict due to local ENABLE(FILTERS) guard See http://trac.webkit.org/changeset/64440 Change-Id: Ibafe3b92117c3a7b3eaaa44c6cf3d04c8c6027c2
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-0911-134/+114
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Fix for issue 2857086 - page cycler hanging.Ben Murdoch2010-08-041-0/+1
| | | | | | Cherry pick of webkit.org r64638. Change-Id: I50ea47544af219cc04717a060d4b70f478a40877
* Merge Webkit at r64264 : Fix conflicts.Kristian Monsen2010-08-041-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracs of the changes: WebCore/html/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/63998/trunk/WebCore/html/HTMLDocumentParser.cpp WebCore/page/EventHandler.cpp WebCore/page/EventHandler.h http://trac.webkit.org/changeset/63888 WebCore/page/Page.cpp http://trac.webkit.org/changeset/64208 WebCore/page/Settings.cpp WebCore/page/Settings.h http://trac.webkit.org/changeset/64110 WebCore/rendering/RenderLayerCompositor.h http://trac.webkit.org/changeset/64054/trunk/WebCore/rendering/RenderLayerCompositor.h WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.cpp WebCore/rendering/break_lines.cpp http://trac.webkit.org/changeset/64207 Change-Id: I34167b43899ee5066e33b40867cd569ce53f9207
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0443-682/+696
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859: Fix conflicts.Ben Murdoch2010-07-272-8/+2
| | | | | | | | | | | | html/HTMLCanvasElement.h due to http://trac.webkit.org/changeset/63502 html/HTMLLinkElement.cpp due to http://trac.webkit.org/changeset/63622 Android.mk and WebCore/Android.mk due to http://trac.webkit.org/changeset/63735 WebCore/page/Settings.cpp|h due to http://trac.webkit.org/changeset/63537 WebCore/page/EventHandler.cpp|h due to http://trac.webkit.org/changeset/63807 WebCore/Android.jscbindings.mk due to http://trac.webkit.org/changeset/63193 WebCore/platform/network/ResourceHandle.h due to http://trac.webkit.org/changeset/63332 Change-Id: I03c929b97550014373f044f56c248040b66118f0
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2753-492/+1215
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge Webkit at r63173 : Fix conflicts.Leon Clarke2010-07-203-16/+3
| | | | | | | | | | | | | | | | | | | | Android.v8bindings.mk: IDBBindingUtilities caused by http://trac.webkit.org/changeset/63064 CSSCompitedStyleDeclaration.cpp conflict caused by http://trac.webkit.org/changeset/63038 'Computed style is not implemented for padding-start, padding-end, margin-start, margin-end' HTMLDocumentParser.cpp conflict caused by http://trac.webkit.org/changeset/63165 'HTML5 Parser: document.write after onload blows away document' Navigator.h conflict caused by http://trac.webkit.org/changeset/62577 Page.cpp caused by http://trac.webkit.org/changeset/62502 ResourceHandleAndroid.cpp by http://trac.webkit.org/changeset/62736 HTMLLinkElement.* by the upstreaming of link prefetching at http://trac.webkit.org/changeset/63032 Change-Id: I5b9d3eef87cd525a9fc7d862676a41fc4122cba0
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2047-897/+11566
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Copy back the upstreamed version of prefetchLeon Clarke2010-07-122-57/+12
| | | | | | https://bugs.webkit.org/show_bug.cgi?id=3652 Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca
* Merge WebKit at r62496: Fix conflictsSteve Block2010-07-091-4/+0
| | | | | | | | | | HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033 FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135 Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284 DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124 RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104 Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-09144-2829/+4444
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Properly guard local changes for link prefetchingSteve Block2010-07-092-7/+19
| | | | | | This fixes the WebKit build for PLATFORM(MAC) Change-Id: Ic19e8840363bc1d42b569c3e732ee3ee4e92c00a
* Merge WebKit at r61871: Fix conflicts in HTMLDocumentParser.cppKristian Monsen2010-07-021-257/+9
| | | | | | | | | | | | New document parser in webkit. Just taking in the new parser. See http://trac.webkit.org/changeset/61674 This file is now what is in webkit at the time of the merge, with ANDROID_INSTRUMENT added. The instrumentation for Parsing now includes inline script execution, this will have to be fixed later. Updated the description for the parsing counter. Change-Id: I2c1bae725fe8989999620430e4745e1dfa7c450b
* Merge WebKit at r61871: Fix conflictsKristian Monsen2010-07-023-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | 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-02191-4220/+6227
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Detect if we're a webapp from the meta tag and send a message throughBen Murdoch2010-06-301-0/+14
| | | | | | | | | | to java land if that is the case. Requires a frameworks/base change. b/2766917 Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756
* Don't dereference the frame when there isn't one in rel=apple-touch-icon linksLeon Clarke2010-06-231-1/+1
| | | | | | http://b/issue?id=2789499 Change-Id: I392825d357057c02cd379228fcfaa23ff7616378
* Merge webkit.org at r61121: Fix conflicts.Ben Murdoch2010-06-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | Fix conflicts due to addition of m_pageinateDuringLayoutEnabled in Settings.cpp|h See http://trac.webkit.org/changeset/60509 Fix conflicts in ImageSource.h due to new functions being added in the same spot as an un upstreamed Android addition. See http://trac.webkit.org/changeset/60927 Fix conflicts due to addition of !PLATFORM(CAIRO) to guard Android has changed and not upstreamed. See http://trac.webkit.org/changeset/60760 Fix conflicts due to a variable renaming colliding with an Android ifdef which is not upstream. See http://trac.webkit.org/changeset/61106 Fix conflicts due to Android IDB makefile fix collising with addition of new IDB file. See http://trac.webkit.org/changeset/61120 Fix conflicts due to un-upstreamed makefile edits colliding with an upstream change. See http://trac.webkit.org/changeset/61000 Change-Id: I330e08850b96d7c9fb1d093663c5847b9140683d
generated by cgit v1.1 at 2025-01-12 21:12:19 +0000