summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r76408: Fix conflicts.Ben Murdoch2011-05-2313-239/+159
| | | | | | | | | | | | | | | | | | | | | Android.jscbindings.mk Conflict due to local addition of EntrySyncCustom.cpp and http://trac.webkit.org/changeset/76216 V8NPUtils.cpp Conflict due to local cherry pick of http://trac.webkit.org/changeset/78994 and merge of http://trac.webkit.org/changeset/76264 FrameView.h Conflict due to local addition of updatePositionedObjects() and http://trac.webkit.org/changeset/76278 RangeInputType.cpp SliderThumbElement.cpp Conflicts due to Android addition of touch handling code in slider code. See http://trac.webkit.org/changeset/76147 .gitignore - keep ours Change-Id: I38aeb361a37e7939f805c6689d7cc8fc720b3e52
* Merge WebKit at r76408: Fix Makefiles.Ben Murdoch2011-05-234-2/+4
| | | | Change-Id: I4d8928d488fb00050058569cf21e7d48e5d5c247
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231355-13430/+56258
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Fix position updateTeng-Hui Zhu2011-05-232-18/+15
| | | | | | | | | | | | We fixed two issues here. First, when fixed left/right both undefined, the renderlayer position already took the fix margin into consideration, so we don't need to compute that again. Second, for compute the fix element's ViewRect, we just need the normal width, not the overflow one. bug:4440999 Change-Id: I664c64688a89579f0023288185772c61b01c7cc8
*-. Reconcile with honeycomb-release honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ | | | | | | | | | Change-Id: Ib6fbd07827ffba629ed5a560c58e5d005f4d4c75
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-070-0/+0
| | |\
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-040-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-030-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-280-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | | |\
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | | |\ | | | |/ /
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-210-0/+0
| | | | |\ | | | |/ /
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-190-0/+0
| | | | |\
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-150-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-130-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | |\
| | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | | |\
| | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-050-0/+0
| | | | | | | |\
| | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-040-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-010-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-310-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-280-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * try faster dashingMike Reed2011-03-251-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we're drawing a horizontal line, try using a bitmap-shader to simulate the dash, as this can be much faster than the general SkDashPathEffect. bug:4163023 Change-Id: I362543d6efb83ebf395cbe92c2d889c590a7c2df
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-240-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-230-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-220-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Turns out args should not be decoded twice.Patrick Scott2011-03-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help out in some cases with redirect/login loops. Bug: 4110115 Change-Id: I42fff7e9227423b9b5ce94234ad6d606234fe252
| | | | | | | | | | | | | | | * Fix native crashNicolas Roard2011-03-212-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't save the extras in the picture when drawing. bug:4126884 bug:4132721 Change-Id: I52c46a33f847e64c1f8245a0bb84445a948d72a4
| | | | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-210-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Fix for missing invalsNicolas Roard2011-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4124433 Change-Id: I8cc7203dad408eff30da33f1c9a0a77dd7c97d66
| | | | | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-180-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * Fix Browser ANRNicolas Roard2011-03-173-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when attempting to forcefully destroy a texture in TilesManager::cleanupLayersTextures(), the call to LayerAndroid::removeTexture() may fail if the texture was busy being painted -- the call to BackedDoubleBufferedTexture::release() would return false, and the layer may thus still keep a pointer to the texture. But the release() call, while indicating it failed, was only delaying the release -- as soon as the texture was marked as not busy, it could set its owner to nil. We could thus have a situation where the layer did not reset its texture pointers because the owner of the texture was not yet changed, but the texture would then reset its owner to nil as soon as it was not busy painting. In TilesManager::cleanupLayersTexture() the next step before deleting a texture is to check that the texture does not have an owner -- but by then the texture could have been marked as not busy, and removed its owner, letting TilesManager destroying it. bug:3472320 Change-Id: I3bcf169b30dfacba1773d3b79a3c0d205bf3cbdb
| | | | | | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-170-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * Merge commit 'adff8fe3e93335625cc084a33dc0506581c2048d' into ↵The Android Automerger2011-03-161-0/+4
| | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1-release
| | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-160-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-150-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-140-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * | allow multiple invals to return first differenceCary Clark2011-03-112-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shape of the text selection changed recently, so the inval computation for the shape area was slightly incorrect. But most of the problem is caused by multiple calls to draw the selection area. The old assumption was that successive calls to compute the inval could each work from the prior state, since only the difference between the last inval and the current inval needs to be redrawn. Now, there are multiple calls to compute the area, and any of them need to return the last difference computed, only computing a new difference if the selection changed. Keep track of the last changed selection, so that the last position, the current position, and the last drawn position can be tracked correctly. bug:4073219 Change-Id: Ic9b9d037329e8f792b5ec09c112e665dbdfd0b81
| | | | | | | | | | | | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-110-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * | Fix for gmail messages not showing after the first one.Nicolas Roard2011-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were not resetting the unusable state (set by the clearView() function) when receiving new content... bug:4080072 Change-Id: Ie1110b511392b0a7fd21bbc23aa1b824eb8a78ad
| | | | | | | | | | | | | | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | |/ / /
generated by cgit v1.1 at 2024-12-23 09:01:20 +0000