summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* replace XLOGC/XLOG with ALOGD/ALOGVChris Craik2012-03-122-109/+78
| | | | | | | 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-121-0/+1
|\ | | | | | | Change-Id: I5c3e6fe524ae5742420c5a6e092d92840e2754f0
| * am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge."Derek Sollenberger2012-03-121-0/+1
| |\ | | | | | | | | | | | | * commit '1969832edc74f5a34c300f386e6739d5faff6bed': Update WebKit with necessary changes for the Skia merge.
| | * Update WebKit with necessary changes for the Skia merge.Derek Sollenberger2012-03-061-0/+1
| | | | | | | | | | | | | | | | | | This CL address the modifications needed for r3312 of Skia Change-Id: I0574657e7a84e53c6b92cefbe07668e9467880db
* | | 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-093-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-22/+0
|\ \ \ \
| * | | | Delete nativeSubtractLayersJohn Reck2012-03-091-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5338388 Change-Id: I2ae12dde6ef2f30e015c052da67c2bafbd59ecd3
* | | | | Merge "Replace picture count with the SurfaceCollection count"Chris Craik2012-03-092-3/+1
|\ \ \ \ \
| * | | | | Replace picture count with the SurfaceCollection countChris Craik2012-03-092-3/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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 "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
* | | | Change the way we apply fixed position to layersNicolas Roard2012-03-081-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-8/+19
| | | | | | | | | | | | | | | | Change-Id: Ia3810e83a2d919ff5fa37b8fcd92e6cbbb63d569
* | | | 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-061-35/+89
|\ \ \ \ | |/ / / |/| | |
| * | | Refactor LayerAndroid and add a FixedLayerAndroid classNicolas Roard2012-03-061-35/+89
| | | | | | | | | | | | | | | | Change-Id: Ic94e67678e7f5783bf6690308d0a13ce2202d1f2
* | | | 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
* | | Delete more unused stuff from navcacheJohn Reck2012-03-053-633/+19
| | | | | | | | | | | | Change-Id: I5ed8bb10141907656347e7c667be19b88f407bf0
* | | 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
* | | | Fixup webkit for WebViewClassic renameJonathan Dixon2012-03-024-12/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Changes native method bindings from API classes WebView and WebSettings, to the corresponding implementation classes WebViewClassic and WebSettingsClassic Interdepends on https://android-git.corp.google.com/g/165608 Change-Id: Ie47e5c8453fabef2afae399f411ffbe047cbfaab
* | | Merge "Fix iframe, for reals!"Nicolas Roard2012-03-015-42/+37
|\ \ \
| * | | Fix iframe, for reals!John Reck2012-03-015-42/+37
| | | | | | | | | | | | | | | | Change-Id: I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733
* | | | Merge "Add one useful log"Teng-Hui Zhu2012-03-011-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add one useful logTeng-Hui Zhu2012-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This log will appear very rarely and it is very useful for debugging. bug:6079959 Change-Id: I52283d7d11f0d200e4ce9d05259b809ddf05d9e5
* | | | Merge "Minor cleanup in PictureSet"John Reck2012-03-014-105/+57
|\ \ \ \
| * | | | Minor cleanup in PictureSetJohn Reck2012-03-014-105/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused variable from add() Switch mArea from SkRegion to SkIRect (we only ever used the region's bounds) Restrict draw's inval checking to within content rect - prevents an issue where after scaling/transforms the canvas clip can end up slightly negative, which results in drawing all the pictures in the list even if we only need to draw a partial inval Change-Id: Ie6e06437af2e326ee7d9286db65858d8886ec15d
* | | | | Merge "Cleanup GL resource for HTML5 Video."Teng-Hui Zhu2012-03-011-4/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Cleanup GL resource for HTML5 Video.Teng-Hui Zhu2012-03-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "pin find-on-page scrolls to content edges"Victoria Lease2012-03-011-10/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | pin find-on-page scrolls to content edgesVictoria Lease2012-03-011-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6066283 This change also contains code to prevent find-on-page from scrolling in unnecessary circumstances, for example when a match is already being displayed. Change-Id: I555c84f8851a82e854d12cb34b8805c9d3f22f5e
* | | | | Merge "Add support for maxlength text fields to WebViewInputConnection."George Mount2012-02-292-2/+14
|\ \ \ \ \
| * | | | | Add support for maxlength text fields to WebViewInputConnection.George Mount2012-02-282-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6083776 Sends the maximum length from WebKit to WebViewInputConnection so that it can limit the number of characters entered and remain in sync with WebKit. Framework Change: I135871db7809e8dc28a3ad8d3aa852976a274555 Change-Id: Ie02f82a3f5b3527c378938d93bac2dece802af26
* | | | | | Merge "layer rendering cleanup/rewrite"Chris Craik2012-02-281-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | layer rendering cleanup/rewriteChris Craik2012-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-281-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Delete the GL shader resources in a cleaner wayTeng-Hui Zhu2012-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6079959 Change-Id: I55c96bb6abc90503c178607d0798c82e2c5ecaf1
* | | | | | Merge "removed unused vars/functions"Chris Craik2012-02-282-27/+1
|\ \ \ \ \ \
| * | | | | | removed unused vars/functionsChris Craik2012-02-282-27/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I07ab8c6e7ea1c15181eaaa936968b60f6cdd69a4
* | | | | | Merge "plugin centering - use correct Y coord"Chris Craik2012-02-281-2/+2
|\ \ \ \ \ \
| * | | | | | plugin centering - use correct Y coordChris Craik2012-02-281-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Id0ac69f708b15ea03022c8ce9ca3d3c12f1ed307