summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Tap to play/pause for html5 video with UI"Teng-Hui Zhu2011-12-132-7/+3
|\
| * Tap to play/pause for html5 video with UITeng-Hui Zhu2011-12-132-7/+3
| | | | | | | | | | | | bug:4232704 Change-Id: Ice99bc0fa19de93627fe8ffb91085838fa682315
* | Merge "Removed computeCursorRings."Victoria Lease2011-12-131-3/+0
|\ \
| * | Removed computeCursorRings.Victoria Lease2011-12-121-3/+0
| | | | | | | | | | | | | | | | | | As a result of the fix for 5688027, computeCursorRings is no longer used. Change-Id: I4e7f06067608e283d327a8abc09b42de7a9b83d2
* | | Merge "update callback mechanism, adds nativeDiscardAllTextures for ↵Chris Craik2011-12-131-8/+17
|\ \ \ | |/ / |/| | | | | TileBenchmark tool"
| * | update callback mechanism, adds nativeDiscardAllTextures for TileBenchmark toolChris Craik2011-12-131-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | bug:5062896 Depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/154844/ Change-Id: I8e5101fa212568837fe002b14fb9171c2f6dfe22
* | | Merge "Removed ConstructPartRects()."Victoria Lease2011-12-121-104/+3
|\ \ \ | |/ / |/| |
| * | Removed ConstructPartRects().Victoria Lease2011-12-121-104/+3
| | | | | | | | | | | | | | | | | | | | | | | | bug: 5688027 This function was producing incorrect bounds. WebKit's bounds are preferable. Change-Id: I2458a149bcb284b29a45972bb46e5c1cb09c0c66
* | | Merge "Fix use of LOG_VERBOSE in WebHistory"Steve Block2011-12-121-18/+18
|\ \ \ | |/ / |/| |
| * | Fix use of LOG_VERBOSE in WebHistorySteve Block2011-12-121-18/+18
| | | | | | | | | | | | | | | | | | | | | This fixes the debug build. See https://android-git.corp.google.com/g/#/c/150512 Change-Id: Id85c11788c2ad913f8826aa55f49f25401b7ee42
* | | am aa816687: Merge "Prevent native crashes on client cert request" into ics-mr1Selim Gurun2011-12-092-11/+12
|\ \ \ | | | | | | | | | | | | | | | | * commit 'aa81668752d33ae7a345626ab61f1ea9fc931392': Prevent native crashes on client cert request
| * \ \ Merge "Prevent native crashes on client cert request" into ics-mr1Selim Gurun2011-12-082-11/+12
| |\ \ \
| | * | | Prevent native crashes on client cert requestSelim Gurun2011-12-072-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4586251 Explicitly manage ref counter for WebUrlLoaderClient. This will prevent early release of the object. Change-Id: I4b8e41b470eaacb594ce85afdd650e7827ab4a6d
* | | | | am 1d9cab1b: Merge "Fix crash" into ics-mr1John Reck2011-12-071-3/+6
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit '1d9cab1bc5a505a47c7a314699520dcd56ee9d4f': Fix crash
| * | | Fix crashJohn Reck2011-12-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5727901 Change-Id: Ic2323eca6bc6e77fe428f3602800799e7b996cce
* | | | am 5b792777: Remove unneeded PictureSet clearNicolas Roard2011-12-061-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5b7927778dc52a2279927acdbef479ca994c843e': Remove unneeded PictureSet clear
| * | | Remove unneeded PictureSet clearNicolas Roard2011-12-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | bug:5720732 Change-Id: Iaf3a41adaa0799867a615b42d1d603aca3c8e35d
* | | | am c8ec6fac: Merge "Support spellcheck on text areas" into ics-mr1John Reck2011-12-061-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c8ec6fac3055c0cb85047eb31c7c6459d28aa1c4': Support spellcheck on text areas
| * | | Merge "Support spellcheck on text areas" into ics-mr1John Reck2011-12-061-0/+1
| |\ \ \
| | * | | Support spellcheck on text areasJohn Reck2011-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5719053 Change-Id: I5f69e411d2ade2eaaf5c9e9e39dc8dc7d23425f1
* | | | | am 1d71a5f4: Merge "Don\'t deep copy animations, prepare animations on both ↵Chris Craik2011-12-061-3/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | trees" into ics-mr1 * commit '1d71a5f4405639dece648eda291ab6a2aecbb968': Don't deep copy animations, prepare animations on both trees
| * | | | Don't deep copy animations, prepare animations on both treesJohn Reck2011-12-051-3/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5699085 Previously, animations were copied along with layer trees from the webkit to UI thread. This changes that to instead use a single object per animation with refcounting so that animations are kept consistent. Additionally, animations are now run on both the painting and drawing trees in the tree manager so that animated content clipped correctly during a tree swap. Change-Id: I79f0c0e47b717f9fdddf303eb7ec29efc4950aaf
* | | | Remove inFullScreenMode JNI call during drawGL call.George Mount2011-12-051-16/+2
| |_|/ |/| | | | | | | | | | | | | | | | | Bug 5629367 Corresonding Framework change: Icc2fb6b7 Change-Id: Ia6f116362107243f472401a1d6361a72e88832a5
* | | am f4bc9879: Merge "Maintain UI-side start times for animations in SW ↵Chris Craik2011-12-021-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | rendering mode" into ics-mr1 * commit 'f4bc9879b9e1ae40df3ef8165b7d6804184b8499': Maintain UI-side start times for animations in SW rendering mode
| * | Maintain UI-side start times for animations in SW rendering modeChris Craik2011-12-021-0/+3
| | | | | | | | | | | | | | | bug:5704428 Change-Id: I1d1d1f214642b6ff868e8425778565686bfe8b69
* | | Merge "Fix init and cleanup of WebCookieJar."Selim Gurun2011-12-022-8/+2
|\ \ \
| * | | Fix init and cleanup of WebCookieJar.Selim Gurun2011-12-022-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential race condition due to reordering of stores in init. Fix cleanup of leftover files. Both of these were introduced during fix for "Defer CookieManager initialization". https://android-git.corp.google.com/g/#/c/152972/3 BUG: 5253777 Change-Id: Ib90debe39f009d178b3183c79949fb0f4a18fdb3
* | | | am f286c7d3: Merge "Scroll position now passed to all layers" into ics-mr1Chris Craik2011-12-011-0/+9
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit 'f286c7d338f3c0f398ee27abe1d37d670c51dbbb': Scroll position now passed to all layers
| * | Merge "Scroll position now passed to all layers" into ics-mr1Chris Craik2011-12-011-0/+9
| |\ \
| | * | Scroll position now passed to all layersChris Craik2011-12-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5666027 Previously, only the most recent version of the scrollablelayerandroid would have its position updated. This caused issues with position inconsistency between the painting and drawing version of the layer, if both existed. Change-Id: Ife29ae4e2cb00fbaa2f6fc95d9914b3434862f10
* | | | am f1a22119: Merge "Fix image layer codepath" into ics-mr1Nicolas Roard2011-12-011-20/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f1a221194f2b0d5fd82d2e98ced94f0553c45986': Fix image layer codepath
| * | | Merge "Fix image layer codepath" into ics-mr1Nicolas Roard2011-12-011-20/+4
| |\ \ \
| | * | | Fix image layer codepathNicolas Roard2011-11-301-20/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - asynchronous loading - support for tiled content using TiledTexture - fix repaint/duplication bugs - share same textures as layers - disambiguate between images by computing a CRC code - added better debugging in TilesManager/ClassTracker to track memory usage bug:5661120 bug:5572134 bug:5521718 Change-Id: Id422fb991d6233bbe4dc6e5c3c7409468b7dca98
* | | | am 87f8fc15: Merge "add support for WebTextView on scrolling layers" into ↵Bart Sears2011-11-301-0/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '87f8fc15a0e59f6d88c57f390697ba1c5bbaa6c3': add support for WebTextView on scrolling layers
| * | | add support for WebTextView on scrolling layersMichael Kolb2011-11-301-0/+11
| |/ / | | | | | | | | | | | | | | | Bug: 5677828 Change-Id: I22ecf16c79badab68d8305d2e040057d73b02bea
| * | Merge "DO NOT MERGE Use unsigned length when reading data" into ics-mr1Russell Brenner2011-11-301-1/+1
| |\ \
| | * | DO NOT MERGE Use unsigned length when reading dataRussell Brenner2011-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a signed length, invalid negative sizes can bypass data limit checks of the type: if (data + length < end) With an unsigned length, absurdly large lengths will now trigger an early exit instead of following through into the decoding routine with a bad length. Bug: 5143832 Change-Id: I8e4a8d357ee04a36e35ab47d538ce57088734ccf
* | | | am 807ee5ec: Merge "synchronize animation starts with webkit" into ics-mr1Chris Craik2011-11-303-10/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '807ee5ec662a7864dee505040ade9a9b3eab143c': synchronize animation starts with webkit
| * | | Merge "synchronize animation starts with webkit" into ics-mr1Chris Craik2011-11-293-10/+29
| |\ \ \ | | |/ / | |/| |
| | * | synchronize animation starts with webkitChris Craik2011-11-293-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5239801 this better supports animations not synchronous with webkit Relies on the frameworks/base CL: https://android-git.corp.google.com/g/#/c/152533/ Change-Id: Ia79a475065b3891db8fc4014559062ab1ac95ebe
* | | | am 06081e3d: Merge "WebView Animation support" into ics-mr1Teng-Hui Zhu2011-11-301-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '06081e3d5c78c73256b49c85d05e7c41d9e2b6f1': WebView Animation support
| * | | Merge "WebView Animation support" into ics-mr1Teng-Hui Zhu2011-11-291-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | WebView Animation supportTeng-Hui Zhu2011-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | bug:4982054 Change-Id: I1e8ea5ed7043a7140254a99053cf241de1b0ef3e
* | | | Merge "Use unsigned length when reading data"Russell Brenner2011-11-291-1/+1
|\ \ \ \
| * | | | Use unsigned length when reading dataRussell Brenner2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a signed length, invalid negative sizes can bypass data limit checks of the type: if (data + length < end) With an unsigned length, absurdly large lengths will now trigger an early exit instead of following through into the decoding routine with a bad length. Bug: 5143832 Change-Id: I50c636ccfbc82a297df802572cf85972dddf8213
* | | | | am 9c0e7d80: Merge "Fix WebViewCore::createBaseLayer() to always do a layout ↵Steve Block2011-11-291-8/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | and paint the background color" into ics-mr1 * commit '9c0e7d80ade0cc9bbe087838232cd0877fa01a98': Fix WebViewCore::createBaseLayer() to always do a layout and paint the background color
| * | | Fix WebViewCore::createBaseLayer() to always do a layout and paint the ↵Steve Block2011-11-241-8/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background color It seems that it's not valid to do this only when the base layer's inval region is not empty. This is a partial revert of https://android-git.corp.google.com/g/#/c/142481. Bug: 5501576 Change-Id: Ie608674e0b61e0d6280777583c64499ff5afe8a3
* | | Only log from notImplemented() in debug buildsSteve Block2011-11-242-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream notImplemented() is only enabled in debug builds. Currently, we use an Android-specific implementation of notImplemented(), which is enabled in all builds. We probably don't want this logging in all builds: logging in debug builds only is sufficient. Also, now that WebKit logging is functional (b/5448972), we don't need an Android-specific implementation of notImplemented(). This patch removes our local edit to address both of these. Change-Id: I07e2e8cb42d99dece1c711508c297d8ae0bdda72
* | | Merge "Defer CookieManager initialization."Selim Gurun2011-11-232-14/+38
|\ \ \
| * | | Defer CookieManager initialization.Selim Gurun2011-11-232-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5253777 Initialize cookiemanager, and the associated components (db, etc) when cookie store is accessed. This prevents a slowdown on UI thread during initialization of the browser. Also remove an unnecessary call to retrieve database file path since now it is stored as a member variable. Change-Id: I0823cd546770d4fb3e8143d4cfab3cb2b104ba7a