summaryrefslogtreecommitdiffstats
path: root/WebCore/loader
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r72805: Cherry-pick WebKit change 72948Steve Block2011-01-063-0/+3
| | | | | | | | | | | | | | | This fixes CodeGeneratorV8.pm It is a re-commit of 'Merge WebKit at r72274: Fix CodeGeneratorV8.pm', which was inadvertantly removed as part of the initial merge by Git to r72805. See http://trac.webkit.org/changeset/72948 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: Iaa56a5a503aaaf4d996ebc44d66d557d12838cfa
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-064-12/+8
| | | | | | | 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-2217-51/+79
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Fix CodeGeneratorV8.pmRussell Brenner2010-12-023-0/+3
| | | | | | | | | | Some of the script-generation code puts include statements in source files when they need to be in headers. Cherry-picked from webkit: http://trac.webkit.org/changeset/72948 Change-Id: I07d425bcb97abcdda25b5ff2ea7af887a925f489
* Merge WebKit at r72272: Fix conflicts.Russell Brenner2010-12-021-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71802 WebCore/bindings/v8/V8Proxy.cpp http://trac.webkit.org/changeset/71735 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71767 http://trac.webkit.org/changeset/72116 (several APIs purged) WebCore/loader/ResourceLoader.cpp http://trac.webkit.org/changeset/71884 WebCore/platform/graphics/MediaPlayer.cpp http://trac.webkit.org/changeset/72117 WebCore/platform/image-decoders/ImageDecoder.cpp http://trac.webkit.org/changeset/72130 WebCore/rendering/RenderBlockLineLayout.cpp http://trac.webkit.org/changeset/72235 WebCore/rendering/RenderView.cpp http://trac.webkit.org/changeset/71851 Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0232-520/+653
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Fix compiling error after a renamingTeng-Hui Zhu2010-11-171-1/+1
| | | | | | http://trac.webkit.org/changeset/71503 Change-Id: I12f477f18630b364b704b28fd63aaf46abb1be9a
* Merge Webkit at r71558: Fix conflicts.Teng-Hui Zhu2010-11-171-8/+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-1734-174/+190
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-0917-34/+89
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-2632-511/+293
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Compile fix, add missing includeKristian Monsen2010-10-071-0/+1
| | | | | | | Fix in a later revision of Webkit, this is a cherry-pick: http://trac.webkit.org/changeset/68780/trunk/WebCore/loader/PingLoader.cpp Change-Id: I95ecfd0de7ef494fbf0eb7413976e326b525a026
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-0711-14/+112
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Fix conflictsSteve Block2010-09-292-20/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2929-107/+149
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Fix conflicts.Iain Merrick2010-09-163-19/+6
| | | | | | | | | | | V8DOMWindowShell::initContextIfNeeded now has a return value: http://trac.webkit.org/changeset/66840 DocLoader renamed to CachedResourceLoader. This affects loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp http://trac.webkit.org/changeset/66963 Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1639-1934/+233
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-1129-196/+211
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0232-289/+278
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Fix conflicts.Iain Merrick2010-08-231-13/+0
| | | | | | | | | | Removing call to Geolocation::stop(), which was lost in the merge with http://trac.webkit.org/changeset/65416 We may still have memory leaks here. This is being tracked in https://bugs.webkit.org/show_bug.cgi?id=39288 Change-Id: I69b75bf07775536ac603a450dbde8c2935c4db16
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2329-169/+266
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add ↵Steve Block2010-08-131-0/+9
| | | | | | | | | | | EmptyDeviceMotionClient See https://android-git.corp.google.com/g/#change,61020 which picked part of this change for EmptyDeviceOrientationClient. See also https://bugs.webkit.org/show_bug.cgi?id=43848 Change-Id: Idefd9becf89199ae9afe475074fc56a66252db8a
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-1216-44/+22
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Provide EmptyDeviceOrientationClient for use with SVGImageSteve Block2010-08-121-0/+9
| | | | | | | | | | | This is a partial cherry-pick of WebKit change 64106 See https://bugs.webkit.org/show_bug.cgi?id=43848 We can't take the complete change because we don't yet have DeviceMotion in our version of WebKit. Bug: 2907653 Change-Id: Ie038a21f9e989af46fb6b77decd7ea10da734b3c
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-098-61/+398
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0411-50/+314
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2716-64/+139
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge "Cherry-pick fix to https://bugs.webkit.org/show_bug.cgi?id=42651 ↵Leon Clarke2010-07-218-17/+6
|\ | | | | | | because it fixes http://b/issue?id=2838936, but includes more refactoring than my original fix at https://android-git.corp.google.com/g/#change,58175"
| * Cherry-pick fix to https://bugs.webkit.org/show_bug.cgi?id=42651Leon Clarke2010-07-218-17/+6
| | | | | | | | | | | | | | because it fixes http://b/issue?id=2838936, but includes more refactoring than my original fix at https://android-git.corp.google.com/g/#change,58175 Change-Id: I67884fc153bff81c9580f36b7be1662acdda194e
* | Prepare browser web archive patch for upstreamming to webkit.Elliott Slaughter2010-07-202-37/+36
|/ | | | Change-Id: I38c7939b81cd0afaaf925b9f74104bcbe27b5977
* Fix http://b/issue?id=2838936Leon Clarke2010-07-201-1/+1
| | | | | | isPrefetch should return true when the resource is a prefetch, not when it isn't Change-Id: I73389e302ba7c57b6c4f6bf871f230a968d09c81
* Merge WebKit at r63173 : @62542 added inspector stuff, but the non-inspector ↵Leon Clarke2010-07-201-0/+2
| | | | | | case doesn't seem to compile Change-Id: I16ee514aa06762fe8c4df50d6739d394d03b6d1b
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2018-108/+292
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Fix for bug 2816268: Refactor ANDROID_USER_GESTURE codeKristian Monsen2010-07-154-55/+0
| | | | | | | | | | | | | | | | | | | Used the UserGestureIndicator class instead of the local ANDROID_USER_GESTURE code. I have made a simple test case for the problem at: http://updates.monsen.it/source.html This cannot be made into a layout test since the Android Dumprendertree does not support focus on windows other than the main one. Lots of local changes removed, but not many actual changes. Most are in parameters sent to other functions. As far as I can see they user gestures are only checked for in ChromeClientAndroid.cpp and WebCoreFrameBridge.cpp, and I replaced ANDROID_USER_GESTURE with UserGestureIndicator::processingUserGesture(). The UserGestureIndicator class was added to webkit in this CL: http://trac.webkit.org/changeset/57045 ResourceRequest.h is a cherry-pick of this CL from webkit.org http://trac.webkit.org/changeset/62668 Change-Id: Ia254b2cee833459fcc2cacfb2751ef7a29a8f64a
* Merge "Copy back the upstreamed version of prefetch ↵Leon Clarke2010-07-1310-110/+37
|\ | | | | | | https://bugs.webkit.org/show_bug.cgi?id=3652"
| * Copy back the upstreamed version of prefetchLeon Clarke2010-07-1210-110/+37
| | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=3652 Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca
* | Merge "Update CachedFont.cpp to reflect upstreaming in WebKit change 63088"Steve Block2010-07-121-1/+1
|\ \
| * | Update CachedFont.cpp to reflect upstreaming in WebKit change 63088Steve Block2010-07-121-1/+1
| |/ | | | | | | | | | | See http://trac.webkit.org/changeset/63088 Change-Id: I41778e43e0e731b6e0116e6e1569e91d5c18750a
* | Browser save page as web archive.Elliott Slaughter2010-07-123-0/+529
|/ | | | Change-Id: Ie92953142ed31fc859975289a978172bdb8b6d79
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0913-86/+98
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Fix conflicts in FrameLoader.cppKristian Monsen2010-07-022-27/+3
| | | | | | | Cleaing up of frameloader removed one of our local changes, this should fix it. http://trac.webkit.org/changeset/61546 Change-Id: Ic0c08e8f944ab93b8a08f500042ce9fdeaa57238
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0236-782/+1117
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Detect if we're a webapp from the meta tag and send a message throughBen Murdoch2010-06-301-0/+4
| | | | | | | | | | to java land if that is the case. Requires a frameworks/base change. b/2766917 Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1621-383/+144
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Cherry-pick WebKit change r60069 to fix a leak in GeolocationSteve Block2010-06-091-0/+13
| | | | | | | | | | This change was made as a fix for Bug https://bugs.webkit.org/show_bug.cgi?id=39288 but was later rolled back in r60441 pending further discussion. We need this fix, so cherry-pick it to Android until https://bugs.webkit.org/show_bug.cgi?id=39288 is fixed properly. Change-Id: Ie5cc610b841798e42ec1232b4af7674ce425b2c4
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-083-24/+40
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-2711-34/+172
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Variable changed to method upstreamKristian Monsen2010-05-251-1/+1
| | | | | | http://trac.webkit.org/changeset/59576/trunk/WebCore/loader/CachedResource.h#file0 Change-Id: Icf2abd0e5983cd4c2188305889edec4e072e684e
* Merge WebKit at r59636: Fix conflictsKristian Monsen2010-05-251-5/+1
| | | | Change-Id: If40295eb42282bace49d422e4a24026ddac17cfe
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2520-134/+392
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
generated by cgit v1.1 at 2025-06-01 09:42:14 +0000