OSDN Git Service
Steve Block [Fri, 27 Aug 2010 10:02:25 +0000 (11:02 +0100)]
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Maksymilian Osowski [Thu, 2 Sep 2010 12:55:45 +0000 (05:55 -0700)]
Merge "Updated the test_expectations.txt to use FAIL instead of IGNORE_RESULT."
Maksymilian Osowski [Wed, 1 Sep 2010 16:21:35 +0000 (17:21 +0100)]
Updated the test_expectations.txt to use FAIL instead of IGNORE_RESULT.
Bug:
2899965
Change-Id: Ia61ab8d7f269d4d3b2db4531fd8e2031b1ae44b4
Elliott Slaughter [Tue, 31 Aug 2010 22:29:02 +0000 (15:29 -0700)]
Use the correct types in SaveWebArchive.
Change-Id: I0a963a0e6b29be73aaede56bb58400ce1e81edb7
Elliott Slaughter [Tue, 24 Aug 2010 01:24:00 +0000 (18:24 -0700)]
Cleanup temporary incognito mode files after last tab closes.
Change-Id: Ib55ef570b181afc99991afb55b6880b7a13f69a7
Kristian Monsen [Wed, 1 Sep 2010 17:19:24 +0000 (10:19 -0700)]
Merge "Using Chrome http as default."
Cary Clark [Wed, 1 Sep 2010 17:13:56 +0000 (10:13 -0700)]
Merge "add web setting for enabling/disabling synthetic links"
Cary Clark [Tue, 31 Aug 2010 19:45:11 +0000 (15:45 -0400)]
add web setting for enabling/disabling synthetic links
According to this feature request
http://b/
1865484
Some webviews wish to load pages and ignore the
email, phone, and postal addresses. Add a way
to specify that preference to the WebView class.
depends on companion change in frameworks/base
Change-Id: Ibcd78ab632063d8ab403567fa40c329339e51572
Kristian Monsen [Wed, 1 Sep 2010 13:51:56 +0000 (14:51 +0100)]
Using Chrome http as default.
Will use the not default stack if USE_ALT_HTTP is defined in the shell.
Change-Id: I8232c906dcdfaefbb03d3765eb8201407e2cef5b
Maksymilian Osowski [Wed, 1 Sep 2010 11:08:36 +0000 (04:08 -0700)]
Merge "Added script to show the source of the test."
Maksymilian Osowski [Tue, 31 Aug 2010 17:08:06 +0000 (18:08 +0100)]
Added script to show the source of the test.
Change-Id: I192b0ecd7830f69193111ebf1d081dcd9495a51b
Kristian Monsen [Wed, 1 Sep 2010 08:59:24 +0000 (01:59 -0700)]
Merge "Move all external/chromiumn includes to one file"
Melanie Clements [Tue, 31 Aug 2010 17:10:56 +0000 (10:10 -0700)]
am
cd011297: am
ff93a851: Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Merge commit '
cd011297fda5b6f6093453d59c2624aaf878e2fb'
* commit '
cd011297fda5b6f6093453d59c2624aaf878e2fb':
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Kristian Monsen [Sun, 29 Aug 2010 14:50:43 +0000 (15:50 +0100)]
Move all external/chromiumn includes to one file
There are several logging errors and warnings when including files from external/chromium
and the <cutils/log.h>. This commit moves all external/chromium includes to one place, and
and LOG_ASSERT to what it is in <cutils/log.h>
Change-Id: If908262cf1b859247d7b8a5880807a2e9ec16980
Melanie Clements [Tue, 31 Aug 2010 16:10:30 +0000 (09:10 -0700)]
am
ff93a851: Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Merge commit '
ff93a851c578d0b570c84b3a83a41a4930e7107c' into gingerbread-plus-aosp
* commit '
ff93a851c578d0b570c84b3a83a41a4930e7107c':
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Cary Clark [Tue, 31 Aug 2010 13:20:16 +0000 (09:20 -0400)]
fix monkey crash in nav cache
WebView::motionUp() got the latest nav cache, extracted
some nodes from it with findAt(), then called setNavBounds()
which got a newer cache. The older cache node was sent
to CachedRoot::setCursor() which crashed trying to use
the state pointer.
The flaw was that, although motionUp requests the newest
cache up front, and then setNavBounds() requests the stale
cache, in rare circumstances it can receive a newer cache
as well.
The fix is to replace the setNavBounds() function with a
direct call on the valid cache.
Change-Id: If23ee9222f2b701d916911f4b667185f1c3d3d18
http://b/
2316138
Melanie Clements [Fri, 20 Aug 2010 18:19:20 +0000 (14:19 -0400)]
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
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
Cary Clark [Fri, 27 Aug 2010 23:05:46 +0000 (16:05 -0700)]
am
586c8632: (-s ours) am
90fa57cd: DO NOT MERGE make the text selection easier to hit
Merge commit '
586c86325776ca506c6380ab41f9e66a69704f45'
* commit '
586c86325776ca506c6380ab41f9e66a69704f45':
DO NOT MERGE make the text selection easier to hit
Steve Block [Fri, 27 Aug 2010 16:31:37 +0000 (09:31 -0700)]
Merge "Add ANGLE at r65615"
Steve Block [Fri, 27 Aug 2010 16:00:52 +0000 (17:00 +0100)]
Add ANGLE at r65615
ANGLE is now required for the Mac build, so should have been added
as part of the merge to r65615.
Change-Id: I048185d196cf3150651fff0e3761fc57928f18ce
Kristian Monsen [Fri, 27 Aug 2010 15:43:35 +0000 (08:43 -0700)]
Merge "Checking that all load operations are done in order."
Cary Clark [Fri, 27 Aug 2010 15:19:11 +0000 (08:19 -0700)]
am
90fa57cd: DO NOT MERGE make the text selection easier to hit
Merge commit '
90fa57cd8b940ab1b46a85da92d950392a77e9da' into gingerbread-plus-aosp
* commit '
90fa57cd8b940ab1b46a85da92d950392a77e9da':
DO NOT MERGE make the text selection easier to hit
Kristian Monsen [Mon, 23 Aug 2010 14:09:26 +0000 (15:09 +0100)]
Checking that all load operations are done in order.
Adding a m_loadState variable and checking that everything is happening when they are supposed to. There were some problems were race conditions between the threads created some issues.
Change-Id: I7fca570aa917eaaa741c3745f6b8417a656d18c4
Steve Block [Fri, 27 Aug 2010 14:42:46 +0000 (07:42 -0700)]
Merge "Restore LayoutTests/storage/sql-error-codes-expected.txt"
Steve Block [Fri, 27 Aug 2010 14:25:09 +0000 (15:25 +0100)]
Restore LayoutTests/storage/sql-error-codes-expected.txt
This should have been added in the merge to WebKit r61871, but was
accidentally removed when creating the Android V8-specific result.
See https://android-git.corp.google.com/g/#change,56250
Change-Id: I48849d32f649009bcb935911558f2543eebb3d2f
Cary Clark [Wed, 25 Aug 2010 21:49:25 +0000 (17:49 -0400)]
fix button cursor state
Clear the pressed state for buttons when the cursor is
shown indefinitely, and set look for the pressed cursor
state when recording the button colors.
Change-Id: I78095ec9a7580c372c66b83913447b8214a6a432
http://b/
2135321
Steve Block [Fri, 27 Aug 2010 11:26:09 +0000 (04:26 -0700)]
Merge "Use upstream version of ANDROID_HITTEST_WITHSIZE"
Steve Block [Thu, 12 Aug 2010 11:11:09 +0000 (12:11 +0100)]
Use upstream version of ANDROID_HITTEST_WITHSIZE
This change removes the last occurrences of ANDROID_HITTEST_WITHSIZE
and updates WebKit to use the upstream version of this logic. This
follows on from https://android-git.corp.google.com/g/#change,60166 which
merged the upstream logic into the Android tree but maintained the existing
behaviour for Android, guarded with ANDROID_HITTEST_WITHSIZE.
This change introduces the following functional changes ...
- HitTestResult::addNodeToRectBasedTestResult()
The Android version proceeded with the containment test if the node is null.
We now early out and continue the hit test. We also record the node's
shadowAncestorNode, rather than the node itself.
- RenderLayer::hitTestList()
The android version always updates the result, but only updates the
result layer if the result is not a rect based result.
We now always update result layer, but only update the result if the
result is not a rect based result.
- RenderSVGRoot::nodeAtPoint()
The Android version returned true only if it's not a rect based hit test.
Now we return true always.
- HitTestResult::m_isRectBased
In the Android version, a padding must have positive width and height.
Now we allow one of the two to be zero, provided the other is positive
All other changes are non-functional and should probably have been done as
part of https://android-git.corp.google.com/g/#change,60166
Note that the change to RenderBlock::nodeAtPoint() is a non-functional change
because we don't pass a rect to addNodeToRectBasedTestResult(), so the default
zero rect is used and the hit test always fails.
Change-Id: I4163fddad59ad6485df40cd48794aa262f76ced7
Steve Block [Fri, 27 Aug 2010 11:02:11 +0000 (04:02 -0700)]
Merge "Add missing Indexed DB tests at r65615"
Steve Block [Fri, 27 Aug 2010 10:19:51 +0000 (11:19 +0100)]
Add missing Indexed DB tests at r65615
These should have been added as part of the merge to WebKit r65615
See http://trac.webkit.org/changeset/65509
Change-Id: I18ff50f54caa6682e8adfc6ae152bce4e94636a9
Cary Clark [Thu, 26 Aug 2010 21:47:21 +0000 (17:47 -0400)]
DO NOT MERGE make the text selection easier to hit
Change-Id: I47b7aa04ebc2a8f0bf2c6b4399ef65e5f4c58d4e
http://b/
2626451
Kristian Monsen [Thu, 26 Aug 2010 17:41:44 +0000 (10:41 -0700)]
Merge "Create HttpAuthHandlerFactory to fix HTTP auth crashes."
Iain Merrick [Thu, 26 Aug 2010 17:38:42 +0000 (18:38 +0100)]
Create HttpAuthHandlerFactory to fix HTTP auth crashes.
We still need to hook in the necessary callbacks to present
the user with a login prompt.
Change-Id: Id4ccb8209d2ffdfcc35f9104a2e448ed552e6390
Steve Block [Thu, 26 Aug 2010 14:43:21 +0000 (15:43 +0100)]
Update get_layout_tests_dir_contents.php to account for new server document root
See https://android-git.corp.google.com/g/#change,63194 which updates apach2.py
to serve HTTP tests at server root
Bug:
2951727
Change-Id: I4a5777d71843c1c2fdcd74a69b13e3c4750a45a0
Maksymilian Osowski [Thu, 26 Aug 2010 15:19:04 +0000 (08:19 -0700)]
Merge "Updated the script to allow for chosing the mode (list files vs. list folders)."
Maksymilian Osowski [Tue, 24 Aug 2010 15:21:18 +0000 (16:21 +0100)]
Updated the script to allow for chosing the mode (list files vs. list folders).
Change-Id: I7a87e5591aef888f47cceaf3f30f5f2752e336aa
Steve Block [Thu, 26 Aug 2010 11:19:01 +0000 (04:19 -0700)]
Merge "Fix line endings on a couple of Android-specific expected results"
Steve Block [Thu, 26 Aug 2010 10:54:13 +0000 (11:54 +0100)]
Fix line endings on a couple of Android-specific expected results
These files were checked in with DOS line endings
See https://android-git.corp.google.com/g/#change,62547
Change-Id: I849afbab74df789b6c1df83a28a65ec92ad10d24
Shimeng (Simon) Wang [Thu, 26 Aug 2010 00:27:07 +0000 (17:27 -0700)]
Add a NULL guard.
issue:
2884022
Change-Id: I471fca7296ca233bc4d9e1c75d173094265c9a9f
Shimeng (Simon) Wang [Wed, 25 Aug 2010 21:52:03 +0000 (14:52 -0700)]
Merge "Preserve the zoomFactor when a new frameview is created."
Cary Clark [Wed, 25 Aug 2010 21:03:19 +0000 (14:03 -0700)]
Merge "simplify cursor ring draw state"
Cary Clark [Wed, 25 Aug 2010 18:40:32 +0000 (14:40 -0400)]
simplify cursor ring draw state
Removed old code and state that used to allow for the cursor
ring to be different if a synthetic link was pressed, state
that allowed the ring to animate, and state that attempted to
show the ring until the link it represented was replaced by
a new page.
The new code
- shows the cursor ring indefinitely when the trackball or dpad is moved
- shows the cursor for 500 ms when the trackball or dpad is clicked
or if the screen is tapped.
This is separate from logic that attempts to select whether to
show the cursor ring at all; this merely chooses how long to
show the cursor ring when the cursor changes.
Requires a companion change in frameworks/base
Change-Id: I309abe346f6b67ed3b665aaa79c367f4599bf1cd
http://b/
2135321
Shimeng (Simon) Wang [Wed, 25 Aug 2010 18:30:59 +0000 (11:30 -0700)]
Preserve the zoomFactor when a new frameview is created.
Currently if the default font size is set "LARGE", it'll be ignored when a page is loaded,
since it's lost in the new frameview.
Change-Id: If4579459cb679fdc9666dda25cd557761f4820b5
Leon Scroggins [Wed, 25 Aug 2010 18:33:58 +0000 (11:33 -0700)]
Merge "Do not clip out found matches."
Leon Scroggins [Wed, 25 Aug 2010 17:37:44 +0000 (13:37 -0400)]
Do not clip out found matches.
Bug:
1691733
We were comparing against the total clip to determine whether each
match was valid. This is likely never necessary, and causes problems,
for example on the textfield on Google's homepage.
Change-Id: Ib6567554ea2ef7ee11fffe7329132406aed33397
Steve Block [Wed, 25 Aug 2010 13:36:30 +0000 (14:36 +0100)]
Add LayoutTests/http/tests/resources at r65615
These scripts are required to run the http tests, eg
http/tests/appcache/fail-on-update.html
Change-Id: I6173fcb9bc0d77a5cfc94fce45d02b1704ee6306
Steve Block [Wed, 25 Aug 2010 09:59:55 +0000 (10:59 +0100)]
Copy WebKit python files to intermediates directory for build
This prevents the generation of Python bytecode files in the source directory.
Note that Python's -B option to suppress generation of these files is not
supported until Python 2.6.
Change-Id: Ie0bee31d00d921daf0184109c27719345e568302
Cary Clark [Tue, 24 Aug 2010 21:43:44 +0000 (14:43 -0700)]
am
e7a07088: am
21ed5a45: Merge "check for null pictures when selecting text" into gingerbread
Merge commit '
e7a0708886b515f34d0a7e034cdea391681bf7f1'
* commit '
e7a0708886b515f34d0a7e034cdea391681bf7f1':
check for null pictures when selecting text
Jean-Baptiste Queru [Tue, 24 Aug 2010 19:57:51 +0000 (12:57 -0700)]
am
f3151d7b: am
828ef22d: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
f3151d7b79fdd18bb98f61e807bf7b0780645cf7'
* commit '
f3151d7b79fdd18bb98f61e807bf7b0780645cf7':
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
Cary Clark [Tue, 24 Aug 2010 19:34:40 +0000 (12:34 -0700)]
Merge "communicate drawing pause to webkit to pause gif animation"
Cary Clark [Tue, 24 Aug 2010 14:52:43 +0000 (10:52 -0400)]
communicate drawing pause to webkit to pause gif animation
Gif frames continue even if the webkit changes aren't drawn.
When we suspend drawing, suspend the gif animation as well.
This is accomplished by fooling webkit into thinking the
browser window is offscreen. When the webkit drawing is
resumed, invalidate the entire content so the gif animations
start up once more.
requires companion change in frameworks/base
Change-Id: I78846214048b038cd8d0401dad103d451cd5a269
http://b/
2621902
Kristian Monsen [Wed, 18 Aug 2010 08:51:37 +0000 (09:51 +0100)]
Special file uris have to be handled in Java.
This depends on: https://android-git.corp.google.com/g/#change,62112
Request an java.io.InputStream from java and queries this for that until all is read.
Change-Id: Ia3e7ad973700bd49be9cae9b432661d61a5470b8
Cary Clark [Tue, 24 Aug 2010 15:29:58 +0000 (08:29 -0700)]
am
0ee15178: (-s ours) am
e4be1fd5: DO NOT MERGE Refactor find and select dialogs
Merge commit '
0ee151789837b0429171a2eeeedc93ce2f8d8d10'
* commit '
0ee151789837b0429171a2eeeedc93ce2f8d8d10':
DO NOT MERGE Refactor find and select dialogs
Steve Block [Tue, 24 Aug 2010 14:50:47 +0000 (07:50 -0700)]
Merge changes I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339,I268dfe7d,Icaf70d9f,Ie234f1a0,Iff5c7aaa,I69b75bf0,Ifbf384f4
* changes:
Merge WebKit at r65615 : Update WebKit revision number
Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
Merge WebKit at r65615 : Android-specific results for Geolocation tests.
Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.
Merge WebKit at r65615 : processingUserGesture() is now static.
Merge WebKit at r65615 : UTF8String() becomes utf8().
Merge WebKit at r65615 : Fix include paths for string headers.
Merge WebKit at r65615 : Fix Makefiles.
Merge WebKit at r65615 : Fix conflicts.
Merge WebKit at r65615 : Initial merge by git.
Cary Clark [Tue, 24 Aug 2010 13:46:50 +0000 (06:46 -0700)]
am
21ed5a45: Merge "check for null pictures when selecting text" into gingerbread
Merge commit '
21ed5a4502b3ce76875505aa220f187d165f47b1' into gingerbread-plus-aosp
* commit '
21ed5a4502b3ce76875505aa220f187d165f47b1':
check for null pictures when selecting text
Cary Clark [Tue, 24 Aug 2010 13:44:55 +0000 (06:44 -0700)]
Merge "check for null pictures when selecting text" into gingerbread
Cary Clark [Mon, 23 Aug 2010 21:06:50 +0000 (17:06 -0400)]
check for null pictures when selecting text
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
Iain Merrick [Tue, 24 Aug 2010 11:14:01 +0000 (12:14 +0100)]
Merge WebKit at r65615 : Update WebKit revision number
Change-Id: I2e7e23173a0204b92bcb959f051588341aeb1dac
Iain Merrick [Tue, 24 Aug 2010 10:31:49 +0000 (11:31 +0100)]
Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
Test added in http://trac.webkit.org/changeset/64613
Needs clearAllApplicationCaches() callback. See http://b/issue?id=
2944196
Change-Id: Ie6ccde3a2fa034f58676f6359af351a3544c9541
Iain Merrick [Mon, 23 Aug 2010 13:05:12 +0000 (14:05 +0100)]
Merge WebKit at r65615 : Android-specific results for Geolocation tests.
Tests added in http://trac.webkit.org/changeset/65416
On Android, we currently aren't printing the onunload handler message.
Change-Id: I3e89f23127f82be75c6e90825b87489f460195ff
Iain Merrick [Fri, 20 Aug 2010 11:14:41 +0000 (12:14 +0100)]
Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.
Code was refactored in http://trac.webkit.org/changeset/65449
Clipping is unimplemented (same as before).
Change-Id: Id06ff3396676f044ffdc06bf40edd1d323fb1dcb
Kristian Monsen [Tue, 24 Aug 2010 09:49:01 +0000 (02:49 -0700)]
Merge "Enable cookies for files."
Jean-Baptiste Queru [Tue, 24 Aug 2010 06:37:10 +0000 (23:37 -0700)]
am
828ef22d: merge -s ours from froyo-release so that upgrading to 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
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:08:20 +0000 (19:08 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2
Elliott Slaughter [Fri, 20 Aug 2010 18:54:00 +0000 (11:54 -0700)]
Fix WebView saveState and restoreState for private browsing mode.
Added a handler for browser:incognito url to simplify WebView implementation.
Change-Id: Ic453bbee7436a210b3d596fb2e7fa96791cd5fc9
Iain Merrick [Fri, 20 Aug 2010 11:03:17 +0000 (12:03 +0100)]
Merge WebKit at r65615 : processingUserGesture() is now static.
See http://trac.webkit.org/changeset/65082
Change-Id: I268dfe7d9ab60453129f00b00cdd5f8ac954855c
Iain Merrick [Fri, 20 Aug 2010 11:01:19 +0000 (12:01 +0100)]
Merge WebKit at r65615 : UTF8String() becomes utf8().
This was changed for JSC strings in http://trac.webkit.org/changeset/65305,
but the V8 implementation was not updated.
Fix upstream in WebKit -- see https://bugs.webkit.org/show_bug.cgi?id=44419
Change-Id: Icaf70d9f8a3120613ab3e80b69d4ce0c7af89d46
Kristian Monsen [Mon, 23 Aug 2010 16:25:17 +0000 (17:25 +0100)]
Enable cookies for files.
This is needed for the page cycler, and is probably more compatible with the old http stack. Maybe we should tweak this later, but for now just enabling all file cookies.
Change-Id: Ic21bbb6f82d3667671818d9b325de46901f43f33
Steve Block [Mon, 23 Aug 2010 16:12:57 +0000 (09:12 -0700)]
Merge "Fix location of several Android-specific LayoutTest expected results"
Cary Clark [Mon, 23 Aug 2010 15:34:58 +0000 (08:34 -0700)]
Merge "Complete implementation of PathAndroid.cpp"
Cary Clark [Mon, 23 Aug 2010 15:03:29 +0000 (11:03 -0400)]
Complete implementation of PathAndroid.cpp
Completing the implementation fixes these bugs
http://b/
2941002
http://b/
2869593
Change-Id: I7bf8964bd91c86c89d7d29007c9a33647c399080
Iain Merrick [Fri, 20 Aug 2010 11:00:05 +0000 (12:00 +0100)]
Merge WebKit at r65615 : Fix include paths for string headers.
These moved to <wtf/text> in http://trac.webkit.org/changeset/65077
Change-Id: Ie234f1a09013e48a5241d9e240c5b2e85ca75125
Iain Merrick [Fri, 20 Aug 2010 10:58:21 +0000 (11:58 +0100)]
Merge WebKit at r65615 : Fix Makefiles.
WebkitTools/Scripts/create-html-entity-table was
added in http://trac.webkit.org/changeset/65351.
Change-Id: Iff5c7aaa13e79f3666ef4176ca12d284c985b005
Iain Merrick [Fri, 20 Aug 2010 10:57:41 +0000 (11:57 +0100)]
Merge WebKit at r65615 : Fix conflicts.
Removing call to Geolocation::stop(), which was lost in the
merge with http://trac.webkit.org/changeset/65416
We may still have memory leaks here. This is being tracked
in https://bugs.webkit.org/show_bug.cgi?id=39288
Change-Id: I69b75bf07775536ac603a450dbde8c2935c4db16
Steve Block [Mon, 23 Aug 2010 11:58:04 +0000 (12:58 +0100)]
Fix location of several Android-specific LayoutTest expected results
These results were previsouly duplicated in the JSC and V8-specific directories.
This change moves them to the general android directory.
Change-Id: I65c7db3759f91b62502e8f5b2c8673305f05d0f5
Iain Merrick [Thu, 19 Aug 2010 16:55:56 +0000 (17:55 +0100)]
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
claireho [Fri, 20 Aug 2010 20:01:30 +0000 (13:01 -0700)]
Merge "Bug2857086 - memory leak in FontCustomPlatformData. The change can also fix Chrome issue32353 - need to patch to Chrome."
claireho [Fri, 20 Aug 2010 18:11:14 +0000 (11:11 -0700)]
Bug2857086 - memory leak in FontCustomPlatformData.
The change can also fix Chrome issue32353 - need to patch
to Chrome.
Change-Id: I08df08f2316156e78e9b63415e9c8720ab193090
Cary Clark [Fri, 20 Aug 2010 16:30:30 +0000 (09:30 -0700)]
Merge "order text selection by line centers"
Cary Clark [Fri, 20 Aug 2010 16:28:25 +0000 (09:28 -0700)]
am
e4be1fd5: DO NOT MERGE Refactor find and select dialogs
Merge commit '
e4be1fd5f14137de249ee66c000f9dadfb2862d7' into gingerbread-plus-aosp
* commit '
e4be1fd5f14137de249ee66c000f9dadfb2862d7':
DO NOT MERGE Refactor find and select dialogs
Cary Clark [Thu, 19 Aug 2010 22:31:48 +0000 (18:31 -0400)]
DO NOT MERGE Refactor find and select dialogs
(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
Cary Clark [Fri, 20 Aug 2010 14:03:57 +0000 (10:03 -0400)]
order text selection by line centers
The older logic assumed that lines don't overlap, but in the
case of Google news, the lines do overlap. The new logic uses
the line centers for ordering.
Change-Id: I56074d289f76ed5027e3a498753caf50644b97f0
http://b/262451
Kristian Monsen [Thu, 19 Aug 2010 20:46:08 +0000 (13:46 -0700)]
Merge "Cleanspec so the reverting of the chrome http stack takes effect."
Kristian Monsen [Thu, 19 Aug 2010 20:44:08 +0000 (21:44 +0100)]
Cleanspec so the reverting of the chrome http stack takes effect.
Change-Id: If55cf19f648c58d0042925ad616c3357d7e136f0
Kristian Monsen [Thu, 19 Aug 2010 20:37:34 +0000 (13:37 -0700)]
Merge "Switching back to java http stack for tonights build"
Kristian Monsen [Thu, 19 Aug 2010 20:21:17 +0000 (21:21 +0100)]
Switching back to java http stack for tonights build
Change-Id: I27900e81e58905c76fe9c62c532571451aa2abd7
Steve Block [Thu, 19 Aug 2010 16:50:16 +0000 (17:50 +0100)]
Fixes a race condition in the Chrome HTTP stack
There is a possible race condition between the IO thread finishing the request and
the WebCore thread cancelling it. If the request has already finished, ignore
subsequent calls to finish to avoid sending duplicate finish messages to WebCore.
Change-Id: I44f61c1b29baef686e59b66b40b32d9b1d9699c2
Steve Block [Wed, 11 Aug 2010 11:55:32 +0000 (12:55 +0100)]
Implement DeviceOrientation
Change-Id: I12d5632b37db581065db9bcbd49f3dc28ecd7719
Elliott Slaughter [Wed, 18 Aug 2010 19:30:53 +0000 (12:30 -0700)]
Merge "Fix for incognito mode cookies from WebCore."
Leon Scroggins [Fri, 13 Aug 2010 21:07:58 +0000 (17:07 -0400)]
Remove calls to change the state of the focus controller.
Bug:
2582455
Never modify the focused state of the focus controller.
A corresponding java change make the active state get changed only when
the webview gains/loses focus.
Change-Id: I6f17f82c772ea4410c0209bf57d251c9bd384e6c
Elliott Slaughter [Wed, 18 Aug 2010 18:05:15 +0000 (11:05 -0700)]
Fix for incognito mode cookies from WebCore.
Change-Id: Id7c2ae708c166da035f1fdda8351b921d86d78de
Cary Clark [Wed, 18 Aug 2010 18:33:53 +0000 (11:33 -0700)]
Merge "Add CSS cursor ring definitions"
Cary Clark [Wed, 28 Jul 2010 21:11:14 +0000 (17:11 -0400)]
Add CSS cursor ring definitions
This allows web pages to have fine-grain control over the appearance
of the rings drawn around nodes.
Generated links (email, addresses, phone numbers) are no longer
given unique colors. To preserve this feature, a separate change
could add an HTML extension similar to vlink to provide the cursor
ring defintions for theses links. The mechanism implemented below
isn't appropriate since these links don't necessarily correspond to
single DOM nodes or other DOM elements.
------------
CSS examples
------------
The CSS to specify the ring looks like:
-webkit-ring-fill-color:rgba(0,0,255,0.4);
-webkit-ring-inner-width:2 px;
-webkit-ring-outer-width:3.5 px;
-webkit-ring-outset: 8 px;
-webkit-ring-pressed-inner-color:rgba(0,0,255,0.8);
-webkit-ring-pressed-outer-color:rgba(0,0,127,0.3);
-webkit-ring-radius: 10 px;
-webkit-ring-selected-inner-color:rgba(63,63,255,0.8);
-webkit-ring-selected-outer-color:rgba(63,63,127,0.3);
and may be alternately defined with a property shortcut:
-webkit-ring:rgba(255,0,0,0.4) 5px 7px
rgba(255,0,0,0.8) rgba(127,0,0,0.3) 20px
rgba(255,63,63,0.8) rgba(127,63,63,0.3);
--------------------
Property definitions
--------------------
A vertical cross-section of the ring corresponds to these
parameters as shown:
______
R / ___O_ R = corner radius
/ / __I_ o I = inner ring
/ / / _O_ ^ O = outer ring
| | | / F | F = fill
|O|I|O| L o = outset
| | | \_F_ | L = original link
\ \ \__O_ V
\ \___I_ o
R \____O_
The fill color specifies what to draw inside the ring
when the link is followed. The fill area consists of the
original link area plus the outset.
The inner and outer widths specify the stoke width of the inner
and outer rings, respectively. The widths may be specified in
fractional pixels. The implementation captures 4 bits of the
fraction.
The outset specifies the distance from the edge of the original
link to the rings' center. Both rings are drawn at the same center
location.
The radius specifies the curvature of the corners at the center
of the rings.
-------------
Data lifetime
-------------
The selected colors specify the colors of the inner and outer
rings when the trackball or D-pad hovers over the link. The
pressed colors specify the colors of the rings when the
trackball center is pressed or the link is tapped.
The CSS data is recorded in the RenderStyle when the DOM
is parsed. The widths are scaled up by 16 to preserve the fraction.
When the nav cache is built, the CSS style information is
recorded in the CachedColor class. Only unique style sets
are recorded; many CachedNode instances can share the same
CachedColor instance.
When the cursor ring is drawn, the CachedColor is
retrieved by getting the index from the CachedNode, and
looking up the entry in the CachedFrame. The widths are
scaled down by 16 since Lengths are stored by the webkit as
integers.
----------
File Edits
----------
WebCore/Android.derived.mk
- Build the CSS data property tables by concatentating
Android specific data and optionally SVG data.
WebCore/config.h
- Add switch for these rings. This switch is meant
as a convenience for finding the code in WebKit
that was added to enable this feature. Since the
old code in DrawCursor has been removed, it does
not revert to the old behavior if the switch is
turned off.
WebCore/css/AndroidCSSPropertyNames.in
- The new ring properties, plus an old one we
added before.
WebCore/css/CSSComputedStyleDeclaration.cpp
WebCore/css/CSSMutableStyleDeclaration.cpp
WebCore/css/CSSParser.cpp
WebCore/css/CSSStyleSelector.cpp
- I can guess what these functions are for as
well as anyone, but I really don't know. Do
I need all of them? Do I need to modify
Mutable at all?
WebCore/css/CSSPropertyNames.in
- Moved Android addition to AndroidCSSPropertyNames.in
WebCore/platform/graphics/Color.h
- Added initial color values here.
WebCore/platform/graphics/android/android_graphics.*
- This draws the cursor ring. The code that draws
'synthetic' links has been discarded.
WebCore/rendering/style/RenderStyle.h
- Functions to get, set, and initialize the style
data.
WebCore/rendering/style/StyleRareInheritedData.*
- The storage for the style data and an equivalence
function.
WebKit/Android.mk
- Added CachedColor to the build.
WebKit/android/nav/CacheBuilder.cpp
- Record the color from the DOM into the cache.
WebKit/android/nav/CachedColor.*
- Store the cached color info.
WebKit/android/nav/CachedFrame.*
- Where the array of colors is stored.
WebKit/android/nav/CachedNode.*
- Where the index to the colors is stored.
Change-Id: Ia3a931f41d6545e47678e245aafe7c84d4658f94
http://b/
2603197
Steve Block [Wed, 18 Aug 2010 16:59:52 +0000 (09:59 -0700)]
Merge "Geolocation delayed permission LayoutTests now pass"
Steve Block [Wed, 18 Aug 2010 14:18:14 +0000 (15:18 +0100)]
Geolocation delayed permission LayoutTests now pass
See https://android-git.corp.google.com/g/#change,61829
Bug:
2914450
Change-Id: Ica6864fc4dc28d92b1a98eee3c588e4007b7e803
Patrick Scott [Wed, 18 Aug 2010 14:23:08 +0000 (07:23 -0700)]
Merge "Get the build bot to use the chrome stack."
Patrick Scott [Wed, 18 Aug 2010 14:04:03 +0000 (10:04 -0400)]
Get the build bot to use the chrome stack.
Change-Id: Ib44e439bc272810e409f61477612dbbf30bb6371
Kristian Monsen [Mon, 16 Aug 2010 17:24:04 +0000 (18:24 +0100)]
Get user agent and accept language from the UI settings.
Adding alternate http in the end of the UA string to identify which http stack is used.
Finally, cleaning up some old includes.
Change-Id: If165403a066009ca85dbf28d6024f1419cfae4fa
Ben Murdoch [Wed, 18 Aug 2010 12:51:02 +0000 (05:51 -0700)]
Merge "Make V8 the default JS engine on all builds (except sim)."
Patrick Scott [Wed, 18 Aug 2010 12:32:59 +0000 (08:32 -0400)]
Fix acid3 crash.
Bug:
2928878,
2928899
Change-Id: I90ca6f93a61c921b520731e6a143e5b4457fa44c