Wrap MSVC-specific pragmas. As -Wunknown-pragmas has been disabled for wtf,

some of these sneaked in.

BUG=2053

Review URL: http://codereview.chromium.org/11801

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5830 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 49 insertions, 17 deletions

diff --git a/webkit/glue/autofill_form.cc b/webkit/glue/autofill_form.cc
index e5a4c5c..9ad9237 100644
--- a/webkit/glue/autofill_form.cc
+++ b/webkit/glue/autofill_form.cc
@@ -3,12 +3,13 @@
 // found in the LICENSE file.
 
 #include "config.h"
+#include "base/compiler_specific.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Frame.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 
diff --git a/webkit/glue/searchable_form_data.cc b/webkit/glue/searchable_form_data.cc
index 582e78c..d8a982c 100644
--- a/webkit/glue/searchable_form_data.cc
+++ b/webkit/glue/searchable_form_data.cc
@@ -23,7 +23,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceRequest.h"
 #include "TextEncoding.h"
 #include <wtf/Vector.h>
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 
diff --git a/webkit/glue/stacking_order_iterator.cc b/webkit/glue/stacking_order_iterator.cc
index c50c9b3..2d77ae9 100755
--- a/webkit/glue/stacking_order_iterator.cc
+++ b/webkit/glue/stacking_order_iterator.cc
@@ -3,11 +3,12 @@
 // found in the LICENSE file.
 
 #include "config.h"
+#include "base/compiler_specific.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "RenderLayer.h"
 #include "RenderObject.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/stacking_order_iterator.h"
diff --git a/webkit/glue/weburlrequest_impl.cc b/webkit/glue/weburlrequest_impl.cc
index 90e7f21..8dc1f17 100644
--- a/webkit/glue/weburlrequest_impl.cc
+++ b/webkit/glue/weburlrequest_impl.cc
@@ -3,12 +3,13 @@
 // found in the LICENSE file.
 
 #include "config.h"
+#include "base/compiler_specific.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "FormData.h"
 #include "HTTPHeaderMap.h"
 #include "ResourceRequest.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/logging.h"
diff --git a/webkit/port/bridge/chromium/PluginsChromium.cpp b/webkit/port/bridge/chromium/PluginsChromium.cpp
index cdc69b1..20c2ce0 100644
--- a/webkit/port/bridge/chromium/PluginsChromium.cpp
+++ b/webkit/port/bridge/chromium/PluginsChromium.cpp
@@ -37,7 +37,14 @@
 
 #include "ChromiumBridge.h"
 #include "PluginData.h"
+#if COMPILER(MSVC)
+__pragma(warning(push, 0))
+#endif
 #include "PluginInfoStore.h"
+#if COMPILER(MSVC)
+__pragma(warning(pop))
+#endif
+#undef LOG
 
 namespace WebCore {
 
diff --git a/webkit/port/loader/IconLoader.cpp b/webkit/port/loader/IconLoader.cpp
index 345d2af..26c6c6cb 100644
--- a/webkit/port/loader/IconLoader.cpp
+++ b/webkit/port/loader/IconLoader.cpp
@@ -25,7 +25,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#if COMPILER(MSVC)
+__pragma(warning(push, 0))
+#endif
 #include "IconLoader.h"
 
 #include "Document.h"
@@ -38,7 +40,9 @@
 #include "ResourceResponse.h"
 #include "ResourceRequest.h"
 #include "SubresourceLoader.h"
-#pragma warning(pop)
+#if COMPILER(MSVC)
+__pragma(warning(pop))
+#endif
 
 using namespace std;
 
diff --git a/webkit/port/platform/chromium/ClipboardChromium.cpp b/webkit/port/platform/chromium/ClipboardChromium.cpp
index 5087cdf..ac701fe 100644
--- a/webkit/port/platform/chromium/ClipboardChromium.cpp
+++ b/webkit/port/platform/chromium/ClipboardChromium.cpp
@@ -25,7 +25,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#if COMPILER(MSVC)
+__pragma(warning(push, 0))
+#endif
 #include "CachedImage.h"
 #include "ChromiumBridge.h"
 #include "ChromiumDataObject.h"
@@ -53,7 +55,9 @@
 #include "StringBuilder.h"
 #include "StringHash.h"
 #include <wtf/RefPtr.h>
-#pragma warning(pop)
+#if COMPILER(MSVC)
+__pragma(warning(pop))
+#endif
 
 namespace WebCore {
 
diff --git a/webkit/port/platform/chromium/FileChooserChromium.cpp b/webkit/port/platform/chromium/FileChooserChromium.cpp
index 37a075e..2a80744 100644
--- a/webkit/port/platform/chromium/FileChooserChromium.cpp
+++ b/webkit/port/platform/chromium/FileChooserChromium.cpp
@@ -25,7 +25,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#if COMPILER(MSVC)
+__pragma(warning(push, 0))
+#endif
 #include "ChromeClientChromium.h"
 #include "Document.h"
 #include "Frame.h"
@@ -35,7 +37,9 @@
 #include "NotImplemented.h"
 #include "Page.h"
 #include "StringTruncator.h"
-#pragma warning(pop)
+#if COMPILER(MSVC)
+__pragma(warning(pop))
+#endif
 
 namespace WebCore {
 
diff --git a/webkit/port/platform/chromium/PopupMenuChromium.cpp b/webkit/port/platform/chromium/PopupMenuChromium.cpp
index 29fcda3..5cda719 100644
--- a/webkit/port/platform/chromium/PopupMenuChromium.cpp
+++ b/webkit/port/platform/chromium/PopupMenuChromium.cpp
@@ -29,7 +29,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#if COMPILER(MSVC)
+__pragma(warning(push, 0))
+#endif
 #include "PopupMenu.h"
 
 #include "CharacterNames.h"
@@ -55,7 +57,9 @@
 #include "ScrollbarTheme.h"
 #include "SystemTime.h"
 #include "Widget.h"
-#pragma warning(pop)
+#if COMPILER(MSVC)
+__pragma(warning(pop))
+#endif
 
 #include "webkit/port/platform/chromium/PopupMenuChromium.h"
 
diff --git a/webkit/port/platform/chromium/PopupMenuChromium.h b/webkit/port/platform/chromium/PopupMenuChromium.h
index 0b73774..0f97ee4 100644
--- a/webkit/port/platform/chromium/PopupMenuChromium.h
+++ b/webkit/port/platform/chromium/PopupMenuChromium.h
@@ -5,12 +5,18 @@
 #ifndef PopupMenuChromium_h
 #define PopupMenuChromium_h
 
-#pragma warning(push, 0)
+#include "config.h"
+
+#if COMPILER(MSVC)
+__pragma(warning(push, 0))
+#endif
 #include "PopupMenuClient.h"
 
 #include "FramelessScrollView.h"
 #include "IntRect.h"
-#pragma warning(pop)
+#if COMPILER(MSVC)
+__pragma(warning(pop))
+#endif
 
 
 namespace WebCore {