Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: webkit/glue/stacking_order_iterator.cc

Issue 11801: Wrap MSVC-specific pragmas. As -Wunknown-pragmas has been disabled for wtf,... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/searchable_form_data.cc ('k') | webkit/glue/weburlrequest_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "base/compiler_specific.h"
6 7
7 #pragma warning(push, 0) 8 MSVC_PUSH_WARNING_LEVEL(0);
8 #include "RenderLayer.h" 9 #include "RenderLayer.h"
9 #include "RenderObject.h" 10 #include "RenderObject.h"
10 #pragma warning(pop) 11 MSVC_POP_WARNING();
11 #undef LOG 12 #undef LOG
12 13
13 #include "webkit/glue/stacking_order_iterator.h" 14 #include "webkit/glue/stacking_order_iterator.h"
14 15
15 // 16 //
16 // RenderLayerIterator 17 // RenderLayerIterator
17 // 18 //
18 19
19 RenderLayerIterator::RenderLayerIterator() { 20 RenderLayerIterator::RenderLayerIterator() {
20 } 21 }
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 if (!current_object_) { 135 if (!current_object_) {
135 // Start the next layer. 136 // Start the next layer.
136 WebCore::RenderLayer* layer = layer_iterator_.Next(); 137 WebCore::RenderLayer* layer = layer_iterator_.Next();
137 if (layer) { 138 if (layer) {
138 current_object_ = layer->renderer(); 139 current_object_ = layer->renderer();
139 current_layer_root_ = current_object_; 140 current_layer_root_ = current_object_;
140 } 141 }
141 } 142 }
142 return current_object_; 143 return current_object_;
143 } 144 }
OLDNEW
« no previous file with comments | « webkit/glue/searchable_form_data.cc ('k') | webkit/glue/weburlrequest_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698