summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge "Improve the CPU upload path."Teng-Hui Zhu2012-06-266-17/+22
|\ \ \
| * | | 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
* | | | am ceeb4309: Reconcile AOSP master and JellyBeanJean-Baptiste Queru2012-06-260-0/+0
|\ \ \ \ | |/ / / |/| | | | | | | * commit 'ceeb43093b8e721dfe6671d7da44c1d1fd6f6ed8':
| * | | Reconcile AOSP master and JellyBeanJean-Baptiste Queru2012-06-260-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I4bc0b90d3078b9eaebe8fc08eda767767dc68dd9
| | * \ \ Reconcile AOSP master and JellyBeanJean-Baptiste Queru2012-06-260-0/+0
| | |\ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I7c9f8c596ec815bc110922acccbb346aa7cbb2bf
* | | | | 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
* | | | | | Merge "Remove updateTextfield for changing passwords."George Mount2012-06-226-26/+11
|\ \ \ \ \ \
| * | | | | | Remove updateTextfield for changing passwords.George Mount2012-06-206-26/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UI no longer needs to know about password field changes as it is not required like it was with the removed WebTextView. Change-Id: I16a6bb44c31c83c5c3e9cb70f2bc865d5eb2732c
* | | | | | am 2b5c39f5: Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | * commit '2b5c39f5942d6b9b0a85d460f941ed419452e696':
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I4a99d2d262440ec6b6e1c6eed220a9e7cd2ae518
| | * \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| | | |\ \ \ \ \
* | | | \ \ \ \ \ am 67169ebc: am 8ac8b3f2: Merge "Make viewport dirtyness calculations ↵Chris Craik2012-06-211-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recursive" into jb-dev * commit '67169ebc1651937450492ebea558fedda74ca50a': Make viewport dirtyness calculations recursive
| * | | | | | | | am 8ac8b3f2: Merge "Make viewport dirtyness calculations recursive" into jb-devChris Craik2012-06-211-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ac8b3f2e5f239eb5068c9a5ac17dae28cceec8b': Make viewport dirtyness calculations recursive
| | * | | | | | | Merge "Make viewport dirtyness calculations recursive" into jb-devChris Craik2012-06-211-0/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Make viewport dirtyness calculations recursiveChris Craik2012-06-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a layer marks the viewport dirty, it should mark all of its children as well, since they likely have also moved. bug:6547356 Change-Id: I0db2704f35e7c8a78108d6ed8372201a7f025994
* | | | | | | | | am 74b2988a: am c6d9134e: Don\'t allow layers that draw via drawGL to merge ↵Chris Craik2012-06-213-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with other surfaces * commit '74b2988a2845cac809d74813fde4e38b2f455431': Don't allow layers that draw via drawGL to merge with other surfaces
| * | | | | | | | am c6d9134e: Don\'t allow layers that draw via drawGL to merge with other ↵Chris Craik2012-06-213-2/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surfaces * commit 'c6d9134e49f290332ca788d10104749a37e9a727': Don't allow layers that draw via drawGL to merge with other surfaces
| | * | | | | | | Don't allow layers that draw via drawGL to merge with other surfacesChris Craik2012-06-203-2/+6
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6694807 They don't paint onto surfacebackings, and draw afterward, so ordering issues occur. Ideally, they should still be allowed to merge onto surfaces and not allow other painting layers to join the surface afterward, but this shouldn't be wasteful in practice. Change-Id: I7a8764bc2b8e531e718602c6114b027a9dbce42d
* | | | | | | | Merge "Use Elegant fonts for Webkit, Compact fonts for Textview"Victoria Lease2012-06-211-62/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Use Elegant fonts for Webkit, Compact fonts for TextviewBilly Hewlett2012-06-211-62/+11
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts can be marked with elegant or compact in fallback_fonts.xml. Webkit uses elegant fonts, Textview uses compact fonts (the default), unmarked fonts are used by both. Bug: 6649136 Change-Id: I55c828c86c3d315d453ddaca05657b0660561eb4
* | | | | | | | Merge "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""Billy Hewlett2012-06-211-10/+62
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"Billy Hewlett2012-06-211-10/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 923ddf3b72d64d0ed87d7132fba048dcafcaa498
* | | | | | | | | Merge "Remove unused ANDROID_STYLE_VERSION"George Mount2012-06-214-33/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused ANDROID_STYLE_VERSIONGeorge Mount2012-06-204-33/+0
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANDROID_STYLE_VERSION was introduced to help with performance of NavCache. Since removal of NavCache, this is unnecessary. Change-Id: I8ebb4f4830f855961ca9c9cdb0ef300d057091de
* | | | | | | | | Merge "Use Elegant fonts for Webkit, Compact fonts for Textview"Victoria Lease2012-06-211-62/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Use Elegant fonts for Webkit, Compact fonts for TextviewBilly Hewlett2012-06-181-62/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts can be marked with elegant or compact in fallback_fonts.xml. Webkit uses elegant fonts, Textview uses compact fonts (the default), unmarked fonts are used by both. Bug: 6649136 Change-Id: Ib131a4279fb3c13a44ff37d45b2b736274fa5042
* | | | | | | | am 50034a4c: am 903d2ec9: Merge "Don\'t use deleted Node object in ↵Jean-Baptiste Queru2012-06-201-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setSizeScreenWidthAndScale" * commit '50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac': Don't use deleted Node object in setSizeScreenWidthAndScale
| * | | | | | | am 903d2ec9: Merge "Don\'t use deleted Node object in ↵Jean-Baptiste Queru2012-06-201-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setSizeScreenWidthAndScale" * commit '903d2ec97b2ac9cf4f50fc3d7f9e503611bce470': Don't use deleted Node object in setSizeScreenWidthAndScale
| | * | | | | | Merge "Don't use deleted Node object in setSizeScreenWidthAndScale"Jean-Baptiste Queru2012-06-201-1/+1
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Don't use deleted Node object in setSizeScreenWidthAndScaleMattias Falk2012-06-191-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to forceLayout may cause the Node object to be deleted. Avoid crash by check that the Node object is still valid when forceLayout has returned. Change-Id: Ieb74a59ca7f2e457b3b17d01bcb02cd566f84ef2
* | | | | | | Merge "Pin renderers to threads instead of tiles"Chris Craik2012-06-2012-53/+56
|\ \ \ \ \ \ \
| * | | | | | | Pin renderers to threads instead of tilesChris Craik2012-06-1912-53/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move thread local bitmaps to renderers, so the renderers own them, and can perform optimizations. Change-Id: I60d604759f4ce2ec9981990d1613eaf23cd1e625
* | | | | | | | Merge "Support recording context in PicturePile"John Reck2012-06-194-70/+108
|\ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-21 03:24:15 +0000