summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Parts of fix for bug 5152544 Reduce the number of warning, initializersKristian Monsen2011-08-114-4/+4
| | | | | | | Cherry pick parts of this upstream CL: http://trac.webkit.org/changeset/86949 Change-Id: I019907814804bacd1c98b1480f9b7949274b1a23
* Part of fix for bug 5152544 Reduce the number of warning, int and size_tKristian Monsen2011-08-111-3/+3
| | | | | | Don't compare and use size_t with int Change-Id: I08b329cdb192fa031acae5a90cd6ad6d8ec39aea
* Part of fix for bug 5152544 Reduce the number of warningKristian Monsen2011-08-111-1/+1
| | | | Change-Id: I06a7975d6b08f01731b8bd1761141e3aba942393
* Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB ↵Kristian Monsen2011-08-111-1/+2
|\ | | | | | | in ICS vs HCMR2"
| * Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS ↵Kristian Monsen2011-08-101-1/+2
| | | | | | | | | | | | | | | | vs HCMR2 Trying to build with static libchromium on the build server. Change-Id: I6ee74f769e51ea7506c7bf1a835f84b351be1774
* | Merge "Fix missing tiles"Nicolas Roard2011-08-101-12/+12
|\ \
| * | Fix missing tilesNicolas Roard2011-08-101-12/+12
| | | | | | | | | | | | | | | | | | bug:5123881 Change-Id: Ia3f5e76bc38f32c756cb4e108fe153dd8e103bf3
* | | Merge "Fix property access in the Java bridge"Steve Block2011-08-101-1/+22
|\ \ \
| * | | Fix property access in the Java bridgeSteve Block2011-08-101-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes JavaInstanceJobject::getField() to use getJNIField() correctly. Bug: 5140493 Change-Id: Ib29fe0a010535f3a8dc2b9084c4e4440169971b2
* | | | Merge "Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and ↵Steve Block2011-08-102-6/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | JavaNPObjectGetProperty()"
| * | | Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and ↵Steve Block2011-08-082-6/+7
| |/ / | | | | | | | | | | | | | | | | | | JavaNPObjectGetProperty() Bug: 5006441 Change-Id: I2da7a6f626560416cf5cac0cde3193a9074fab0f
* | | Merge "Revert "Remove ANativeWindow call to avoid blocking call""Chris Craik2011-08-091-11/+2
|\ \ \
| * | | Revert "Remove ANativeWindow call to avoid blocking call"Chris Craik2011-08-091-11/+2
| | | | | | | | | | | | This reverts commit aa809ca82529a9d546f50918830d075daea08a91
* | | | Merge "Remove ANativeWindow call to avoid blocking call"Chris Craik2011-08-091-2/+11
|\ \ \ \ | |/ / /
| * | | Remove ANativeWindow call to avoid blocking callChris Craik2011-08-091-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5114637 Determine alpha blending through surface texture instead of ANativeWindow call. Change-Id: I5a56178047b7f7782bbd3b736e98f0d5965c1c2b
* | | | Merge "Plumb a bool through to Java to supress auth dialog."Ben Murdoch2011-08-096-8/+21
|\ \ \ \
| * | | | Plumb a bool through to Java to supress auth dialog.Ben Murdoch2011-08-056-8/+21
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of a prefetch or favicon load, we want to silently fail auth loads but allow the use of cached credentials. To acheive this, pass an extra flag through to Java to decide whether to show the prompt or not. Requires: frameworks/base change: Ida5708aad7cbe5633106e9ae2997c9231aaf95b8 packages/apps/Browser change: Id901855830bbe17ede8a18293cff2bbc0aad4ba8 Bug: 5094761 Change-Id: If8c6f22e8307e1e13b8f7ad29f79305ce24b3255
* | | | Merge "Revert "Disable Crankshaft at runtime for performace testing.""Ben Murdoch2011-08-091-1/+0
|\ \ \ \
| * | | | Revert "Disable Crankshaft at runtime for performace testing."Ben Murdoch2011-08-091-1/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This reverts commit 7178bcff68f2abc8fefe50fa62b7043663034c05. Bug: 5052287
* | | | Merge "Fix for bug 5104510 Log chromium values of unknown browser errors"Kristian Monsen2011-08-091-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix for bug 5104510 Log chromium values of unknown browser errorsKristian Monsen2011-08-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are many errors that are not used at the moment, will look at the output and add the ones that are used. Change-Id: I16da444b9e1aa0ca12a17cfd77aa8f220e642914
* | | | Fix ANR in webkitNicolas Roard2011-08-0810-56/+17
| | | | | | | | | | | | | | | | | | | | bug:5128336 Change-Id: I591882eb9bd96a04fd34299a8bf76d35a9462d94
* | | | Previous commit was missing a chunk of code...Nicolas Roard2011-08-081-0/+3
| |_|/ |/| | | | | | | | | | | bug:5121768 Change-Id: Ie0065bca023b9a8470970ba15f5837f600fe4afb
* | | Merge "Return NativeWindow on subsequent requests for the plugin's surface."Derek Sollenberger2011-08-081-1/+5
|\ \ \
| * | | Return NativeWindow on subsequent requests for the plugin's surface.Derek Sollenberger2011-08-051-1/+5
| | | | | | | | | | | | | | | | | | | | bug: 5114637 Change-Id: I08213be77036d6e8918bfec3915fcf09210c4f8c
* | | | Merge "Fix memory leak in WebKit's NinePatch code."Derek Sollenberger2011-08-081-3/+3
|\ \ \ \ | |/ / /
| * | | Fix memory leak in WebKit's NinePatch code.Derek Sollenberger2011-08-051-3/+3
| | |/ | |/| | | | | | | | | | bug: 5128453 Change-Id: I08704ae3cbc6bae9c189a6e16f2e7aebebd5544c
* | | Merge "Fix crashes on plus.google.com and reduce the number of necessary layers"Nicolas Roard2011-08-081-4/+20
|\ \ \
| * | | Fix crashes on plus.google.com and reduce the number of necessary layersNicolas Roard2011-08-051-4/+20
| |/ / | | | | | | | | | | | | bug:5121768 Change-Id: I616af5cdc3f8b0a790fd50434c919b2c95b0e486
* | | Merge "Fix a potential sync problem for TransferQueue"Teng-Hui Zhu2011-08-084-24/+65
|\ \ \
| * | | Fix a potential sync problem for TransferQueueTeng-Hui Zhu2011-08-084-24/+65
| | | | | | | | | | | | | | | | | | | | | | | | bug:5044597 Change-Id: Id8cd326774a174a537f2b104d934539269395151
* | | | Merge "Force NativeWindow rendering to use EXTERNAL_OES textures"Chris Craik2011-08-053-19/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Force NativeWindow rendering to use EXTERNAL_OES texturesChris Craik2011-08-053-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5114637 Allows browser plugin to draw texture correctly Change-Id: Ibd61b11598d0ca5bcff28ed0c92e6f20073f5ad6
* | | | Merge "Fixes layers painting crashes"Nicolas Roard2011-08-0410-10/+80
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixes layers painting crashesNicolas Roard2011-08-0410-10/+80
| | | | | | | | | | | | | | | | | | | | | | | | bug:5097230 bug:5045149 Change-Id: I20fcae13e7f617658447c02bd51dc83d2914922e
* | | | Better driver bug workaroundTeng-Hui Zhu2011-08-041-4/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems like the FBO operation is out of sync in some GL driver. Instead of doing a readPixel, we can also force a read after write by calling an extra draw. bug:5118763 Change-Id: Idaf259f84b0dcc0f3bc94bcf1bd1a4adf5250350
* | | Fix memory increaseNicolas Roard2011-08-041-2/+10
| |/ |/| | | | | | | bug:5118763 Change-Id: Ice0f3792cd9e288459713411d755f1717896087e
* | Merge "Finalize the sync part."Teng-Hui Zhu2011-08-035-192/+134
|\ \
| * | Finalize the sync part.Teng-Hui Zhu2011-08-035-192/+134
| | | | | | | | | | | | | | | | | | | | | | | | Improve the sync part for the Shared Surface Texture. Clean up the interface as much as possible. bug:5044597 Change-Id: I123cc520fb447aeb6e72e90149d1658a657740f7
* | | Change the constants used for the inverted preferencesNicolas Roard2011-08-031-2/+2
| |/ |/| | | | | | | | | | | | | to match the ones sent by the Browser bug:5111259 Change-Id: I3d7c0d94d61e173915ab6ec01f42778182462064
* | Replace plugin's OpenGL API with a NativeWindow API.Derek Sollenberger2011-08-0313-254/+179
|/ | | | | bug: 5114637 Change-Id: Idfadf95b9b65bf87ad2edf76fd2c5fc0513a75c3
* increase layer tiles limitTeng-Hui Zhu2011-08-031-1/+1
| | | | | | bug:5069164 Change-Id: Ifbba6d912e20868d0618441b7f497270e1d9f737
* Merge "Support registering page swap callback, content inval"Chris Craik2011-08-034-0/+25
|\
| * Support registering page swap callback, content invalChris Craik2011-08-024-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | bug:5062896 Depends on the following frameworks/base change: https://android-git.corp.google.com/g/#change,124879 a WebView may now register a page swap callback and content invalidate to benchmark tile rendering performance Change-Id: I97f6ed05cff12b11266a472163aab1f3b3ddc87e
* | Merge "Shared surface texture"Teng-Hui Zhu2011-08-0319-69/+848
|\ \
| * | Shared surface textureTeng-Hui Zhu2011-08-0219-69/+848
| |/ | | | | | | | | | | | | | | | | | | | | Instead of assigning each tile a Surface Texture, now just a normal GL texture. The content from skia bitmap will first drawn into a queue of Surface Textures, at draw time, blit them into each tile's GL texture. Added extra lock to protect the queue operation and Surface Texture operation. bug:5044597 Change-Id: I25f46228b93a3e99526daf52d8bd0d8d8fcc2879
* | Add setters for the contrastNicolas Roard2011-08-022-0/+8
| | | | | | | | | | | | bug:5111259 Change-Id: I08701fd7f4d4fe6a506d05f847b4e1a07ed458b3
* | Merge "Fix transparency bug, and add support for contrast"Nicolas Roard2011-08-022-12/+38
|\ \ | |/ |/|
| * Fix transparency bug, and add support for contrastNicolas Roard2011-08-022-12/+38
| | | | | | | | | | | | bug:5111072 bug:5111259 Change-Id: Icc5d7c9f3fc9390f89b8c76eefe8a9d704116c57
* | Merge "Unify the the tile size for base tiles and layers"Teng-Hui Zhu2011-08-011-2/+2
|\ \