diff options
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r-- | webkit/glue/webframe_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index fa607d5..fd3ceb1 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -268,10 +268,10 @@ int WebFrameImpl::live_object_count_ = 0; WebFrameImpl::WebFrameImpl() // Don't complain about using "this" in initializer list. -#pragma warning(disable: 4355) +MSVC_PUSH_DISABLE_WARNING(4355) : frame_loader_client_(this), scope_matches_factory_(this), -#pragma warning(default: 4355) +MSVC_POP_WARNING() currently_loading_request_(NULL), plugin_delegate_(NULL), allows_scrolling_(true), |