diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 21:46:14 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 21:46:14 +0000 |
| commit | fa41969da48955ec4b4ab30589db22322e065a32 (patch) | |
| tree | 4a165afed24e0c4dc38bcd485100d8d56397da40 /webkit/glue/resource_handle_impl.cc | |
| parent | 812eaca72f309bcbb51ee8f386a7d33429c3a314 (diff) | |
| download | chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.zip chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.tar.gz chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.tar.bz2 | |
Replace MSVC pragmas with the macro. Also adds two files
from webkit/glue to the build rule.
Patch from icefox (TorchMobile)
http://codereview.chromium.org/7418
Review URL: http://codereview.chromium.org/7454
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/resource_handle_impl.cc')
| -rw-r--r-- | webkit/glue/resource_handle_impl.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc index 424d344..058a6ca 100644 --- a/webkit/glue/resource_handle_impl.cc +++ b/webkit/glue/resource_handle_impl.cc @@ -24,7 +24,9 @@ #include "config.h" -#pragma warning(push, 0) +#include "base/compiler_specific.h" + +MSVC_PUSH_WARNING_LEVEL(0); #include "CString.h" #include "Console.h" #include "DocLoader.h" @@ -37,7 +39,7 @@ #include "ResourceHandleClient.h" #include "ResourceRequest.h" #include "ResourceResponse.h" -#pragma warning(pop) +MSVC_POP_WARNING(); #undef LOG #include "base/logging.h" @@ -251,12 +253,12 @@ ResourceHandleInternal::ResourceHandleInternal(ResourceHandle* job, : job_(job), client_(c), request_(r), +MSVC_SUPPRESS_WARNING(4355) // can use this + data_url_factory_(this), load_flags_(net::LOAD_NORMAL), pending_(false), expected_content_length_(-1), - multipart_delegate_(NULL), -MSVC_SUPPRESS_WARNING(4355) // can use this - data_url_factory_(this) { + multipart_delegate_(NULL) { } ResourceHandleInternal::~ResourceHandleInternal() { |