summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | resolved conflicts for merge of 5d8f08b9 to masterRussell Brenner2011-11-101-10/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / Change-Id: Idc88ff5f613a7c8f771b067f4a01967a32ede276
| * | | | | | Merge "Fix font size handling for harfbuzz hack" into ics-mr1Russell Brenner2011-11-091-10/+15
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix font size handling for harfbuzz hackRussell Brenner2011-11-081-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complex languages (Arabic, Thai, etc.) currently need to override the base font (e.g. Roboto) with an explicitly loaded copy of the right fallback font (e.g. DroidNaskh). To keep from running out of file descriptors, a caching mechanism was put in place, but the cached data contained the font size, so the first size seen on the page was applied to all subsequent renderings of that font, regardless of the size requested. Size is now also considered in the cache. Bug: 5509443 Change-Id: I616954980122e89da14ce86efe99d5e4343a40c2
* | | | | | | am 7c7fadae: Merge "Add support for Bengali and Tamil gpos/gsub tables" into ↵Russell Brenner2011-11-101-13/+23
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '7c7fadaed03fc262d86394fc08ae3948ebc904e1': Add support for Bengali and Tamil gpos/gsub tables
| * | | | | | Merge "Add support for Bengali and Tamil gpos/gsub tables" into ics-mr1Russell Brenner2011-11-091-13/+23
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Add support for Bengali and Tamil gpos/gsub tablesRussell Brenner2011-11-091-13/+23
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HB_Script_Bengali and HB_Script_Tamil are now recognized in FontAndroid.cpp and map to Lohit-Bengali.ttf and Lohit-Tamil.ttf, allowing Harfbuzz to properly load the gpos/gsub tables for those languages. Bug: 5578901 Change-Id: I20ed542dd5a616535222dcb5c808f3716a062e80
* | | | | | am 6b0ab97a: (-s ours) Merge "Revert crash on bad scale - do not merge" into ↵Bart Sears2011-11-100-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '6b0ab97afc8596ad2a5579ce6c6b6ef992ba6c0a': Revert crash on bad scale - do not merge
| * | | | | Merge "Revert crash on bad scale - do not merge" into ics-mr1Bart Sears2011-11-081-3/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Revert crash on bad scale - do not mergeBart Sears2011-11-081-3/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5367327 Cherry pick of: dc193f393a845e88f55ecf0055386fc4e4204537 Change-Id: Iea6e4a564fc003d8e2ad8e1d6d9d9b64d016e43d
* | | | | am c97291b2: Merge "Add necessary null pointer check to avoid crash on ↵Teng-Hui Zhu2011-11-101-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | youtube video" into ics-mr1 * commit 'c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90': Add necessary null pointer check to avoid crash on youtube video
| * | | | Merge "Add necessary null pointer check to avoid crash on youtube video" ↵Teng-Hui Zhu2011-11-081-0/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | into ics-mr1
| | * | | Add necessary null pointer check to avoid crash on youtube videoTeng-Hui Zhu2011-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | bug:5562347 Change-Id: I9b53a58137d70955bde5334c7c8b581343a8c2ce
* | | | | Offset scroll area by the scroll origin on AndroidGeorge Mount2011-11-093-11/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5268793 The scrolled area for WebView is 0,0 - maxX,maxY while ScrollView can have any origin. On RTL pages, the origin is negative when it can scroll. This scrolls the page to the right when it detects an RTL page. Framework CL: I2537b84a Change-Id: I6a91b97f90f5ba4c323c56dda9d125108d9502c4
* | | | | Part of fix for bug 5584571 Add HTTP request header with app nameKristian Monsen2011-11-092-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the app package name from JNI. Cache the string after the first call. Add a header to every request with: X-Requested-With: com.package.name Change-Id: If9d8c131f6c4203036678516ccae6a7ec9131df9
* | | | | am b15d3e9d: Merge "Fix extras clipping" into ics-mr1John Reck2011-11-082-3/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b15d3e9d4201362f2617955b89fbd88ecbeb06c4': Fix extras clipping
| * | | | Merge "Fix extras clipping" into ics-mr1John Reck2011-11-072-3/+2
| |\ \ \ \
| | * | | | Fix extras clippingJohn Reck2011-11-072-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5556494 Change-Id: I82e8282271dfc623afa9b1ef0d0061ca9c3df5f4
* | | | | | am 00d524fd: Merge "Change the default webView behavior to minimize the ↵Teng-Hui Zhu2011-11-074-6/+26
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory consumption" into ics-mr1 * commit '00d524fd5dc3e995e2b517da48e479694260ce2f': Change the default webView behavior to minimize the memory consumption
| * | | | | Merge "Change the default webView behavior to minimize the memory ↵Teng-Hui Zhu2011-11-074-6/+26
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / consumption" into ics-mr1
| | * | | Change the default webView behavior to minimize the memory consumptionTeng-Hui Zhu2011-11-074-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, we just limit the expansion on x and y direction. In the future, we need to dynamically allocate and deallocate the memory. browser change is : c/148242 bug:5522175 Change-Id: I8562c39c55913ab89848afe8a36e8a2784c12727
* | | | | am 82ccbd8c: Remove the global button lockJohn Reck2011-11-0711-296/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '82ccbd8ce95211b4b5afad6a653462fd3beb771b': Remove the global button lock
| * | | | Remove the global button lockJohn Reck2011-11-0711-296/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 5558699 Bug: 5572238 Change-Id: Ic199ffda5bc4aa09d39ee54221c6fcce6a91ca05
* | | | am 54464c40: Merge "Doesn\'t lock the entire drawing..." into ics-mr1Nicolas Roard2011-11-073-5/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '54464c408c893079c1486aec03329f1de8ec6a29': Doesn't lock the entire drawing...
| * | | Merge "Doesn't lock the entire drawing..." into ics-mr1Nicolas Roard2011-11-073-5/+9
| |\ \ \
| | * | | Doesn't lock the entire drawing...Chris Craik2011-11-043-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused us to potentially waiting on the completion of a tile painting. On sites where skia struggle with, this had a large impact on scrolling performances. This is only part one of the solution -- we need to also get rid of the global button lock. We also lower the priority of the texture gneeration thread. bug:5558699 Change-Id: I251354d6cabb2fd7ebfd665c30eff7fe90c3d316
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: I714b979c375d557f9ff0f9285134998b2fd8bb08
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-060-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | am ea916557: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | * commit 'ea9165575f272fb29379a4fb2d0b4f1a032e37b8':
| * | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-070-0/+0
| |\ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: If02ce708d74c5d627e4e6f83cfc5ee003fb42b58
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-040-0/+0
| | |\ \ \
* | | \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Change-Id: Ia8abb9480bf69481e9df3134f81af548b4e1649b
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-010-0/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-260-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-200-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | Revert "Support "Vertical Writing Mode"."John Reck2011-10-126-61/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5403113c5aa5d55a05ea001f562829e907632178
| | | | | | | | | | * | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-120-0/+0
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-040-0/+0
| | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \
generated by cgit v1.1 at 2024-07-31 08:03:15 +0000