OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Mike Reed [Thu, 2 Apr 2009 16:07:27 +0000 (09:07 -0700)]
Merge branch 'readonly-p4-master'
Mike Reed [Thu, 2 Apr 2009 16:06:19 +0000 (09:06 -0700)]
AI 144018: change path to return its internal cached bounds, making it much lighter-weight to get the bounds.
BUG=
1748928
Automated import of CL 144018
The Android Open Source Project [Wed, 1 Apr 2009 04:34:25 +0000 (21:34 -0700)]
Merge commit 'goog/readonly-p4-master'
Grace Kloba [Tue, 31 Mar 2009 21:15:16 +0000 (14:15 -0700)]
AI 143691: am: CL 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/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143691
Cary Clark [Mon, 30 Mar 2009 21:18:20 +0000 (14:18 -0700)]
AI 143526: Clear execute bit on C++ source files.
Our execute bit is out of sync with webkit.org, so make
them the same. This helps keep the diff tool from
getting confused.
BUG=
1553405
Automated import of CL 143526
Leon Scroggins [Mon, 30 Mar 2009 20:40:59 +0000 (13:40 -0700)]
AI 143515: Fix for issue
1730904: Find only searches the first part of large pages. The previous fix, 142939-p9, allowed larger pages to be searched fully, but not with a length larger than a 16 bit number. In change 143089-p9, bitmap's width and height were promoted to 32 bits, so our previous fix is no longer necessary, and prevents larger pages from working. This removes the prior fix.
BUG=
1730904
Automated import of CL 143515
Cary Clark [Mon, 30 Mar 2009 18:02:39 +0000 (11:02 -0700)]
AI 143486: Update diff tool rules in webkit makefiles.
Anticipating another merge with webkit, these changes
update the rules to automatically exclude files we've already removed
manually. A new rule allows including files that are not yet
checked into webkit's makefiles (e.g., Touch).
The exclude rules no longer need to be alphabetized, but the
makefile sources still do -- so fix a couple of entries that
are out of order.
BUG=
1553405
Automated import of CL 143486
Mike Reed [Mon, 30 Mar 2009 15:35:27 +0000 (08:35 -0700)]
AI 143477: respect the srcRect parameter in drawPattern, so we can correctly show nineslice images
BUG=
1745838
Automated import of CL 143477
Alexey Tarasov [Tue, 13 Jan 2009 22:26:31 +0000 (08:26 +1000)]
Allows building of WebKit libs on FreeBSD
Includes declarations of AF_INET, sockaddr_in & etc.
The Android Open Source Project [Sun, 29 Mar 2009 15:55:31 +0000 (08:55 -0700)]
Merge branch 'open_source_contributions_cherry_picked' into google_internal
Leon Scroggins [Sat, 28 Mar 2009 01:50:40 +0000 (18:50 -0700)]
AI 143340: am: CL 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/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143340
The Android Open Source Project [Fri, 27 Mar 2009 22:31:06 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Leon Scroggins [Thu, 26 Mar 2009 17:38:14 +0000 (10:38 -0700)]
Automated import from //branches/cupcake/...@142939,142939
Patrick Scott [Thu, 26 Mar 2009 17:03:06 +0000 (10:03 -0700)]
Automated import from //branches/master/...@142932,142932
Grace Kloba [Wed, 25 Mar 2009 23:23:15 +0000 (16:23 -0700)]
Automated import from //branches/master/...@142772,142772
Mike Reed [Wed, 25 Mar 2009 23:03:48 +0000 (16:03 -0700)]
Automated import from //branches/master/...@142750,142750
Mike Reed [Wed, 25 Mar 2009 22:46:51 +0000 (15:46 -0700)]
Automated import from //branches/master/...@142735,142735
Grace Kloba [Wed, 25 Mar 2009 22:33:48 +0000 (15:33 -0700)]
Automated import from //branches/cupcake/...@142678,142678
Leon Scroggins [Wed, 25 Mar 2009 22:14:00 +0000 (15:14 -0700)]
Automated import from //branches/master/...@142593,142593
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
Cary Clark [Wed, 25 Mar 2009 15:47:23 +0000 (08:47 -0700)]
Automated import from //branches/master/...@142546,142546
Patrick Scott [Wed, 25 Mar 2009 05:46:47 +0000 (22:46 -0700)]
Automated import from //branches/master/...@142404,142404
Mike Reed [Wed, 25 Mar 2009 05:38:28 +0000 (22:38 -0700)]
Automated import from //branches/master/...@142337,142337
Cary Clark [Wed, 25 Mar 2009 05:31:44 +0000 (22:31 -0700)]
Automated import from //branches/master/...@142298,142298
Patrick Scott [Wed, 25 Mar 2009 04:16:20 +0000 (21:16 -0700)]
Automated import from //branches/master/...@141965,141965
Cary Clark [Wed, 25 Mar 2009 04:14:25 +0000 (21:14 -0700)]
Automated import from //branches/master/...@141953,141953
Cary Clark [Wed, 25 Mar 2009 04:09:12 +0000 (21:09 -0700)]
Automated import from //branches/master/...@141913,141913
Patrick Scott [Wed, 25 Mar 2009 03:40:43 +0000 (20:40 -0700)]
Automated import from //branches/master/...@141633,141633
Grace Kloba [Wed, 25 Mar 2009 03:22:51 +0000 (20:22 -0700)]
Automated import from //branches/master/...@141472,141472
Grace Kloba [Wed, 25 Mar 2009 03:17:36 +0000 (20:17 -0700)]
Automated import from //branches/master/...@141440,141440
Andrei Popescu [Wed, 25 Mar 2009 02:46:24 +0000 (19:46 -0700)]
Automated import from //branches/master/...@141189,141189
Mike Reed [Wed, 25 Mar 2009 02:41:28 +0000 (19:41 -0700)]
Automated import from //branches/master/...@141164,141164
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:43 +0000 (18:36 -0700)]
Automated import from //branches/master/...@140824,140824
Grace Kloba [Wed, 25 Mar 2009 00:45:54 +0000 (17:45 -0700)]
Automated import from //branches/master/...@140476,140476
Grace Kloba [Wed, 25 Mar 2009 00:39:40 +0000 (17:39 -0700)]
Automated import from //branches/master/...@140426,140426
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
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:08:04 +0000 (16:08 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
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
Alexey Tarasov [Tue, 13 Jan 2009 22:26:31 +0000 (08:26 +1000)]
Allows building of WebKit libs on FreeBSD
Includes declarations of AF_INET, sockaddr_in & etc.
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:16:04 +0000 (00:16 -0800)]
Merge branch 'cupcake'
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:05:32 +0000 (14:05 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:03:58 +0000 (14:03 -0800)]
auto import from //branches/cupcake/...@127101
android-build SharedAccount [Fri, 16 Jan 2009 00:15:57 +0000 (16:15 -0800)]
Merge branch 'cupcake'
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 02:04:18 +0000 (18:04 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Sat, 10 Jan 2009 01:51:23 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
Jean-Baptiste Queru [Fri, 19 Dec 2008 16:00:27 +0000 (08:00 -0800)]
Merge commit 'remotes/korg/cupcake'
Conflicts:
JavaScriptCore/kjs/function.cpp
JavaScriptCore/kjs/function.h
WebCore/bindings/js/JSStyleSheetCustom.cpp
The Android Open Source Project [Thu, 18 Dec 2008 02:05:15 +0000 (18:05 -0800)]
Code drop from //branches/cupcake/...@124589
Rich Cannings [Thu, 4 Dec 2008 23:42:39 +0000 (15:42 -0800)]
This fixes two webkit bugs already fixed in the G1:
(1) Memory corruption due to dangling ownerNode pointer on JSStyleSheet
object (CVE-2008-2317). Described by: http://trac.webkit.org/changeset/37368
(2) Integer overflow in handling of JavaScript array indicees
(CVE-2008-2303). This is a slightly smaller change than the one shown by:
http://trac.webkit.org/changeset/37355
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