OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Mike LeBeau [Thu, 9 Jul 2009 22:20:51 +0000 (15:20 -0700)]
Revert phanna's change which broke the build.
This reverts commit
91f07d3317527703031378a388bc92853479d6a8.
Android (Google) Code Review [Thu, 9 Jul 2009 20:38:12 +0000 (13:38 -0700)]
Merge change 6642 into donut
* changes:
Do not merge
Patrick Scott [Thu, 9 Jul 2009 18:55:03 +0000 (14:55 -0400)]
Do not merge
Pull down http://trac.webkit.org/changeset/42163 to fix the icon database crash.
I believe the issue was that m_syncThreadRunning could have been initialized to
false if the moons aligned. When the Browser quits, it closes the icon db. If
m_syncThreadRunning happened to be false, the close method would not wait for
the sync thread to complete before cleaning up (and closing) the sqlite
database. I think that caused the underlying db to be null within sqlite.
Grace Kloba [Thu, 9 Jul 2009 00:32:41 +0000 (17:32 -0700)]
Fix #
1896846. Move reset the meta data from canHandleRequest to transitionToCommittedForNewPage as canHandleRequest may not trigger to go to a new page. For example, if a link is to open in a new window, even canHandleRequest returns true, the current page doesn't switch to a new page. So we should not reset the meta data.
Grace Kloba [Tue, 7 Jul 2009 01:30:11 +0000 (18:30 -0700)]
Make deep copy of the String when use them in the UI thread as AtomicString is not thread safe.
Patrick Scott [Tue, 30 Jun 2009 18:36:18 +0000 (14:36 -0400)]
Do not merge
Use 2 * aLength as Grace pointed out characters() returns UChar*.
Patrick Scott [Tue, 30 Jun 2009 17:39:54 +0000 (13:39 -0400)]
Do not merge
Fix the alignment bug in donut. Only check for ARM since SH4 is in the newer
webkit.
Grace Kloba [Fri, 26 Jun 2009 21:06:35 +0000 (14:06 -0700)]
Add JavaScript parsing into instrumentation. Also modify css parsing calculations.
Cary Clark [Fri, 26 Jun 2009 16:21:00 +0000 (12:21 -0400)]
Add security fix as seen in trac.webkit.org/changeset/44799
Sriram Raman [Tue, 23 Jun 2009 00:22:02 +0000 (17:22 -0700)]
Remove webcore-tests from test build
Grace Kloba [Fri, 12 Jun 2009 18:53:23 +0000 (11:53 -0700)]
Fix WebKit keygen. Has submitted the change to webkit as bug 26016.
Android (Google) Code Review [Mon, 15 Jun 2009 18:33:05 +0000 (11:33 -0700)]
Merge change 4191 into donut
* changes:
detect null pointer in webkit script exception
Cary Clark [Mon, 15 Jun 2009 18:02:40 +0000 (14:02 -0400)]
detect null pointer in webkit script exception
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()
Grace Kloba [Fri, 12 Jun 2009 18:52:18 +0000 (11:52 -0700)]
Add <keygen> support for VPN team.
Android (Google) Code Review [Thu, 11 Jun 2009 22:21:06 +0000 (15:21 -0700)]
Merge change 3774 into donut
* changes:
DO NOT MERGE.
Cary Clark [Mon, 8 Jun 2009 18:29:40 +0000 (14:29 -0400)]
add security fix to webkit
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"
Grace Kloba [Wed, 10 Jun 2009 18:55:52 +0000 (11:55 -0700)]
DO NOT MERGE.
Merge 2390 from master to donut.
Added postUrl() to WebView so that we can pass lat/lon for the search.
Android (Google) Code Review [Mon, 8 Jun 2009 15:06:12 +0000 (08:06 -0700)]
Merge change 3067 into donut
* changes:
browser security patches
Patrick Scott [Thu, 4 Jun 2009 15:08:53 +0000 (11:08 -0400)]
If the server redirected us, use the url instead of the urlForHistory.
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.
Cary Clark [Wed, 3 Jun 2009 20:01:34 +0000 (16:01 -0400)]
browser security patches
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
Guang Zhu [Fri, 8 May 2009 22:54:24 +0000 (15:54 -0700)]
Added JNI binding for new onJsTimeout callback
Android (Google) Code Review [Tue, 28 Apr 2009 19:29:22 +0000 (12:29 -0700)]
Merge change 598 into donut
* changes:
Remove call to purge image-cache. Now handled by ActivityThread
Android (Google) Code Review [Tue, 28 Apr 2009 12:17:37 +0000 (05:17 -0700)]
Merge change 587 into donut
* changes:
Move imagecache into android_runtime from browser
Mike Reed [Mon, 27 Apr 2009 18:33:09 +0000 (14:33 -0400)]
Remove call to purge image-cache. Now handled by ActivityThread
Mike Reed [Mon, 27 Apr 2009 17:06:14 +0000 (13:06 -0400)]
Respect globalAlpha (fill, stroke, images)
Mike Reed [Mon, 27 Apr 2009 15:41:25 +0000 (11:41 -0400)]
Move imagecache into android_runtime from browser
Now that Java is also using ashmem and globalpool for images, move the management
of the globalpool budget into android_runtime
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:58 +0000 (17:56 -0700)]
merge cupcake into donut
Patrick Scott [Tue, 14 Apr 2009 12:46:04 +0000 (05:46 -0700)]
AI 146109: Use KURL(baseUrl, rel) with a blank baseUrl to properly encode the data:
url.
BUG=
1698745
Automated import of CL 146109
Grace Kloba [Thu, 9 Apr 2009 01:57:56 +0000 (18:57 -0700)]
AI 145241: Automated g4 rollback of changelist 144888.
*** 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
Patrick Scott [Tue, 7 Apr 2009 19:02:28 +0000 (12:02 -0700)]
AI 144888: 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.
BUG=
1698745
Automated import of CL 144888
Grace Kloba [Tue, 31 Mar 2009 17:54:07 +0000 (10:54 -0700)]
AI 143663: am: CL 143479 Skip fit-to-column if the block has float:right in 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
Grace Kloba [Mon, 30 Mar 2009 16:39:43 +0000 (09:39 -0700)]
AI 143479: Skip fit-to-column if the block has float:right in 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.
BUG=
1741810
Automated import of CL 143479
Leon Scroggins [Sat, 28 Mar 2009 00:06:39 +0000 (17:06 -0700)]
AI 143189: am: CL 142939 Fix for issue
1730904: Find in page only searches 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
Leon Scroggins [Thu, 26 Mar 2009 17:38:14 +0000 (10:38 -0700)]
Automated import from //branches/cupcake/...@142939,142939
Grace Kloba [Thu, 26 Mar 2009 00:27:32 +0000 (17:27 -0700)]
Automated import from //branches/donutburger/...@142728,142728
Mike Reed [Wed, 25 Mar 2009 23:41:56 +0000 (16:41 -0700)]
Automated import from //branches/donutburger/...@142713,142713
Mike Reed [Wed, 25 Mar 2009 22:53:51 +0000 (15:53 -0700)]
Automated import from //branches/donutburger/...@142696,142696
Grace Kloba [Wed, 25 Mar 2009 22:33:48 +0000 (15:33 -0700)]
Automated import from //branches/cupcake/...@142678,142678
Mike Reed [Wed, 25 Mar 2009 22:10:50 +0000 (15:10 -0700)]
Automated import from //branches/cupcake/...@142604,142604
Mike Reed [Wed, 25 Mar 2009 16:27:17 +0000 (09:27 -0700)]
Automated import from //branches/cupcake/...@142554,142554
Patrick Scott [Wed, 25 Mar 2009 05:40:29 +0000 (22:40 -0700)]
Automated import from //branches/donutburger/...@142403,142403
Mike Reed [Wed, 25 Mar 2009 05:30:39 +0000 (22:30 -0700)]
Automated import from //branches/donutburger/...@142335,142335
Cary Clark [Wed, 25 Mar 2009 05:23:25 +0000 (22:23 -0700)]
Automated import from //branches/donutburger/...@142283,142283
Patrick Scott [Wed, 25 Mar 2009 04:12:13 +0000 (21:12 -0700)]
Automated import from //branches/donutburger/...@141964,141964
Cary Clark [Wed, 25 Mar 2009 04:05:28 +0000 (21:05 -0700)]
Automated import from //branches/donutburger/...@141910,141910
Grace Kloba [Wed, 25 Mar 2009 03:22:30 +0000 (20:22 -0700)]
Automated import from //branches/donutburger/...@141470,141470
Grace Kloba [Wed, 25 Mar 2009 03:17:13 +0000 (20:17 -0700)]
Automated import from //branches/donutburger/...@141437,141437
Andrei Popescu [Wed, 25 Mar 2009 02:46:53 +0000 (19:46 -0700)]
Automated import from //branches/donutburger/...@141184,141184
Mike Reed [Wed, 25 Mar 2009 02:41:55 +0000 (19:41 -0700)]
Automated import from //branches/donutburger/...@141163,141163
Patrick Scott [Wed, 25 Mar 2009 02:38:24 +0000 (19:38 -0700)]
Automated import from //branches/cupcake/...@142399,142399
Mike Reed [Wed, 25 Mar 2009 02:25:16 +0000 (19:25 -0700)]
Automated import from //branches/cupcake/...@142333,142333
Cary Clark [Wed, 25 Mar 2009 02:17:15 +0000 (19:17 -0700)]
Automated import from //branches/cupcake/...@142229,142229
Patrick Scott [Wed, 25 Mar 2009 01:44:26 +0000 (18:44 -0700)]
Automated import from //branches/cupcake/...@141963,141963
Cary Clark [Wed, 25 Mar 2009 01:36:59 +0000 (18:36 -0700)]
Automated import from //branches/cupcake/...@141897,141897
Dianne Hackborn [Wed, 25 Mar 2009 01:36:53 +0000 (18:36 -0700)]
Automated import from //branches/donutburger/...@140818,140818
Grace Kloba [Wed, 25 Mar 2009 00:43:55 +0000 (17:43 -0700)]
Automated import from //branches/donutburger/...@140474,140474
Grace Kloba [Wed, 25 Mar 2009 00:37:48 +0000 (17:37 -0700)]
Automated import from //branches/donutburger/...@140424,140424
The Android Open Source Project [Fri, 20 Mar 2009 06:08:54 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 00:39:45 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
The Android Open Source Project [Fri, 13 Mar 2009 20:04:22 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Wed, 11 Mar 2009 19:11:56 +0000 (12:11 -0700)]
auto import from //branches/cupcake/...@137873
The Android Open Source Project [Mon, 9 Mar 2009 18:52:12 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Thu, 5 Mar 2009 22:34:32 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:30:52 +0000 (19:30 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:41 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:21 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:32 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Fri, 20 Feb 2009 15:38:31 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Thu, 19 Feb 2009 18:57:31 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Fri, 13 Feb 2009 20:57:50 +0000 (12:57 -0800)]
auto import from //branches/cupcake/...@131421
The Android Open Source Project [Tue, 10 Feb 2009 23:44:00 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 22 Jan 2009 08:13:42 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
The Android Open Source Project [Tue, 20 Jan 2009 22:03:58 +0000 (14:03 -0800)]
auto import from //branches/cupcake/...@127101
The Android Open Source Project [Fri, 16 Jan 2009 00:12:09 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 01:51:23 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
The Android Open Source Project [Thu, 18 Dec 2008 02:05:15 +0000 (18:05 -0800)]
Code drop from //branches/cupcake/...@124589
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution
WebKit Authors [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
SVN commits 30708-30711
Upstream [Mon, 12 Jan 1970 13:46:40 +0000 (13:46 +0000)]
external/webkit r30707