summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix WebKit keygen. Has submitted the change to webkit as bug 26016.Grace Kloba2009-06-181-0/+4
|
* Merge change 4191 into donutAndroid (Google) Code Review2009-06-151-0/+2
|\ | | | | | | | | * changes: detect null pointer in webkit script exception
| * detect null pointer in webkit script exceptionCary Clark2009-06-151-0/+2
| | | | | | | | | | | | | | | | | | This security fix https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commit;h=df1815070cfd8d2ed6f7101d1b8d60d037c839e6 introduced a regression in the layout test javascript-url-crash-function.html It's enough to check for a null scriptExecutionContext in reportException()
* | Add <keygen> support for VPN team.Grace Kloba2009-06-127-17/+166
|/
* Merge change 3774 into donutAndroid (Google) Code Review2009-06-111-0/+25
|\ | | | | | | | | * changes: DO NOT MERGE.
| * DO NOT MERGE.Grace Kloba2009-06-101-0/+25
| | | | | | | | | | | | Merge 2390 from master to donut. Added postUrl() to WebView so that we can pass lat/lon for the search.
* | add security fix to webkitCary Clark2009-06-1113-32/+81
|/ | | | | | | | | | | | | | | | | | | | | do not merge bug is described by http://b/issue?id=1892983 (23148) originally fixed by http://trac.webkit.org/changeset/42216 with this fix in place, these exploits fail: http://evil.webblaze.org/jww/tests/location-exploit.html generates: D/WebCore ( 788): Console: Unsafe JavaScript attempt to access frame with URL http://evil.webblaze.org/jww/tests/location-exploit.html from frame with URL http://good.webblaze.org/jww/tests/location-exploit-iframe.html. Domains, protocols and ports must match. D/WebCore ( 788): line: 1 source: D/WebCore ( 788): Console: TypeError: Result of expression 'location.__defineGetter__.argumentNames' [undefined] is not a function. line: 3 source: http://evil.webblaze.org/jww/tests/location-exploit.html http://evil.webblaze.org/jww/tests/location-test.html puts up an alert that says "undefined" http://evil.webblaze.org/jww/tests/history-test.html puts up an alert that says "undefined"
* Merge change 3067 into donutAndroid (Google) Code Review2009-06-0812-21/+51
|\ | | | | | | | | * changes: browser security patches
| * browser security patchesCary Clark2009-06-0312-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 25420: REGRESSION: XMLHttpRequest allows loading from another origin - fix: http://trac.webkit.org/changeset/42983 Bug 24575: Cross-origin XMLHttpRequest is always allowed - fix: http://trac.webkit.org/projects/webkit/changeset/41667 Bug 21456: UXSS after navigation via directly referencing document - fix: http://trac.webkit.org/changeset/42223 Bug 22655: Stack overflow crash in WebCore::RenderBlock::layout() with deeply nested <div>s - fix: http://trac.webkit.org/projects/webkit/changeset/41938
* | If the server redirected us, use the url instead of the urlForHistory.Patrick Scott2009-06-041-1/+7
|/ | | | | | This change will allow a new entry to be added to the visited history and will correctly update that new item when the title arrives. Another change in BrowserActivity fixes the title bar during the redirect.
* Added JNI binding for new onJsTimeout callbackGuang Zhu2009-05-083-1/+15
|
* Merge change 598 into donutAndroid (Google) Code Review2009-04-281-3/+0
|\ | | | | | | | | * changes: Remove call to purge image-cache. Now handled by ActivityThread
| * Remove call to purge image-cache. Now handled by ActivityThreadMike Reed2009-04-271-3/+0
| |
* | Merge change 587 into donutAndroid (Google) Code Review2009-04-281-7/+0
|\ \ | |/ | | | | | | * changes: Move imagecache into android_runtime from browser
| * Move imagecache into android_runtime from browserMike Reed2009-04-271-7/+0
| | | | | | | | | | Now that Java is also using ashmem and globalpool for images, move the management of the globalpool budget into android_runtime
* | Respect globalAlpha (fill, stroke, images)Mike Reed2009-04-272-3/+5
|/
* merge cupcake into donutJean-Baptiste Queru2009-04-220-0/+0
|\
| * AI 143479: Skip fit-to-column if the block has float:right in LTR or ↵Grace Kloba2009-03-301-2/+6
| | | | | | | | | | | | | | | | float:left in RTL. This should fix the layout problem in the docomo site. The downside is that we will not trigger fit-to-column for this category any more. BUG=1741810 Automated import of CL 143479
| * Automated import from //branches/cupcake/...@142939,142939Leon Scroggins2009-03-261-1/+3
| |
| * Automated import from //branches/cupcake/...@142678,142678Grace Kloba2009-03-251-1/+1
| |
| * Automated import from //branches/cupcake/...@142604,142604Mike Reed2009-03-252-8/+10
| |
| * Automated import from //branches/cupcake/...@142554,142554Mike Reed2009-03-251-3/+0
| |
| * Automated import from //branches/cupcake/...@142399,142399Patrick Scott2009-03-245-7/+25
| |
| * Automated import from //branches/cupcake/...@142333,142333Mike Reed2009-03-2410-35/+224
| |
| * Automated import from //branches/cupcake/...@142229,142229Cary Clark2009-03-241-0/+3
| |
| * Automated import from //branches/cupcake/...@141963,141963Patrick Scott2009-03-244-1/+95
| |
| * Automated import from //branches/cupcake/...@141897,141897Cary Clark2009-03-242-7/+16
| |
| * auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-198-8/+1054
| |
* | AI 146109: Use KURL(baseUrl, rel) with a blank baseUrl to properly encode ↵Patrick Scott2009-04-141-2/+3
| | | | | | | | | | | | | | | | | | the data: url. BUG=1698745 Automated import of CL 146109
* | AI 145241: Automated g4 rollback of changelist 144888.Grace Kloba2009-04-081-2/+1
| | | | | | | | | | | | | | | | | | | | *** Reason for rollback *** Browser home page won't load. *** Original change description *** Given a url from java, percent encode the url to maintain any encoding. This fixes the loadData call when the data has non-ascii values. Automated import of CL 145241
* | AI 144888: Given a url from java, percent encode the url to maintain any ↵Patrick Scott2009-04-071-1/+2
| | | | | | | | | | | | | | | | | | encoding. This fixes the loadData call when the data has non-ascii values. BUG=1698745 Automated import of CL 144888
* | AI 143663: am: CL 143479 Skip fit-to-column if the block has float:right in ↵Grace Kloba2009-03-311-2/+6
| | | | | | | | | | | | | | | | | | LTR or float:left in RTL. This should fix the layout problem in the docomo site. The downside is that we will not trigger fit-to-column for this category any more. Original author: klobag Merged from: //branches/cupcake/... Automated import of CL 143663
* | AI 143189: am: CL 142939 Fix for issue 1730904: Find in page only searches ↵Leon Scroggins2009-03-271-1/+3
| | | | | | | | | | | | | | | | | | the first part of large pages. Cap the width and height of the page so we do not overflow a 16 bit int and think the page is smaller than it is when performing the find. Original author: scroggo Merged from: //branches/cupcake/... Automated import of CL 143189
* | Automated import from //branches/donutburger/...@142728,142728Grace Kloba2009-03-251-1/+1
| |
* | Automated import from //branches/donutburger/...@142713,142713Mike Reed2009-03-252-8/+10
| |
* | Automated import from //branches/donutburger/...@142696,142696Mike Reed2009-03-251-3/+0
| |
* | Automated import from //branches/donutburger/...@142403,142403Patrick Scott2009-03-245-7/+25
| |
* | Automated import from //branches/donutburger/...@142335,142335Mike Reed2009-03-2410-35/+224
| |
* | Automated import from //branches/donutburger/...@142283,142283Cary Clark2009-03-241-0/+3
| |
* | Automated import from //branches/donutburger/...@141964,141964Patrick Scott2009-03-244-1/+95
| |
* | Automated import from //branches/donutburger/...@141910,141910Cary Clark2009-03-242-7/+16
| |
* | Automated import from //branches/donutburger/...@141470,141470Grace Kloba2009-03-241-1/+1
| |
* | Automated import from //branches/donutburger/...@141437,141437Grace Kloba2009-03-241-0/+7
| |
* | Automated import from //branches/donutburger/...@141184,141184Andrei Popescu2009-03-241-1/+7
| |
* | Automated import from //branches/donutburger/...@141163,141163Mike Reed2009-03-241-2/+2
| |
* | Automated import from //branches/donutburger/...@140818,140818Dianne Hackborn2009-03-241-0/+1032
| |
* | Automated import from //branches/donutburger/...@140474,140474Grace Kloba2009-03-241-2/+3
| |
* | Automated import from //branches/donutburger/...@140424,140424Grace Kloba2009-03-242-2/+2
|/
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-1814-101/+341
|
* auto import from //branches/cupcake_rel/...@138607The Android Open Source Project2009-03-132-1/+7
|