summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes I899af0a4,I1d8b554a,Iefb91f0bKristian Monsen2011-07-0113-100/+100
|\ | | | | | | | | | | | | * changes: Merge Chromium at r11.0.696.0: Compile fix, update include location Merge Chromium at r11.0.696.0: Compile fixes in WebRequestContext.cc Merge Chromium at r11.0.696.0: Just AutoFill => Autofill renaming
| * Merge Chromium at r11.0.696.0: Compile fix, update include locationKristian Monsen2011-06-301-1/+1
| | | | | | | | | | | | | | chrome/browser/tab_contents/tab_contents.h has moved to content/browser/tab_contents/tab_contents.h Change-Id: I899af0a4895f0d6a30850c65c22fbc67c7bedd88
| * Merge Chromium at r11.0.696.0: Compile fixes in WebRequestContext.ccKristian Monsen2011-06-291-5/+5
| | | | | | | | | | | | | | | | | | Members in UrlRequestContext was made private in: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165 Using setter to set instead of using variable directly. Change-Id: I1d8b554a1f017d39acbf5ae014e934631c29049b
| * Merge Chromium at r11.0.696.0: Just AutoFill => Autofill renamingKristian Monsen2011-06-2911-94/+94
| | | | | | | | Change-Id: Iefb91f0b784c26b503125017ae3582a28e7d530d
* | Merge "Refactoring: Moved 'SkLayer' to 'Layer' class in webkit"Chris Craik2011-06-3012-19/+379
|\ \
| * | Refactoring: Moved 'SkLayer' to 'Layer' class in webkitChris Craik2011-06-3012-19/+379
| | | | | | | | | | | | Change-Id: Ie1c24e5e402c539e0359810cfdf872178fa083c1
* | | Merge "Add initial support for Ganesh renderer."Derek Sollenberger2011-06-3011-65/+476
|\ \ \
| * | | Add initial support for Ganesh renderer.Derek Sollenberger2011-06-3011-65/+476
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The GaneshRenderer can now be swapped in for the RasterRenderer in BaseTile. A following CL will enable this swap at runtime. Change-Id: Id42040fce2895ab00cccb8f11dfd0489df861655
* | | | Don't create newer LayerTexture when hitting upper bound.Teng-Hui Zhu2011-06-301-0/+4
| |/ / |/| | | | | | | | | | | bug:4976882 Change-Id: If1c913da8bdc3a310a3a665dc895711093fb8788
* | | Added fix for AndroidAnimation copy (m_name was forgotten)Chris Craik2011-06-291-0/+1
| | | | | | | | | | | | | | | bug:4595809 Change-Id: Ieaacb3cf7c6ea51f2ae7d92e5acf5c9fcafcf1d8
* | | Merge "Use full scrollable area for content width/height."Shimeng (Simon) Wang2011-06-291-1/+1
|\ \ \ | |_|/ |/| |
| * | Use full scrollable area for content width/height.Shimeng (Simon) Wang2011-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently after webkit merge, the content width/height is only for visible area. issue: 4672075 Change-Id: Ib7d51119a59131f1443a3c0d59980a8da34b4173
* | | Merge "Revert Android specific method name"Kristian Monsen2011-06-292-2/+2
|\ \ \ | |_|/ |/| |
| * | Revert Android specific method nameKristian Monsen2011-06-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The name change was reverted in external/chromium in: https://android-git.corp.google.com/g/#change,118320 This fixes external/webkit after that change. Change-Id: I21ff90a8759deee1799e718e0bac06b165477606
* | | Merge "Add BaseRenderer to handle generic rendering tasks."Derek Sollenberger2011-06-296-124/+295
|\ \ \
| * | | Add BaseRenderer to handle generic rendering tasks.Derek Sollenberger2011-06-296-124/+295
| | | | | | | | | | | | | | | | Change-Id: I5cf0e2da4d4f48be5daf176b5aac8222b9919ba9
* | | | Merge "2nd try: Bubbles up the url that has the invalid certificate."Huahui Wu2011-06-283-5/+8
|\ \ \ \ | |/ / / |/| | |
| * | | 2nd try: Bubbles up the url that has the invalid certificate.Huahui Wu2011-06-283-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as this CL https://android-git.corp.google.com/g/#change,117817 except one minor change to make the build happy: Change-Id: Ie863737eee00c42de5d7a289b60aff8c2cfaa8e2
* | | | Merge "Cleanup Skia related rendering code for raster rendering."Derek Sollenberger2011-06-2815-161/+108
|\ \ \ \ | |/ / / |/| | |
| * | | Cleanup Skia related rendering code for raster rendering.Derek Sollenberger2011-06-2815-161/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the existing code we created a sharedBitmap for BaseTiles and never used it instead opting for createing bitmaps on the stack to enable partial invalidation. This CL removes the sharedBitmap concept and instead creates all bitmaps on the stack. This means that BackedDoubleBufferedTexture no longer needs to have a bitmap member, but instead simply takes the bitmap from the caller and uploads it to the appropriate texture. To make this upload clean we now pass the bitmap via const references instead of pointers. Change-Id: Ie218c4b4564e5574ca6e404d4857904ab41a3a5c
* | | | Merge "Revert "Bubbles up the url that has the invalid certificate.""Huahui Wu2011-06-283-8/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Bubbles up the url that has the invalid certificate."Huahui Wu2011-06-283-8/+5
| | | | | | | | | | | | | | | | This reverts commit f072ccf633e8c2c2812289f0e65f18320f2147c8.
* | | | Merge "Bubbles up the url that has the invalid certificate."Huahui Wu2011-06-283-5/+8
|\ \ \ \ | |/ / /
| * | | Bubbles up the url that has the invalid certificate.Huahui Wu2011-06-273-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/2689122 SSL error shows the wrong page when triggered by an image/javascript in the page This CL bubbles the url, which has the invalid cert, up to framework to display it. Related CLs are: Framework: https://android-git.corp.google.com/g/#change,117828 Browser: https://android-git.corp.google.com/g/#change,117835 Change-Id: If01ea2320aa50450a6d3d409123bed5a9f101d61
* | | | Merge "Delete the GL texture when deleting the Surface Texture"Teng-Hui Zhu2011-06-281-0/+1
|\ \ \ \
| * | | | Delete the GL texture when deleting the Surface TextureTeng-Hui Zhu2011-06-271-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Otherwise, there will be GPU memory leak. bug:4947376 Change-Id: Ib76a47c197d7c1a01471c4b38e210e0d5dd9fa02
* | | | Merge "Prevent GL rings on layers"John Reck2011-06-271-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Prevent GL rings on layersJohn Reck2011-06-271-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4496611 Rings on layers are still drawn with the software path, but the gl ones are also drawn and in the wrong location. For now, prevent the drawing of the incorrect GL rings Change-Id: I7436dec9da3ce936b2ed0c4aa549a31b00e6e066
* | | Refactor and improve the raster rendering for base tiles.Derek Sollenberger2011-06-275-198/+326
|/ / | | | | | | Change-Id: I1dc4622e0ce1602f6dc314f0b510c41adb95a443
* | Merge "Browser ST: Support both OES and 2D texture target"Teng-Hui Zhu2011-06-248-37/+193
|\ \
| * | Browser ST: Support both OES and 2D texture targetTeng-Hui Zhu2011-06-248-37/+193
| |/ | | | | | | | | | | | | | | | | | | | | | | | | B/c of driver limitation, we are using 2D texture target for our Surface Texture, this will be switched to EXTERNAL_OES soon. In order to have smooth transition, I added the code which can handle both types and it depends on what Surface Texture itself reports. Tested with both modes on Crespo since its driver support both. bug:4905428 Change-Id: Ic91702e7b8f75329f7d948e9217f7fc689a95bbb
* | Better way to determine not to reflow.Shimeng (Simon) Wang2011-06-231-2/+2
|/ | | | | | | | | Instead of using border which may be too broad, using whether an object is floating to fix flickr's reflow issue. Checked sites like slashdot.org and nytimes.com, this works better. issue: 4596265 Change-Id: Ic263b1e6fddedb47e410687ed04cd2ac7ccb7bed
* Merge "Do not reflow text if a div has border."Shimeng (Simon) Wang2011-06-231-1/+1
|\
| * Do not reflow text if a div has border.Shimeng (Simon) Wang2011-06-231-1/+1
| | | | | | | | | | | | | | | | This also fixes the case where flickr header's position is not good since it's reflowed for issue 4596265. issue: 4596265 Change-Id: I8445ec408a813935871c5d011b23b70e569105d3
* | Merge "Remove legacy fps cap"John Reck2011-06-232-12/+0
|\ \
| * | Remove legacy fps capJohn Reck2011-06-222-12/+0
| | | | | | | | | | | | | | | | | | Bug: 4743033 Change-Id: Ic0603ecf3af9290bd6d374aa8ddf4342948064ac
* | | Tiles: increase the minimal number to cover the whole screenTeng-Hui Zhu2011-06-221-5/+4
| |/ |/| | | | | Change-Id: Iad5ef9dc1f9944a326e45dd2721cb0005e69f425
* | Browser ST: Lower the upper limit for texture allocationTeng-Hui Zhu2011-06-221-2/+6
|/ | | | Change-Id: Ie88de19e89e298b69b106fbb42d2b9d26bb98014
* Merge "Fix compiler error when DEBUG is turned on"Teng-Hui Zhu2011-06-222-2/+2
|\
| * Fix compiler error when DEBUG is turned onTeng-Hui Zhu2011-06-212-2/+2
| | | | | | | | Change-Id: I1a9d8eab3e5259eade94fc9e825ec4d162a1e392
* | Merge "Remove old customized code."Shimeng (Simon) Wang2011-06-211-7/+0
|\ \
| * | Remove old customized code.Shimeng (Simon) Wang2011-06-211-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes slashdot.org after recent webkit merge, since the removed code will sometimes require extra layout. This code is two years old, and related to iframe flattening, which is not used any more in Android. Android still does frameset flattening. Verified sites such as developer.android.com are still working. issue: 4753055 Change-Id: I69f78bec53671eb488b629bde7cc2c3158f1a510
* | | Merge "Fix the Surface Texture Issue on the phones"Teng-Hui Zhu2011-06-212-0/+3
|\ \ \ | | |/ | |/|
| * | Fix the Surface Texture Issue on the phonesTeng-Hui Zhu2011-06-212-0/+3
| | | | | | | | | | | | Change-Id: Ibee33c53d65a6c1b98f5e88ed79862cd30418347
* | | Merge changes I1f457d1e,I365930f3,Iad35a220Ben Murdoch2011-06-211-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | * changes: Fix storage/transaction-error-callback.html Fix fast/encoding/dumpAsText//utf-16-no-bom.xml Add android-specific result for fast/encoding/meta-in-script.html
| * | Fix fast/encoding/dumpAsText//utf-16-no-bom.xmlBen Murdoch2011-06-211-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | This test now expects us to use the XMLTreeViewer, so make sure that it's enabled. SetDeveloperExtras enables the XMLTreeViewer and Inspector, but we have no inspector on Android, so this is just toggling the XMLTreeViewer on. Change-Id: I365930f34003d6e97aed88af77746c784a3c3bd1
* | The background image should be opaqueTeng-Hui Zhu2011-06-201-2/+2
| | | | | | | | | | bug:4406718 Change-Id: Iea532c639bf41aad2488819d42c315a0e3d747fd
* | Copied into Surface Texture line by line instead of pixel by pixel.Teng-Hui Zhu2011-06-201-7/+4
|/ | | | Change-Id: Ide38fce4ba0be0eb506cb4c5497915e11812b6bd
* Merge "Turn the Surface Texture path on for baseTile"Teng-Hui Zhu2011-06-178-65/+156
|\
| * Turn the Surface Texture path on for baseTileTeng-Hui Zhu2011-06-178-65/+156
| | | | | | | | Change-Id: I852c546b2c62419ccfb96ed1c0d157e49a3b1aef
generated by cgit v1.1 at 2025-11-15 19:38:49 +0000