summaryrefslogtreecommitdiffstats
path: root/skia/ext
Commit message (Collapse)AuthorAgeFilesLines
* linux: add a NonHintedSans font to test_shellagl@chromium.org2010-03-251-3/+1
| | | | | | | | This is used by an upcoming layout test. http://codereview.chromium.org/1303001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42612 0039d316-1c4b-4281-b951-d872f2087c98
* linux: be more conservative in Liberation font fallbackevan@chromium.org2010-03-232-66/+41
| | | | | | | | | | | | | Rather than encoding all of the supposedly metric-compatible fonts from fontconfig, let's only whitelist fonts we know really improve the web for users. The Helvetica and Courier New substitutes don't look too great. BUB=39099 Review URL: http://codereview.chromium.org/1235001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42399 0039d316-1c4b-4281-b951-d872f2087c98
* Move image codec stuff to toplevel gfx.ben@chromium.org2010-03-181-1/+1
| | | | | | | | | TBR=darin BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41911 0039d316-1c4b-4281-b951-d872f2087c98
* Remove WebCore usage from vector_canvas_unittest.ccdarin@chromium.org2010-03-121-20/+16
| | | | | | | | | | R=maruel BUG=none TEST=none Review URL: http://codereview.chromium.org/916001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41460 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 40951 - UpStreamimg *image_decoder_unittest. Used WebKit API's ↵kkanetkar@chromium.org2010-03-101-9/+2
| | | | | | | | | | | | | | | | ImageDecoder to decouple WebCore deps. Corresponding WebKit Bug 35415. BUG=28063 TEST=Run unit tests. Review URL: http://codereview.chromium.org/661231 TBR=yaar@chromium.org Review URL: http://codereview.chromium.org/802001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41112 0039d316-1c4b-4281-b951-d872f2087c98
* svn prop fixes. Applied to all files not in third_party.pkasting@chromium.org2010-03-091-10/+10
| | | | | | | | | | | | * Removed eol-style, executable and mergeinfo from BMP/GIF/ICO/JPEG files, and set correct mime-type. * Removed executable and mergeinfo from .c/.cc/.cpp/.h/.m/.mm and .gyp files, and set eol-style to LF. TBR=evanm BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40991 0039d316-1c4b-4281-b951-d872f2087c98
* UpStreamimg *image_decoder_unittest. Used WebKit API's ImageDecoder toyaar@chromium.org2010-03-081-2/+9
| | | | | | | | | | | decouple WebCore deps. Corresponding WebKit Bug 35415. BUG=28063 TEST=Run unit tests. Review URL: http://codereview.chromium.org/661231 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40951 0039d316-1c4b-4281-b951-d872f2087c98
* linux: handle basic metric-compatibile font fallbackevan@chromium.org2010-03-082-24/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a page CSS asks for: font-family: Arial, sans-serif; and you don't have Arial, fontconfig tries to provide a substitute. However, as far as I can tell there is no way to distinguish fontconfig picking Liberation Sans (a metric-equivalent substitute for Arial) or it picking a bad substitute like Times New Roman. So historically we didn't allow fontconfig to do any fallback at all. (In this example, we would then match attempt to match sans-serif, which as a last resort we do allow fontconfig to do fallback on, so it could pick e.g. DejaVu Sans or any other font matching "sans".) Frustratingly, fontconfig knows whether a font substitute is an equivalent font or just a last-resort fallback one -- in the XML files the equivalents are marked with 'binding="same"' -- but I played around with the API for a few hours and couldn't figure out any way to get this information out of it. So I hardcode a list of equivalent fonts. Ugh. This fixes some sites where they specify Arial and then have pixel-width-specified page layout that breaks when you use any other sans-serif font. BUG=18159,32005,33125,others I've since forgotten about TEST=uninstall Arial; visit one of the sites mentioned in the bug list Review URL: http://codereview.chromium.org/668127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40912 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll to r55636.levin@chromium.org2010-03-081-0/+1
| | | | | | | | | | One minor build fix due to WebKit r55633. TBR=michaeln@chromium.org Review URL: http://codereview.chromium.org/668172 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40878 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: make "NonAntiAliasedSans" a magic font name.agl@chromium.org2010-03-021-1/+3
| | | | | | | | | | | This will be used in a layout test for per-strike renderer preferences. BUG=none TEST=Future layout test http://codereview.chromium.org/660383 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40410 0039d316-1c4b-4281-b951-d872f2087c98
* Add library support for subpixel rendering of images during Resize().brettw@chromium.org2010-03-012-2/+128
| | | | | | | | | BUG=34809 TEST=No test since inactive by default. For a very manual test, modify Resize() to only call the subpixel variant. Then go to your favorite web page (with some image) and choose Zoom > Smaller git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40292 0039d316-1c4b-4281-b951-d872f2087c98
* Move skia_utils_gtk.cc/.h to app/gfx/. Original patch by Thiago Farina (see ↵pkasting@chromium.org2010-02-262-54/+0
| | | | | | | | | http://codereview.chromium.org/660063 ), r=me. BUG=22853 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40083 0039d316-1c4b-4281-b951-d872f2087c98
* Solaris: Second set adding in Solaris as an OS optionevan@chromium.org2010-02-182-2/+4
| | | | | | | | | | TEST=compiles BUG=30101 Patch by James Choi <jchoi42@pha.jhu.edu>. Review URL: http://codereview.chromium.org/606075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39362 0039d316-1c4b-4281-b951-d872f2087c98
* Make clicking on side tabs to select them work. ben@chromium.org2010-02-112-53/+0
| | | | | | | | | | | | Use a simple round rect for the visual treatment. Add some rect conversion utils. http://crbug.com/34509 TEST=none Review URL: http://codereview.chromium.org/597012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38856 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 38828 - Make clicking on side tabs to select them work.ben@chromium.org2010-02-112-0/+53
| | | | | | | | | | | | | | Use a simple round rect for the visual treatment. Add some rect conversion utils. http://crbug.com/34509 TEST=none Review URL: http://codereview.chromium.org/597012 TBR=ben@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38834 0039d316-1c4b-4281-b951-d872f2087c98
* Make clicking on side tabs to select them work.ben@chromium.org2010-02-112-53/+0
| | | | | | | | | | | | Use a simple round rect for the visual treatment. Add some rect conversion utils. http://crbug.com/34509 TEST=none Review URL: http://codereview.chromium.org/597012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38828 0039d316-1c4b-4281-b951-d872f2087c98
* FreeBSD/OpenBSD ifdefs for skiapvalchev@google.com2010-02-046-10/+11
| | | | | | Review URL: http://codereview.chromium.org/569036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38080 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for gratuitous fake emboldening of already-bold fonts on Linux.senorblanco@chromium.org2010-02-031-1/+1
| | | | | | | | | BUG=22360 TEST=none Review URL: http://codereview.chromium.org/564038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37974 0039d316-1c4b-4281-b951-d872f2087c98
* Linux/fontconfig: support retrieving a default font via CreateTypeface(NULL, ↵tschmelcher@chromium.org2010-02-011-2/+0
| | | | | | | | | | | | | NULL, ...). This is needed in order for SkTypeface::UniqueID(NULL) to not crash. (By removing the else branch, Match() is called with resolved_family_name as the empty string, which it supports.) TEST=built and tested O3D on Linux x64 and tried to render "Arial" on a system that didn't have it; verified resulting call to UniqueID(NULL) did not crash and the app successfully rendered text with some sort of default font BUG=none Review URL: http://codereview.chromium.org/551210 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37758 0039d316-1c4b-4281-b951-d872f2087c98
* Lands paint logging with the appropriate include this time:sky@chromium.org2010-01-201-0/+4
| | | | | | | | | | | | Adds some CHECKs in hopes of figuring out why we're getting crashes during painting. BUG=25324 TEST=none TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/554009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36636 0039d316-1c4b-4281-b951-d872f2087c98
* Reverts CHECKs as broke build. I likely need to include base/logging.sky@chromium.org2010-01-191-3/+0
| | | | | | | | | | BUG=25324 TEST=none TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/542129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36572 0039d316-1c4b-4281-b951-d872f2087c98
* Adds some CHECKs in hopes of figuring out why we're getting crashessky@chromium.org2010-01-191-0/+3
| | | | | | | | | | | during painting. BUG=25324 TEST=none Review URL: http://codereview.chromium.org/543118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36567 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Add favicons to task manager.thakis@chromium.org2010-01-132-0/+8
| | | | | | | | | | | | | Pull NSImage cache out of search engine dialog into its own class, reuse that. Implement browser icon code in task_manager_resource_provider's browser resource provider. BUG=13156 TEST=Open task manager. You should see icons. Open search engine manager, should still show icons. Review URL: http://codereview.chromium.org/549021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36087 0039d316-1c4b-4281-b951-d872f2087c98
* Returns an error immediately without sending IPC message when a font family ↵yusukes@google.com2009-12-183-1/+10
| | | | | | | | | | | | | | | | | | | | | | name to resolve is too long. This change is important when a site has @font-face rule like: // http://paulirish.com/webkit-fontface-hang.html @font-face{font-family:testfont;src:url('data:font/ttf;base64,AA.....<<looooooooooong base64 data>>.....aQ==')} In such a case, WebCore first calls SkFontHost::CreateTypeface() with the (possibly very long) data-uri string itself, then calls SkFontHost::CreateTypefaceFromStream() with decoded byte stream. Since render_sandbox_host_linux.cc just ignores too long IPC message, the renderer process could block indefinitely waiting for a reply inside recvmsg() system call called from SkFontHost::CreateTypeface(). I'm not sure if the WebCore behavior (i.e. calling CreateTypeface with data-uris) is reasonable, but I believe the Skia part is better to be fixed anyway. Non data-uri font family names could be very long too: @font-face{font-family:testfont;src:local('AA........AA');} BUG=29861 TEST=First, set up your Linux SUID Sandbox binary: http://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment. Then start Chromium and visit http://paulirish.com/webkit-fontface-hang.html or http://typekit.com/. Verify that the renderer does not freeze. Review URL: http://codereview.chromium.org/507037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34915 0039d316-1c4b-4281-b951-d872f2087c98
* Roll DEPS for Skia 450:451. Enable USE_NEW_BUILDER in Skia. Mark as failingsenorblanco@chromium.org2009-12-042-0/+0
| | | | | | | | | | | | the ~85 layout tests that now need rebaselining (due to slight pixel coverage change). Refactor SkUserConfig.h a tad. Rebaseline unit test VectorCanvasTest.ClippingIntersect. BUG=24646 TEST=none Review URL: http://codereview.chromium.org/464044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33863 0039d316-1c4b-4281-b951-d872f2087c98
* Preserve optimized scrolling in the presence of multiple animating rects.darin@chromium.org2009-12-044-21/+27
| | | | | | | | | | | | | | Change PlatformCanvas so that it only fills with "sea foam green" when bitmap data is not externally supplied. Modifying the interface to make this an option bloated the CL too much. I may do this as a follow-up. Adds a new --show-paint-rects command line flag that will render a border around paint rects to help debug and study WebKit painting issues. R=brettw BUG=25905 TEST=none Review URL: http://codereview.chromium.org/414016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33861 0039d316-1c4b-4281-b951-d872f2087c98
* First patch in making destructors of refcounted objects private.jam@chromium.org2009-11-051-4/+5
| | | | | | | BUG=26749 Review URL: http://codereview.chromium.org/360042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31136 0039d316-1c4b-4281-b951-d872f2087c98
* Restoring r29827. The skia file is new to this attempt, and may be what was ↵pamg@google.com2009-11-041-0/+1
| | | | | | | | | | | | | | | causing a unit test to crash last time. Refactor security-icon code to a more general form, also more consistent with the Windows implementation, in preparation for implementing page actions. Review URL: http://codereview.chromium.org/264037 BUG=14899, 22922, 12281 TEST=unit tests included Review URL: http://codereview.chromium.org/348069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31023 0039d316-1c4b-4281-b951-d872f2087c98
* [Landing for Jonathon Dixon] Tiny code simplification/optimization: remove ↵senorblanco@chromium.org2009-10-161-3/+2
| | | | | | | | | | | | unecessay temporary copy of SkMatrix. BUG=none TEST=none Review URL: http://codereview.chromium.org/267112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29332 0039d316-1c4b-4281-b951-d872f2087c98
* Re-try r29078: Remove some deprecated file_util wstring functions.estade@chromium.org2009-10-151-63/+64
| | | | | | | | | | | | | With the previous patch, the try bots failed with mysterious messages, so I ignored them, patched it into my windows box and tested it there manually, and found no problems. As it turns out, the try failures were real :(. But nsylvain and I found the problem: the behavior of file_util::GetDirectoryFromPath() differs from DirName() when the path is empty (officially, GetDirectoryFromPath is not supposed to support non-absolute paths, but that is not enforced). Here is a green win try result: http://build.chromium.org/buildbot/try-server/builders/win/builds/3705 mac: http://build.chromium.org/buildbot/try-server/builders/mac/builds/3491 linux: http://build.chromium.org/buildbot/try-server/builders/linux/builds/3466 I also applied this patch locally in Windows to test that it doesn't break the chrome frame compile or tests, since that's not covered by the trybots yet. Review URL: http://codereview.chromium.org/271099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29094 0039d316-1c4b-4281-b951-d872f2087c98
* Revert wstring patch (r29078 and follow up commits). It is causing failures ↵estade@chromium.org2009-10-151-64/+63
| | | | | | | | | | on the buildbots. TBR=nsylvain Review URL: http://codereview.chromium.org/280004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29085 0039d316-1c4b-4281-b951-d872f2087c98
* Remove some deprecated file_util wstring functions.estade@chromium.org2009-10-151-63/+64
| | | | | | | | | | | death to the wstring TEST=trybots BUG=none Review URL: http://codereview.chromium.org/276016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29078 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Fix early font free during printing.estade@chromium.org2009-10-092-49/+59
| | | | | | | | | | The ownership model for this stuff (fonts, cairo canvas, etc.) is a bit brittle. Don't know how to improve it though. BUG=23372 Review URL: http://codereview.chromium.org/270048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28619 0039d316-1c4b-4281-b951-d872f2087c98
* Move classes depending on Skia out of base/gfx and into app/gfx. Renamebrettw@chromium.org2009-10-072-10/+41
| | | | | | | | | | native_theme to native_theme_win since its Windows-specific. BUG=none TEST=none Review URL: http://codereview.chromium.org/259047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28300 0039d316-1c4b-4281-b951-d872f2087c98
* Makes canvas_paint_linux use the event region, not the eventsky@chromium.org2009-10-051-11/+16
| | | | | | | | | | | | rectangle. This is needed as gtk/gdk may set complex clips, so that if we paint everything we can end up painting on top of other widgets. BUG=none TEST=none Review URL: http://codereview.chromium.org/242134 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27995 0039d316-1c4b-4281-b951-d872f2087c98
* Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classesbrettw@chromium.org2009-10-031-8/+8
| | | | | | | | | | | | | | | into the gfx namespace. Combine the PNGEncoder and PNGDecoder. There were separate when we had different executables for the browser and renderer, and linked the encoder only in one of them (which saved us some space used by libpng). This hasn't been the case for years, so combining them (again) makes sense. TEST=none BUG=none Review URL: http://codereview.chromium.org/243076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27930 0039d316-1c4b-4281-b951-d872f2087c98
* Move cairo font handling from printing to skia to avoid circular dependency.mmoss@chromium.org2009-09-282-4/+150
| | | | | | | | | http://crbug.com/22792 Review URL: http://codereview.chromium.org/245027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27395 0039d316-1c4b-4281-b951-d872f2087c98
* Move functions from skia/ext to app/gfx where possible: most of skia_utils.* ↵pkasting@chromium.org2009-09-249-1089/+81
| | | | | | | | | | | | | and image_operations.* can be moved because they are not used by WebKit code. This also fixes the spelling of "Convolusion" to "Convolution" and updates some copyrights. This is a re-do of r26975, this time with WebKit update and some fixes to compile on Mac and Linux. BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27031 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 26975.pkasting@chromium.org2009-09-239-81/+1089
| | | | | | Review URL: http://codereview.chromium.org/222011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26979 0039d316-1c4b-4281-b951-d872f2087c98
* Move functions from skia/ext to app/gfx where possible: most of skia_utils.* ↵pkasting@chromium.org2009-09-239-1089/+81
| | | | | | | | | | | | and image_operations.* can be moved because they are not used by WebKit code. This also fixes the spelling of "Convolusion" to "Convolution" and updates some copyrights. BUG=none TEST=none Review URL: http://codereview.chromium.org/207059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26975 0039d316-1c4b-4281-b951-d872f2087c98
* Lands http://codereview.chromium.org/193032 for Charlie:sky@chromium.org2009-09-151-1/+6
| | | | | | | | | | | | | | | First pass at adding ChromeOS settings - a mock wifi selector combobox - touchpad settings that makes calls to synclient - on startup, touchpad settings are initialized to what's stored in preferences TEST=none BUG=none Review URL: http://codereview.chromium.org/203073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26259 0039d316-1c4b-4281-b951-d872f2087c98
* Embed fonts information into resulting PDF file for printing.maruel@chromium.org2009-09-111-17/+43
| | | | | | | | | | BUG=9847 TEST=printing on linux should have right font in pdf Patch contributed by Min-Yu Huang <minyu.huang@gmail.com> Review URL: http://codereview.chromium.org/196071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25974 0039d316-1c4b-4281-b951-d872f2087c98
* Second fix for the Issue 12530. Modified Match() function so that it allows ↵yusukes@google.com2009-09-111-2/+9
| | | | | | | | | | | | | | | the following case: requested family: A post_config_family: B post_match_family: A BUG=12530 TEST=none Review URL: http://codereview.chromium.org/192062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25959 0039d316-1c4b-4281-b951-d872f2087c98
* Pass printing result to the browser.maruel@chromium.org2009-09-084-48/+51
| | | | | | | | | | | | The resulting PDF file will now be passed to the browser and be saved as "chromium_printing_test.pdf" under current directory. BUG=9847 TEST=printing on linux should now generate chromium_printing_test.pdf in download directory. Printing on Windows should still work. Patch contributed by minyu.huang@gmail.com Review URL: http://codereview.chromium.org/172115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25615 0039d316-1c4b-4281-b951-d872f2087c98
* Avoids the use of "namespace using-directives" in a few places.thakis@chromium.org2009-09-072-10/+6
| | | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/183008 Patch from tfarina. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25607 0039d316-1c4b-4281-b951-d872f2087c98
* Added USE_GDK, set when either TOOLKIT_GTK or TOOLKIT_VIEWS is set butbenl@chromium.org2009-09-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not OS_WIN. Added USE_X11. Set when OS_LINUX or OS_FREEBSD is set. Added USE_BASE_DATA_PACK for base::DataPack usage, set for OS_MACOSX, OS_LINUX or OS_FREEBSD. Added USE_NSS for ... nss (for crypto). Windows and MacOS use platform-specific libraries. All of the above cause slightly odd formulations like: #if defined(OS_WIN) ... #elif defined(USE_BASE_DATA_PACK) ... #endif Possibly should also define USE_DLL_FOR_DATA, etc? Or something? Wrapped various references to struct stat64 and stat64() to use struct stat and stat() for FreeBSD - but a "man stat64" on Linux suggests that we could do the same thing for at least Linux, too, and perhaps eliminate the wrapper? git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25599 0039d316-1c4b-4281-b951-d872f2087c98
* Adjust color spaces so that Mac Chrome renders colors properly.amanda@chromium.org2009-09-031-4/+2
| | | | | | | | | | | BUG=19951,20552 TEST=compare pages rendered in Chromium and Safari. They should appear the same. mark: review jrg/brettw: FYI Review URL: http://codereview.chromium.org/194013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25380 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: fix fd leak added in r25083agl@chromium.org2009-09-021-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25132 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: use mmap fonts.agl@chromium.org2009-09-011-24/+37
| | | | | | | | | | (First landed in r24790, reverted in r24802.) I'm landing this patch because it breaks page_cycler_intl2 on Linux and I don't know why. I want to watch the bots when they fail. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25083 0039d316-1c4b-4281-b951-d872f2087c98
* Adding a skia utils for Gtk.jcampan@chromium.org2009-09-012-0/+49
| | | | | | | | | | | | BUG=None TEST=None See original review: http://codereview.chromium.org/179048/show Review URL: http://codereview.chromium.org/177053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25042 0039d316-1c4b-4281-b951-d872f2087c98