OSDN Git Service
Patrick Scott [Mon, 15 Nov 2010 19:20:19 +0000 (14:20 -0500)]
Fix a crash due to null java strings.
Change-Id: I29a229da168181ba3d5bc5fb84365f275eb42869
Cary Clark [Mon, 15 Nov 2010 17:05:59 +0000 (12:05 -0500)]
increase the select text anchor hit slop
bug:
3195900
Change-Id: I55317b6c2d1f2dd48e2522df9ba45653a479793a
Cary Clark [Fri, 12 Nov 2010 21:18:31 +0000 (16:18 -0500)]
make the button state revert to normal
This moves the logic used to ensure that cursor rings
eventually go away after being tapped to buttons, so
that they too go back to their normal state after a short
period.
bug:
2127333
Change-Id: Ia2e1d4b7f735581dbd88bf32b35fe5b24922ea11
Patrick Scott [Thu, 11 Nov 2010 18:14:26 +0000 (13:14 -0500)]
Allow applications to intercept requests.
The api returns a response containing the mime type, encoding, and an optional
InputStream for reading data. Move the asset and content url logic into the
new api to consolidate some code.
Requires a change in frameworks/base.
Bug:
2905943
Change-Id: Ic7af410308872042c412aedf62e589f6d2095782
Iain Merrick [Fri, 12 Nov 2010 14:24:49 +0000 (14:24 +0000)]
Don't set error description strings in ResourceError.
These strings may be displayed to the user, so they need to be
localized. In a separate change (I7dec8dff) I updated the Java
framework to use a standard localized message if the description
is empty, so here we just use the empty string (same as Chrome).
Bug:
3172265
Test: Load http://google.com:81 to force a timeout error, check
that the correct message is displayed.
Change-Id: I9042a2ee99cd78619cc0392cdc2cbb82ebd51743
Patrick Scott [Fri, 12 Nov 2010 20:53:20 +0000 (15:53 -0500)]
Use LayerAndroid::find with the original x and y.
If the picture is not provided, use the findInner case to find the layer at the
given position.
Change-Id: I811c1c4d631086832a3a32038834117a1c4e9601
Leon Scroggins [Fri, 12 Nov 2010 19:39:06 +0000 (14:39 -0500)]
Return a float for text size.
Bug:
3085564
Requires a change in frameworks/base: https://android-git.corp.google.com/g/#change,79591
Change-Id: Iaf3ebc405fca349e23bebb113228c4b550e6b88e
Shimeng (Simon) Wang [Fri, 12 Nov 2010 18:36:13 +0000 (10:36 -0800)]
Merge "Fix mobile google.com flickering issue."
Shimeng (Simon) Wang [Fri, 12 Nov 2010 01:22:57 +0000 (17:22 -0800)]
Fix mobile google.com flickering issue.
Implementing request cache policy in chrome http integration.
issue:
3008478
Change-Id: I3d7c32912e72e7639885056fb70f9f627d075c4e
Derek Sollenberger [Fri, 12 Nov 2010 17:53:51 +0000 (09:53 -0800)]
Merge "Track all tiles in the viewport instead of only the upper left tile."
Derek Sollenberger [Thu, 11 Nov 2010 20:22:47 +0000 (15:22 -0500)]
Track all tiles in the viewport instead of only the upper left tile.
We currently store only the coordinates of the upper left tile and
leave it to the caller to compute the actual number of tiles in the
viewport. This CL computes that information upfront and then passes
a rect containing the tiles in the viewport to the necessary parties.
This also allows us to intelligently prepare tiles that are currently
off-screen but given the user's scroll direction will be on-screen
shortly.
bug:
3190926
Change-Id: I50a5922ed8bc7e8fd8e4cacd4986a9f275cd37b0
Jeff Brown [Fri, 12 Nov 2010 02:57:31 +0000 (18:57 -0800)]
Merge "Add new keycodes initially used for GoogleTV devices."
Cary Clark [Thu, 11 Nov 2010 18:02:24 +0000 (13:02 -0500)]
compute select text distance biasing x over y
Rather than using a regular distance function, first
find the closest match in Y then look for the closest
match in X. This allows the touch point to be well to
the right or left of the paragraph and still move the
selection to the next or preceeding line while the
selection is extended.
bug:
3183434
Change-Id: I6abf14b9dbca4b7bafe2cb9a96a2915732038ce1
Cary Clark [Thu, 11 Nov 2010 15:14:14 +0000 (10:14 -0500)]
use layer id to maintain selection
The pictures used to draw the page content can change
in response to refreshes, as the selection is moved or
as the screen is scrolled or zoomed.
Track the layer id, instead of the picture pointer,
to find the picture that contains the current selection.
Before, the selection would disappear as the screen
was pinched, or the highlight might disappear even
though the anchors draw, or the highlight and anchors
might be drawn offset from the screen data. This change
eliminates this class of bugs.
Change-Id: Ifc440b8aa0c9d6d232e298e42c4c544a41629442
http://b/
3183492
Steve Block [Thu, 11 Nov 2010 16:56:18 +0000 (08:56 -0800)]
Merge "Remove the failing expectation for fast/encoding/char-encoding.html for DRT2"
Derek Sollenberger [Thu, 11 Nov 2010 14:59:44 +0000 (09:59 -0500)]
Only check to see if the page is ready when necessary.
This CL reorders the contents of an if statement to ensure that
we do not pointlessly check to see if the tiledPage is ready.
Change-Id: I7155c4beb5a6dcbcb195e2c80c317a599a9553af
Derek Sollenberger [Thu, 11 Nov 2010 14:56:03 +0000 (06:56 -0800)]
Merge "Use a fixed number of BaseTiles per TiledPage."
Steve Block [Thu, 11 Nov 2010 14:25:11 +0000 (14:25 +0000)]
Remove the failing expectation for fast/encoding/char-encoding.html for DRT2
This test now passes with both HTTP stacks.
Bug:
3047156
Change-Id: I44e1834782acc3d0674beb70f2a4ac78343cb2c5
Derek Sollenberger [Fri, 5 Nov 2010 12:12:51 +0000 (08:12 -0400)]
Use a fixed number of BaseTiles per TiledPage.
This CL ensures that the TiledPage only keeps track of BaseTiles
that are backed by a texture. In order to avoid unecessary
allocations on the stack we pre-allocate the memory for the tiles
and reuse tiles.
Change-Id: I894cf4d5c6b564169ccf7a967629f5d670a5426d
Bart Sears [Thu, 11 Nov 2010 06:05:43 +0000 (22:05 -0800)]
Revert "Merge "Fix text-shadow style when blur is 0px""
Bug:
3185661
This reverts commit
ccbb8a238ca0ba5fc0780884e281e6b6a601a675, reversing
changes made to
fcb462de639304deaa2da761823fbfeef88b36d4.
Steve Block [Wed, 10 Nov 2010 20:42:24 +0000 (12:42 -0800)]
Merge "Set failing expectations for DRT2 for some pixel LayoutTests"
Cary Clark [Wed, 10 Nov 2010 20:13:23 +0000 (12:13 -0800)]
Merge "build select region for one character"
Cary Clark [Wed, 10 Nov 2010 20:07:49 +0000 (15:07 -0500)]
build select region for one character
bug:
3183119
Change-Id: Iebd070feeb9c9a52e0d6214563c378647d97b977
Steve Block [Wed, 10 Nov 2010 19:49:25 +0000 (19:49 +0000)]
Set failing expectations for DRT2 for some pixel LayoutTests
When these tests were added to the triaged set they were observed to
pass with DRT1 because they have no generic expected result. DRT1
considers this to imply a non-text test and hence ignores the result.
Change-Id: Id3e6edb8e1e3927e8441e2b88761cfa348688155
Cary Clark [Wed, 10 Nov 2010 15:26:31 +0000 (10:26 -0500)]
Ratchet back style changes that rebuild nav caches
Many style changes do not visibly affect the way
links are detected -- so limit the rebuild to
style changes that either move the size the style,
or changes that edit the style's display property.
Styles appearing or disappearing (i.e., one is 0)
is not treated as a style version change since
these events accompany dom edits which are detected
outside of this change.
bug:
3181683
Change-Id: Ie62ef524a956fcd9298ce5878b632645a22e461a
Jason Bayer [Tue, 9 Nov 2010 22:56:20 +0000 (14:56 -0800)]
Add new keycodes initially used for GoogleTV devices.
Change-Id: I8fab33352f894f3bfe07f9ffbdddd76d3aa2df8f
John Reck [Thu, 4 Nov 2010 22:40:20 +0000 (15:40 -0700)]
Merge Webkit at r70949: Update WebKit revision number.
Change-Id: I08e7b28e921e16d11fc57f24fc6a9a9188463d6f
John Reck [Thu, 4 Nov 2010 22:07:22 +0000 (15:07 -0700)]
Merge Webkit at r70949: Fixed code generation
Cherry pick of: http://trac.webkit.org/changeset/71396
Change-Id: Ib8bfa183ff03608b8419fea5c267278966961071
John Reck [Thu, 4 Nov 2010 22:05:50 +0000 (15:05 -0700)]
Merge Webkit at r70949: moved stub to right namespace
Cherry pick of http://trac.webkit.org/changeset/71346
Change-Id: Id64a084c3e0e74e5b9ec7c0c22141b46b044097d
John Reck [Thu, 4 Nov 2010 22:05:12 +0000 (15:05 -0700)]
Merge Webkit at r70949: setSelectionRange changed
Updated WebViewCore to use setSelectionRange instead of
RenderTextControl:setSelectionRange. Now takes the Node* to set the
selection on.
http://trac.webkit.org/changeset/70945
Change-Id: I862c986e11d54c6f05f62a14196b4478a70fc549
John Reck [Thu, 4 Nov 2010 21:56:49 +0000 (14:56 -0700)]
Merge Webkit at r70949: Added new FrameLoaderClient stubs
http://trac.webkit.org/changeset/70333
http://trac.webkit.org/changeset/70574
http://trac.webkit.org/changeset/70894
Change-Id: I9a212f4ab07c0599ebb8dbd10201f5ca0fa71f69
John Reck [Thu, 4 Nov 2010 21:53:10 +0000 (14:53 -0700)]
Merge Webkit at r70949: Added FontOrientation param
FontOrientation was added as a parameter to the fontPlatformData function
http://trac.webkit.org/changeset/70250
Change-Id: I918401828c6b1cd9901c0aa50f6a6ffffac01a8c
John Reck [Thu, 4 Nov 2010 21:35:10 +0000 (14:35 -0700)]
Merge Webkit at r70949: Fix Makefiles.
Change-Id: I53862fae2dd81232760db726c7783437af5f58f4
John Reck [Thu, 4 Nov 2010 20:06:22 +0000 (13:06 -0700)]
Merge Webkit at r70949: Fix conflicts.
JavaScriptCore/wtf/Platform.h
http://trac.webkit.org/changeset/70726
WebCore/Android.derived.v8bindings.mk
http://trac.webkit.org/changeset/70854
WebCore/Android.jscbindings.mk
http://trac.webkit.org/changeset/70854
WebCore/Android.mk
http://trac.webkit.org/changeset/70854
WebCore/css/CSSStyleSelector.cpp
http://trac.webkit.org/changeset/70250
WebCore/page/Settings.cpp
http://trac.webkit.org/changeset/70714
WebCore/page/Settings.h
http://trac.webkit.org/changeset/70714
WebCore/rendering/RenderBox.h
http://trac.webkit.org/changeset/70482
http://trac.webkit.org/changeset/70664
http://trac.webkit.org/changeset/70917
Change-Id: I0cdaca316df016c3885a23d42ee2038777b7ccff
John Reck [Thu, 4 Nov 2010 19:00:17 +0000 (12:00 -0700)]
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Steve Block [Tue, 9 Nov 2010 15:07:28 +0000 (07:07 -0800)]
Merge "Add Android expected results for some Appcache tests"
Steve Block [Tue, 9 Nov 2010 14:57:34 +0000 (14:57 +0000)]
Add Android expected results for some Appcache tests
These differ from the generic expected results in whitespace only.
DRT1 ignores whitespace when comparing results, but DRT2, like DRT for
other WebKit platforms does not.
It's not clear why Android output differs in whitespace from other
platforms, but it seems safer to add Android-specific expected results
on a case-by-case basis than to always ignore whitespace.
Change-Id: I0bab87e3f5641c4ce81db4e3f74ec7246d3612c7
Cary Clark [Tue, 9 Nov 2010 13:50:56 +0000 (05:50 -0800)]
Merge "update dom version on style change"
Cary Clark [Mon, 8 Nov 2010 16:35:24 +0000 (11:35 -0500)]
update dom version on style change
The DOM version number is used to know when the
nav cache is out of date. Webkit changes the version
when DOM attributes change, but not when the CSS
style property changes.
Tracking the style version fixes Google properties like
the 'Options' menu that is available on mobile
devices after a search.
Additionally, fix a crash if the root layer doesn't
exist. And, rebuild the nav cache always on touch.
bug:
2628448
Change-Id: I50aa258c1b057ac7deed00f6eca37c0ee323efcf
Patrick Scott [Mon, 8 Nov 2010 19:07:07 +0000 (11:07 -0800)]
Merge "Encode email addresses that are not mailto: links."
Steve Block [Mon, 8 Nov 2010 18:46:35 +0000 (10:46 -0800)]
Merge "Remove fast/dom/StyleSheet from the list of triaged LayoutTests"
Russell Brenner [Mon, 8 Nov 2010 17:35:18 +0000 (09:35 -0800)]
Merge "Null-check in GLUtils::isEGLImageSupported()"
Teng-Hui Zhu [Mon, 8 Nov 2010 17:25:40 +0000 (09:25 -0800)]
Merge "Fix text-shadow style when blur is 0px"
Patrick Scott [Mon, 8 Nov 2010 15:05:47 +0000 (10:05 -0500)]
Encode email addresses that are not mailto: links.
Fix a few extra copies of KURL and String. Added more characters to the list of
allowable mailbox characters.
Bug:
3038103
Change-Id: I49bd3ba9c628a70e7e1633d16fc329d64613dbf1
Steve Block [Wed, 3 Nov 2010 20:41:40 +0000 (21:41 +0100)]
Fix some compiler warnings
Noe that in FindCanvas.h we include
external/icu4c/common/unicode/umachine.h, rather than
external/webkit/WebCore/icu/unicode/umachine.h to avoid warnings about
redefining U_NAMESPACE_BEGIN
We should be using the header from external/icu4c because we don't
include any ICU headers from WebCore.
The fix works becuase external/icu4c/common is on the include path,
but WebCore/icu is not.
Change-Id: I5c0ff1c5815018ba97962595debca12a17bdd0cd
Steve Block [Mon, 8 Nov 2010 00:59:42 +0000 (00:59 +0000)]
Remove fast/dom/StyleSheet from the list of triaged LayoutTests
This should not have been in the list, as the directory was removed in
https://android-git.corp.google.com/g/#change,68234
Change-Id: I5400bc5506f7f260d416b30aa27bd4243521b16d
Shimeng (Simon) Wang [Sat, 6 Nov 2010 01:06:20 +0000 (18:06 -0700)]
Merge "Fix compilation error when ANDROID_LAYOUT is not defined."
Teng-Hui Zhu [Sat, 6 Nov 2010 01:04:27 +0000 (18:04 -0700)]
Fix text-shadow style when blur is 0px
When blur is 0px , the should at least show up without any blurry.
http://b/issue?id=
2581273
Change-Id: I3db26647c1ed3f7dd29e7045ae6f5c5b81722da6
Shimeng (Simon) Wang [Fri, 5 Nov 2010 22:45:11 +0000 (15:45 -0700)]
Fix compilation error when ANDROID_LAYOUT is not defined.
Change-Id: I6bdb9832bd94017a5f4a894474c30f2cea89d39d
Nicolas Roard [Fri, 5 Nov 2010 04:14:41 +0000 (21:14 -0700)]
Fix the blank screen bug.
As the texture generator thread isn't an infinite loop, we could miss
a signaled new request.
Bug:
3155078
Change-Id: Ifad1ec356b061eec24399cad4b572866f6d74f06
Russell Brenner [Fri, 5 Nov 2010 18:55:06 +0000 (11:55 -0700)]
Null-check in GLUtils::isEGLImageSupported()
Avoid segfault by checking for null strings in GLUtils::isEGLImageSupported() and
GLUtils::isEGLFenceSyncSupported().
Bug:
3169653
Derek Sollenberger [Fri, 5 Nov 2010 16:07:58 +0000 (12:07 -0400)]
Support partial invalidation of tiles based on webkit's inval rect.
This CL reverts the rollback of the original CL now that we have
fixed bug #
3165953.
This reverts commit
144ccd9c8dba05ffaa0ae598f9b70032050fc20e.
Change-Id: Ibb5254f652ed95aa3b7b71bf24a2578c51e74a70
Derek Sollenberger [Fri, 5 Nov 2010 16:35:28 +0000 (16:35 +0000)]
Merge "Do not create GL specific objects if we are not using hw acceleration"
Derek Sollenberger [Fri, 5 Nov 2010 13:16:18 +0000 (09:16 -0400)]
Do not create GL specific objects if we are not using hw acceleration
bug:
3166223
Change-Id: I5c18b76ac19119c3620636ce5d3b33892e18f523
Russell Brenner [Fri, 5 Nov 2010 15:56:02 +0000 (15:56 +0000)]
Merge "Code cleanup for FontCacheAndroid.cpp"
Patrick Scott [Fri, 5 Nov 2010 15:12:15 +0000 (15:12 +0000)]
Merge "Fix browser crash."
Patrick Scott [Fri, 5 Nov 2010 15:09:11 +0000 (11:09 -0400)]
Fix browser crash.
Also fixed indenting (3 spaces?).
Change-Id: If4a137d1af3ec8a597e8b929e5b4f10240f2f054
Kristian Monsen [Fri, 5 Nov 2010 14:44:45 +0000 (14:44 +0000)]
Merge "Update method to take const std::string& argument"
Cary Clark [Fri, 5 Nov 2010 14:17:11 +0000 (14:17 +0000)]
Merge "Adjust layers when parent layer scrolls"
Ben Murdoch [Tue, 19 Oct 2010 18:41:08 +0000 (19:41 +0100)]
Send the AutoFill Preview string java side.
When we have determined that the form can be autofilled, send
a preview string over to Java so that we can display it in the
drop down box.
Requires a change in frameworks/base:
https://android-git.corp.google.com/g/#change,77127
Change-Id: Ia0dd899d659c6e5710155f33749255058d7c3faf
Kristian Monsen [Fri, 5 Nov 2010 10:45:07 +0000 (10:45 +0000)]
Update method to take const std::string& argument
It's safe to pass this across threads since NewRunnableMethod
copies the argument.
Change-Id: I620ebfe64ead7947ac3a6733507865938e04a8df
Nicolas Roard [Thu, 4 Nov 2010 17:46:00 +0000 (10:46 -0700)]
Remove extras from GLWebViewState for now
Change-Id: Ic4d4866302645edb6c0a457ef6d0bd1d8f9cf484
Russell Brenner [Thu, 4 Nov 2010 21:02:05 +0000 (14:02 -0700)]
Code cleanup for FontCacheAndroid.cpp
Minor changes to allow check-webkit-style to complete without warning for
FontCacheAndroid.cpp.
Change-Id: Ifaa8634d53374c94251641d6b9daf5f8114af9e9
Derek Sollenberger [Thu, 4 Nov 2010 20:28:34 +0000 (13:28 -0700)]
Merge "Revert "Support partial invalidation of tiles based on webkit's inval rect.""
Derek Sollenberger [Thu, 4 Nov 2010 20:22:28 +0000 (16:22 -0400)]
Revert "Support partial invalidation of tiles based on webkit's inval rect."
This reverts commit
fc92ca2409a95b539274985812d88016b6b84b7e.
Cary Clark [Mon, 1 Nov 2010 21:25:39 +0000 (17:25 -0400)]
Adjust layers when parent layer scrolls
When a page has layers, it causes the main body of the
page to become a layer as well. The scroll position
of the WebView must be applied to the layer to
translate the cursor rings correctly for hit-testing.
Today, applying the scroll position of the WebView
screws up overflow scrolling. Until this gets figured
out, skip using the scroll position in CacheFrame
adjust() and unadjust().
The position of the layer, and all of its parent layers,
should be considered when adjusting the rectangle
bounds contained by that layer. Before, only the
child layer's position was considered.
The clip used by scrollable divs may be initialized
but never set. If it is empty, ignore it, rather than
clipping out all content.
In CacheBuilder, remove a couple of unnecessary
lines -- the CacheInput initialization clears all
members.
In SelectText, reverse the order of the xfer mode
and paint objects to remove a Skia ref count assert.
In CachedInput, make the debug printout current.
Overall, added more debugging output (turned
off by default).
bug:
3030370
Change-Id: Ic19c24b3bf33d081a1d0c1f8c06601dcb56ae881
claireho [Thu, 4 Nov 2010 18:06:08 +0000 (11:06 -0700)]
Merge "Sync up with chromium/FontLinux.cpp"
Iain Merrick [Thu, 4 Nov 2010 17:25:14 +0000 (17:25 +0000)]
Map Chromium error codes to WebKit error codes.
On network errors, we were seeing strange "Data connectivity problem"
alert boxes. This is because we were using the HTTP status code instead
of a real error code; and when there's a connection error, the HTTP
status is uninitialised, so the "error code" was 0 (no error).
Bug:
3140283
Change-Id: I0566c29359a0ecb2998573d1a2a77306922c87be
Russell Brenner [Thu, 4 Nov 2010 17:35:36 +0000 (10:35 -0700)]
Merge "Fixed
2720133. Better lookup with @font-face local"
Derek Sollenberger [Thu, 4 Nov 2010 16:56:56 +0000 (09:56 -0700)]
Merge "Support partial invalidation of tiles based on webkit's inval rect."
Kristian Monsen [Thu, 4 Nov 2010 14:49:26 +0000 (14:49 +0000)]
Let Chrome HTTP stack handle number of connections
First of changes based on willchan's feedback.
Note that this code doesn't really work as intended anyway.
Change-Id: I91d43f1daa78248700738338cf3d24a12496ac19
Kristian Monsen [Thu, 4 Nov 2010 14:13:31 +0000 (07:13 -0700)]
Merge "Hook chromium logging up in WebKit"
Kristian Monsen [Thu, 4 Nov 2010 14:13:23 +0000 (07:13 -0700)]
Merge "Add support for file uploads in WebKit"
Derek Sollenberger [Tue, 2 Nov 2010 15:15:08 +0000 (11:15 -0400)]
Support partial invalidation of tiles based on webkit's inval rect.
This CL causes the selective repainting of BaseTiles (and their
associated GL textures) using the information provided by Webkit.
If tiles need repainted they are marked with as dirty and the
thread painting and uploading the textures will only operate on
dirty tiles. This change resulted in some significant refactoring
most of which revolved around these changes...
(1) Removed PaintingInfo from the Texture object and instead track
the state of the tile in Tile object.
(2) Removed all pending TileSets for a TiledPage when the page
produces a new set. This ensures that the tiles currently visible
to the user are painted instead of ones that may already be offscreen.
Change-Id: I93845d8e6e7b066e6bab84bcde11be4a6940002f
Kristian Monsen [Wed, 3 Nov 2010 10:21:33 +0000 (10:21 +0000)]
Hook chromium logging up in WebKit
Change-Id: Ide08371e0bc8f74ef80fe25d416623bd03ac6038
Iain Merrick [Thu, 4 Nov 2010 12:10:40 +0000 (12:10 +0000)]
Add SSL layout tests at WebKit r70209.
Only 3 tests, all passing. See http://b/issue?id=
3164771
Change-Id: I2f3b03969a97618f1d4ba9dd91d782e1814914f0
Kristian Monsen [Mon, 1 Nov 2010 14:28:16 +0000 (14:28 +0000)]
Add support for file uploads in WebKit
This also moves some of the android file handling to Java so it is not
duplicated in both places.
This CL needs https://android-git.corp.google.com/g/#change,77400
in frameworks/base
Change-Id: I90c1726e6c323a9de3fd64f2e6feef4b64171053
claireho [Wed, 3 Nov 2010 22:44:38 +0000 (15:44 -0700)]
Sync up with chromium/FontLinux.cpp
Adopted the code style change for TextRunWalker class from
chromium/FontLinux.cpp to android/FontAndroid.cpp.
Change-Id: I7f49efcaf5685181980a4ffa3b654d1577e3f9cd
Russell Brenner [Wed, 3 Nov 2010 18:06:53 +0000 (11:06 -0700)]
Fixed
2720133. Better lookup with @font-face local
Using existing Skia APIs, FontCache::createFontPlatformData can detect when
the retrieved font is the Skia default and will reject that choice,
allowing WebCore to try the next font on the CSS fallback list. If the
requested family is a generic family, e.g. "serif" or "monotype", the Skia
default will be accepted.
Change-Id: I8007caae96f26cd58ea1cf5bf2da8170e3ce6d9d
Bug:
2720133
claireho [Wed, 3 Nov 2010 19:52:05 +0000 (12:52 -0700)]
Merge "Bug
3158404 : Performance improvement for browser complex script handle."
claireho [Tue, 2 Nov 2010 21:26:59 +0000 (14:26 -0700)]
Bug
3158404 : Performance improvement for browser complex script handle.
1. Reduce the number of calls of normalization function.
The purpose of NFC normalization is to compose base letter and non-spacing
combining marks to be accented character. i.e. Convert A(U+0041) and
acute(U+0301) to A with Acute(U+00C1).
NFC includes three parts - decomposition, canonical sort and composition
for entire string. It is very expensive. TextRunWalker class would like
to convert '\t', '\n' and non-break space(\U+00A0) to space. NFC cannot
achieve this purpose. So, it is not necessary to call normalization for
Font::treatAsSpace().
This improvement saves the NFC nomalization calls for complex script text
has '\t', '\n' or 0xA0 and does not have non-spacing combining marks.
2. FontAndroid.cpp scans text for space and punctuation in 2 separate
loops. Combine these 2 loops to one pass.
Change-Id: I6b1ff20dd1072cf1f03066ce1c87ad39d0040779
Iain Merrick [Tue, 2 Nov 2010 12:51:09 +0000 (12:51 +0000)]
Merge Chromium at r63472 : WebKit fixes.
Chromium now uses protocol buffers so we need libprotobuf.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=63221
HttpCache takes an extra constructor argument.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=61789
Change-Id: I5e78b0de9a8ff86040b13212455eb37a4ed0e39e
Cary Clark [Wed, 3 Nov 2010 14:46:49 +0000 (07:46 -0700)]
Merge "Unref the picture instead of deleting it"
Cary Clark [Wed, 3 Nov 2010 14:21:19 +0000 (10:21 -0400)]
Unref the picture instead of deleting it
This fixes a couple of bugs related to layers
and hardware acceleration.
The picture used by select text is now accessed
asynchronously from the UI thread. The UI thread
now unrefs it rather than deleting it outright.
The layer position may not be up to date when
the cursor rings are drawn, so update them if
the cursor ring is in a layer.
bug:
3112657
bug:
3030370
Change-Id: I99d07175ec30dcba895a26cf1d44bc0364430793
Jeff Brown [Wed, 3 Nov 2010 00:38:28 +0000 (17:38 -0700)]
Merge "Add volume mute key."
Nicolas Roard [Wed, 3 Nov 2010 00:07:14 +0000 (17:07 -0700)]
Fix for deadlock
Bug:
3155066
Change-Id: I3e249050c779d10db75f97b177e09144a52f70b1
Nicolas Roard [Tue, 2 Nov 2010 19:52:48 +0000 (12:52 -0700)]
Set the page background color in BaseLayerAndroid
This allows us to show the correct background even if the tiles aren't yet painted.
Change-Id: Ia3ef97770aadb5f64490e44f20110ea21578ccd0
Cary Clark [Tue, 2 Nov 2010 13:36:37 +0000 (06:36 -0700)]
Merge "add function to find color on picture's edge"
Nicolas Roard [Sat, 30 Oct 2010 01:39:15 +0000 (18:39 -0700)]
Update the layers only
C++ counterpart to https://android-git.corp.google.com/g/#change,77500
Bug:
2975990
Change-Id: I3b8fd27f991d6776059a15eef36d0c9a7b44f9bb
Jeff Brown [Mon, 1 Nov 2010 22:24:52 +0000 (15:24 -0700)]
Add volume mute key.
Also fixed incorrect keycode constant for numpad parens.
Bug:
2912307
Change-Id: I65d02ca1c131638ea70f333bf06982747f34223c
Cary Clark [Thu, 28 Oct 2010 21:29:48 +0000 (17:29 -0400)]
add function to find color on picture's edge
bug:
3065048
Change-Id: I18ef06a4b9ac3bef077f08efd738958bd5abaafe
Steve Block [Mon, 1 Nov 2010 16:45:35 +0000 (09:45 -0700)]
Merge "Disable -Wsign-promo when building WebKit to avoid excessive warnings from Chromium headers"
Steve Block [Mon, 1 Nov 2010 16:15:34 +0000 (16:15 +0000)]
Disable -Wsign-promo when building WebKit to avoid excessive warnings from Chromium headers
If the root of the problem is fixed upstream, this warning can be
re-enabled.
Bug:
3143773
Change-Id: Ic419e353e3d0536d3a3c86f9e8e4615d30d9fb25
Steve Block [Mon, 1 Nov 2010 13:16:30 +0000 (13:16 +0000)]
Fix WebCoreStringToJString() to not delete the local reference to the new jstring
The JNI spec allows for local objects to be GC'ed before the JNI frame
returns, so this is dangerous.
Also rename the method to WtfStringToJstring() to match the existing
jstringToWtfString() and update call sites to JNIEnv::NewString() to
make use of it.
Change-Id: I84aa25ba1aca2aee346bf6e3d83a58afc3a95219
Shimeng (Simon) Wang [Fri, 29 Oct 2010 18:44:01 +0000 (11:44 -0700)]
Merge "Enhance auto hyphenation."
Shimeng (Simon) Wang [Fri, 29 Oct 2010 00:14:27 +0000 (17:14 -0700)]
Enhance auto hyphenation.
1. Bypass leading white spaces, since webkit does pass them down.
2. Return better hyphenation point, since previously it's more
aggressive and causes display issue in Google books.
issue:
2672163
Change-Id: I8ae47f7c553f533f752d6f7c697cf2fffd421e5b
Steve Block [Fri, 29 Oct 2010 15:51:22 +0000 (08:51 -0700)]
Merge changes I28fb1392,I6b881465
* changes:
CookieManager.getCookie() should return null rather than the empty string
Hook up remaining CookieManager methods
Iain Merrick [Fri, 29 Oct 2010 11:42:54 +0000 (12:42 +0100)]
Notify WebKit of redirects in the Chrome HTTP stack.
In this CL we just defer the redirect until WebKit has had a chance
to check it, and potentially cancel it.
There's a comment in the old code asking what to do if we're given
a bad request. Looks like this should never happen; it's a DCHECK in
Chrome so I've turned it into an ASSERT here.
We only follow redirects if WebKit does not modify the URL (this is
the same behaviour as Chrome).
Change-Id: I0c8b8cd61c501527a29dda5aca521a7df4a3ccef
Steve Block [Fri, 29 Oct 2010 12:24:17 +0000 (13:24 +0100)]
CookieManager.getCookie() should return null rather than the empty string
This is to match the behaviour of the Android Java HTTP stack.
Bug:
3116410
Change-Id: I28fb1392c36754a7c2fd78bc76281db8318a1056
Steve Block [Thu, 28 Oct 2010 14:35:47 +0000 (15:35 +0100)]
Hook up remaining CookieManager methods
hasCookies(), removeExpiredCookie(), removeSessionCookie() and setCookie()
Requires a change to frameworks/base ...
https://android-git.corp.google.com/g/76898
Bug:
3116410
Change-Id: I6b881465f78e090ed29b215785c4018119ccc5d8