summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | Don't send selection info to WebView for unrendered selections.George Mount2012-05-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6537569 Change-Id: Iefbb06ad9175f61b79d815c668754538febec4f5
* | | | | | | | | | | | am cd6a3bff: am 6f4fd96b: Merge "Don\'t set up background images if 1x1" ↵Nicolas Roard2012-05-232-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'cd6a3bff0abccf9f1c3c3351c6984be2c3124239': Don't set up background images if 1x1
| * | | | | | | | | | | am 6f4fd96b: Merge "Don\'t set up background images if 1x1" into jb-devNicolas Roard2012-05-232-6/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f4fd96b140b47cb8215dfe480209424929b609e': Don't set up background images if 1x1
| | * | | | | | | | | | Merge "Don't set up background images if 1x1" into jb-devNicolas Roard2012-05-232-6/+12
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Don't set up background images if 1x1Nicolas Roard2012-05-232-6/+12
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this check in other places. We still need a better solution for the general case. bug:6540356 Change-Id: I3f75c62141d7b6993928927117d972d0ec224b55
* | | | | | | | | | | | am 3b6f13bd: am 596f7241: Merge "Use Surface areas to compute tile usage" ↵Chris Craik2012-05-235-20/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '3b6f13bd760fd553d10f7d31a7840d9c2da11c43': Use Surface areas to compute tile usage
| * | | | | | | | | | | am 596f7241: Merge "Use Surface areas to compute tile usage" into jb-devChris Craik2012-05-235-20/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '596f7241ffc821ce234bc891c2fb54483c96c16c': Use Surface areas to compute tile usage
| | * | | | | | | | | | Merge "Use Surface areas to compute tile usage" into jb-devChris Craik2012-05-235-20/+30
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Use Surface areas to compute tile usageChris Craik2012-05-235-20/+30
| | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used the surface's first layer's area, which is often incorrect in the case of significant layer merging. bug:6545187 Change-Id: Ied3e5e3cd894b145ed905f8ba83649b3c4f3b1dd
* | | | | | | | | | | | am f942c7b1: am 21ed283c: Merge "Add tracing to interesting/potentially ↵Chris Craik2012-05-233-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | costly functions" into jb-dev * commit 'f942c7b1e00c598672ed1298d08f543eb17b702e': Add tracing to interesting/potentially costly functions
| * | | | | | | | | | | am 21ed283c: Merge "Add tracing to interesting/potentially costly functions" ↵Chris Craik2012-05-233-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '21ed283c2e1cbf2b5a9d46dd6b8c1e1983860fa2': Add tracing to interesting/potentially costly functions
| | * | | | | | | | | | Merge "Add tracing to interesting/potentially costly functions" into jb-devChris Craik2012-05-233-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Add tracing to interesting/potentially costly functionsChris Craik2012-05-233-0/+5
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6530473 bug:6344165 Change-Id: I40b190036af8c021134d5ac450e3217098ba2296
* | | | | | | | | | | am 5557efbd: am 17f16d58: Merge "Clean up the transferQueue code and add ↵Teng-Hui Zhu2012-05-232-55/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more detailed GL log" into jb-dev * commit '5557efbdd0cc4e7c6c4a849ae590699a68c1e2d7': Clean up the transferQueue code and add more detailed GL log
| * | | | | | | | | | am 17f16d58: Merge "Clean up the transferQueue code and add more detailed GL ↵Teng-Hui Zhu2012-05-232-55/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log" into jb-dev * commit '17f16d583b7f3e3fdc425c1823e039c902bbaab2': Clean up the transferQueue code and add more detailed GL log
| | * | | | | | | | | Merge "Clean up the transferQueue code and add more detailed GL log" into jb-devTeng-Hui Zhu2012-05-232-55/+11
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Clean up the transferQueue code and add more detailed GL logTeng-Hui Zhu2012-05-232-55/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove one unnecessary parameter in blitTileFromQueue. Remove syncKHR related code in TransferQueue since that is supported by SurfaceTexture. bug:6516534 Change-Id: Iaf1f46a0f459ad8973c7465a9b8550f760115384
* | | | | | | | | | am 1d1eaec5: am a6645da2: Merge "Correctly handle the EGL context ↵Teng-Hui Zhu2012-05-232-24/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recreation." into jb-dev * commit '1d1eaec558a4a4aa8a054c5bb36c9a0e5f715598': Correctly handle the EGL context recreation.
| * | | | | | | | | am a6645da2: Merge "Correctly handle the EGL context recreation." into jb-devTeng-Hui Zhu2012-05-232-24/+21
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6645da2a8bfb194b7ee9c790f1da607e0e984c0': Correctly handle the EGL context recreation.
| | * | | | | | | | Merge "Correctly handle the EGL context recreation." into jb-devTeng-Hui Zhu2012-05-232-24/+21
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Correctly handle the EGL context recreation.Teng-Hui Zhu2012-05-232-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6516534 Change-Id: Iaf62359803d65d3a9acb88aa224a1a5c42f8aa4c
* | | | | | | | | | am 344434ac: am 7f33cb9c: Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '344434ac35a7b6406e794e619f8a8a1f6a6805fb': Fix crash
| * | | | | | | | | am 7f33cb9c: Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f33cb9c658dd731469489f217b45b2316a214bc': Fix crash
| | * | | | | | | | Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix crashNicolas Roard2012-05-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6537803 Change-Id: Ie0bb6e64644fd82c0ed6cf92c592c434f67fdc0d
* | | | | | | | | | am 311b8af6: am 55d60259: Merge "Don\'t use an ImageBuffer for ↵John Reck2012-05-222-1/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scratchContext()" into jb-dev * commit '311b8af66f874fb9dfa1680c6910b9653ff41ea1': Don't use an ImageBuffer for scratchContext()
| * | | | | | | | | am 55d60259: Merge "Don\'t use an ImageBuffer for scratchContext()" into jb-devJohn Reck2012-05-222-1/+21
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55d602593a60888cfc87c244a5e3258f35bae50e': Don't use an ImageBuffer for scratchContext()
| | * | | | | | | | Merge "Don't use an ImageBuffer for scratchContext()" into jb-devJohn Reck2012-05-222-1/+21
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Don't use an ImageBuffer for scratchContext()John Reck2012-05-222-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6509450 Change-Id: I6d952b92062e96772663824839b0229062c3a524
* | | | | | | | | | am ee7dbc2a: am 56ec1c56: Merge "We need to clear the items even when seeing ↵Teng-Hui Zhu2012-05-221-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obsolete tiles" into jb-dev * commit 'ee7dbc2aac5123cc15590218bbaf182a8abeb3e3': We need to clear the items even when seeing obsolete tiles
| * | | | | | | | | am 56ec1c56: Merge "We need to clear the items even when seeing obsolete ↵Teng-Hui Zhu2012-05-221-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tiles" into jb-dev * commit '56ec1c56c865189726480f3c481056a48a0ad61f': We need to clear the items even when seeing obsolete tiles
| | * | | | | | | | Merge "We need to clear the items even when seeing obsolete tiles" into jb-devTeng-Hui Zhu2012-05-221-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| / / / / / / | | | |/ / / / / /
| | | * | | | | | We need to clear the items even when seeing obsolete tilesTeng-Hui Zhu2012-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6531360 Change-Id: Ia23ddeb56d384c4e3904cabf787bbe72be4a6f08
* | | | | | | | | am 697d71c9: am 45aaa37e: Merge "Handle more favicon decoding error cases" ↵John Reck2012-05-224-15/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '697d71c9b19614584faef81da4ff9527aa2a334a': Handle more favicon decoding error cases
| * | | | | | | | am 45aaa37e: Merge "Handle more favicon decoding error cases" into jb-devJohn Reck2012-05-224-15/+25
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '45aaa37ec3809f4220214dd57c3dc50b7b5dd0d9': Handle more favicon decoding error cases
| | * | | | | | | Merge "Handle more favicon decoding error cases" into jb-devJohn Reck2012-05-224-15/+25
| | |\ \ \ \ \ \ \
| | | * | | | | | | Handle more favicon decoding error casesJohn Reck2012-05-224-15/+25
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6517530 Switch to having webcoreImageToSkBitmap return a pointer instead as it makes dealing with error cases easier. Also add a check to see if SkImageDecoder::DecodeMemory returned true or false, as if it returns false we may have already allocated pixels (so isNull = false), however it might not have valid data or any config Also aggressively check that we have a valid bitmap with a valid config Change-Id: I2a2e856a389d73cdda319eaeaee5d1279a9e2eb6
* | | | | | | | | am 061f7db7: Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | * commit '061f7db7b36c4c50aa416cd154c50c9faeaac5b6':
| * | | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | Change-Id: I373ddadb18af4e17995bd5dfc8a4030edcd457a3
| | * | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ am 88d6aef4: (-s ours) am c8d9e14b: DO NOT MERGE Consider fixed layers when ↵George Mount2012-05-220-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrolling the edit box. * commit '88d6aef480c0782008a52e79730fb5ea22d0a071': DO NOT MERGE Consider fixed layers when scrolling the edit box.
| * | | | | | | | | am c8d9e14b: DO NOT MERGE Consider fixed layers when scrolling the edit box.George Mount2012-05-221-0/+90
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8d9e14ba1a7c55e17ac2009bda77dc4da834b1c': DO NOT MERGE Consider fixed layers when scrolling the edit box.
| | * | | | | | | | DO NOT MERGE Consider fixed layers when scrolling the edit box.George Mount2012-05-221-0/+90
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6147580 Framework Change: Idaa538824e611acd64eb5a4ccb7866d3c978a077 Change-Id: I810891decf0bad682e90f29f0f65c6b765b7d6d6
* | | | | | | | | Merge "Remove unused WebViewCore::isPaused() and setIsPaused()"Steve Block2012-05-222-18/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused WebViewCore::isPaused() and setIsPaused()Steve Block2012-05-222-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last caller of these methods was removed in I7be5b4224555bc8c3893b75275ac3a997a6677d1. See framework change I9e5c0fd914f53d11e130ffcdc0e749f45dfe4013. Change-Id: Ie645cb657407c34a63e5df6b0ade050f1780a7f0
* | | | | | | | | | Merge "Use preemptive permissions policy for Geolocation"Steve Block2012-05-221-5/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use preemptive permissions policy for GeolocationSteve Block2012-05-221-5/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that we always check for permission before starting the location acquisition process. We pass all Geolocation LayoutTests. Bug: 4500947 Change-Id: Ia963874cecbf79ce2cc99c5f848682d1cc8aa6aa
* | | | | | | | | | am 3d964c36: am fa25b832: Merge "Null check" into jb-devJohn Reck2012-05-221-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | | | | | | | | | * commit '3d964c36f6895074686f909bffde814dcd622a73': Null check
| * | | | | | | | am fa25b832: Merge "Null check" into jb-devJohn Reck2012-05-221-2/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa25b832c863e0ff0a57de465f3e45e51ce780a6': Null check
generated by cgit v1.1 at 2025-09-15 12:26:16 +0000