summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clear DOM storage when clearing other cached data. Do not merge.Ben Murdoch2011-04-1110-1/+162
| | | | | | | | | | | | Empty out DOM local and session storage in addition to HTML5 database and app cache when we get a request from java to delete cached data. Cherry pick of I5b6ee075d2a8fb44ee373ad4462a33623c9c2460 Bug: 4267038 Change-Id: Id2dece1963d443c3758710e9c3e871054991ae32
* Apply webit security patchBart Sears2011-03-111-2/+6
| | | | | bug: 4089100 Change-Id: Ibaa52a6bcbbe47f33ec4131051309ed05b05748b
* DO NOT MERGE - Move localstorage into private folderJohn Reck2011-01-251-0/+5
| | | | | | | | Bug: 3258386, 3244281 Move all the localstorage databases into their own private subfolder without global execute permission Change-Id: I53575fee65a3f835782f61f715d7e7303926116b
* DO NOT MERGE - Set 660 permissions on Appcache databaseSteve Block2011-01-121-3/+24
| | | | | | | Bug: 3244281, 3258386 cherry pick Change-Id: If4a90a68df50b8b977f7fb3be668132ce839f81f
* DO NOT MERGE - Fixes webicon permissionsJohn Reck2011-01-121-4/+23
| | | | | | | Bug: 3244281, 3258386 partial cherry pick Change-Id: I30397effabe4b60d916f01f9b32bcfc3a6a402bc
* DO NOT MERGE - Set 660 permissions on Geolocation cache DBJohn Reck2011-01-071-2/+14
| | | | | | Bug: 3256540, 3258386 Change-Id: I96aece2efd8dbe8ce8f6310fec89b69206cbcba6
* DO NOT MERGE - Set 660 permissions on Geolocation permissions DBJohn Reck2011-01-072-3/+20
| | | | | | Bug: 3256540, 3258386 Change-Id: I734b90251f949098aab2a91207f4172bae57acd1
* Cherry-pick WebKit change 60729 to avoid an AppCache crash - DO NOT MERGESteve Block2010-12-231-1/+11
| | | | | | | | | | | | | This was observed when the AppCache database path was not set and hence opening the database failed. This change has already been pulled into master as part of the regular WebKit merge process, so do not merge. See http://trac.webkit.org/changeset/60729 Bug: 3305684 Change-Id: I5707839a9b0f886a24604f890ca4d575e311edbe
* Allow HTML5 video to seek.Ben Murdoch2010-12-221-0/+4
| | | | | | | | Need to return the duration of the currently playing video to WebCore to allow the video to seek correctly. Bug: 3303699 Change-Id: I79f6a7e7217cf987d35b5b1a9313a918630be7a0
* Do not merge.Rob Tsuk2010-12-011-0/+1
| | | | | | | | | | Re-implement a security fix against our older webkit code base. Change-Id: Iaefa1d060bb71b717558a427e326742f8fa5c4fd modified: WebCore/rendering/RenderBlock.cpp modified: WebCore/rendering/RenderBlock.cpp
* Merge "Do not merge: fix dns prefetch, multiply range" into gingerbreadCary Clark2010-11-302-6/+29
|\
| * Do not merge: fix dns prefetch, multiply rangeCary Clark2010-10-292-6/+29
| | | | | | | | | | bug:3140715 Change-Id: If85c99d591b94fb463f34b1430400cc391323a8b
* | Cherry-pick WebKit security fix (webkit.org r64706) Do not mergeBart Sears2010-11-042-0/+7
|/ | | | | | | | See http://trac.webkit.org/changeset/64706 Bug:3162623 Change-Id: I17abfbac4013ea98401f4088e9079faa15b9b8d9
* Cherry-pick WebKit security fix (webkit.org r67967) Do not mergeBen Murdoch2010-10-211-2/+2
| | | | | | | | | | See http://trac.webkit.org/changeset/67967 Note this is only a partial cherry pick of r67967 as it is based on a CL later than our current revision and not all deltas are relevant. Change-Id: I7d153c9470abb2b0994900b2c5909fded4a94752
* Cherry-pick WebKit security fix (webkit.org r69345) Do not mergeBen Murdoch2010-10-212-2/+9
| | | | | | See http://trac.webkit.org/changeset/69345 Change-Id: Ie0f421c22fc4ec007417181c834e50033a389230
* Cherry-pick WebKit security fix (webkit.org r68705) Do not mergeBen Murdoch2010-10-211-0/+2
| | | | | | See http://trac.webkit.org/changeset/68705 Change-Id: I5a3b76fa6e536746af794a15b187bc197000387b
* Cherry-pick WebKit security fix (webkit.org r69476) Do not mergeBen Murdoch2010-10-211-1/+6
| | | | | | See http://trac.webkit.org/changeset/69476 Change-Id: If25c271f9d1cda225fbdf040d2f1d2bc57529768
* Cherry-pick WebKit security fix (webkit.org r68408) Do not mergeBen Murdoch2010-10-212-3/+2
| | | | | | See http://trac.webkit.org/changeset/68408 Change-Id: I53167c57f32a43c6bd80a1aca8126f41cb01da53
* Cherry-pick WebKit security fix (webkit.org r68096) Do not mergeBen Murdoch2010-10-214-5/+25
| | | | | | | | | | | | See http://trac.webkit.org/changeset/68096 Note that this is not an exact cherry pick of the above webkit CL as it is dependant on http://trac.webkit.org/changeset/61094 that we do not have and provides the Element::isIdAttributName and Element::getIdAttribute methods. 61094 is a large change so we do not take it, rather use methods that achieve the same effect. Change-Id: Ifae90116f794673a610dd7988ba366a0b51888d9
* Cherry-pick WebKit security fix (webkit.org r68485) Do not mergeBen Murdoch2010-10-211-1/+2
| | | | | | See http://trac.webkit.org/changeset/68485 Change-Id: I714d385759a6e30d315cd2ace4aa87a2d7b28e92
* Cherry-pick WebKit security fix (webkit.org r68860) Do not mergeBen Murdoch2010-10-211-1/+4
| | | | | | See http://trac.webkit.org/changeset/68860 Change-Id: I7860374528be836e1f4ea7c6faa48966fd3ed23c
* DO NOT MERGE : Fix Webkit comments for document.createTouchBen Murdoch2010-10-195-4/+30
| | | | | | | | | | Cherry pick to GingerBread. See WebKit bug https://bugs.webkit.org/show_bug.cgi?id=47676 for details. Bug: 3101402 Change-Id: I8e2b0fc54468cd0827229243716c7d6bb62c7b3c
* Don't force video end event when full screen video playing is returned.Shimeng (Simon) Wang2010-10-182-0/+18
| | | | | | | Use pause instead. issue: 3102273 Change-Id: Ic4ba84a5d9f7976abbb8ff0443f1d00f4a8390f8
* Add more padding round select boxes, use different assets atLeon Clarke2010-10-183-35/+84
| | | | | | | | | | | different resolutions, use new assets and don't deform the arrows when stretching the select box. http://b/issue?id=2506670 DO NOT MERGE, cherry pick to GingerBread Bug: 3101402 Change-Id: I21224922db45c1cf4585667d8fa323c6a59dd240
* fix the pause() problem...Nicolas Roard2010-10-181-0/+1
| | | | | | | DO NOT MERGE, cherry pick to Gingerbread from master. Bug: 3101402 Change-Id: Ifbdab630badfffa12bc166ac20e804efba16436a
* Fix media element creationNicolas Roard2010-10-181-1/+1
| | | | | | | | Cherry pick to Gingerbread, DO NOT MERGE! Bug:3101402 Change-Id: I095182351ef49d5931241a50ab0880d6743659a5
* Implement the audio tag in webkit -- the corresponding java CL is ↵Nicolas Roard2010-10-1815-279/+830
| | | | | | | | | https://android-git.corp.google.com/g/#change,41406 Cherry pick to Gingerbread, DO NOT MERGE! Bug:3101402 Change-Id: Idbfb0efcc777f9354fcf88df32105ca9e50a24cd
* DO NOT MERGE Implement the document.createTouch, createTouchList APIsBen Murdoch2010-10-1717-1/+266
| | | | | | | | | | | Cherry pick to Gingerbread to enable HTML5 video playback on some sites that look for certain APIs to determine player compatability. Do not merge. Bug: 3101402 Change-Id: Id54f4cbac23208249922c3ef44086c8d9828d32c
* DO NOT MERGEShimeng (Simon) Wang2010-10-153-0/+28
| | | | | | | | | | | For cherry-picking to GB. Implement supportsType in MediaPlayerPrivateAndroid. Use Java API to obtain this info. issue: 3101402 Change-Id: I2baaf8ad861bec9b9b6f92fe753cbd879b33497c
* Merge "Provide padding + border values for textfields." into gingerbreadCary Clark2010-10-134-7/+44
|\
| * Provide padding + border values for textfields.Leon Scroggins2010-10-124-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3085564 They are used by WebView.java to align the WebTextView's text positioning with the page below. This allows the selection and insertion arrow handlers to line up better with the actual selection on the page. Requires a change in frameworks/base: https://android-git.corp.google.com/g/#change,73565 Change-Id: Ia100286016a780abd5f30e32975f8ad566a6ed74
* | change webkit text select to orangeCary Clark2010-10-111-49/+80
|/ | | | | | | | | | | | | | This changes the selection to a transparent orange. This won't match the UI exactly, because this draws transparently over the text instead of opaquely behind the text. This also changes the design of the text selection handles to match the bitmaps in the UI. http://b/3083069 Change-Id: I02656c42a3020f9b1e5dbc431c47bf2b51d22de8
* Revert to skia's decoder for gifs with 1 frame.Patrick Scott2010-10-071-10/+32
| | | | | | | | | If a site has a bunch of gifs, they will all be kept in memory. If the gif only has one frame, revert to using skia's decoder so that we can share the memory and use RLE encoding. Bug: 3060919 Change-Id: I3091b184ce4a8c27a264473526ce4ea83a20e74f
* Do not merge: fix array overwrite crasherCary Clark2010-09-302-5/+8
| | | | | | | | | | | | | | | | If two nodes have the same coordinates, one is deleted. If either has focus, the focus needs to be transfered to the other, and the focus index recomputed, so the index won't point to the wrong node. If the two nodes are at the end of the list, the index may point off the end of the array, subsequently crashing on access. This is a possible security issue. Change-Id: I1ca934074637fbf68e40318fbc354e28c6b474ba http://b/3043268
* Do not merge -- restrict text selection to the main layerCary Clark2010-09-151-0/+6
| | | | | | | | | Gmail causes layers to appear as a message is scrolled. This confuses the text selection logic. To workaround this in Gingerbread, text selection is only allowed to be drawn in the main layer. Change-Id: Idd814bcb5dfeef2fc12d6b0d586a63f711351d96 http://b/2998882
* Cherry-pick security fix in WebKit change 63048. Do not mergeSteve Block2010-09-134-6/+43
| | | | | | | | | | See http://trac.webkit.org/changeset/63048 Note that this required a manual merge as we do not have http://trac.webkit.org/changeset/59988 Bug: 2986936 Change-Id: I82617a011f68aeea953000d5487f40b32dcc7c72
* Cherry-pick security fix in WebKit change 66052Steve Block2010-09-091-0/+5
| | | | | | | See http://trac.webkit.org/changeset/66052 Bug: 2986936 Change-Id: I42d1b546b328e28d8dd817c5904fa1d0ee0b759c
* Cherry-pick security fix in WebKit change 65826Steve Block2010-09-091-1/+1
| | | | | | | See http://trac.webkit.org/changeset/65826 Bug: 2986936 Change-Id: Ie69df8dfa6314d46e5dbf51663ebb207995b8d3b
* Cherry-pick security fix in WebKit change 65748Steve Block2010-09-091-3/+6
| | | | | | | See http://trac.webkit.org/changeset/65748 Bug: 2986936 Change-Id: Idd9927f39d49b8eadd589f1513cf5210cd9dfee0
* Cherry-pick security fix in WebKit change 65329Steve Block2010-09-091-0/+6
| | | | | | | See http://trac.webkit.org/changeset/65329 Bug: 2986936 Change-Id: I664cc00bba4cdd68cc5e23d2566279de614f5f64
* Cherry-pick security fix in WebKit change 65280Steve Block2010-09-091-1/+7
| | | | | | | See http://trac.webkit.org/changeset/65280 Bug: 2986936 Change-Id: Ia70edaa46747536a9e7adc05493ef70a9baec610
* Cherry-pick security fix in WebKit change 65090Steve Block2010-09-091-15/+17
| | | | | | | | | | See http://trac.webkit.org/changeset/65090 Note that this required a manual merge due to our not having http://trac.webkit.org/changeset/60251 Bug: 2986936 Change-Id: I035ec5d92c4e31cc8f7667dfc46e22d2a02cda97
* Cherry-pick security fix in WebKit change 64293Steve Block2010-09-091-0/+3
| | | | | | | See http://trac.webkit.org/changeset/64293 Bug: 2986936 Change-Id: I2b4e9d218909872260e031032356b02038b73ced
* Cherry-pick security fix in WebKit change 64077Steve Block2010-09-091-9/+3
| | | | | | | See http://trac.webkit.org/changeset/64077 Bug: 2986936 Change-Id: Ic3e825e880f2094f274758af93a0949b0b9278f0
* Cherry-pick security fix in WebKit change 63773Steve Block2010-09-093-9/+6
| | | | | | | See http://trac.webkit.org/changeset/63773 Bug: 2986936 Change-Id: I5536ceeee25b07476a92e4531862c7c9d7beb6c8
* Cherry-pick security fix in WebKit change 63772Steve Block2010-09-091-1/+6
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/63772 Note that this is only a partial cherry-pick. I don't think that the fix to RenderBlock::canMergeContiguousAnonymousBlocks() is required as we don't have this method in our version of WebKit. The method was added in http://trac.webkit.org/changeset/60201). Attempting to make the fix without this change, or cherry-picking this change too, would be too high risk. Bug: 2986936 Change-Id: I8d9f1924611e693e340dcb2f05a43d5673ef23b1
* Cherry-pick security fix in WebKit change 62873Steve Block2010-09-091-0/+3
| | | | | | | See http://trac.webkit.org/changeset/62873 Bug: 2986936 Change-Id: I8353bade3fb14aedeaa517e6bc8331cd05ee3fd8
* Cherry-pick security fix in WebKit change 62271Steve Block2010-09-091-0/+4
| | | | | | | See http://trac.webkit.org/changeset/62271 Bug: 2986936 Change-Id: I368b10ff368aef5317c01b18524f1e0521df056e
* Cherry-pick security fix in WebKit change 62134Steve Block2010-09-092-5/+5
| | | | | | | See http://trac.webkit.org/changeset/62134 Bug: 2986936 Change-Id: Ie5c1698e58b9183519aae5dfa8cf5fb8f158feb1
* Cherry-pick security fix in WebKit change 61709Steve Block2010-09-091-2/+7
| | | | | | | See http://trac.webkit.org/changeset/61709 Bug: 2986936 Change-Id: Ib2be95d12bb89c57b6f30d57cd6422bbbf364fc6