summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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-0115-152/+101
|\
| * Fix iframe, for reals!John Reck2012-03-0115-152/+101
| | | | | | | | 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 "take proper credit for overflow scrolling support"Victoria Lease2012-03-012-0/+5
|\ \ \
| * | | take proper credit for overflow scrolling supportVictoria Lease2012-03-012-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5771391 Change-Id: I3072fd1e9ad7b0ab9d3f6beac84c125d1930024f
* | | | Merge "Cleanup GL resource for HTML5 Video."Teng-Hui Zhu2012-03-015-133/+171
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Cleanup GL resource for HTML5 Video.Teng-Hui Zhu2012-03-015-133/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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 "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-2833-1190/+1175
|\ \ \ \ | |_|_|/ |/| | |
| * | | layer rendering cleanup/rewriteChris Craik2012-02-2833-1190/+1175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-286-25/+56
|\ \ \ \
| * | | | Delete the GL shader resources in a cleaner wayTeng-Hui Zhu2012-02-286-25/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6079959 Change-Id: I55c96bb6abc90503c178607d0798c82e2c5ecaf1
* | | | | am 797ef404: am c892a72d: am 538b01d6: Cherry-pick WebKit r100677 to fix a ↵Steve Block2012-02-281-8/+13
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | rendering crash * commit '797ef40436bbd0876936c82037ce7aa8d520933d': Cherry-pick WebKit r100677 to fix a rendering crash
| * | | | am 538b01d6: Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-8/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '538b01d6410e7c7a5b2faabe7b84c80ddc32d5f3': Cherry-pick WebKit r100677 to fix a rendering crash
| | * | | | Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-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 "removed unused vars/functions"Chris Craik2012-02-287-39/+2
|\ \ \ \ \ \
| * | | | | | removed unused vars/functionsChris Craik2012-02-287-39/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | 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
* | | | | | Merge "Merge webkit change to reveal last character in password."George Mount2012-02-286-4/+103
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge webkit change to reveal last character in password.George Mount2012-02-286-4/+103
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6083915 cherry pick of webkit 93656 http://trac.webkit.org/changeset/93656 Change-Id: I1f979a3b2b9916736f3785ab2d5998b958b55cd2
* | | | | Merge "Fix content detector crashes"Chris Craik2012-02-272-4/+14
|\ \ \ \ \
| * | | | | Fix content detector crashesJohn Reck2012-02-272-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6075831 Add some sanity checks to AndroidHitTestResult Update DOMTextContentWalker to latest which had some extra checks Change-Id: If6d129e78712c8cfc5ec84e48487e32cc585680f
* | | | | | Merge "Delete navcache native"John Reck2012-02-2721-6338/+62
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Delete navcache nativeJohn Reck2012-02-2721-6338/+62
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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-274-6/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Gl resource should be re-initialized after EGL context changedTeng-Hui Zhu2012-02-274-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-278-11/+64
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix iframe webkit positioningNicolas Roard2012-02-278-11/+64
| | | | | | | | | | | | | | | | | | | | Change-Id: I7b2b3a7312c89bc505d7f629380df0d3f24eee5f
* | | | | Merge "Delete CursorRing"John Reck2012-02-276-385/+11
|\ \ \ \ \
| * | | | | Delete CursorRingJohn Reck2012-02-276-385/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 6074032 Change-Id: I74f80da22bebbfac556728bba25bcddc2333629a
* | | | | move libgui headers in the right placeMathias Agopian2012-02-272-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ice3e54df3accab3874ef95e1ec0c2bf55809a57e
* | | | | 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 "Delete CacheBuilder"John Reck2012-02-2414-3888/+376
|\ \ \ \ \
| * | | | | Delete CacheBuilderJohn Reck2012-02-2414-3888/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed address_detector to pass CTS Change-Id: I6e3c4146d4c03881d036be9b8d8708a8200efef8
* | | | | | 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
* | | | | | | Merge "Fix issues when DEBUG turned on"Teng-Hui Zhu2012-02-243-5/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fix issues when DEBUG turned onTeng-Hui Zhu2012-02-243-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifeeed93859f3b9122cf6e2aa3ae66d6cfa603dce