summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \
| * | | | | | Fix cursor rings for buttonsJohn Reck2012-03-063-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6124914 Change-Id: I2a802ac7f83117acdac7d44cb872b9e3c227025f
* | | | | | | Merge "Support passing focus to the chrome"John Reck2012-03-063-2/+34
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Support passing focus to the chromeJohn Reck2012-03-063-2/+34
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6109044 This is primarily for tab navigation, arrow keys are handled differently Change-Id: I72968014535afe21bbcb43913bd11cbb676daaf9
* | | | | Merge "Refactor LayerAndroid and add a FixedLayerAndroid class"Nicolas Roard2012-03-0610-309/+562
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactor LayerAndroid and add a FixedLayerAndroid classNicolas Roard2012-03-0610-309/+562
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic94e67678e7f5783bf6690308d0a13ce2202d1f2
* | | | | Merge "operation and filter cleanup"Chris Craik2012-03-056-98/+8
|\ \ \ \ \
| * | | | | operation and filter cleanupChris Craik2012-03-056-98/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0074d10bc969f139e66c9c8014811309a1e85f5b
* | | | | | Merge "Fix platformLayerIdFromNode lookup"John Reck2012-03-051-0/+2
|\ \ \ \ \ \
| * | | | | | Fix platformLayerIdFromNode lookupJohn Reck2012-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6119014 If the RenderLayer of the node isn't composited, traverse up the tree until we find a composited parent. Change-Id: I9448273fb5cc86ae56a47e229e9556a15569ed69
* | | | | | | Merge "Fix scrollable divs"John Reck2012-03-051-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix scrollable divsJohn Reck2012-03-051-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6118912 Change-Id: I1345370b975e8a47b5969224f77e506bb87d973d
* | | | | | Merge "Removes unused classes"Nicolas Roard2012-03-052-139/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Removes unused classesNicolas Roard2012-03-052-139/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that find text is done through webkit, we don't need those. Change-Id: I70a7bbdcc0e6842ab2ce181871c2893ce84012c7
* | | | | | Merge "Delete more unused stuff from navcache"John Reck2012-03-053-633/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Delete more unused stuff from navcacheJohn Reck2012-03-053-633/+19
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I5ed8bb10141907656347e7c667be19b88f407bf0
* | | | | Fix scaling issue with translationTeng-Hui Zhu2012-03-051-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5684832 Change-Id: I57fd4cddd480f6d8d5e3bebdf9a63bcab59e02c5
* | | | | add more logs and format correctionTeng-Hui Zhu2012-03-051-12/+14
|/ / / / | | | | | | | | | | | | Change-Id: I63bda1a03b3e634b8ee92a0379ab46af8a7af6b5
* | | | Merge "Pass transform matrix in draw instead of through painter"Chris Craik2012-03-0215-39/+37
|\ \ \ \
| * | | | Pass transform matrix in draw instead of through painterChris Craik2012-03-0215-39/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6105013 Since BaseTile's painter pointer may be stale, pass transform through draw rename transparency->opacity where needed added const for drawing path rects Change-Id: Ie08cef63c656e95887a3230af18b5b6a4513c10d
* | | | | Merge "Fix crash when getting input text on an empty node."George Mount2012-03-021-8/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix crash when getting input text on an empty node.George Mount2012-03-021-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6109122 Change-Id: I1ecc5a599256dfb4701eb1f57f950b8950acf006
* | | | | Merge "Fix m.movies.com crash"John Reck2012-03-021-5/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix m.movies.com crashJohn Reck2012-03-011-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6105672 Bug was caused by an attempt to get WebViewCore in a frame destructor. Fixed by adding some shortcuts that do not rely on a valid tree if the ScrollView given has a platformWidget Change-Id: I14b4506f621c7234fb1a841d5c9ed14028d0d816
generated by cgit v1.1 at 2024-08-17 06:12:45 +0000