summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Use a linear allocator for the RTreeJohn Reck2012-07-175-63/+301
| | | | Change-Id: I5e04c28a0c65378a26b1b99bcfeed4331591e265
* Merge "Cache gl operations to avoid redundancy"Chris Craik2012-07-172-22/+63
|\
| * Cache gl operations to avoid redundancyChris Craik2012-07-162-22/+63
| | | | | | | | Change-Id: I1e8f607a94685f3aa8f63e40fe2a265bca8a084e
* | Merge "Revert "Don't prepare in invoke mode unless needed""Chris Craik2012-07-172-33/+6
|\ \
| * | Revert "Don't prepare in invoke mode unless needed"Chris Craik2012-07-172-33/+6
| | | | | | | | | | | | | | | bug:6829376 This reverts commit 0453f79675ffe6fddb59add2dcee0e3f0e7e74b1
* | | Merge "Clear the player even when completelyLoaded"Teng-Hui Zhu2012-07-171-1/+4
|\ \ \
| * | | Clear the player even when completelyLoadedTeng-Hui Zhu2012-07-171-1/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | Clear will only happen when the player is stopped and we are moving away from the current page. bug:6520904 Change-Id: I8fd872eefdc012aa819280499298e50186a9a20f
* | | Add remove functionNicolas Roard2012-07-162-5/+43
| | | | | | | | | | | | Change-Id: I1d9c361cff6d8b5ff5f1cd198ca97740fdcc2954
* | | Merge "Add some comments/cleanup"Nicolas Roard2012-07-162-158/+192
|\ \ \
| * | | Add some comments/cleanupNicolas Roard2012-07-162-158/+192
| | | | | | | | | | | | | | | | Change-Id: I71e41f1a76ac3e8e845d9636d57cf3896bb6ec0d
* | | | Merge "Delete unused code"John Reck2012-07-163-413/+0
|\ \ \ \
| * | | | Delete unused codeJohn Reck2012-07-163-413/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8ef6737ef4798d0a0b9100ea60e3a04b8198661c
* | | | | Merge "Don't prepare in invoke mode unless needed"Chris Craik2012-07-162-6/+33
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Don't prepare in invoke mode unless neededChris Craik2012-07-122-6/+33
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | A change in collection, visible rect or scale will cause a re-prepare in invoke mode. Always re-prepare in draw mode to keep updating tile draw counts - this way a scrolling webview doesn't steal tiles unjustly from a non-scrolling webview. Change-Id: Idf9f88afe36b582a3aa0369cfb76d8e47e5d3da6
* | | Merge "improved text bound estimates"Victoria Lease2012-07-161-34/+26
|\ \ \ | |_|/ |/| |
| * | improved text bound estimatesVictoria Lease2012-07-161-34/+26
| | | | | | | | | | | | | | | | | | | | | | | | The previous text bound estimates were incorrect for vertical text, empty for single-glyph runs, and generally way too large. This change addresses all of the above issues. Change-Id: I5f3740a96f0532609f57347299ccb1adf78dc391
* | | New R-Tree implementationNicolas Roard2012-07-134-1626/+651
| | | | | | | | | | | | | | | Change-Id: If46f35856279ab2a356cb7f99671fcd15f4ddf37 (cherry picked from commit 19d56fe70a9ea33c3ce2ad4f0b547e35453aeafd)
* | | Fix getTotalMatrix()John Reck2012-07-132-4/+6
| | | | | | | | | | | | Change-Id: I13145c96ae5911c5ebe6b2006c53f1a05ffddc1e
* | | Fix stuttering caused by mallinfoJohn Reck2012-07-131-36/+8
|/ / | | | | | | | | | | | | | | | | | | mallinfo will block any malloc/frees while it is running, and unfortunately it is rather slow - it takes upwards of 70ms. Fortunately, we don't need all the info mallinfo returns, and can instead query for the total usage directly. This call merely returns a global value, so the caching mechanism that is in place is no longer necessary. Change-Id: Ida3af9202a6825b19b8590d4b40ca72ba2230c90
* | Handle MatrixesJohn Reck2012-07-133-14/+86
| | | | | | | | | | | | | | | | Make sure to take into account the current matrix to calculate the right global bounds Tag operations with the matrix that affected their drawing Change-Id: Iadda9f3849dc3df1507e63423ff8d3ad0f37d74e
* | Merge "De-dupe States, fix state allocation issues"John Reck2012-07-121-10/+47
|\ \
| * | De-dupe States, fix state allocation issuesJohn Reck2012-07-121-10/+47
| | | | | | | | | | | | Change-Id: I7a081b0a99574697a2ea77f85693d7fa65b80743
* | | Merge "approximate text bounds for recording context"Victoria Lease2012-07-121-13/+53
|\ \ \ | |/ / |/| |
| * | approximate text bounds for recording contextVictoria Lease2012-07-121-13/+53
| |/ | | | | | | | | | | | | | | | | | | Currently, SkPaint::measureText() is very, very slow. Fortunately, we do not need precise text bounds and can live with approximated bounds so long as the approximation is not smaller than the glyphs. We err very much on the side of safety so as to play nicely with calligraphic fonts and scripts that make heavy use of modifiers. Change-Id: Id08f0856c0d902386089560fc3cfcdd853a06177
* | Don't attempt to draw clipped-out picturesJohn Reck2012-07-121-3/+8
|/ | | | Change-Id: Iaf91d46b448ae49fe2359cfd19694995edec95e5
* Use an R-Tree for operation recordingJohn Reck2012-07-1210-121/+1936
| | | | Change-Id: I1380ae53139d5f50a25ea5edb61ec8b6818112ca
* Merge "Add reset state"Teng-Hui Zhu2012-07-111-1/+1
|\
| * Add reset stateTeng-Hui Zhu2012-07-101-1/+1
| | | | | | | | | | | | | | This just keep the state in sync with java side, even though native side didn't rely on such states. Change-Id: Ia73b4d09eed7282cdf1687d9ba6e74788749f738
* | Merge "Build a clipping tree in RecordingContext"John Reck2012-07-108-124/+200
|\ \
| * | Build a clipping tree in RecordingContextJohn Reck2012-07-108-124/+200
| |/ | | | | | | Change-Id: I967c8e2ea209c848e6a09b44390ab2228b213ca5
* | Merge "Clean appcache properly on deleteAllData()"Selim Gurun2012-07-101-7/+3
|\ \
| * | Clean appcache properly on deleteAllData()Selim Gurun2012-07-091-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6763306 The prior approach queries and deletes only the resources that are given in the manifest file. There are two problems it seems: 1. It is expensive & complicated. The deletealldata is called by an API method which clearly states this will clear all javascript storage APIs. there is an webstorage API for this, why make it complicated? 2. It seems a bug somewhere actually prevents cleaning disk storage. (see the bug above for experiments). This can be a bug of the old approach, or this can be a webkit bug (less likely). Change-Id: I7cf984efce5117191ca0e691007e2e0a11d75e93
* | | Merge "Fix onReachedMaxAppCacheSize callback"Selim Gurun2012-07-101-2/+16
|\ \ \ | |_|/ |/| |
| * | Fix onReachedMaxAppCacheSize callbackSelim Gurun2012-07-101-2/+16
| |/ | | | | | | | | | | | | | | | | | | | | Bug: 5869022 When appcache reached max size, a callback is triggered. The second parameter of this callback was returning the used Web SQL quota, which is a rather different concept then AppCache. Fix this to return max database size. Change-Id: I5ece83934d5a43b6927bc8fc25bcae1354c49149
* | Refactor RecordingContext optimization workJohn Reck2012-07-035-113/+112
| | | | | | | | | | | | | | | | | | Makes more sense to have PlatformGraphicsContextRecording do the optimizations as it already has all of the interesting data rather than have GraphicsOperationCollection "deep inspect" the stream Change-Id: I0dba6531a352d178afbee2c5eea7d67b82c28df5
* | Filter out empty save/restoresJohn Reck2012-07-022-2/+61
| | | | | | | | | | | | | | | | | | WebKit will sometimes produce graphics context calls that result in GC::Save, GC::SetClip, GC::Restore - as they don't do any drawing, we can detect and filter those out which saves on the amount of state management done. Change-Id: I61715b0a14adb39521c605e2562fc4ac4e70a327
* | Switch to ThreadSafeRefCounted<>John Reck2012-07-024-51/+49
| | | | | | | | Change-Id: I086a3ff7b6191bf5e20f8b5f6f74bcc7d2e867c2
* | Support fullscreen to inline video transition.Teng-Hui Zhu2012-06-279-33/+68
| | | | | | | | | | | | | | | | | | | | | | | | Basically, player is responsible to enter fullscreen mode such that we have the proper proxy updated on the Java side. bug:5710646 framework change: https://android-git.corp.google.com/g/#/c/202139/ Change-Id: Ie7adf620f2e9889142ef153e12d676a5f288bc0a
* | Merge "Fix construction order warning"Chris Craik2012-06-271-1/+1
|\ \
| * | Fix construction order warningChris Craik2012-06-261-1/+1
| | | | | | | | | | | | Change-Id: I39a170ce120e4ce5237e1cfc2b0e94cdb42c6124
* | | Improve the CPU upload path.Teng-Hui Zhu2012-06-266-17/+22
| | | | | | | | | | | | | | | | | | Swap the SkBitmap instead of a copy to save the memory bandwidth. Change-Id: I0998248a9a87ce4058898e66a4739995da9c003c
* | | Reduce number of operationsJohn Reck2012-06-265-31/+61
|/ / | | | | | | | | | | | | | | | | | | | | Don't record state changes that didn't actually change state Due to GraphicsContextAndroid::syncPlatformContext these 4 states are set before every draw call. This is cheap for PlatformContextSkia, as it detects that nothing has changed and so doesn't do anything. However, PlatformGraphicsContextRecording would always record these same 4 commands over and over again, which isn't efficient Change-Id: I386bcb91c7851824ed01de1856ce6f6a358f8eb4
* | Remove unneeded/unused operationsJohn Reck2012-06-251-51/+0
| | | | | | | | Change-Id: Ifc514b1cfc12298c65a6c553c749a7b35520de7b
* | am ff80940a: resolved conflicts for merge of 343fe48a to jb-dev-plus-aospJean-Baptiste Queru2012-06-251-9/+9
|\ \ | | | | | | | | | | | | * commit 'ff80940ae8358f49efbbb2d989b02e4b23dd1930': Accept-Language header is not updated when phone language changes
| * \ resolved conflicts for merge of 343fe48a to jb-dev-plus-aospJean-Baptiste Queru2012-06-251-9/+9
| |\ \ | | | | | | | | | | | | Change-Id: I9b3379ec26c3a0fb208b8cdd66a0b60088c1b01d
| | * \ Merge "Accept-Language header is not updated when phone language changes"Jean-Baptiste Queru2012-06-251-9/+9
| | |\ \
| | | * | Accept-Language header is not updated when phone language changesAnders Edenbrandt2012-06-211-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Java class WebSettings has accessor methods for User Agent and Accept-Language strings. These methods ensure that the values are updated if the Locale has changed. However, WebSettings.cpp in WebKit reads the private fields in WebSettings.java directly, and thereby fails to trigger the update. The correction is to use the appropriate accessor methods from WebSettings.cpp. Change-Id: Id1aa1f4de38d2a73cad9660afc35944c663dbd4a
* | | | | Enable RecordingContext by defaultJohn Reck2012-06-253-33/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance seems comparable to SkPicture already, and this makes it easier to iterate on fixing some of the problem areas Change-Id: I2e7b6b282e6b53ba2dc68d8a62b3b982f2b5838d
* | | | | Merge "Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS"George Mount2012-06-227-50/+0
|\ \ \ \ \
| * | | | | Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPSGeorge Mount2012-06-217-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an unused #define and code associated with it. This will smooth a possible future webkit merge. Framework change: Ibf046337cdabb9bee9cff8e3d77d9f69a59ecb15 Change-Id: I16d8c457a3f08996bc66401b241fe0db5a118975