summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform
Commit message (Collapse)AuthorAgeFilesLines
* replace XLOGC/XLOG with ALOGD/ALOGVChris Craik2012-03-1241-1061/+489
| | | | | | | 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-126-108/+18
|\ | | | | | | Change-Id: I5c3e6fe524ae5742420c5a6e092d92840e2754f0
| * am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge."Derek Sollenberger2012-03-126-112/+18
| |\ | | | | | | | | | | | | * commit '1969832edc74f5a34c300f386e6739d5faff6bed': Update WebKit with necessary changes for the Skia merge.
| | * Update WebKit with necessary changes for the Skia merge.Derek Sollenberger2012-03-066-112/+18
| | | | | | | | | | | | | | | | | | This CL address the modifications needed for r3312 of Skia Change-Id: I0574657e7a84e53c6b92cefbe07668e9467880db
* | | Introduce a LayerContent interfaceNicolas Roard2012-03-0911-114/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-092-42/+0
|\ \ \
| * | | Delete nativeSubtractLayersJohn Reck2012-03-092-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5338388 Change-Id: I2ae12dde6ef2f30e015c052da67c2bafbd59ecd3
* | | | Merge "Replace picture count with the SurfaceCollection count"Chris Craik2012-03-0923-102/+75
|\ \ \ \
| * | | | Replace picture count with the SurfaceCollection countChris Craik2012-03-0923-102/+75
| |/ / / | | | | | | | | | | | | | | | | | | | | Displays surface collection count on tiles when visual indicator is on. Change-Id: Ibe90792279849baff6f5bf0d71b80d9081471dc4
* | | | 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
* | | | 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 "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-086-88/+117
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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-0712-97/+290
| | | | | | | | | | | | Change-Id: Ia3810e83a2d919ff5fa37b8fcd92e6cbbb63d569
* | | UI-side layer mergingChris Craik2012-03-0710-128/+333
| | | | | | | | | | | | | | | | | | | | | | | | Merge multiple painted layers into a LayerGroup to share a dualTiledTexture see LayerAndroid::canJoinGroup() for merging rules Change-Id: I5f5b156894c3743825f570b47d34e905d74de10a
* | | Merge "Refactor LayerAndroid and add a FixedLayerAndroid class"Nicolas Roard2012-03-068-274/+471
|\ \ \
| * | | Refactor LayerAndroid and add a FixedLayerAndroid classNicolas Roard2012-03-068-274/+471
| | | | | | | | | | | | | | | | 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 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
* | | | 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
* | | 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
* | | Fix iframe, for reals!John Reck2012-03-018-89/+64
| | | | | | | | | | | | Change-Id: I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733
* | | Merge "Cleanup GL resource for HTML5 Video."Teng-Hui Zhu2012-03-014-129/+165
|\ \ \
| * | | Cleanup GL resource for HTML5 Video.Teng-Hui Zhu2012-03-014-129/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the code such that the shared resources are in the VideoLayerManager now. Get rid of the solid color texture and use pure color shader. bug:6079959 Change-Id: I0d1ce50157fb2ed083b9cc80464a1e61fa8e159f
* | | | fix stalls in tile updatesChris Craik2012-02-292-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable layer readiness check when in single surface mode Disregard painter change in TransferQueue::checkObsolete bug:6091207 Change-Id: I556fca3faf2482beffd81ecbcf7a03a43d297cb9
* | | | Merge "layer rendering cleanup/rewrite"Chris Craik2012-02-2831-1186/+1170
|\ \ \ \ | |/ / / |/| | |
| * | | layer rendering cleanup/rewriteChris Craik2012-02-2831-1186/+1170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added 'LayerGroup' class separate the painting/tiled features of a layer (eventually multiple layers) tiled drawing/preparing/counting details are abstracted out of LayerAndroid * added 'SurfaceCollection' class incorporates both the BaseLayerAndroid/LayerAndroid tree, as well as the vector of tiled LayerGroup * renamed 'TreeManager' to 'SurfaceManager' * Removes PaintedSurface was mostly a thin wrapper around DualTiledTexture * Combines TilePainter/SurfacePainter * Simplified ref counting Change-Id: I92c5c75f48d92e0e28812c56de00102399fc02ee
* | | | Merge "Delete the GL shader resources in a cleaner way"Teng-Hui Zhu2012-02-285-24/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Delete the GL shader resources in a cleaner wayTeng-Hui Zhu2012-02-285-24/+55
| | | | | | | | | | | | | | | | | | | | | | | | bug:6079959 Change-Id: I55c96bb6abc90503c178607d0798c82e2c5ecaf1
* | | | removed unused vars/functionsChris Craik2012-02-285-12/+1
|/ / / | | | | | | | | | Change-Id: I07ab8c6e7ea1c15181eaaa936968b60f6cdd69a4
* | | Merge "Delete navcache native"John Reck2012-02-271-0/+3
|\ \ \
| * | | Delete navcache nativeJohn Reck2012-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Will clean up the JNI in a later CL Change-Id: I448fe5592026c325c3b2fa1c90f174674bf358b1
* | | | Merge "Gl resource should be re-initialized after EGL context changed"Teng-Hui Zhu2012-02-273-5/+19
|\ \ \ \
| * | | | Gl resource should be re-initialized after EGL context changedTeng-Hui Zhu2012-02-273-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGLContext can be re-created when memory pressure is very high, that will delete all the GL resources automatically. After this, we should re-create the GL resources for webView. bug:6075574 Change-Id: I3035554d124cee38df3ba2dfae1eda0568b45d0f
* | | | | Merge "Fix iframe webkit positioning"Nicolas Roard2012-02-275-6/+32
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix iframe webkit positioningNicolas Roard2012-02-275-6/+32
| | | | | | | | | | | | | | | | | | | | Change-Id: I7b2b3a7312c89bc505d7f629380df0d3f24eee5f
* | | | | Merge "Delete CursorRing"John Reck2012-02-274-264/+7
|\ \ \ \ \
| * | | | | Delete CursorRingJohn Reck2012-02-274-264/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 6074032 Change-Id: I74f80da22bebbfac556728bba25bcddc2333629a
* | | | | Merge "Activate the GL error log in release build"Teng-Hui Zhu2012-02-272-13/+65
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Activate the GL error log in release buildTeng-Hui Zhu2012-02-242-13/+65
| | | | | | | | | | | | | | | | | | | | Change-Id: I81b97a376cc40f6c1d8eebe99fdb107506462f0c
* | | | | Merge "fix scrollable layer inside scrollable layer"Michael Kolb2012-02-241-4/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix scrollable layer inside scrollable layerMichael Kolb2012-02-241-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6065371 take the layer offset out of the transformation matrix used for the children. Change-Id: I464eda636df50c98e2042687c80f4a2c4a9bddc3
* | | | | Fix issues when DEBUG turned onTeng-Hui Zhu2012-02-243-5/+8
|/ / / / | | | | | | | | | | | | Change-Id: Ifeeed93859f3b9122cf6e2aa3ae66d6cfa603dce