summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Draw vertical text using by setting verticalText flag in SkPaint."Derek Sollenberger2012-03-191-19/+20
|\
| * Draw vertical text using by setting verticalText flag in SkPaint.Derek Sollenberger2012-03-141-19/+20
| | | | | | | | | | | | | | | | | | This approach replaces drawing each vertical character on a Path. The use of the verticalText flag requires an update to Skia's freetype implementation which in external/skia. bug: 5558851 Change-Id: If33288c348e3c51df2d8edc1ee4352de0ac521df
* | Merge "Fix selection positioning for RTL languages"Russell Brenner2012-03-161-2/+2
|\ \
| * | Fix selection positioning for RTL languagesRussell Brenner2012-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Logic error prevented placement of the cursor at the left edge of an RTL sequence. Bug: 5041179 Change-Id: I091f1d8ae546890b6a6be50f729b662742ca2221
* | | Merge "Paint tiles with the PaintTileOperation's painter"Chris Craik2012-03-166-17/+11
|\ \ \
| * | | Paint tiles with the PaintTileOperation's painterChris Craik2012-03-166-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The refcounting there prevents the painter from being deallocated while painting bug:6064973 Change-Id: Ief4e615876aab74afb74e135acc1dd92c92af570
* | | | only report actual changes to matchCountVictoria Lease2012-03-161-3/+4
|/ / / | | | | | | | | | | | | | | | Bug: 6052412 Change-Id: If188ea2e54b52f16767d8df8d66c4a80f5a400c0
* | | Update edit text size when the text changes so scroll works.George Mount2012-03-153-2/+42
|/ / | | | | | | | | | | | | Bug 6176413 Framework Change: I6b8f244cd747d6d19c261d685a3cfb9ef4d71ec3 Change-Id: I487322ca9578c003f937b92ca4e8d46d34ea8c78
* | Merge "Scroll cursor with edited text."George Mount2012-03-151-0/+1
|\ \
| * | Scroll cursor with edited text.George Mount2012-03-151-0/+1
| | | | | | | | | | | | | | | | | | Bug 6175492 Change-Id: I0f36e3ff371df1b8941a47ee910c0729cd5a01e1
* | | Merge "Add scrolling editable text with a finger drag."George Mount2012-03-152-25/+89
|\ \ \ | |/ /
| * | Add scrolling editable text with a finger drag.George Mount2012-03-142-25/+89
| |/ | | | | | | | | | | | | | | Bug 6156451 Framework Change: I1a16c708e5ea2ef8bd1f99197dacbc7831764ef4 Change-Id: Ie08712fb17b237fbb2d520d745ef8a2e489fd728
* | Merge "Remove gmail specific mime code from webview"Selim Gurun2012-03-142-12/+3
|\ \
| * | Remove gmail specific mime code from webviewSelim Gurun2012-03-142-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6019611 Remove gmail specific mime code from webview so the query parameters can be passed to asset files. The changes were added in honeycomb timeframe (see commit 7d2f6c10941c9083e9ec30fb08444a5755ff8bc9). The changes seem not in use anymore (tested for some attachments following the original commit above), also talked to gmail team and they also do not think it is in use. Also it seems a hack to modify webview for one app in such a way. Get rid of an unused private variable. Change-Id: Ic74414eaa0d6a2be77eefdd0b8a053f655b285ff
* | | Merge "Refresh fonts when system locale is changed"Russell Brenner2012-03-144-0/+87
|\ \ \
| * | | Refresh fonts when system locale is changedRussell Brenner2012-03-144-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When content is cleared, check for locale change and flush internal font caches, if necessary. Bug: 5873170 Change-Id: Ifba52e6e827444b41d08f1ca08c3b6f2c9d87462
* | | | Merge "use scale 1 when no GLWebViewState"Chris Craik2012-03-141-2/+5
|\ \ \ \
| * | | | use scale 1 when no GLWebViewStateChris Craik2012-03-131-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | fixes crash when updateLayerPositions called on a layer before m_state set bug:6154462 Change-Id: I1568fde3d8458f13bdb01ec2364334dbfc27041a
* | | | Fix layers ordering issue with Absolute positioned elementsNicolas Roard2012-03-138-66/+121
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | - Promote absolute positioned elements to be composited - Reorder the elements as needed in LayerAndroid - Simplify fixed elements composition culling (don't do it anymore, we just promote everything and let the Layers sort things out) Change-Id: If76cf76a92410dec7e305a1a70c660d8597e399a
* | | Merge "Support "prev" for IME input."George Mount2012-03-131-11/+8
|\ \ \
| * | | Support "prev" for IME input.George Mount2012-03-121-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6152403 Framework change: I6d339d724616b9f156458dd4223d3b991191b13d Change-Id: I09e5f63d41bb88a632f70b010e8ab4851bf90bab
* | | | Fix tile discard, acquire, transfer, crashChris Craik2012-03-121-2/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Tile texture discard could leave the transfer queue with a mismatched base tile and texture, so that the saved tile isn't the correct owner. Detect this case, and mark the transfer obsolete. bug:6157456 Change-Id: Ib02ecf877c4b99d07172541db8236e15c528af58
* | | replace XLOGC/XLOG with ALOGD/ALOGVChris Craik2012-03-1243-1170/+567
| | | | | | | | | | | | | | | | | | | | | Started using ALOGW/E for indicating warnings/errors Also delete the unused TilesTracker.h Change-Id: I1986a3057efd4c8e260dbc020e21c02d4d646cf3
* | | resolved conflicts for merge of f6d49173 to masterDerek Sollenberger2012-03-127-108/+19
|\ \ \ | |/ / |/| | | | | Change-Id: I5c3e6fe524ae5742420c5a6e092d92840e2754f0
| * | am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge."Derek Sollenberger2012-03-127-112/+19
| |\ \ | | | | | | | | | | | | | | | | * commit '1969832edc74f5a34c300f386e6739d5faff6bed': Update WebKit with necessary changes for the Skia merge.
| | * | Update WebKit with necessary changes for the Skia merge.Derek Sollenberger2012-03-067-112/+19
| | | | | | | | | | | | | | | | | | | | | | | | This CL address the modifications needed for r3312 of Skia Change-Id: I0574657e7a84e53c6b92cefbe07668e9467880db
| | * | Merge from ics-mr1Jean-Baptiste Queru2012-03-011-8/+13
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ib2618ca7bd118da611e897f537b4f4ab5deb8e36
| | | * | Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-03-011-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash from positioned generated content under run-in. See http://trac.webkit.org/changeset/100677. Bug: 6079158 Change-Id: I3d2012c58f47e71ae500e33551dfab5587b84534
* | | | | Merge "Add back auto-completion and auto-fill."George Mount2012-03-125-43/+129
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add back auto-completion and auto-fill.George Mount2012-03-095-43/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5993316 Framework Change: If00d42c0cb4f2c207f0d502e297741e1d6a68bf4 Change-Id: I9d09a924a579d2d4551bff0489670de71d04757e
* | | | | Introduce a LayerContent interfaceNicolas Roard2012-03-0915-130/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layers can now use a LayerContent object to draw their content. We currently have two subclasses, one using an SkPicture (currently used for composited layers), the other using a PictureSet (that we use for the base layer). First step toward unification... Change-Id: I5e7fd06a653f02f8721613fd3a39d36fb64a8614
* | | | | Merge "Delete nativeSubtractLayers"John Reck2012-03-093-64/+0
|\ \ \ \ \
| * | | | | Delete nativeSubtractLayersJohn Reck2012-03-093-64/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5338388 Change-Id: I2ae12dde6ef2f30e015c052da67c2bafbd59ecd3
* | | | | | Merge "Replace picture count with the SurfaceCollection count"Chris Craik2012-03-0925-105/+76
|\ \ \ \ \ \
| * | | | | | Replace picture count with the SurfaceCollection countChris Craik2012-03-0925-105/+76
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Displays surface collection count on tiles when visual indicator is on. Change-Id: Ibe90792279849baff6f5bf0d71b80d9081471dc4
* | | | | | Merge "Use audio_policy_output_flags_t consistently"Glenn Kasten2012-03-091-1/+1
|\ \ \ \ \ \
| * | | | | | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-091-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: Icc275ded644cc5e3b4e09098d52715ec4e7a0c1b
* | | | | | Merge "add bounds check in layer merging"Chris Craik2012-03-091-13/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add bounds check in layer mergingChris Craik2012-03-081-13/+15
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ie35c0bf17535a6234986bc47344407697ce68d4b
* | | | | Merge "remove TextureTileInfo and readyfor check"Chris Craik2012-03-095-114/+12
|\ \ \ \ \
| * | | | | remove TextureTileInfo and readyfor checkChris Craik2012-03-085-114/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These checks are obsolete, as texture/tile stealing both occur on the UI thread, and detach textures from tiles. Change-Id: I6d906217ee8954ac04b95f94a4516fd4dfbbb3b0
* | | | | Merge "remove hacky workaround for a scrolling bug"Victoria Lease2012-03-091-3/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove hacky workaround for a scrolling bugVictoria Lease2012-03-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5470588 I'll file a bug for the scrolling issue that this unmasks. Change-Id: If6ea7ffd163260c70ada61960ac3d70465e93918
* | | | | Merge "partial multi-layer invalidates in layergroups"Chris Craik2012-03-081-12/+16
|\ \ \ \ \
| * | | | | partial multi-layer invalidates in layergroupsChris Craik2012-03-071-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic17235008ba96056cef353285e46eec86ee52597
* | | | | | Change the way we apply fixed position to layersNicolas Roard2012-03-088-118/+147
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the latest refactoring we lost the possibility of having a layer other than LayerAndroid be fixed positioned. This CL remove the FixedLayerAndroid class (rename it into FixedPositioning) of the hierarchy, and use delegation to apply fixed position. Change-Id: Ib291fcaefe6a4431849ccfe2cf458fac6cac58aa
* | | | | Refactor LayerAndroid to add iframe subclassesNicolas Roard2012-03-0715-105/+311
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia3810e83a2d919ff5fa37b8fcd92e6cbbb63d569
* | | | | Merge "UI-side layer merging"Chris Craik2012-03-0712-129/+348
|\ \ \ \ \
| * | | | | UI-side layer mergingChris Craik2012-03-0712-129/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge multiple painted layers into a LayerGroup to share a dualTiledTexture see LayerAndroid::canJoinGroup() for merging rules Change-Id: I5f5b156894c3743825f570b47d34e905d74de10a
* | | | | | Merge "Fix cursor rings for buttons"John Reck2012-03-063-8/+26
|\ \ \ \ \ \