summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLLinkElement.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-1/+17
| | | | 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-171-0/+10
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-2/+2
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-3/+3
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-7/+6
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-29/+0
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-2/+7
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859: Fix conflicts.Ben Murdoch2010-07-271-4/+0
| | | | | | | | | | | | 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-271-0/+4
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge Webkit at r63173 : Fix conflicts.Leon Clarke2010-07-201-3/+0
| | | | | | | | | | | | | | | | | | | | 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-201-0/+3
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Copy back the upstreamed version of prefetchLeon Clarke2010-07-121-33/+5
| | | | | | https://bugs.webkit.org/show_bug.cgi?id=3652 Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-70/+0
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Properly guard local changes for link prefetchingSteve Block2010-07-091-4/+8
| | | | | | This fixes the WebKit build for PLATFORM(MAC) Change-Id: Ic19e8840363bc1d42b569c3e732ee3ee4e92c00a
* Merge WebKit at r61871: Fix conflictsKristian Monsen2010-07-021-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | 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-021-3/+31
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* 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 r60469 : Initial merge by git.Leon Clarke2010-06-081-3/+7
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-2/+2
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Fix conflictsKristian Monsen2010-05-251-84/+20
| | | | Change-Id: If40295eb42282bace49d422e4a24026ddac17cfe
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-5/+69
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-111-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-111-2/+7
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Link prefetch supportLeon Clarke2010-05-041-46/+64
| | | | http://b/issue?id=2268353
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-5/+28
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-1/+1
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* fix instrumentation. The new WebKit has CachedResourceClientGrace Kloba2009-10-281-0/+22
| | | | derived from FastAllocBase which has overload operator new. So we need to override it again to avoid ambiguous.
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-9/+38
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Add apple-touch-icon-precomposed processing.Patrick Scott2009-09-221-4/+13
| | | | Send up a boolean to indicate if the touch icon url is precomposed.
* Merge in WebKit r47029.Ben Murdoch2009-08-111-5/+7
|
* Add a callback for parsing apple-touch-icon.Patrick Scott2009-08-051-0/+21
| | | | | | | Call through FrameLoaderClient when an apple-touch-icon attribute is parsed. Instead of always downloaded the icon, just report the url so that if it is needed, it can downloaded by java. It is also a lot more code to let WebCore handle storage and retrieval of the icon.
* Get WebKit r44544.Feng Qian2009-06-171-28/+21
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-27/+23
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+406
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-406/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-60/+85
|
* Initial ContributionThe Android Open Source Project2008-10-211-13/+47
|
* external/webkit r30707Upstream1970-01-121-0/+347
generated by cgit v1.1 at 2025-06-01 19:31:14 +0000