summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Initialize properties of JavaValue"Steve Block2011-11-031-1/+12
|\
| * Initialize properties of JavaValueSteve Block2011-11-021-1/+12
| | | | | | | | | | | | | | | | | | | | | | When converting from NPVariant to JavaValue, there are cases where we don't do an explicit conversion, but instead rely on the default value of the JavaValue for the corresponding type. We need to make sure that the default values are correctly set. This bug was introduced in http://trac.webkit.org/changeset/82194. Change-Id: I681a305e57a706d54e26c1e0d00ccc2d657bedd9
* | am 9f3355b5: Fix crash in Autofill.Ben Murdoch2011-11-031-7/+9
|\ \ | | | | | | | | | | | | * commit '9f3355b57b144ac285d6bb28e39268a8e9f26fd6': Fix crash in Autofill.
| * | Fix crash in Autofill.Ben Murdoch2011-11-031-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | Fix a crash in autofill that can be caused by toggling the setting on and off. Bug: 5452927 Change-Id: I80ba0b823fd16cb4e2df3359be95f3d063a9b091
| * | Report a load error when network loads blocked. Do not mergeBen Murdoch2011-10-314-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from master. When network loads are blocked, we should fail those loads rather than leaving them dangling. In particular, this fixes an issue where WebCore will wait to do the first layout while CSS loads are pending. If network loads are blocked, we need to tell WebCore they are never going to complete. To implement this, we make use of the Chromium stack's load flags and move the code to a more suitable location. Bug: 5416543 Change-Id: I4bd9987611364b29d3ccaa50437d418a5eb9a5cd
* | | compiler error fix when DEBUG is onTeng-Hui Zhu2011-11-024-7/+6
| |/ |/| | | | | Change-Id: I6fbaa9dfe50752fa5ec95cd43ed50306b63270f3
* | am c5d840ba: Merge "Fix plugin rendering bug when video surface is not ↵Derek Sollenberger2011-10-281-1/+1
|\ \ | |/ | | | | | | | | | | ready." into ics-mr1 * commit 'c5d840baeea0b171c64e9746942d95e95a7f7769': Fix plugin rendering bug when video surface is not ready.
| * Merge "Fix plugin rendering bug when video surface is not ready." into ics-mr1Derek Sollenberger2011-10-281-1/+1
| |\
| | * Fix plugin rendering bug when video surface is not ready.Derek Sollenberger2011-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The browser incorrectly jumps out of the compositing step for a plugin early if it detects a video surface is not ready. The correct behavior is to skip rendering the video and proceed to rendering the other plugin contents. bug: 5525272 Change-Id: Id838f6cef4913e817f58bf2b7e17d871f9f0250e
* | | am 3b9a114e: Merge "Don\'t discardQueue if the upload type didn\'t change" ↵John Reck2011-10-281-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr1 * commit '3b9a114e4f6b7f2510ca2df9a2ee569bc1dee857': Don't discardQueue if the upload type didn't change
| * | Merge "Don't discardQueue if the upload type didn't change" into ics-mr1John Reck2011-10-281-0/+3
| |\ \ | | |/ | |/|
| | * Don't discardQueue if the upload type didn't changeJohn Reck2011-10-271-0/+3
| | | | | | | | | | | | | | | | | | Bug: 5529012 Change-Id: I0b57c4cf9d295524f675f2cb7504d5a9c0363871
* | | Force LOG_ERROR() to be enabled in all buildsSteve Block2011-10-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also, now that LOG() no longer collides with the system logging macro, don't force LOG() and LOG_VERBOSE() to always be disabled. Bug: 5448972 Change-Id: I7f3691b41b5d6f419f4b44c70750489cc6c9e4ed
* | | Implement all WebKit logging functions on AndroidSteve Block2011-10-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, all WebKit logging goes to stderr. This change hooks it up to logcat. We use a single log level (LOG_DEBUG) to avoid forking this code excessively. Note that logging is enabled only in debug builds, and we force LOG() and LOG_VERBOSE() to never be enabled. This will be changed in a future patch. Bug: 5448972 Change-Id: I8b056743ae09adc518658a639185c3983dd56573
* | | Cherry-pick WebKit change 87687 to fix debug buildSteve Block2011-10-283-0/+4
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/87687 Bug: 5448972 Change-Id: I1f2da8f5a2264ce6627dc99ebe1b235ae34f7c62
* | | Cherry-pick WebKit change 98548 to fix debug buildSteve Block2011-10-283-5/+9
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/98548 Bug: 5448972 Change-Id: I099d9ca9e63cbc6e8c3e163ecb2b0a0c82d1141a
* | | Cherry-pick WebKit change 89708 to fix debug buildSteve Block2011-10-286-26/+26
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/89708 Bug: 5448972 Change-Id: I03d576b0c819fdb9a6d99fea8099cf7120945a45
* | | Fix debug buildSteve Block2011-10-285-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - FrameLoaderClientAndroid::dispatchDidClearWindowObjectInWorld() FrameLoader::url() was removed in http://trac.webkit.org/changeset/76872. We should use Document::url() instead. - ImageBufferAndroid See http://trac.webkit.org/changeset/77286 and http://trac.webkit.org/changeset/77398 - Add PluginDebug.cpp to build - ChromiumIncludes.h Don't build Chromium code without NDEBUG set - Frame.cpp We should not include WebKit files from WebCore. WebViewCore.h introduces problems due to the change to ChromiumIncludes.h and is not required here. Bug: 5448972 Change-Id: I82c5c95591bf01fb65179282d03f865df4255c89
* | | am 75fd6068: Merge "Keep text handles in sync with native touch targets" ↵John Reck2011-10-273-4/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr1 * commit '75fd6068b065c26beb1ce4d86090aaacbe243c22': Keep text handles in sync with native touch targets
| * | Merge "Keep text handles in sync with native touch targets" into ics-mr1John Reck2011-10-273-4/+46
| |\ \
| | * | Keep text handles in sync with native touch targetsJohn Reck2011-10-273-4/+46
| | |/ | | | | | | | | | | | | | | | | | | | | | Bug: 5522153 Also add some slop to the handle targets, cleaned up the JNI and improved debugging. Change-Id: I3b2c3c8b1543d4a1aa599ae2938fa78fe95e01bf
* | | am 0b8560de: Add missing save/restore calls to GraphicsContext::fillRectBen Murdoch2011-10-271-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit '0b8560dee52ce9d55cda03caa5f2a3e733b55ba3': Add missing save/restore calls to GraphicsContext::fillRect
| * | Add missing save/restore calls to GraphicsContext::fillRectBen Murdoch2011-10-271-0/+4
| |/ | | | | | | | | | | | | | | | | Android is missing some calls to GraphicsContext::save/restore inside our GraphicsContext::fillRect implementations. The calls were added to the Skia GraphicsContext in http://trac.webkit.org/changeset/63102 Bug: 5361502 Change-Id: Ifcbc116d997473e3a184561102dc5cb74f5aa5ec
| * Merge "DO NOT MERGE Adjust text selection position" into ics-mr1John Reck2011-10-253-3/+12
| |\
| | * DO NOT MERGE Adjust text selection positionJohn Reck2011-10-253-3/+12
| | | | | | | | | | | | | | | | | | Bug: 5507800 Change-Id: Icfcfdb9ff019fac7e3e40df679723594fab15dc6
| * | Merge "DO NOT MERGE Fix SW extras for layers" into ics-mr1John Reck2011-10-2514-107/+17
| |\ \
| | * | DO NOT MERGE Fix SW extras for layersJohn Reck2011-10-2514-107/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5507239 Also remove all the old, unused layer setExtras stuff Change-Id: Id1670010536712b7a9f50e74821c9fb7f708e851
* | | | Merge "Added Y positions for complex script rendering."claireho2011-10-261-22/+24
|\ \ \ \
| * | | | Added Y positions for complex script rendering.claireho2011-10-211-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5445861: Some Thai accents are misplaced in browser TextRunWalker only gets the x positions from Hrafbuzz but no Y positions. This CL applied the changes http://trac.webkit.org/changeset/85013/ to pass both x and y positions from harfbuzz to skia. Change-Id: Ibb23d61eb58c2e687c7ea7773d2266d68ce9ab97
* | | | | am c43f9396: Merge "Don\'t draw prefetch page if not necessary" into ics-mr1Chris Craik2011-10-264-23/+33
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'c43f9396708d95ecbce1f4ef65530999fab96c0d': Don't draw prefetch page if not necessary
| * | | | Merge "Don't draw prefetch page if not necessary" into ics-mr1Chris Craik2011-10-254-23/+33
| |\ \ \ \
| | * | | | Don't draw prefetch page if not necessaryChris Craik2011-10-254-23/+33
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5494086 Also only try to draw visible tiles. Change-Id: Ic850afab94309d9d4d031600a40dc889298fef24
| * | | | Take scale into account when greedily prefetching an entire layerChris Craik2011-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5509149 Scale wasn't being taken into account when estimating layer tile consumption, so zooming in on layer content could attempt to fetch and draw hundreds of layers per tile, causing lots of missing content. Change-Id: Ib26e203827ad93be12d29561b9d8094cb712f014
| * | | | SwapLayersTextures on all layer changesChris Craik2011-10-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5507262 This restores behavior, and allows a single setBaseLayer to set content (such as is used in browser saved pages). Change-Id: Ifeda068ce5c22275553d0e1ec99ee74647806a6c
| * | | | Mark layers as ready to swap if invisibleChris Craik2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5505364 This avoids the problem of waiting infinitely during initialization (when a layer doesn't have content) for the layer to be ready. Change-Id: I364eff66616ea304a68976d5ad06ce5fdb1a6d4b
| * | | | Remove unnecessary logNicolas Roard2011-10-251-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | CL https://android-git.corp.google.com/g/#/c/144158/ introduced a debug log that we don't need, spamming logcat Change-Id: Iea8a1784153dd9f6f53e67f7cb62504440344c7c
| * | | Don't force composited layers to be stacking contexts - DO NOT MERGEChris Craik2011-10-251-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5264240 Was causing crashes, and layer ordering problems. Cherry-pick of b8c237486bcf299d8a04bdae8d8e35fd37866172 Change-Id: I1f76516d4e313101ea9c90759ee63d4cef2d6ced
* | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-2513-84/+84
| | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I821098330652380686aca9e83222936bd5678970
* | | Merge "Report a load error when network loads blocked."Ben Murdoch2011-10-254-19/+26
|\ \ \
| * | | Report a load error when network loads blocked.Ben Murdoch2011-10-254-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When network loads are blocked, we should fail those loads rather than leaving them dangling. In particular, this fixes an issue where WebCore will wait to do the first layout while CSS loads are pending. If network loads are blocked, we need to tell WebCore they are never going to complete. To implement this, we make use of the Chromium stack's load flags and move the code to a more suitable location. Bug: 5416543 Change-Id: I0bd41e430c7ab3cefa302ed0e0576c7e74e7274a
* | | | Merge "Adjust text selection position"John Reck2011-10-253-3/+12
|\ \ \ \
| * | | | Adjust text selection positionJohn Reck2011-10-243-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5507800 Change-Id: Ifed5cae83a66170dcf1a20789642ffc3d9654050
* | | | | am 0d4258e7: Merge "Take scale into account when greedily prefetching an ↵Chris Craik2011-10-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entire layer" into ics-mr0 * commit '0d4258e78caa860491a4c9e6965e574dabc3ec63': Take scale into account when greedily prefetching an entire layer
| * \ \ \ \ Merge "Take scale into account when greedily prefetching an entire layer" ↵Chris Craik2011-10-241-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into ics-mr0
| | * | | | | Take scale into account when greedily prefetching an entire layerChris Craik2011-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5509149 Scale wasn't being taken into account when estimating layer tile consumption, so zooming in on layer content could attempt to fetch and draw hundreds of layers per tile, causing lots of missing content. Change-Id: Ib26e203827ad93be12d29561b9d8094cb712f014
* | | | | | | am bee2599e: SwapLayersTextures on all layer changesChris Craik2011-10-241-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bee2599ec82af8aaf47491b6aea4ee07a377c81a': SwapLayersTextures on all layer changes
| * | | | | | SwapLayersTextures on all layer changesChris Craik2011-10-241-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5507262 This restores behavior, and allows a single setBaseLayer to set content (such as is used in browser saved pages). Change-Id: Ifeda068ce5c22275553d0e1ec99ee74647806a6c
* | | | | | am a4adfec4: Merge "Mark layers as ready to swap if invisible" into ics-mr0Chris Craik2011-10-241-1/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | * commit 'a4adfec4837fe35c27bbee2963cbc105dbce38ff': Mark layers as ready to swap if invisible
| * | | | Merge "Mark layers as ready to swap if invisible" into ics-mr0Chris Craik2011-10-241-1/+1
| |\ \ \ \
| | * | | | Mark layers as ready to swap if invisibleChris Craik2011-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5505364 This avoids the problem of waiting infinitely during initialization (when a layer doesn't have content) for the layer to be ready. Change-Id: I364eff66616ea304a68976d5ad06ce5fdb1a6d4b