OSDN Git Service
Feng Qian [Tue, 21 Apr 2009 00:23:12 +0000 (17:23 -0700)]
Separate JSC and JSC binding from WebCore build file.
Introduce a flag JS_ENGINE, which can be set to 'jsc' or 'v8'. Currently only 'jsc' is working.
Feng Qian [Mon, 20 Apr 2009 18:26:10 +0000 (11:26 -0700)]
Import a new V8 revision 1746.
r1746 can turn off debugger support to save code size.
Feng Qian [Fri, 17 Apr 2009 23:17:43 +0000 (16:17 -0700)]
Add Android makefiles for v8 and v8shell.
To build v8 librariy, use make libv8, and build v8 shell, use make v8shell.
v8 is built as a shared library, it requires libv8.so be in core/prelink-linux-arm.map
Feng Qian [Fri, 17 Apr 2009 17:56:30 +0000 (10:56 -0700)]
Update v8 source to bleeding_edge 1738.
Git thinks bug-269.js and func-name-inferrer.cc are similar because both has copyright info and small code size.
Feng Qian [Thu, 16 Apr 2009 17:13:32 +0000 (10:13 -0700)]
Import V8 r1682 from trunk.
v8/REVISION has svn URL and revision number:
http://v8.googlecode.com/svn/trunk@1682
Cary Clark [Wed, 15 Apr 2009 16:07:58 +0000 (12:07 -0400)]
update webkitmerge with git-specific commands
Android (Google) Code Review [Wed, 15 Apr 2009 14:36:13 +0000 (07:36 -0700)]
Merge change 189
* changes:
updated utf16 files that differ from webkit.org CL 42026
Cary Clark [Wed, 15 Apr 2009 14:24:50 +0000 (10:24 -0400)]
updated utf16 files that differ from webkit.org CL 42026
Patrick Scott [Wed, 15 Apr 2009 14:10:56 +0000 (07:10 -0700)]
Merge branch 'readonly-p4-master'
Patrick Scott [Wed, 15 Apr 2009 14:09:41 +0000 (07:09 -0700)]
AI 146317: Traverse the frame tree and compute the largest rectangle that holds all
the frames. If this rectangle is larger than the computed content, make
the frame's view size equal to the computed total so that the content
will be the correct size.
When expanded iframes, set the width and height to the content width and
height plus the padding and border.
BUG=
1719555
Automated import of CL 146317
Ben Murdoch [Wed, 15 Apr 2009 10:11:02 +0000 (03:11 -0700)]
Merge branch 'readonly-p4-master'
Ben Murdoch [Wed, 15 Apr 2009 10:09:47 +0000 (03:09 -0700)]
AI 146302: Android thread registration. Sent to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=25091
Automated import of CL 146302
Leon Scroggins [Tue, 14 Apr 2009 18:07:13 +0000 (11:07 -0700)]
Merge branch 'readonly-p4-master'
Leon Scroggins [Tue, 14 Apr 2009 17:57:12 +0000 (10:57 -0700)]
AI 146153: Make the TextDialog invisible, so that we only show WebKit's rendering of the textfield, yet we retain the benefits of having the TextDialog.
Frame.cpp:
Removed a line that should not be there anyway. Somehow when merging in Apple's ENABLE(TEXT_CARET) changes we left in a line that disables the blinking Cursor.
Platform.h:
Let WebKit draw the cursor.
RenderThemeAndroid.cpp:
Make the active selection color (the color of a selection in an active <textfield> or <textarea>) visible, and match the selection color shown in other places in Android.
WebViewCore.cpp:
Make the focused node's document's focus controller active. This allows webkit to draw the cursor.
TextDialog.java:
Set WillNotDraw to true, and remove our background, so that the TextDialog is completely invisible. Note that I have not changed its visibility to View.VISIBLE, which would have other undesired effects (would not accept touch events, for example). Since we are not drawing, remove onPreDraw, which is no longer necessary. In onSelectionChanged, pass a message to webkit telling it that the selection has changed. It is important that the two threads always agree (albeit webkit may be behind) because the user will now only see the selection drawn by webkit. Remove some old flawed code whose purpose was to keep the selection up to date and do not send key events for arrow keys (which would mess up the selection that was correct thanks to onSelectionChanged).
BUG=
1781070,
1712752,916193,
1411370,
1160999,
1775425,
1354814
Automated import of CL 146153
Leon Scroggins [Mon, 13 Apr 2009 21:51:39 +0000 (17:51 -0400)]
Remove a compile warning. We were comparing signed and unsigned integers. Use a cast to avoid it.
Cary Clark [Tue, 14 Apr 2009 13:38:09 +0000 (06:38 -0700)]
Merge branch 'readonly-p4-master'
Cary Clark [Tue, 14 Apr 2009 13:36:55 +0000 (06:36 -0700)]
AI 146111: update webkitmerge to handle git, svg, fix bugs
//branches/master/android/external/webkit/WebCore/Android.derived.mk
add exclusion rules for svg
//branches/master/android/external/webkit/WebCore/Android.mk
add exclusion exceptions (e.g., files from /skia/ that we use)
remove the need to have '\' at the end of each file
//branches/master/android/external/webkit/WebKitTools/android/webkitmerge/webkitmerge.cpp
don't delete modified files, but mark them with MANUAL_MERGE_REQUIRED
add --execute option (in progress)
add --perforce, --git options
fix double add of file when it appears in sandbox and new webkit
BUG=
1553405
Automated import of CL 146111
Cary Clark [Tue, 14 Apr 2009 13:34:37 +0000 (06:34 -0700)]
Merge branch 'readonly-p4-master'
Cary Clark [Tue, 14 Apr 2009 13:33:00 +0000 (06:33 -0700)]
AI 146110: add missing files to webkit
brings it in sync with webkit svn cl 42046
Automated import of CL 146110
Grace Kloba [Mon, 13 Apr 2009 17:23:50 +0000 (10:23 -0700)]
Merge branch 'readonly-p4-master'
Grace Kloba [Mon, 13 Apr 2009 17:22:37 +0000 (10:22 -0700)]
AI 145877: Fix the sim-debug build due to the changes in the new WebKit.
Automated import of CL 145877
Grace Kloba [Sat, 11 Apr 2009 01:41:43 +0000 (18:41 -0700)]
Merge branch 'readonly-p4-master'
Grace Kloba [Sat, 11 Apr 2009 01:40:31 +0000 (18:40 -0700)]
AI 145799: Added back the ANDROID_INSTRUMENT for JS.
Automated import of CL 145799
Feng Qian [Sat, 11 Apr 2009 01:12:53 +0000 (18:12 -0700)]
Merge branch 'readonly-p4-master'
Feng Qian [Sat, 11 Apr 2009 01:11:29 +0000 (18:11 -0700)]
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Grace Kloba [Thu, 9 Apr 2009 02:32:46 +0000 (19:32 -0700)]
Merge branch 'readonly-p4-master'
Grace Kloba [Thu, 9 Apr 2009 02:31:40 +0000 (19:31 -0700)]
AI 145242: am: CL 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.
Original author: klobag
Automated import of CL 145242
Patrick Scott [Wed, 8 Apr 2009 18:19:22 +0000 (11:19 -0700)]
Merge branch 'readonly-p4-master'
Patrick Scott [Wed, 8 Apr 2009 18:18:09 +0000 (11:18 -0700)]
AI 145074: Override calcWidth and calcHeight to compute the content dimensions.
This fixes a few calls to calcWidth/calcHeight without doing a layout.
BUG=
1360169
Automated import of CL 145074
Cary Clark [Wed, 8 Apr 2009 15:10:51 +0000 (08:10 -0700)]
Merge branch 'readonly-p4-master'
Cary Clark [Wed, 8 Apr 2009 15:09:33 +0000 (08:09 -0700)]
AI 145053: add SVG to the browser [disabled by default]
To enable SVG, edit your buildspec.mk to
ENABLE_SVG:=true
then
make clean-libwebcore && make
Some SVG functionality has been stubbed out in this checkin.
//branches/master/android/build/buildspec.mk.default # edit
- add ENABLE_SVG, commented out by default
- fix up WEBCORE_INSTRUMENTATION define while I was in there
//branches/master/android/external/webkit/Android.mk # edit
- add ENABLE_SVG C define
- add svg paths to C includes
//branches/master/android/external/webkit/WebCore/Android.derived.mk # edit
- update merge tool rules
- add svg to css property names, keywords, generated bindings
- add svg names, element factory, wrappers
- remove obsolete ksvgcssproperties.h
- add XLinkNames, required by SVG
//branches/master/android/external/webkit/WebCore/Android.mk # edit
- update merge tool rules
- add svg bindings, css svg parsing, svg rendering, svg engine
//branches/master/android/external/webkit/WebCore/config.h # edit
- leave ENABLE_SVG alone if it is already defined
//branches/master/android/external/webkit/WebCore/loader/EmptyClients.h # edit
- add some Android extensions as empty virtuals (EmptyClients is only used by SVG)
//branches/master/android/external/webkit/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp # edit
//branches/master/android/external/webkit/WebCore/platform/graphics/android/PathAndroid.cpp # edit
- add SVG graphics porting functions. Note the FIXMEs -- some are unimplemented.
BUG=
1474412
Automated import of CL 145053
Patrick Scott [Wed, 8 Apr 2009 07:26:33 +0000 (00:26 -0700)]
Merge branch 'readonly-p4-master'
Patrick Scott [Wed, 8 Apr 2009 07:25:22 +0000 (00:25 -0700)]
AI 144889: am: CL 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.
Original author: phanna
Automated import of CL 144889
Mike Reed [Mon, 6 Apr 2009 18:47:00 +0000 (11:47 -0700)]
Merge branch 'readonly-p4-master'
Mike Reed [Mon, 6 Apr 2009 18:45:51 +0000 (11:45 -0700)]
AI 144671: use correct phase in matrix (cribbed from chrome)
BUG=
1451775
Automated import of CL 144671
Mike Lockwood [Mon, 6 Apr 2009 18:17:42 +0000 (14:17 -0400)]
Fix webkitmerge build.
Signed-off-by: Mike Lockwood <lockwood@google.com>
Grace Kloba [Mon, 6 Apr 2009 17:48:35 +0000 (10:48 -0700)]
Merge branch 'readonly-p4-master'
Grace Kloba [Mon, 6 Apr 2009 17:47:25 +0000 (10:47 -0700)]
AI 144661: Fix #175030. Preserve the zoom factor during refresh. Remove the code change in FrameLoader.cpp which was to preserve the zoom factor when we first did layout. Now we only use the initialZoomScale if it is a standard load. If it is history load, restoreScale() should be called before didFirstLayout(), in the other cases, like reload, refresh, replace, we don't change the zoom factor.
BUG=175030
Automated import of CL 144661
Grace Kloba [Mon, 6 Apr 2009 17:21:34 +0000 (10:21 -0700)]
Merge branch 'readonly-p4-master'
Grace Kloba [Mon, 6 Apr 2009 17:20:23 +0000 (10:20 -0700)]
AI 144646: Fix #
1726127. During history navigation, ScrollView::platformSetScrollPosition() can be called for an iframe in the creation, which is before it is added to the view hierarchy. So we need to check "this" against mainFrame's view to know whether it is the top view instead of checking parent().
BUG=
1726127
Automated import of CL 144646
Cary Clark [Mon, 6 Apr 2009 16:56:12 +0000 (09:56 -0700)]
Merge branch 'readonly-p4-master'
Cary Clark [Mon, 6 Apr 2009 16:55:02 +0000 (09:55 -0700)]
AI 144643: a few more fixes for the automated merge tool
don't include chromium files in JavaScriptCore
add a list of generated files to exclude
BUG=
1553405
Automated import of CL 144643
Mike Reed [Mon, 6 Apr 2009 16:20:27 +0000 (09:20 -0700)]
Merge branch 'readonly-p4-master'
Mike Reed [Mon, 6 Apr 2009 16:19:20 +0000 (09:19 -0700)]
AI 144639: curse you copy/paste! Fix error in matrix indices
BUG=
1595243
Automated import of CL 144639
Cary Clark [Mon, 6 Apr 2009 13:49:00 +0000 (06:49 -0700)]
Merge branch 'readonly-p4-master'
Cary Clark [Mon, 6 Apr 2009 13:47:49 +0000 (06:47 -0700)]
AI 144627: webkitmerge is a command line tool that merges newer version of webkit to Android.
It can be either run from XCode using the xcodeproj or from the command line.
BUG=
1553405
Automated import of CL 144627
Mike Reed [Fri, 3 Apr 2009 21:17:49 +0000 (14:17 -0700)]
Merge branch 'readonly-p4-master'
Mike Reed [Fri, 3 Apr 2009 21:16:36 +0000 (14:16 -0700)]
AI 144502: remove unused/obsolete helper functions
Automated import of CL 144502
Leon Scroggins [Fri, 3 Apr 2009 21:02:35 +0000 (14:02 -0700)]
Merge branch 'readonly-p4-master'
Leon Scroggins [Fri, 3 Apr 2009 21:01:27 +0000 (14:01 -0700)]
AI 144499: Remove some unnecessary ifdef ANDROID code to make our merges simpler. Rather than using a private function, we now use public functions to accomplish the same task.
Automated import of CL 144499
Leon Scroggins [Fri, 3 Apr 2009 16:44:57 +0000 (09:44 -0700)]
Merge branch 'readonly-p4-master'
Leon Scroggins [Fri, 3 Apr 2009 16:43:49 +0000 (09:43 -0700)]
AI 144458: Remove our hack to prevent drawing the selection, and set our selection color to transparent. This gets us the same result while simplifying the merge.
Automated import of CL 144458
Mike Reed [Fri, 3 Apr 2009 13:35:17 +0000 (06:35 -0700)]
Merge branch 'readonly-p4-master'
Mike Reed [Fri, 3 Apr 2009 13:34:07 +0000 (06:34 -0700)]
AI 144443: Change how skia handles gradient stops that are missing either pos=0 or pos=1. Instead of ignoring the first and last pos, and assuming they were 0,1, now we insert in the missing values. This matches webkit's expectations, and seems fine for skia clients as well.
On the webkit side, call Gradient::getColor() before we sniff the stops-array. This has the side-effect of sorting the stops, which we need for skia.
BUG=
1688373
Automated import of CL 144443
Leon Scroggins [Thu, 2 Apr 2009 21:53:23 +0000 (14:53 -0700)]
Merge branch 'readonly-p4-master'
Leon Scroggins [Thu, 2 Apr 2009 21:52:09 +0000 (14:52 -0700)]
AI 144288: Remove an #ifdef ANDROID.... We no longer care what the selection of the textarea is on focus, since we set the selection before we edit it anyway.
Automated import of CL 144288
Leon Scroggins [Thu, 2 Apr 2009 17:51:37 +0000 (10:51 -0700)]
Merge branch 'readonly-p4-master'
Leon Scroggins [Thu, 2 Apr 2009 17:50:28 +0000 (10:50 -0700)]
AI 144237: Fix for issue
1600838: error handling <select multiple="multiple"> when using <optgroup>. Previously, I was appending 0 to my selected list for <optgroup>s, as if 0 meant the item at that index is not selected. In reality, the list is a list of indeces which are selected, so this made the first item always selected if there was a multiple with an <optgroup>. Removed the erroneous append, and add some asserts.
BUG=
1600838
Automated import of CL 144237
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