diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 22:10:22 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 22:10:22 +0000 |
| commit | 74155979aaabd78b893a67f5268023470f61c3bb (patch) | |
| tree | 1a87ba9adf14eb0e3205bc5d871c74bafe47a2ef /webkit | |
| parent | 051236f654c97138dd90a81c84e2b4dcaeb29918 (diff) | |
| download | chromium_src-74155979aaabd78b893a67f5268023470f61c3bb.zip chromium_src-74155979aaabd78b893a67f5268023470f61c3bb.tar.gz chromium_src-74155979aaabd78b893a67f5268023470f61c3bb.tar.bz2 | |
Make canary bot happy by disabling warning resulted from StringImpl.h.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/892003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/image_decoder_unittest.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/image_decoder_unittest.h b/webkit/tools/test_shell/image_decoder_unittest.h index 760ac2c..e0fc416 100644 --- a/webkit/tools/test_shell/image_decoder_unittest.h +++ b/webkit/tools/test_shell/image_decoder_unittest.h @@ -9,6 +9,9 @@ #include <vector> #include "Vector.h" +#if OS(WINDOWS) +#pragma warning(disable: 4355) // 'this' used in initializer list +#endif #include "ImageDecoder.h" #undef LOG |