| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Prevents duplicates of the media_sse and yuv_convert targets from
ending up in both media and media_unittests during shared builds.
- Removes the yuv_convert target since everyone who uses it already
uses media.
- Merges differ_block_sse2 and yuv_convert_simd_x86 into media_sse2.
- Moves assembly into media_asm.
- Moves incorrect mmx bundling from sse2 to new media_mmx target.
- Introduces EXPORT macro to x86inc.asm
- Introduces yasm_includes for non-.asm files in yasm_compile.gypi.
- Fixes missing const on yuv constants table.
BUG=none
TEST=compiles, all unittests pass.
TBR=fischman@chromium.org, kbr@chromium.org, sergeyu@chromium.org
Review URL: https://codereview.chromium.org/15151002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202230 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
BUG=147355
TEST=VP8 Alpha video streams play
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/13886011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195339 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Broke linux compilation http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Builder%20%28dbg%29&number=47451
> media: Add support for playback for VP8 Alpha video streams.
>
> BUG=147355
> TEST=VP8 Alpha video streams play
>
> Review URL: https://codereview.chromium.org/12263013
>
> Patch from Vignesh Venkatasubramanian <vigneshv@chromium.org>.
TBR=tomfinegan@chromium.org
Review URL: https://codereview.chromium.org/13972014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194469 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
BUG=147355
TEST=VP8 Alpha video streams play
Review URL: https://codereview.chromium.org/12263013
Patch from Vignesh Venkatasubramanian <vigneshv@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194465 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
condition media_unittests
BUG=173697, 166496
TEST=With other build errors fixed in privates (fix win64 gmock_mutant template functor redefinitions & ignore C4267 size_t to int truncations), win64 media_unittests builds without link error to (shared library) media::FilterYUVRows_MMX
R=scherkus@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12213029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181344 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
VS2010 support for them in Win64
On Win64, exclude MMX version in ChooseFilterYUVRowsProc; still use faster
SSE2 version.
Replace _mm_empty() with new yasm that implements EmptyRegisterState_MMX()
with emms in EmptyRegisterState(), ConvertYUVToRGB32_MMX(...), and
ConvertYUVToRGB32_SSE(...).
This patch does not fix other win64 media link errors; more work remains for
bug 172938.
Committing for wolenetz from : https://codereview.chromium.org/12082087/#msg15
BUG=172938, 166496
R=wolenetz@chromium.org
TBR=wolenetz@chromium.org
Review URL: https://codereview.chromium.org/12090114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180141 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 36d40b890e4f763d86546d285bcf7ce0be78c4c8.
BUG=
Review URL: https://codereview.chromium.org/11362104
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166098 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Follow-on to r165103. Turns out that we want smooth interpolation on the
UV planes. Also removes the unittest added to check that straight conversion
and 1:1 scaling give identical results -- this will fail because straight
conversion is presently buggy and does not do UV interpolation.
BUG=chromium:158462
TEST=local build, run on x86, unittests
Review URL: https://chromiumcodereview.appspot.com/11358022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166072 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The present YUV conversion has bugs in that it:
* Does not account correctly for pixel centers (i.e.: a 2-high texture should
have pixel centers at 0.25 and 0.75)
* Interpolates the UV planes incorrectly for formats that have half-height UV
planes (e.g. YV12)
Note that YUV conversion is also incorrect in the X coordinate, but that's
going to be more involved (as it uses vector-optimized routines), and it's
likely going to be made a moot point anyways when we switch to using libYUV
for color converions. Punt for now.
BUG=chromium:158462
TEST=local build, run on x86, unittests
Review URL: https://chromiumcodereview.appspot.com/11337018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165103 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
Small change in media.gyp to support building for MIPS arch.
BUG=130022
TEST=make chrome
Review URL: https://chromiumcodereview.appspot.com/10952006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157697 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
BUG=none
TEST=media_unittests.
Review URL: https://chromiumcodereview.appspot.com/10537082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141627 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: https://chromiumcodereview.appspot.com/10075001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132808 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/10048004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131661 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
CID=101617,101618
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9871001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129967 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=116138
Review URL: http://codereview.chromium.org/9514009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124372 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
buffer to another. YUV to RGB and RGB to RGB operations are supported. YUV to RGB allows down-scaling of re
This CL also adds a supression for Valgrind which otherwise falsely complains about accessing uninitialized memory. See 113076 for details.
BUG=109938,113076
TEST=remoting_unittests.Yuv2Rgb
Review URL: http://codereview.chromium.org/9371002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121258 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=109938
Review URL: http://codereview.chromium.org/9352017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120866 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
buffer to another. YUV to RGB and RGB to RGB operations are supported. YUV to RGB allows down-scaling of rectangles. The wrappers hide (to some degree) gory details of manipulations with buffer pointers and rectangles. Added unit tests (remoting_unittests.Yuv2Rgb) to verify functionality of the YUV to RGB wrapper.
BUG=109938
TEST=remoting_unittests.Yuv2Rgb
Review URL: http://codereview.chromium.org/9320025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120739 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This implementation re-uses the common row filter procedures, but is currently limited to a C horizontal interpolation procedure.
There's also plenty of scope for optimizing the new sub-rectangle scaler routine.
BUG=93451
TEST=media_unittests, remoting_unittests and manual verification of image quality of Chromoting sessions using fit-to-screen.
Review URL: http://codereview.chromium.org/8954003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117748 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Temporarily disable SSSE3 version of color conversion. It caused
a color shift problem on edges of text. We should switch back to
SSSE3 version when the problem is resolved.
BUG=100462
TEST=Run chromoting and see the quality improvement
Review URL: http://codereview.chromium.org/8306005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105782 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
This change fixes a stupid problem in getcpuid() (I forgot declaring cpuid breaks rbx) and re-enables my SSSE3-optimized RGB->YUV conversion.
BUG=none
TEST=YUVConvertTest.*
Review URL: http://codereview.chromium.org/7979016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103237 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After rewriting assembly code in YASM we can finally move all these
different versions of files in the same folder, i.e. media/base/simd.
After this change the main entry point will be:
yuv_convert.cc and yuv_convert.h
It then calls into the internal functions under media/base/simd.
After this change I'll move all the color conversion files to
media/csc.
BUG=None
TEST=Tree is gree
Review URL: http://codereview.chromium.org/7888012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101507 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
I'll watch the official buildbot this time.
TBR=ajwong, dhollowa
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7891039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101067 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Failed on official Linux 32 builder. (x486?)
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux/builds/11240/steps/compile/logs/stdio
In file included from media/base/yuv_convert.cc:33:
/usr/lib/gcc/i486-linux-gnu/4.4.3/include/emmintrin.h:32:3:error: #error "SSE2 instruction set not enabled"
make: *** [out/Release/obj.target/yuv_convert/media/base/yuv_convert.o] Error 1
Besides rewrite assembly code in YASM, this change also do
runtime selection of routine depending processor support.
There are couple advantages in this YASM version.
1. Performance improvement
Using YASM we can push less to the stack, this results in ~5%
improvement on 32-bits system.
2. MMX and SSE versions are separate
SSE version use movntq while MMX version use movq.
3. 64-bits version works universally
This means that 64-bits YASM code compile and run on 64-bits
windows, mac and linux. While previously it only runs on
linux 64.
4. Handling PIC much better
PIC code runs and build on 32-bits and 64-bits system.
This is better than before which only works on 32-bits mac.
5. Easier maintenance
This code uses x86asm.inc for a bunch of nice macros. Having
just one YASM verion is better than having inline VC assembly
and don't have to worry inline assemly has different register
names on mac and linux.
I tested on linux 32-bits, linux 32-bits PIC and linux 64-bits
that this code is at least as fast as before.
BUG=None
TEST=media_unittests runs and all passing
Review URL: http://codereview.chromium.org/7858003
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/7887025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101008 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Failed on official Linux 32 builder. (x486?)
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux/builds/11240/steps/compile/logs/stdio
In file included from media/base/yuv_convert.cc:33:
/usr/lib/gcc/i486-linux-gnu/4.4.3/include/emmintrin.h:32:3:error: #error "SSE2 instruction set not enabled"
make: *** [out/Release/obj.target/yuv_convert/media/base/yuv_convert.o] Error 1
Disable SSSE3 conversion code as tests are not running.
TBR=hbono@chromium.org
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7888014
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/7890023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101006 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
Disable SSSE3 conversion code as tests are not running.
TBR=hbono@chromium.org
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7888014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100917 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Besides rewrite assembly code in YASM, this change also do
runtime selection of routine depending processor support.
There are couple advantages in this YASM version.
1. Performance improvement
Using YASM we can push less to the stack, this results in ~5%
improvement on 32-bits system.
2. MMX and SSE versions are separate
SSE version use movntq while MMX version use movq.
3. 64-bits version works universally
This means that 64-bits YASM code compile and run on 64-bits
windows, mac and linux. While previously it only runs on
linux 64.
4. Handling PIC much better
PIC code runs and build on 32-bits and 64-bits system.
This is better than before which only works on 32-bits mac.
5. Easier maintenance
This code uses x86asm.inc for a bunch of nice macros. Having
just one YASM verion is better than having inline VC assembly
and don't have to worry inline assemly has different register
names on mac and linux.
I tested on linux 32-bits, linux 32-bits PIC and linux 64-bits
that this code is at least as fast as before.
BUG=None
TEST=media_unittests runs and all passing
Review URL: http://codereview.chromium.org/7858003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100915 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
Sorry, I forgot disabling my ConvertRGB32ToYUV_SSSE3()
TBR=hclam
BUG=none
TEST=fix media_unittests
Review URL: http://codereview.chromium.org/7861020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100364 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
It seems my ConvertRGB24ToYUV_SSSE3() causes a crash on Linux x64. This change disables this function until I fix it.
TBR=hclam
BUG=none
TEST=make media_unittests green.
Review URL: http://codereview.chromium.org/7857028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100362 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
This change implements two conversions (RGB32-to-YV12 and RGB24-to-YV12) in YASM. This change uses 8-bit fixed-point calculation and converts up to four pixels at once.
BUG=none
TEST=YUVConvertTest.SideBySideRGB
Review URL: http://codereview.chromium.org/7003082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100352 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
Took the time to clean up said tests for improved coverage.
BUG=90173
TEST=media_unittests
Review URL: http://codereview.chromium.org/7794016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99113 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
BUG=87490
TEST=None
Review URL: http://codereview.chromium.org/7230023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90818 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the patch containing code necessary for communicating with the VideoCaptureMessageFilter from the browser process and transferring Transport Dibs filled with video frames in I420 color format. It also contain code for color converting video frames to I420.
Color conversion has been tested on Linux and Windows by using video_capture_host_unittest and dumping I420 frames to file. See #define DUMP_VIDEO #define TEST_REAL_CAPTURE_DEVICE.
Patch by perk@google.com:
http://codereview.chromium.org/7002027/
BUG=none
TEST=try bots
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86927 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Put the SSE2 block differ code back in.
TBR=dhollowa
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/6501005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74671 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We have the SSE2 lying around in the tree just never being used. This will
allow us to use it.
A number of Windows bots have gone red in media_tests on the waterfall:
http://build.chromium.org/p/chromium/builders/XP%20Tests%20%281%29
http://build.chromium.org/p/chromium/builders/XP%20Tests%20%281%29/builds/501/steps/media_unittests/logs/stdio
This seems to be related to r74571. So am reverting to see.
BUG=None
TEST=Chromoting to a host machine and the diff will work correctly
Review URL: http://codereview.chromium.org/6469022
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/6502002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74630 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(Quick test to see if it is the cause of crashes in media_unittests)
(Test showed this CL is not to blame)
We have the SSE2 lying around in the tree just never being used. This will
allow us to use it.
BUG=None
TEST=Chromoting to a host machine and the diff will work correctly
Review URL: http://codereview.chromium.org/6469022
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/6488023
TBR=finnur@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74588 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(Quick test to see if it is the cause of crashes in media_unittests)
We have the SSE2 lying around in the tree just never being used. This will
allow us to use it.
BUG=None
TEST=Chromoting to a host machine and the diff will work correctly
Review URL: http://codereview.chromium.org/6469022
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/6488023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74583 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
We have the SSE2 lying around in the tree just never being used. This will
allow us to use it.
BUG=None
TEST=Chromoting to a host machine and the diff will work correctly
Review URL: http://codereview.chromium.org/6469022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74571 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
This will make text in chromoting view to looks much nicer.
BUG=72218
TEST=Text looks much better in chromoting
Review URL: http://codereview.chromium.org/6410127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74154 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=42064
TEST=sse2 version of scaling should be faster on Atom. No quality change.
Review URL: http://codereview.chromium.org/1700010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45431 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
BUG=42064
TEST=unittests should still pass
Review URL: http://codereview.chromium.org/1733004
TBR=jamesr@chromium.org
Review URL: http://codereview.chromium.org/1718007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45270 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
BUG=42064
TEST=unittests should still pass
Review URL: http://codereview.chromium.org/1733004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45265 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=19113
TEST=use playerwtl and reduce size to half and turn filtering on/off. Should look better.
Review URL: http://codereview.chromium.org/1625017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44760 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=19113
TEST=builds on arm
Review URL: http://codereview.chromium.org/1553033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44608 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=19113,41045
TEST=none. just cleanup and making all platforms produce the same results
Review URL: http://codereview.chromium.org/1638008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44591 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=19113
TEST=none
Review URL: http://codereview.chromium.org/1559032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44584 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=19113
TEST=Right border has correct color
Review URL: http://codereview.chromium.org/1518027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44455 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=19113
TEST=scale up by 4x and watch right edge for texel wrap.
Review URL: http://codereview.chromium.org/1560032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44437 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=19113
TEST=build official chrome on linux 32 bit.
Review URL: http://codereview.chromium.org/1508031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44318 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=19113
TEST=do large scale factors and look for lines every nth line. Should look smooth and be faster than previously.
Review URL: http://codereview.chromium.org/1521023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44307 0039d316-1c4b-4281-b951-d872f2087c98
|