summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | Make sure CanvasLayer isn't merged and is initialized correctlyJohn Reck2012-05-173-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6516775 Change-Id: Ifecddec18d369ba701668be85d4032918fc8d4fa
* | | | | | | | | | | am 4b0853e6: am 6af93dd2: Merge "Workaround double texture removal" into jb-devBart Sears2012-05-211-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b0853e65bc347632bd7b2d8ea77add39117db43': Workaround double texture removal
| * | | | | | | | | | am 6af93dd2: Merge "Workaround double texture removal" into jb-devBart Sears2012-05-171-1/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6af93dd239b6de08c9d86ee7a022148fb5a06643': Workaround double texture removal
| | * | | | | | | | | Merge "Workaround double texture removal" into jb-devBart Sears2012-05-171-1/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Workaround double texture removalChris Craik2012-05-171-1/+5
| | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6463659 Change-Id: I5e98357f09d1a5e7f6e91c3a72728981b58c4185
* | | | | | | | | | | am 7faf7cc9: am 9b0772e7: Fix repaint glitches on merged layersNicolas Roard2012-05-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7faf7cc97e11331eff9a1c790354e9a011b87dfb': Fix repaint glitches on merged layers
| * | | | | | | | | | am 9b0772e7: Fix repaint glitches on merged layersNicolas Roard2012-05-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b0772e730f6ddda6199c42de267fc7742716c00': Fix repaint glitches on merged layers
| | * | | | | | | | | Fix repaint glitches on merged layersNicolas Roard2012-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6502237 Change-Id: I62f296d429dcf4917ff2e93029022a7ab2cf3fd6
* | | | | | | | | | | am afa83dc9: am 377dc9f6: Fix invalidations sent to frameworkNicolas Roard2012-05-2112-19/+57
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'afa83dc9a969a65309ddc3ad75c53e3f27e4c27b': Fix invalidations sent to framework
| * | | | | | | | | | am 377dc9f6: Fix invalidations sent to frameworkNicolas Roard2012-05-1712-19/+57
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '377dc9f6b46a2ac0f968d9ee8d3c7916f3bf6904': Fix invalidations sent to framework
| | * | | | | | | | | Fix invalidations sent to frameworkNicolas Roard2012-05-1712-19/+57
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6479200 bug:6323847 bug:4124445 Change-Id: I1a4058ba6c69d3e285b6274d99a6eafcbf1cdc6f
* | | | | | | | | | am c328457e: am 37df6b06: Merge "Fix mouse nudging in hit test" into jb-devJohn Reck2012-05-211-13/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c328457e578cf0c594ef7db2259754d3ee0b1fcd': Fix mouse nudging in hit test
| * | | | | | | | | am 37df6b06: Merge "Fix mouse nudging in hit test" into jb-devJohn Reck2012-05-171-13/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37df6b06a8481e3608cff1718038d353a8733d6c': Fix mouse nudging in hit test
| | * | | | | | | | Merge "Fix mouse nudging in hit test" into jb-devJohn Reck2012-05-171-13/+20
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix mouse nudging in hit testJohn Reck2012-05-171-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6490959 Change-Id: I3b9c17a69d15983093047b31d950c16894f6cd24
* | | | | | | | | | | am d8c854e5: am 824ebef6: Merge "Fix the tile dirty and framework inval when ↵Teng-Hui Zhu2012-05-215-23/+82
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in single Surface mode" into jb-dev * commit 'd8c854e53633cfc2d72a89fe3eae1bf2274dedc7': Fix the tile dirty and framework inval when in single Surface mode
| * | | | | | | | | | am 824ebef6: Merge "Fix the tile dirty and framework inval when in single ↵Teng-Hui Zhu2012-05-175-23/+82
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Surface mode" into jb-dev * commit '824ebef65508846b8155ad893f40f6fd145e3c13': Fix the tile dirty and framework inval when in single Surface mode
| | * | | | | | | | | Merge "Fix the tile dirty and framework inval when in single Surface mode" ↵Teng-Hui Zhu2012-05-175-23/+82
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | into jb-dev
| | | * | | | | | | | Fix the tile dirty and framework inval when in single Surface modeTeng-Hui Zhu2012-05-175-23/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6457191 Change-Id: Icaef168e16aa26c9a09c6f99e5a498fc1948d2bc
* | | | | | | | | | | am 52499cf3: am c6097fa8: Merge "Check layer state before dereferencing" ↵Chris Craik2012-05-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '52499cf37d4d6b13e4c8a8cde4e4058dcd77aa49': Check layer state before dereferencing
| * | | | | | | | | | am c6097fa8: Merge "Check layer state before dereferencing" into jb-devChris Craik2012-05-171-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6097fa86138b3dc74b91e12017cfab615fa0f38': Check layer state before dereferencing
| | * | | | | | | | | Merge "Check layer state before dereferencing" into jb-devChris Craik2012-05-171-1/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Check layer state before dereferencingChris Craik2012-05-171-1/+3
| | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6509226 Change-Id: Ie64bc2d92ddb2f323b20fa5bc8d1385dcb0e04c1
* | | | | | | | | | | am 542a48a7: am 7dcc872e: Merge "Fix crash in ↵Mangesh Ghiware2012-05-211-16/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderLayerCompositor::updateCompositingLayers" into jb-dev * commit '542a48a7e2e89800bf476fbd63ca6427f01f0eb3': Fix crash in RenderLayerCompositor::updateCompositingLayers
| * | | | | | | | | | am 7dcc872e: Merge "Fix crash in ↵Mangesh Ghiware2012-05-171-16/+19
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderLayerCompositor::updateCompositingLayers" into jb-dev * commit '7dcc872e6ac009998881a3dcb6804e5d237097f8': Fix crash in RenderLayerCompositor::updateCompositingLayers
| | * | | | | | | | | Merge "Fix crash in RenderLayerCompositor::updateCompositingLayers" into jb-devMangesh Ghiware2012-05-171-16/+19
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fix crash in RenderLayerCompositor::updateCompositingLayersMangesh Ghiware2012-05-171-16/+19
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear the composited mode for layers before running the loop to mark the ones following a fixed layer as composited. This fixes the scenario where a layer switches between fixed and not, but the layers following it have an inconsistent compositing mode. Bug: 6417235 Change-Id: Ifa57ec482d4570a7798663fa0c6dc6c60839f5f6
* | | | | | | | | | am c085b5fe: am 02085505: Merge "Track where we want to click the mouse ↵John Reck2012-05-212-6/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | independently" into jb-dev * commit 'c085b5fefdf5cbd9a203f11ce239ee0dce48ec1d': Track where we want to click the mouse independently
| * | | | | | | | | am 02085505: Merge "Track where we want to click the mouse independently" ↵John Reck2012-05-172-6/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '020855054c167ec65720853fff4116f51d6e6f31': Track where we want to click the mouse independently
| | * | | | | | | | Merge "Track where we want to click the mouse independently" into jb-devJohn Reck2012-05-172-6/+16
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Track where we want to click the mouse independentlyJohn Reck2012-05-162-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6490959 Change-Id: I920167cb16723f63132ecdb5581fb7a19e4461dd
* | | | | | | | | | Consider fixed layers when scrolling the edit box.George Mount2012-05-181-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6147580 Framework Change: Idaa538824e611acd64eb5a4ccb7866d3c978a077 Change-Id: I810891decf0bad682e90f29f0f65c6b765b7d6d6
* | | | | | | | | | Merge changes I2de9dfed,I80436e37Steve Block2012-05-1811-69/+70
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Move GeolocationServiceBridge to WebKit/android/jni and extract Listener interface GeolocationPermissions cleanup
| * | | | | | | | | | Move GeolocationServiceBridge to WebKit/android/jni and extract Listener ↵Steve Block2012-05-186-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface Also modify GeolocationServiceBridge to take a WebViewCore rather than a Frame. This will simplify the transition to client-based implementation, which will re-use GeolocationServiceBridge. No functional change. Bug: 6511338 Change-Id: I2de9dfed51d785c85b40f362f20189f208adf6ec
| * | | | | | | | | | GeolocationPermissions cleanupSteve Block2012-05-185-31/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid the need to pass the main frame to GeolocationPermissions. This can be determined from the WebViewCore. - Call GeolocationPermissions::maybeStorePermanentPermissions() directly from WebViewCore to avoid the need for a ChromeClient method. No functional change. Bug: 6511338 Change-Id: I80436e3728080338199a632890a64e573a658bba
* | | | | | | | | | | am e0712714: am ed2ce36a: Allow more layers to be merged (merging fixed)Nicolas Roard2012-05-179-33/+46
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0712714e35eede5ffdaadef529d9919005d0825': Allow more layers to be merged (merging fixed)
| * | | | | | | | | | am ed2ce36a: Allow more layers to be merged (merging fixed)Nicolas Roard2012-05-169-33/+46
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed2ce36a1fac9f85b65edf34a1c241c2f73d806c': Allow more layers to be merged (merging fixed)
| | * | | | | | | | | Allow more layers to be merged (merging fixed)Nicolas Roard2012-05-169-33/+46
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will reduce the need to go to single surface rendering mode, as well as improving jank by reducing the number of surfaces we need. (tested on a set of popular sites, we now need up to 16 times less surfaces, commonly 4-5 times less) bug:5683630 bug:6499283 bug:6366440 Change-Id: I761c6a60279e5b21dca8bc1faccd956be58e3702
* | | | | | | | | | Merge "Turn off autohinting at HDPI"Billy Hewlett2012-05-171-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Turn off autohinting at HDPIBilly Hewlett2012-05-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6478362 Change-Id: I9734658a509010035eb3081be8affb609863d46c
* | | | | | | | | | | Add WEBKIT_MERGE_REVISIONBen Murdoch2012-05-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that ThirdPartyProject.prop was removed, revert to the old way of tracking our webkit merge revision. See I5384206c478da146a7fbd5333bfb3227d9c042e4 for removal. Change-Id: I8a8eb4797158e6d18e50bf65f3bd0c9b5c79835c
* | | | | | | | | | | am dd2e1637: am 7b17ee7d: Merge "Revert "Fix crash in ↵Teng-Hui Zhu2012-05-161-7/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderLayerCompositor::updateCompositingLayers"" into jb-dev * commit 'dd2e1637bc1cf728ea0d87f0feb390f60d1ecc37': Revert "Fix crash in RenderLayerCompositor::updateCompositingLayers"
| * | | | | | | | | | am 7b17ee7d: Merge "Revert "Fix crash in ↵Teng-Hui Zhu2012-05-161-7/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderLayerCompositor::updateCompositingLayers"" into jb-dev * commit '7b17ee7dc951f404d93a458a61884d5c1bf6e40f': Revert "Fix crash in RenderLayerCompositor::updateCompositingLayers"
| | * | | | | | | | | Merge "Revert "Fix crash in RenderLayerCompositor::updateCompositingLayers"" ↵Teng-Hui Zhu2012-05-161-7/+2
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | into jb-dev
| | | * | | | | | | | Revert "Fix crash in RenderLayerCompositor::updateCompositingLayers"Teng-Hui Zhu2012-05-161-7/+2
| | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6505453 This reverts commit 87431609180dfb277a94cb8b81554e8bd2ef355d.
* | | | | | | | | | am e6df58a2: am f0acbad2: Merge "Revert "Allow more layers to be merged."" ↵John Reck2012-05-164-15/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'e6df58a2ee3da14d6260378eed1d716f3b4eacb8': Revert "Allow more layers to be merged."
| * | | | | | | | | am f0acbad2: Merge "Revert "Allow more layers to be merged."" into jb-devJohn Reck2012-05-164-15/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0acbad2f51b0bd62dbc427b4f2fdc97e233edb9': Revert "Allow more layers to be merged."
| | * | | | | | | | Merge "Revert "Allow more layers to be merged."" into jb-devJohn Reck2012-05-164-15/+19
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Revert "Allow more layers to be merged."Chris Craik2012-05-164-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing content to go missing. bug:6504906 This reverts commit 0b072353e2ad89087c944dfb4acb1eff87bbac49
* | | | | | | | | | | am 9b4d5d5e: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b4d5d5e61a9cb6ac863835ed836abab0d4f88e2': Ensure getFavicon() does not return uninitialized bitmaps. Don't create a new functor if old one exists Follow the new rule from framework about EGLContext deletion Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash" Revert "Turn on Fence sync for transfer queue." Revert "simplify texture generation filters"