summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r78450: Fix conflicts in media controlsSteve Block2011-05-255-421/+55
| | | | | | | Conflict due to Android modifications to handle touch events. See http://trac.webkit.org/changeset/76950 Change-Id: I499d66319614af4bc23f1c0f89f072b814503703
* Merge WebKit at r78450: Fix MakefilesSteve Block2011-05-246-124/+17
| | | | | | PCRE switched for YARR - http://trac.webkit.org/changeset/78042 Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-242801-41565/+187031
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()Steve Block2011-05-241-1/+4
| | | | | Bug: 4461705 Change-Id: I0facda892e16e1b626964b032cf337c29f0d3364
* Merge WebKit at r76408: Update ThirdPartyProject.propBen Murdoch2011-05-231-2/+2
| | | | | | Update merge revisions. Change-Id: I1ffb3ef0f49409fd2a815c1eb06de57889a83820
* Merge WebKit at r76408: Fix Bridge.hBen Murdoch2011-05-2341-42/+42
| | | | | | | | Cherry pick of upstream http://trac.webkit.org/changeset/79988 Needed now due to FastAllocBase and Noncopyable changes in this merge. Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
* Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()Ben Murdoch2011-05-233-5/+5
| | | | | | | | As of http://trac.webkit.org/changeset/76291 RenderLayer::scrollToOffset only takes two parameters (the x and y offset). Update our callsites to reflect this. It seems safe to disregard the booleans. Change-Id: I63bc103e4fc961968055770792aead82be82435a
* Merge WebKit at r76408: Fix EventHandlerAndroid.cppBen Murdoch2011-05-231-3/+0
| | | | | | | | | See http://trac.webkit.org/changeset/76248 which introduced an include of Clipboard.h, causing the real definition of WebCore::Clipboard to be included in EventHandlerAndroid.cpp. Remove the stub that was there. Change-Id: I5bc04bf573aa1da19cbdd282d3611f571e46c6fa
* Merge WebKit at r76408: Fix FontAndroid.cppBen Murdoch2011-05-231-0/+1
| | | | | | | | | | TextRun.h was removed as an include from Font.h. This is where FontAndroid was picking it up from. Add it into FontAndroid.cpp. See http://trac.webkit.org/changeset/76170 Change-Id: I2d1306fde1742a2e75cb7b47c2a0ad132939258c
* Merge WebKit at r76408: Rename syncCompositingStateRecursive()Ben Murdoch2011-05-231-1/+1
| | | | | | | | | FrameView::syncCompositingStateRecursive() was rename to FrameVuew::syncCompositingStateIncludingSubframes() See http://trac.webkit.org/changeset/76196 Change-Id: I615cc9cccee03ac5259079aea47494746b586b25
* Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBaseBen Murdoch2011-05-237-5/+14
| | | | | | | | | | | | | | | | Upstream now uses macros rather than inheritance for classes declard Noncopyable or Fast Allocated. Note that in the case of PluginTimer and ClipboardAndroid we now need to explicitly declare them fast allocated. This is because previously they got the fast allocated methods through a common superclass (FastAllocBase) but now both parents provide implementations, so there is an ambiguity the compiler cannot resolve. See http://trac.webkit.org/changeset/76248 Change-Id: I186e3fd36bde2074d34f453983d48e8fc223f420
* Merge WebKit at r76408: Fix ImageBufferAndroid.Ben Murdoch2011-05-231-0/+5
| | | | | | | Implement missing dataSize function introduced in http://trac.webkit.org/changeset/76371 (JSC only) Change-Id: Ie9a714cdb41894ceb2d928b6e42ed6a41d8d04a7
* 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
| | | | | | | | | | | | | | | | | |\
generated by cgit v1.1 at 2025-05-31 06:04:46 +0000