summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Remove Gears from Chrome.aa@chromium.org2011-03-113-3/+3
| | | | | | | | | | There are probably a few more bits and pieces that can be removed, but I think this is the majority of it. BUG=51934 Review URL: http://codereview.chromium.org/6576020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77888 0039d316-1c4b-4281-b951-d872f2087c98
* Enable O2D fullscreen under Windows.gangji@google.com2011-03-112-7/+33
| | | | | | Review URL: http://codereview.chromium.org/6681005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77836 0039d316-1c4b-4281-b951-d872f2087c98
* O2D Mac FF: Fix issue where we sometimes rendered a single frame to the ↵tschmelcher@google.com2011-03-091-2/+16
| | | | | | | | | | | wrong spot on-screen. This occurred because FF sometimes changes our CGContextRef and then changes it back again, and we weren't updating the renderer with the changes when using the Carbon event model, so we briefly rendered to the wrong CGContextRef. TEST=O2D in FF BUG=none Review URL: http://codereview.chromium.org/6650013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77394 0039d316-1c4b-4281-b951-d872f2087c98
* Add comment explaining why we don't initializemilligan@google.com2011-03-091-0/+3
| | | | | | | | | breakpad when loaded in the Chrome browser on Mac. Review URL: http://codereview.chromium.org/6639011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77392 0039d316-1c4b-4281-b951-d872f2087c98
* Work around the multiple breakpad issue by nevermilligan@google.com2011-03-091-1/+8
| | | | | | | | | | | initializing o3d's breakpad if loaded in the Chrome Helper process. Hopefully this is temporary and we will revert once we get breakpad working with multiple instances. Review URL: http://codereview.chromium.org/6639006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77390 0039d316-1c4b-4281-b951-d872f2087c98
* O2D Mac: Don't crash if the user tries to go to fullscreen with O2D.tschmelcher@google.com2011-03-091-0/+6
| | | | | | | | | TEST=tried to go fullscreen with O2D on Mac in FF, Chrome, and Sarafi and verified nothing happens BUG=none Review URL: http://codereview.chromium.org/6650012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77389 0039d316-1c4b-4281-b951-d872f2087c98
* Allow developers to override RenderMode=Auto to either =3D or =2D with an ↵tschmelcher@google.com2011-03-091-3/+14
| | | | | | | | | | | environment variable. TEST=ran in FF & Chrome on OSX with O3D_OVERRIDE_RENDER_MODE_AUTO=2D and verified 2D was used; ran without and verified 3D was used BUG=none Review URL: http://codereview.chromium.org/6648013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77384 0039d316-1c4b-4281-b951-d872f2087c98
* Bump O3D version for the release of the first one with O2D support.tschmelcher@google.com2011-03-091-1/+1
| | | | | | | | | TEST=no BUG=none Review URL: http://codereview.chromium.org/6651007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77377 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing random resizing issues under Windows. When resizing under Windows,gangji@google.com2011-03-082-21/+27
| | | | | | | | sometimes, the windows is not updated when creating the surface. Now update the clip region and surface parameters when this happens. Review URL: http://codereview.chromium.org/6626080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77334 0039d316-1c4b-4281-b951-d872f2087c98
* O2D: Work around crash in Mac Safari 5.0.2 when resizing or closing. Safari ↵tschmelcher@google.com2011-03-081-13/+21
| | | | | | | | | | | performs many CGContextSaveGState/RestoreGState calls during the plugin's lifetime and it foolishly calls into the plugin's rendering code and resizing/shutdown code with a different gstate stack depth, which makes it unsound to call RestoreGState on the old CGContext when resizing or shutting down (which happened both explicitly in DestroyCairoSurface() and implicitly inside cairo_surface_destory()). This resulted in an assertion failure inside the CGContextRestoreGState as it tried to pop from an empty stack. To avoid this we have no choice but to create and destroy the Cairo surface on every frame. Luckily, there is no significant perf impact. TEST=O2D on OSX 10.6.4 in FF 3.6.13, Safari 5.0.2, and Chrome 10.0.648.127; compared framerate and CPU usage in FF to the original code and verified there is no significant difference BUG=none Review URL: http://codereview.chromium.org/6624096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77319 0039d316-1c4b-4281-b951-d872f2087c98
* Bump o3d_code_rev to pick up fixes in pixman.gangji@google.com2011-03-081-1/+1
| | | | | | Review URL: http://codereview.chromium.org/6621072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77313 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for Core Graphics with Carbon, allowing us to use Core Graphics ↵tschmelcher@google.com2011-03-086-64/+115
| | | | | | | | | | | | | in Firefox (since it does not support Cocoa). This lets us use O2D in FF without porting it to Quickdraw. Also tweak the drawing model behaviour so that we select the best possible model for the requested RenderMode. TEST=RenderMode=Auto and =2D in FF on an MBP6,2 and verified 2D avoids issues with the dynamic GPU switching feature of that hardware; RenderMode=2D in Chrome and Safari BUG=none Review URL: http://codereview.chromium.org/6626059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77223 0039d316-1c4b-4281-b951-d872f2087c98
* When auto fall-back is enabled, fall back to o2d milligan@google.com2011-03-078-57/+35
| | | | | | | | | | | if we detect a software renderer is being reported by o3d. Also add software renderer detection to o2d keyed off of the GL_RENDERER string "Software Rasterizer" Review URL: http://codereview.chromium.org/6592020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77177 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Mac breakpad support for all browsers except for chrome.milligan@google.com2011-03-072-1/+9
| | | | | | | | | | | | | This fixes three isues: 1. The URL being used to upload was out of date. 2. The path to the reporter and inspector apps needed to be specified to work around a problem with module address detection in this version of breakpad on mac. 3. The crash inspector was missing from the plugin package. Review URL: http://codereview.chromium.org/6633008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77150 0039d316-1c4b-4281-b951-d872f2087c98
* Add O2D rendering with cairo into Windows build.gangji@google.com2011-03-045-5/+49
| | | | | | Review URL: http://codereview.chromium.org/6628015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76986 0039d316-1c4b-4281-b951-d872f2087c98
* Oops, change O3D's DEPS on Chromium's breakpad code again. :( The current ↵tschmelcher@chromium.org2011-03-041-1/+1
| | | | | | | | | | | trunk revision requires newer revisions of other Chromium code for Mac and Linux, so the bump broke those builds. Updating all the dependencies is too hairy, so instead decrease the breakpad revision to the latest version that works for all platforms. TEST=built on Windows, Mac, and Linux BUG=none Review URL: http://codereview.chromium.org/6626005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76940 0039d316-1c4b-4281-b951-d872f2087c98
* Bump O3D's DEPS on Chromium's breakpad code to the current trunk revision to ↵tschmelcher@chromium.org2011-03-041-1/+1
| | | | | | | | | | | pick up the fix for a Windows GYP failure pulled in by O3D's DEPS bump on GYP in r76839. TEST=built on Windows BUG=none Review URL: http://codereview.chromium.org/6610036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76855 0039d316-1c4b-4281-b951-d872f2087c98
* Port O2D to Mac, currently just for Core Graphics (the drawing model used in ↵tschmelcher@chromium.org2011-03-0315-94/+265
| | | | | | | | | | | Chrome on 10.5). Unfortunately the performance is not yet good enough to prefer it over the CGL + GPU readback + CoreGraphics re-render code path currently in use, so some optimization work will be necessary. TEST=loaded O3D on OSX with RenderMode=Auto and RenderMode=2D in Chrome 9 on 10.5 and 10.6, Safari 4 on 10.5, Safari 5 on 10.6, and FF 3.6 on 10.5 and 10.6 and verified that Auto works everywhere, 2D works in Chrome on 10.5, and 2D fails without crashing in the remaining cases; unit tests BUG=none Review URL: http://codereview.chromium.org/6614005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76839 0039d316-1c4b-4281-b951-d872f2087c98
* Adding cairo and pixman build to windows.gangji@google.com2011-03-024-3/+164
| | | | | | Review URL: http://codereview.chromium.org/6594091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76584 0039d316-1c4b-4281-b951-d872f2087c98
* Pure pedantry: Replace all ".size() == 0" with ".empty()".erg@google.com2011-03-026-8/+8
| | | | | | | | | BUG=carnitas TEST=compiles; existing unit tests. Review URL: http://codereview.chromium.org/6602049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76467 0039d316-1c4b-4281-b951-d872f2087c98
* Add build rules for cairo, pixman, and pkg-config on Mac. (Not yet being used.)tschmelcher@google.com2011-03-015-1/+196
| | | | | | | | | TEST=added them as dependencies to a real target and verified they were built successfully BUG=none Review URL: http://codereview.chromium.org/6591079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76438 0039d316-1c4b-4281-b951-d872f2087c98
* Remove FORCE_CAIRO flag and replace with a new feature.milligan@google.com2011-02-246-28/+41
| | | | | | | | | | | | | | | The possible feature values are: RenderMode=Auto RenderMode=2D RenderMode=3D The default if no feature is specified is 3D for backwards compatibility. Review URL: http://codereview.chromium.org/6576007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75895 0039d316-1c4b-4281-b951-d872f2087c98
* Fix multiple issues in the way O3D IPC server address name strings were ↵tschmelcher@chromium.org2011-02-232-10/+14
| | | | | | | | | | | | | | | generated: - They had a small chance of colliding. e.g., message queue 41 for process 4 and message queue 1 for process 44 would both attempt to acquire the name "o3d441", and whichever one came second would fail since it was already in use. The fix is to separate the PID and instance number with a hypen. This way the names in such a case become "o3d4-41" and "o3d41-4", which are distinct. - The PID in the name was truncated if it was greater than 65535 (possible in some edge cases on Windows and Linux). - Incrementing of the per-process id was not thread-safe. TEST=loaded o3d on Linux and verified IPC still works BUG=none Review URL: http://codereview.chromium.org/6578008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75810 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for runtime fall-back from o3d to o2d iff o3d initialization ↵milligan@google.com2011-02-236-14/+42
| | | | | | | | | fails for any reason. This is still only supported on linux for GL renderer. o2d mode can still be forced at compile time via the force_cairo=1 GYP_DEFINE. Verified on Linux in o3d and o2d mode and on Mac. Unit tests are still passing 100%. Also confirmed o2d fall-back using NX on Linux. Review URL: http://codereview.chromium.org/6538102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75776 0039d316-1c4b-4281-b951-d872f2087c98
* Baby steps toward o2d and o3d dynamic switching in the video acceleratormilligan@google.com2011-02-2214-54/+47
| | | | | | | | | | | browser plugin. This step rolls the o2d renderer and the gl renderer into the same linux plugin. Unfortunately the code path for which one gets used is still controlled by a compile time switch. That switch is force_cairo which is set to 0 by default (meaning o3d) in common.gypi. Review URL: http://codereview.chromium.org/6532010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75614 0039d316-1c4b-4281-b951-d872f2087c98
* Log the number of objects in a Pack when it is deleted in debug builds to ↵tschmelcher@chromium.org2011-02-181-0/+2
| | | | | | | | | | help JS app developers find leaks. TEST=used it in a JS app to help identify a leak BUG=none Review URL: http://codereview.chromium.org/6542028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75441 0039d316-1c4b-4281-b951-d872f2087c98
* Import cairo and pixman (a dependency of cairo) into third_party/ on Win and ↵tschmelcher@chromium.org2011-02-101-1/+14
| | | | | | | | | | | Mac so that we can build them as static libraries. TEST=none BUG=none Review URL: http://codereview.chromium.org/6473001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74468 0039d316-1c4b-4281-b951-d872f2087c98
* O2D: Add an API to the Layer class to enable painting the entire screen ↵tschmelcher@chromium.org2011-02-025-33/+36
| | | | | | | | | | | area. JavaScript will use this to paint a custom background colour using a Pattern created by Pattern::CreateRgbPattern(). (In principle JavaScript could already do this by setting (x, y) = (0, 0) and (width, height) = resolution of the display area, but this is simpler.) Also delete the code implementing the hard-coded black background. TEST=loaded O2D and verified that a background can be created as described above BUG=none Review URL: http://codereview.chromium.org/6349032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73511 0039d316-1c4b-4281-b951-d872f2087c98
* O2D: Add an API to set the pattern extension method.tschmelcher@chromium.org2011-02-013-6/+59
| | | | | | | | | TEST=pending: loaded O2D and verified the API functions BUG=none Review URL: http://codereview.chromium.org/6409019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73243 0039d316-1c4b-4281-b951-d872f2087c98
* O2D: Add an API for setting the texture filter.tschmelcher@chromium.org2011-01-273-3/+62
| | | | | | | | | TEST=loaded O2D and verified that choosing different filters gives different results BUG=none Review URL: http://codereview.chromium.org/6254021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72859 0039d316-1c4b-4281-b951-d872f2087c98
* Update DEPS to pick up FCollada build fixes.tschmelcher@chromium.org2011-01-271-1/+1
| | | | | | | | | TEST=built in Debug and Release mode on Lucid 64-bit BUG=none Review URL: http://codereview.chromium.org/6379008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72740 0039d316-1c4b-4281-b951-d872f2087c98
* O2D: Fix graphical artifacting with transparent images caused by using ↵tschmelcher@chromium.org2011-01-262-43/+49
| | | | | | | | | | | non-premultiplied alpha ARGB images as if they were premultiplied alpha ARGB. This caused the transparent parts of images to be too bright (and in some cases fully opaque). Cairo only supports premultiplied alpha, but O3D calls SetRect() with non-premultiplied alpha, so we have to convert. TEST=loaded O2D and verified transparent images look correct now BUG=none Review URL: http://codereview.chromium.org/6309007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72658 0039d316-1c4b-4281-b951-d872f2087c98
* Add HANDLE_CRASHES to Linux callback functions, since they are plugin entry ↵tschmelcher@chromium.org2011-01-241-0/+10
| | | | | | | | | | | points too. This makes no difference right now because we currently don't gate Linux crash uploading on HANDLE_CRASHES, but once we change that we'll want these in all the right places. TEST=loaded O2D on Linux, verified it works BUG=none Review URL: http://codereview.chromium.org/6348018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72388 0039d316-1c4b-4281-b951-d872f2087c98
* O2D: Implement the COPY_WITH_FADING paint operator, and change some of the ↵tschmelcher@chromium.org2011-01-211-22/+28
| | | | | | | | | | | other code to be simpler. TEST=loaded O2D and verified COPY_WITH_FADING works BUG=none Review URL: http://codereview.chromium.org/6298011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72194 0039d316-1c4b-4281-b951-d872f2087c98
* O2D:tschmelcher@chromium.org2011-01-208-28/+183
| | | | | | | | | | | | | | | | | | | - New APIs: - Add a "visible" property to the Layer class to mimick the visible property of the Transform class. - Add a method to set an affine transform on Pattern objects so that texture patterns can be transformed independently from the Layers that use them. - Add a "paint operators" API for Layers and define four operators (currently only three of them implemented). The previous hard-coded behaviour was equivalent to the BLEND_WITH_TRANSPARENCY operator. - Fixes: - Replace the "mask" nomenclature with "clip", which is a more standard name. - Don't clip alpha-blended layers. - Restrict Layer painting to the rectangle defined by the attributes. - Set default alpha value to 0.0 instead of 1.0 to match what JavaScript expects. TEST=loaded O2D and verified all new functionality is working BUG=none Review URL: http://codereview.chromium.org/6255003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72006 0039d316-1c4b-4281-b951-d872f2087c98
* O2D:tschmelcher@chromium.org2011-01-191-3/+8
| | | | | | | | | | | | - Fix graphical artifacting for images downloaded from the Internet caused by overwriting them with their own mip-maps. This resulted in each image being rendered with copies of itself of decreasing size in one of the corners. Cairo does not support/need mip-maps, so we now just ignore the calls to set the mip-maps. - Do not alpha-blend new texture content with the old texture content, which is wrong and would have been wasting a bit of CPU too. TEST=loaded O2D and verified the artifacting is fixed BUG=none Review URL: http://codereview.chromium.org/6268006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71819 0039d316-1c4b-4281-b951-d872f2087c98
* O2D: Several (unrelated) improvements:tschmelcher@chromium.org2011-01-145-19/+64
| | | | | | | | | | | | | - Use Cairo double-buffering (prevents flickering when there is translucency). - Add an API to allow JS to indicate the stacking order of layers. (Previously it was the arbitrary order of their creation!) - Delete layer objects that have been discarded by the JS via Pack::RemoveObject(). TEST=loaded O2D and verified no significant change in perf as a result of double-buffering (~70% of a core before and ~72% of a core after) BUG=none Review URL: http://codereview.chromium.org/6320002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71475 0039d316-1c4b-4281-b951-d872f2087c98
* Clang: enable -Wbool-conversions and -Wunused-variables on Linux.hans@chromium.org2011-01-142-44/+44
| | | | | | | | | | | | | | | -Wbool-conversion warns about EXPECT_EQ(false, blah), so replace that with EXPECT_FALSE(blah). Do the same with EXPECT_EQ(true, blah) for good measure (even though that doesn't generate warnings). Also remove the one instance of an unused variable. BUG=69421 TEST=buildbots all compile and all tests pass Review URL: http://codereview.chromium.org/6300001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71431 0039d316-1c4b-4281-b951-d872f2087c98
* Revert o3d changes in 70977akalin@chromium.org2011-01-112-4/+2
| | | | | | | | | | | According to Bardley Nelson, o3d uses a pinned (stale) version of base, and one must not update o3d to reflect new base changes. BUG=None TEST=None TBR=bradnelson git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70985 0039d316-1c4b-4281-b951-d872f2087c98
* Made logging not look up --enable-dcheck from command lineakalin@chromium.org2011-01-112-2/+4
| | | | | | | | | | | | | | | | Made --enable-dcheck a parameter to InitLogging() and fixed up all callsites. BUG=62736 TEST=Manual Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70782 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70920 Review URL: http://codereview.chromium.org/6070006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70977 0039d316-1c4b-4281-b951-d872f2087c98
* Change #ifdef _DEBUG test to #ifndef NDEBUG test.tfarina@chromium.org2011-01-105-8/+8
| | | | | | | | | BUG=None TEST=trybots Review URL: http://codereview.chromium.org/5991010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70956 0039d316-1c4b-4281-b951-d872f2087c98
* add Opera to the list of agents that work okay with O3D (as Opera 11.0)fbarchard@chromium.org2011-01-051-3/+4
| | | | | | | | | BUG=68593 TEST=use google talk video in opera 11. Should work without warning if you enable labs 'Google Talk Enhancements' Review URL: http://codereview.chromium.org/6066009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70537 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting the o3d parts of: 70009 70345 70353bradnelson@google.com2011-01-044-9/+9
| | | | | | | | | | | | | | O3D is frozen on an old version of base, so I believe you want to avoid updating it in future base changes. BUG=None TEST=None Review URL: http://codereview.chromium.org/6075009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70450 0039d316-1c4b-4281-b951-d872f2087c98
* Move base/lock and base/condition_variable to base/synchronization/brettw@chromium.org2011-01-011-6/+6
| | | | | | | | | | | I kept a base/lock.h in place with a using statement to avoid updating all callers in one CL. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6018013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70363 0039d316-1c4b-4281-b951-d872f2087c98
* Move base/thread.h to base/threading, fix up callers to use the new location.brettw@chromium.org2011-01-012-2/+2
| | | | | | | | TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6028009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70345 0039d316-1c4b-4281-b951-d872f2087c98
* Move base/cocoa_protocols_mac.h to base/mac/cocoa_protocols.hbrettw@chromium.org2010-12-231-1/+1
| | | | | | | | | | Fix users of this file to use the new location. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6019004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70009 0039d316-1c4b-4281-b951-d872f2087c98
* o3d: Fix o3d build.tfarina@chromium.org2010-12-211-2/+1
| | | | | | | | | | | This reverts the changes did on http://src.chromium.org/viewvc/chrome?view=rev&revision=69785 BUG=None TEST=None Review URL: http://codereview.chromium.org/5970006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69793 0039d316-1c4b-4281-b951-d872f2087c98
* Add base:: prefix to the calls to StringAppendV.tfarina@chromium.org2010-12-211-1/+2
| | | | | | | | | BUG=None TEST=trybots Review URL: http://codereview.chromium.org/6055003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69785 0039d316-1c4b-4281-b951-d872f2087c98
* Fix ON_DEMAND_RENDER mode on Mac OSX.tschmelcher@chromium.org2010-12-155-10/+14
| | | | | | | | Submitting on behalf of pthatcher@google.com Review URL: http://codereview.chromium.org/5843001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69197 0039d316-1c4b-4281-b951-d872f2087c98
* Update DEPS to pick up nixysa changes r72 and r73.tschmelcher@chromium.org2010-12-101-1/+1
| | | | | | | | | TEST=built and ran on Linux BUG=none Review URL: http://codereview.chromium.org/5766001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68799 0039d316-1c4b-4281-b951-d872f2087c98