summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Stop the blinking caret when moving to another field.Leon Scroggins2011-02-245-9/+35
| | | | | | | | Bug:2930013 Requires a change in frameworks/base. Change-Id: I892fcdd9b9a0abdcf82e5bb26c930b68ae8b10fa
* Fixed element in iframe supportTeng-Hui Zhu2011-02-243-5/+40
| | | | | | | | We first identify the iframe for each LayerAndroid. Then when traverse to update the fixed elements, we use the parent iframe info to update the fixed position. Change-Id: I13e0333fc6453414cea2343a787c41d525f6e3d2
* Merge "Skia Merge (revision 808)"Derek Sollenberger2011-02-2416-57/+88
|\
| * Skia Merge (revision 808)Derek Sollenberger2011-02-2216-57/+88
| | | | | | | | | | | | This is a companion CL to the one found in /external/skia Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa
* | Merge "Copy constructor for AutoJObject must increase the ref count on the ↵Steve Block2011-02-241-0/+4
|\ \ | | | | | | | | | underlying object"
| * | Copy constructor for AutoJObject must increase the ref count on the ↵Steve Block2011-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | underlying object This is needed to balance the derefs in any temporary instance's d'tor. See https://chromereview.prom.corp.google.com/2013001 Change-Id: I8329f475ecbd1bc8669d0e8d368f1a385d891fb3
* | | Merge "Scroll the RenderLayer during touch events."Patrick Scott2011-02-2212-123/+56
|\ \ \
| * | | Scroll the RenderLayer during touch events.Patrick Scott2011-02-2212-123/+56
| | |/ | |/| | | | | | | | | | | | | | | | | | | Keep track of the owning layer for each LayerAndroid. No longer need to unadjust the node bounds since the node will be scrolled into view. Bug: 3442108 Change-Id: I7c9604d347af326ccfb86e6d3f2b95b7ce1b97c1
* | | Merge "fix select text space detection"Cary Clark2011-02-221-17/+27
|\ \ \ | |/ / |/| |
| * | fix select text space detectionCary Clark2011-02-221-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some helpers like isSpace() are used in two contexts: while the picture is parsed, and after the best answer in the picture has been found. The proper paint must be used in each case. Associate paints with candidate and best glyphs, so that the appropriate paint can be used as needed. bug:3470564 Change-Id: I28bcc82dbe727ee3ef0716e7657e61a982467a40
* | | Merge "Fix for bug 3424689 Corrupt (truncated) downloads for apk from browser"Kristian Monsen2011-02-211-1/+1
|\ \ \
| * | | Fix for bug 3424689 Corrupt (truncated) downloads for apk from browserKristian Monsen2011-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending the url of the response instead of the request, so using the new url if there is a redirect. Change-Id: Ic314d315a6e9b5be837c302cdcfd740cc185466d
* | | | Merge "Fix a leaked JNI LocaRef in WebViewCore::jsPrompt()"Steve Block2011-02-211-2/+3
|\ \ \ \
| * | | | Fix a leaked JNI LocaRef in WebViewCore::jsPrompt()Steve Block2011-02-211-2/+3
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 3470906 Change-Id: I8fb9ddcf4ff3dee35c2225a18a86b4015002da96
* | | | am d3b2919d: (-s ours) am 634f229e: Do not merge: Cherry-pick Fix ANR in the ↵Nicolas Roard2011-02-190-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | browser from master * commit 'd3b2919d307e4b0ea98b7b5c67991c853c99b562': Do not merge: Cherry-pick Fix ANR in the browser from master
| * \ \ \ am 634f229e: Do not merge: Cherry-pick Fix ANR in the browser from masterNicolas Roard2011-02-1910-26/+91
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '634f229e4f0075b052e110ba0a89554c46f6c510': Do not merge: Cherry-pick Fix ANR in the browser from master
| | * | | | Do not merge: Cherry-pick Fix ANR in the browser from masterNicolas Roard2011-02-1910-26/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes we were not releasing textures as they were busy; they could still be deleted when swapping the layers trees, and as they were also still present in the LayerTexture Hashmap this was causing an ANR (at best -- the texture was already deallocated, the LayerTexture dtor was then trying to release() them...) bug:3398660 Change-Id: I3b08af94a6a7041d45d373ebaec0ec4ba59dac82
* | | | | | am d3f53495: (-s ours) am 928bc355: Merge "Do not merge: Cherry-pick 2nd ↵Nicolas Roard2011-02-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | part of GL_BLEND CL from master" into honeycomb * commit 'd3f534955e1e80e5a9192c84db518f8f0eff5b00': Do not merge: Cherry-pick 2nd part of GL_BLEND CL from master
| * | | | | am 928bc355: Merge "Do not merge: Cherry-pick 2nd part of GL_BLEND CL from ↵Nicolas Roard2011-02-194-1/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" into honeycomb * commit '928bc35505a3fa29f1598842d49124c06703f972': Do not merge: Cherry-pick 2nd part of GL_BLEND CL from master
| | * | | | Merge "Do not merge: Cherry-pick 2nd part of GL_BLEND CL from master" into ↵Nicolas Roard2011-02-194-1/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | honeycomb
| | | * | | | Do not merge: Cherry-pick 2nd part of GL_BLEND CL from masterDerek Sollenberger2011-02-184-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure non-ready tiles are painted with the page background color. bug: 3465059 bug: 3471680 Change-Id: Id0cc94f181882d1308471c9bd898fe005101d6f8
* | | | | | | am ffef3d3a: (-s ours) am 6f7a546a: Do not merge: Cherry-pick Flash ↵Nicolas Roard2011-02-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | performance CL from Master * commit 'ffef3d3a1baae44ba44696024ddc12f92337d518': Do not merge: Cherry-pick Flash performance CL from Master
| * | | | | | am 6f7a546a: Do not merge: Cherry-pick Flash performance CL from MasterNicolas Roard2011-02-181-6/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '6f7a546a8676227fcd810149bce26090ab1e49eb': Do not merge: Cherry-pick Flash performance CL from Master
| | * | | | | Do not merge: Cherry-pick Flash performance CL from MasterNicolas Roard2011-02-181-6/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3471589 Fix some of the performance issues when using the flash plugin embedded. What happened was that MediaLayer was always telling us to repaint the screen; we could repaint the same frame a dozen of times unecessarily. This in itself was wasteful but should have been ok, but the stream of commands plus the compositing caused the GPU commands used by flash to stall until they were executed... The compounded impact drasticaly lowered the performances. This is not a full fix as those conditions (us repainting the screen a lot) happens anyway when zooming or scrolling; but this should improve performances in the general case. Change-Id: I79a75c759fd5968cb822616eba0caa8c77e75835
* | | | | | am b1c4dba8: (-s ours) am b1f94474: Do Not Merge: Cherry-pick GL_BLEND CL ↵Derek Sollenberger2011-02-180-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from master * commit 'b1c4dba88c350dca089fc918e923d77052df750c': Do Not Merge: Cherry-pick GL_BLEND CL from master
| * | | | | am b1f94474: Do Not Merge: Cherry-pick GL_BLEND CL from masterDerek Sollenberger2011-02-186-16/+59
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b1f94474f57c247527261dbb10de63b7a4285d60': Do Not Merge: Cherry-pick GL_BLEND CL from master
| | * | | | Do Not Merge: Cherry-pick GL_BLEND CL from masterDerek Sollenberger2011-02-186-16/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Selectively enable and disable GL_BLEND for better performance. Bug: 3471680 Change-Id: I065b07f72a097418b81e5922574579574e7ca91a
* | | | | | am 6e36bd5d: (-s ours) am dc8ac1db: DO NOT MERGE Fix GL_BLEND problem. ↵Nicolas Roard2011-02-180-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glBindAttribLocation() will only work after a shader has been linked; This was working previously due to the way the nvidia driver work when using blending (it generates another shader). * commit '6e36bd5dadbf7af2b01b92ebb38e23a22b9718d1': DO NOT MERGE Fix GL_BLEND problem. glBindAttribLocation() will only work after a shader has been linked; This was working previously due to the way the nvidia driver work when using blending (it generates another shader).
| * | | | | am dc8ac1db: DO NOT MERGE Fix GL_BLEND problem. glBindAttribLocation() will ↵Nicolas Roard2011-02-182-11/+16
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only work after a shader has been linked; This was working previously due to the way the nvidia driver work when using blending (it generates another shader). * commit 'dc8ac1db6f8a14dbac0eb104ecfc18292f6e9a03': DO NOT MERGE Fix GL_BLEND problem. glBindAttribLocation() will only work after a shader has been linked; This was working previously due to the way the nvidia driver work when using blending (it generates another shader).
| | * | | | DO NOT MERGE Fix GL_BLEND problem.Nicolas Roard2011-02-182-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glBindAttribLocation() will only work after a shader has been linked; This was working previously due to the way the nvidia driver work when using blending (it generates another shader). Change-Id: Ie5d28ba451e7b37fd9c6a76c14fc3e4e525d9bf0
* | | | | | am dd17d165: (-s ours) am bdbce22a: DO NOT MERGE Clip layers if the texture ↵Nicolas Roard2011-02-180-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size is too large for the GPU * commit 'dd17d165c8aefdc123104908cef4cb5f742f2296': DO NOT MERGE Clip layers if the texture size is too large for the GPU
| * | | | | am bdbce22a: DO NOT MERGE Clip layers if the texture size is too large for ↵Nicolas Roard2011-02-181-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the GPU * commit 'bdbce22a3ad0e8abea6b824e7ec9fd5ae3ea9637': DO NOT MERGE Clip layers if the texture size is too large for the GPU
| | * | | | DO NOT MERGE Clip layers if the texture size is too large for the GPUNicolas Roard2011-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:3436987 Change-Id: Ibf42685ee07c6d0dd8a1a2b9c8b57da7f2a422db
* | | | | | am 6c92fe34: am 227fffee: Fix potential bug in setMaxTextureCount and limit ↵Nicolas Roard2011-02-180-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the number of textures to 154 * commit '6c92fe3486d362d49c3d2a0399611797d35173d1': Fix potential bug in setMaxTextureCount and limit the number of textures to 154
| * | | | | am 227fffee: Fix potential bug in setMaxTextureCount and limit the number of ↵Nicolas Roard2011-02-181-6/+14
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures to 154 * commit '227fffee9ee9b07919a140866fda1ee7445d3f5a': Fix potential bug in setMaxTextureCount and limit the number of textures to 154
| | * | | | Fix potential bug in setMaxTextureCount and limitNicolas Roard2011-02-181-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the number of textures to 154 Change-Id: I39409e938b6b4bff23d6f1f0dc44648d63443f59
* | | | | | am e69a5d5d: (-s ours) am 704eaca6: Set correct max texture allocations.Shimeng (Simon) Wang2011-02-180-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'e69a5d5da77aef92f09588057db3ec1f5be5c71b': Set correct max texture allocations.
| * | | | | am 704eaca6: Set correct max texture allocations.Shimeng (Simon) Wang2011-02-183-5/+10
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '704eaca6f77288587c438291bc15a967515eaa8e': Set correct max texture allocations.
| | * | | | Set correct max texture allocations.Shimeng (Simon) Wang2011-02-183-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes core dump or dead lock in GL code when rotating screen. Change-Id: Ia7bfa71125f1d24158084b6192d805b5b08b60f8
* | | | | | Fix potential bug in setMaxTextureCount and limitNicolas Roard2011-02-181-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the number of textures to 154 Change-Id: Ie77935015d744fcfda9bfffd751df6c7f3cd10bb
* | | | | | Merge "Fix some of the performance issues when using the flash plugin embedded."Nicolas Roard2011-02-181-6/+1
|\ \ \ \ \ \
| * | | | | | Fix some of the performance issues when using the flash plugin embedded.Nicolas Roard2011-02-181-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What happened was that MediaLayer was always telling us to repaint the screen; we could repaint the same frame a dozen of times unecessarily. This in itself was wasteful but should have been ok, but the stream of commands plus the compositing caused the GPU commands used by flash to stall until they were executed... The compounded impact drasticaly lowered the performances. This is not a full fix as those conditions (us repainting the screen a lot) happens anyway when zooming or scrolling; but this should improve performances in the general case. Change-Id: I3391c2c5a5198a73863ace53bc10f623cdc00921
* | | | | | | Merge "Ensure non-ready tiles are painted with the page background color."Derek Sollenberger2011-02-184-1/+8
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Ensure non-ready tiles are painted with the page background color.Derek Sollenberger2011-02-184-1/+8
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | bug: 3465059 Change-Id: Ia6e5ec7e9f68d641f5bf0df34c04c5c9958a4046
* | | | | | Part of fix for bug 3424424 Browser hangingKristian Monsen2011-02-181-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always calling complete, and adding an assert if Wait finishes without incrementing the count. Change-Id: Iceec36c2b82f225ee88cd67eeb18d5c5064c6bfb
* | | | | | Merge "use measure instead of bounder to find spaces"Cary Clark2011-02-181-66/+19
|\ \ \ \ \ \
| * | | | | | use measure instead of bounder to find spacesCary Clark2011-02-181-66/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pictures do not include white space characters in their text spans, so they must be deduced. The old method used drawing through the canvas, compared against drawing the text directly. The new method measure and rounds the text to match how webkit adjusts characters' widths in WidthIterator. bug:348629 Change-Id: I39fecd274fe0b195fbad13a6083656daa62ed852
* | | | | | | Fix memory allocation bug in convertV8ObjectToNPVariant() for stringsSteve Block2011-02-181-2/+3
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of WebKit change 78994 See http://trac.webkit.org/changeset/78994 Change-Id: I1994bbbe89490e68025f9bbaa0606cf9766f2ca3
* | | | | | Merge "Fixed element in iframe should have a layer"Teng-Hui Zhu2011-02-171-4/+0
|\ \ \ \ \ \
| * | | | | | Fixed element in iframe should have a layerTeng-Hui Zhu2011-02-171-4/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | bug:3466931 Change-Id: I3ce5aaef47b6135b191749b40869913f6420ce7f