summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 946ea101: Cherry-pick security fix in WebKit change 66052Steve Block2010-09-101-0/+5
|\ | | | | | | | | | | | | Merge commit '946ea101a7673e7f566d52b1ba81f85b75666d16' into gingerbread-plus-aosp * commit '946ea101a7673e7f566d52b1ba81f85b75666d16': Cherry-pick security fix in WebKit change 66052
| * 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
* | am 93f07dbc: Cherry-pick security fix in WebKit change 65826Steve Block2010-09-101-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '93f07dbc620b468fe98b72a93f0d0e84c40353cd' into gingerbread-plus-aosp * commit '93f07dbc620b468fe98b72a93f0d0e84c40353cd': Cherry-pick security fix in WebKit change 65826
| * 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
* | am badca5a6: Cherry-pick security fix in WebKit change 65748Steve Block2010-09-101-3/+6
|\ \ | |/ | | | | | | | | | | Merge commit 'badca5a6d49b048c5dc9c5a847ab2d729b936b09' into gingerbread-plus-aosp * commit 'badca5a6d49b048c5dc9c5a847ab2d729b936b09': Cherry-pick security fix in WebKit change 65748
| * 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
* | am 0a05678e: Cherry-pick security fix in WebKit change 65329Steve Block2010-09-101-0/+6
|\ \ | |/ | | | | | | | | | | Merge commit '0a05678e32a04623b93aa4d3990d14877ee80386' into gingerbread-plus-aosp * commit '0a05678e32a04623b93aa4d3990d14877ee80386': Cherry-pick security fix in WebKit change 65329
| * 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
* | am 6dba6e09: Cherry-pick security fix in WebKit change 65280Steve Block2010-09-101-1/+7
|\ \ | |/ | | | | | | | | | | Merge commit '6dba6e09f232d333432972b64d0074cbee59ca7a' into gingerbread-plus-aosp * commit '6dba6e09f232d333432972b64d0074cbee59ca7a': Cherry-pick security fix in WebKit change 65280
| * 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
* | am 3f2f7e2f: Cherry-pick security fix in WebKit change 65090Steve Block2010-09-101-15/+17
|\ \ | |/ | | | | | | | | | | Merge commit '3f2f7e2fd4924ef8eaf542740438ede42a81732e' into gingerbread-plus-aosp * commit '3f2f7e2fd4924ef8eaf542740438ede42a81732e': Cherry-pick security fix in WebKit change 65090
| * 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
* | am e1d3e323: Cherry-pick security fix in WebKit change 64293Steve Block2010-09-101-0/+3
|\ \ | |/ | | | | | | | | | | Merge commit 'e1d3e323642600e02d50760bd7dacd11e4ccfa83' into gingerbread-plus-aosp * commit 'e1d3e323642600e02d50760bd7dacd11e4ccfa83': Cherry-pick security fix in WebKit change 64293
| * 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
* | am da4ffba3: Cherry-pick security fix in WebKit change 64077Steve Block2010-09-101-9/+3
|\ \ | |/ | | | | | | | | | | Merge commit 'da4ffba387f70730453d4533272dd55870dd81bb' into gingerbread-plus-aosp * commit 'da4ffba387f70730453d4533272dd55870dd81bb': Cherry-pick security fix in WebKit change 64077
| * 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
* | am 237faca5: Cherry-pick security fix in WebKit change 63773Steve Block2010-09-103-9/+6
|\ \ | |/ | | | | | | | | | | Merge commit '237faca5ff0377c7fda5c4dcc0f287e67fe66091' into gingerbread-plus-aosp * commit '237faca5ff0377c7fda5c4dcc0f287e67fe66091': Cherry-pick security fix in WebKit change 63773
| * 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
* | am 440c0366: Cherry-pick security fix in WebKit change 63772Steve Block2010-09-101-1/+6
|\ \ | |/ | | | | | | | | | | Merge commit '440c0366ae0192fb737c7dd87dc2d7156266b3f7' into gingerbread-plus-aosp * commit '440c0366ae0192fb737c7dd87dc2d7156266b3f7': Cherry-pick security fix in WebKit change 63772
| * 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
* | am be2b5a3f: Cherry-pick security fix in WebKit change 62873Steve Block2010-09-101-0/+3
|\ \ | |/ | | | | | | | | | | Merge commit 'be2b5a3fe0063db46087ef38f78a1e2aa7b47631' into gingerbread-plus-aosp * commit 'be2b5a3fe0063db46087ef38f78a1e2aa7b47631': Cherry-pick security fix in WebKit change 62873
| * 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
* | am d8dd893d: Cherry-pick security fix in WebKit change 62271Steve Block2010-09-101-0/+4
|\ \ | |/ | | | | | | | | | | Merge commit 'd8dd893d690e9d208fe4a71b7d62374687d279f4' into gingerbread-plus-aosp * commit 'd8dd893d690e9d208fe4a71b7d62374687d279f4': Cherry-pick security fix in WebKit change 62271
| * 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
* | am eea24577: Cherry-pick security fix in WebKit change 62134Steve Block2010-09-102-5/+5
|\ \ | |/ | | | | | | | | | | Merge commit 'eea2457721313546f0b5ddab3836282e338847b9' into gingerbread-plus-aosp * commit 'eea2457721313546f0b5ddab3836282e338847b9': Cherry-pick security fix in WebKit change 62134
| * 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
* | am a926fcfd: Cherry-pick security fix in WebKit change 61709Steve Block2010-09-101-2/+7
|\ \ | |/ | | | | | | | | | | Merge commit 'a926fcfd627808c13994eb22aa991c82fd57673a' into gingerbread-plus-aosp * commit 'a926fcfd627808c13994eb22aa991c82fd57673a': Cherry-pick security fix in WebKit change 61709
| * 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
* | am ff93a851: Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."Melanie Clements2010-08-311-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Merge commit 'ff93a851c578d0b570c84b3a83a41a4930e7107c' into gingerbread-plus-aosp * commit 'ff93a851c578d0b570c84b3a83a41a4930e7107c': Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."
| * | Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."Melanie Clements2010-08-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android browser inserts "/." at the beginning of the URL path when processing an <img> in an HTML document with a <base> tag. This does not cause any errors but should be fixed to comply with RFC 3986 section 5.4. This only happens at the first pass of the URL parsing, at the second pass where the base and path are parsed together this is dealt with correctly. I am therefore fixing it by modifying the parse() method in KURL to check for a trailing '.' at the end of the base segment. Change-Id: I0d641c8619e00aa2b08a33e271ef863cee5ed7ad
* | | am 90fa57cd: DO NOT MERGE make the text selection easier to hitCary Clark2010-08-271-1/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '90fa57cd8b940ab1b46a85da92d950392a77e9da' into gingerbread-plus-aosp * commit '90fa57cd8b940ab1b46a85da92d950392a77e9da': DO NOT MERGE make the text selection easier to hit
| * | DO NOT MERGE make the text selection easier to hitCary Clark2010-08-261-1/+4
| | | | | | | | | | | | | | | Change-Id: I47b7aa04ebc2a8f0bf2c6b4399ef65e5f4c58d4e http://b/2626451
* | | am 21ed5a45: Merge "check for null pictures when selecting text" into ↵Cary Clark2010-08-241-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '21ed5a4502b3ce76875505aa220f187d165f47b1' into gingerbread-plus-aosp * commit '21ed5a4502b3ce76875505aa220f187d165f47b1': check for null pictures when selecting text
| * | Merge "check for null pictures when selecting text" into gingerbreadCary Clark2010-08-241-0/+9
| |\ \
| | * | check for null pictures when selecting textCary Clark2010-08-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LayerAndroid supplied to SelectText may have no picture associated with it. If that's the case, ignore it. This change was original uploaded as https://android-git.corp.google.com/g/#change,62627 in master, but then I realized it should go into gingerbread as well, and get merged into master automagically. http://b/2930142 Change-Id: If6332d81f1f9baba804131caae124dd18e0b0799
* | | | am 828ef22d: merge -s ours from froyo-release so that upgrading to ↵Jean-Baptiste Queru2010-08-230-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread is a git fast-forward Merge commit '828ef22db863664b8e992adf15ddf92ef570f4f8' into gingerbread-plus-aosp * commit '828ef22db863664b8e992adf15ddf92ef570f4f8': Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
| * | | merge -s ours from froyo-release so that upgrading to gingerbread is a git ↵Jean-Baptiste Queru2010-08-230-0/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | fast-forward Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2
| | * | Cherry-pick WebKit change 61921 to fix exploitable memory corruption in ↵Steve Block2010-08-181-28/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderBoxModelObject Bug: 2895569 Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
| | * | Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is ↵Steve Block2010-08-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | changed Bug: 2895569 Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
* | | | am e4be1fd5: DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-204-220/+1430
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'e4be1fd5f14137de249ee66c000f9dadfb2862d7' into gingerbread-plus-aosp * commit 'e4be1fd5f14137de249ee66c000f9dadfb2862d7': DO NOT MERGE Refactor find and select dialogs
| * | | DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-204-220/+1430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Change imported by hand from master, based on https://android-git.corp.google.com/g/#change,53489 ) SelectText now permits incremental extension of the selection using either touch or trackball data. SelectText adds word selection and select all interfaces. SelectText has been rewritten to do a better job of finding space characters and selecting text outside of the visible window. Companion changes in frameworks/base and packages/apps/Browser Change-Id: I28a815375345d842f79464edbf0cb3a2019b7fe8 http://b/2626451
* | | | am 5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cppHenrik Baard2010-08-171-2/+13
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit '5dc34a8555dde1ae4a2c174870c4296cc44f8a22' into gingerbread-plus-aosp * commit '5dc34a8555dde1ae4a2c174870c4296cc44f8a22': activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
| * | | activeDocumentLoader() causes crash in WebCoreFrameBridge.cppHenrik Baard2010-08-161-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for a crash found in real phones, there is cases when activeDocumentLoader() can return null, probably related to closing of a frame or canceling of a request. Change-Id: Id340ab006b6e40e396645a4e668dcb58824a63e7
* | | | am e9ee2d86: am a4279478: Cherry-pick WebKit change 61921 to fix exploitable ↵Steve Block2010-08-061-28/+39
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | memory corruption in RenderBoxModelObject Merge commit 'e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3' into gingerbread-plus-aosp * commit 'e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3': Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
| * | | am a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory ↵Steve Block2010-08-061-28/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corruption in RenderBoxModelObject Merge commit 'a42794783dfec7f142845611dc0f20bfe2657c49' into gingerbread * commit 'a42794783dfec7f142845611dc0f20bfe2657c49': Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
| | * | | Cherry-pick WebKit change 61921 to fix exploitable memory corruption in ↵Steve Block2010-08-051-28/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderBoxModelObject Bug: 2895569 Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
* | | | | am 7162fe0e: am 2b6ea029: Cherry-pick WebKit change 60984 to fix an ↵Steve Block2010-08-061-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exploitable crash when focus is changed Merge commit '7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf' into gingerbread-plus-aosp * commit '7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf': Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
| * | | | am 2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash ↵Steve Block2010-08-061-1/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when focus is changed Merge commit '2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0' into gingerbread * commit '2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0': Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
| | * | | Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is ↵Steve Block2010-08-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed Bug: 2895569 Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
* | | | | am 71b088a0: Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-051-20/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '71b088a040027130a502f60e6f953c08a194b11e' into gingerbread-plus-aosp * commit '71b088a040027130a502f60e6f953c08a194b11e': Tracking merge of dalvik-dev to gingerbread
generated by cgit v1.1 at 2024-08-20 14:52:19 +0000