fix WEBKIT_xxx_IMPLEMENTATION macros in webkit/common and webkit/renderer

R=jamesr@chromium.org
BUG=239107

Review URL: https://codereview.chromium.org/16049013

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

10 files changed, 57 insertions, 38 deletions

diff --git a/webkit/common/webdropdata.h b/webkit/common/webdropdata.h
index b8e383a..0b041cd 100644
--- a/webkit/common/webdropdata.h
+++ b/webkit/common/webdropdata.h
@@ -17,7 +17,7 @@
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/common/webkit_common_export.h"
 
 struct IDataObject;
 
@@ -25,9 +25,9 @@ namespace WebKit {
 class WebDragData;
 }
 
-struct WEBKIT_GLUE_EXPORT WebDropData {
+struct WEBKIT_COMMON_EXPORT WebDropData {
   // The struct is used to represent a file in the drop data.
-  struct WEBKIT_GLUE_EXPORT FileInfo {
+  struct WEBKIT_COMMON_EXPORT FileInfo {
     FileInfo();
     FileInfo(const base::string16& path, const base::string16& display_name);
 
diff --git a/webkit/common/webpreferences.h b/webkit/common/webpreferences.h
index 6dc0fb6..3998cb1 100644
--- a/webkit/common/webpreferences.h
+++ b/webkit/common/webpreferences.h
@@ -17,7 +17,7 @@
 
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/common/webkit_common_export.h"
 
 namespace WebKit {
 class WebView;
@@ -45,11 +45,11 @@ enum EditingBehavior {
 // The ISO 15924 script code for undetermined script aka Common. It's the
 // default used on WebKit's side to get/set a font setting when no script is
 // specified.
-WEBKIT_GLUE_EXPORT extern const char kCommonScript[];
+WEBKIT_COMMON_EXPORT extern const char kCommonScript[];
 
 }  // namespace webkit_glue
 
-struct WEBKIT_GLUE_EXPORT WebPreferences {
+struct WEBKIT_COMMON_EXPORT WebPreferences {
   webkit_glue::ScriptFontFamilyMap standard_font_family_map;
   webkit_glue::ScriptFontFamilyMap fixed_font_family_map;
   webkit_glue::ScriptFontFamilyMap serif_font_family_map;
diff --git a/webkit/glue/multipart_response_delegate.h b/webkit/glue/multipart_response_delegate.h
index 10b3171..6de1591 100644
--- a/webkit/glue/multipart_response_delegate.h
+++ b/webkit/glue/multipart_response_delegate.h
@@ -53,7 +53,7 @@
 
 #include "base/basictypes.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/common/webkit_common_export.h"
 
 namespace WebKit {
 class WebURLLoader;
@@ -65,7 +65,7 @@ namespace webkit_glue {
 // Used by unit tests to access private members.
 class MultipartResponseDelegateTester;
 
-class WEBKIT_GLUE_EXPORT MultipartResponseDelegate {
+class WEBKIT_COMMON_EXPORT MultipartResponseDelegate {
  public:
   MultipartResponseDelegate(WebKit::WebURLLoaderClient* client,
                             WebKit::WebURLLoader* loader,
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index df8346d..478c4f9 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -60,8 +60,7 @@
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
-        'WEBKIT_EXTENSIONS_IMPLEMENTATION',
-        'WEBKIT_GLUE_IMPLEMENTATION',
+        'WEBKIT_COMMON_IMPLEMENTATION',
       ],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
@@ -75,23 +74,18 @@
         '<(DEPTH)/url/url.gyp:url_lib',
       ],
 
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)/webkit',
-        '<(SHARED_INTERMEDIATE_DIR)/ui',
-      ],
-
       'sources': [
-        'multipart_response_delegate.cc',
-        'multipart_response_delegate.h',
         '../common/webdropdata.cc',
         '../common/webdropdata.h',
+        '../common/webkit_common_export.h',
+        '../common/webpreferences.cc',
+        '../common/webpreferences.h',
+        'multipart_response_delegate.cc',
+        'multipart_response_delegate.h',
         'weburlrequest_extradata_impl.cc',
         'weburlrequest_extradata_impl.h',
         'weburlresponse_extradata_impl.cc',
         'weburlresponse_extradata_impl.h',
-        '../common/webpreferences.cc',
-        '../common/webpreferences.h',
       ],
 
       'conditions': [
@@ -128,8 +122,7 @@
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
-        'WEBKIT_EXTENSIONS_IMPLEMENTATION',
-        'WEBKIT_GLUE_IMPLEMENTATION',
+        'WEBKIT_RENDERER_IMPLEMENTATION',
       ],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
@@ -140,17 +133,14 @@
         'glue_common',
       ],
 
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      ],
-
       'sources': [
         '../renderer/cpp_bound_class.cc',
         '../renderer/cpp_bound_class.h',
         '../renderer/cpp_variant.cc',
         '../renderer/cpp_variant.h',
+        '../renderer/webkit_renderer_export.h',
         '../renderer/webpreferences_renderer.cc',
+        '../renderer/webpreferences_renderer.h',
       ],
     },
 
diff --git a/webkit/glue/weburlrequest_extradata_impl.h b/webkit/glue/weburlrequest_extradata_impl.h
index f268303..151c4845 100644
--- a/webkit/glue/weburlrequest_extradata_impl.h
+++ b/webkit/glue/weburlrequest_extradata_impl.h
@@ -9,13 +9,13 @@
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/common/webkit_common_export.h"
 
 namespace webkit_glue {
 
 // Base class for Chrome's implementation of the "extra data" stored in each
 // ResourceRequest.
-class WEBKIT_GLUE_EXPORT WebURLRequestExtraDataImpl :
+class WEBKIT_COMMON_EXPORT WebURLRequestExtraDataImpl :
     public NON_EXPORTED_BASE(WebKit::WebURLRequest::ExtraData) {
  public:
   // |custom_user_agent| is used to communicate an overriding custom user agent
diff --git a/webkit/glue/weburlresponse_extradata_impl.h b/webkit/glue/weburlresponse_extradata_impl.h
index a5ddba0..c26325c 100644
--- a/webkit/glue/weburlresponse_extradata_impl.h
+++ b/webkit/glue/weburlresponse_extradata_impl.h
@@ -11,12 +11,12 @@
 #include "base/compiler_specific.h"
 #include "net/http/http_response_info.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/common/webkit_common_export.h"
 
 namespace webkit_glue {
 
 // Base class for Chrome's implementation of the "extra data".
-class WEBKIT_GLUE_EXPORT WebURLResponseExtraDataImpl :
+class WEBKIT_COMMON_EXPORT WebURLResponseExtraDataImpl :
     public NON_EXPORTED_BASE(WebKit::WebURLResponse::ExtraData) {
  public:
   explicit WebURLResponseExtraDataImpl(
diff --git a/webkit/renderer/cpp_bound_class.h b/webkit/renderer/cpp_bound_class.h
index 2a75be5..7cc6345 100644
--- a/webkit/renderer/cpp_bound_class.h
+++ b/webkit/renderer/cpp_bound_class.h
@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "base/callback.h"
-#include "webkit/glue/webkit_glue_export.h"
 #include "webkit/renderer/cpp_variant.h"
+#include "webkit/renderer/webkit_renderer_export.h"
 
 namespace WebKit {
 class WebFrame;
@@ -35,7 +35,7 @@ typedef std::vector<CppVariant> CppArgumentList;
 
 // CppBoundClass lets you map Javascript method calls and property accesses
 // directly to C++ method calls and CppVariant* variable access.
-class WEBKIT_GLUE_EXPORT CppBoundClass {
+class WEBKIT_RENDERER_EXPORT CppBoundClass {
  public:
   class PropertyCallback {
    public:
diff --git a/webkit/renderer/cpp_variant.h b/webkit/renderer/cpp_variant.h
index 9dd8c83..b390402 100644
--- a/webkit/renderer/cpp_variant.h
+++ b/webkit/renderer/cpp_variant.h
@@ -23,11 +23,11 @@
 
 #include "base/basictypes.h"
 #include "third_party/npapi/bindings/npruntime.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/renderer/webkit_renderer_export.h"
 
 namespace webkit_glue {
 
-class WEBKIT_GLUE_EXPORT CppVariant : public NPVariant {
+class WEBKIT_RENDERER_EXPORT CppVariant : public NPVariant {
  public:
   CppVariant();
   ~CppVariant();
diff --git a/webkit/renderer/webkit_renderer_export.h b/webkit/renderer/webkit_renderer_export.h
new file mode 100644
index 0000000..376ac42
--- /dev/null
+++ b/webkit/renderer/webkit_renderer_export.h
@@ -0,0 +1,29 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_RENDERER_WEBKIT_RENDERER_EXPORT_H_
+#define WEBKIT_RENDERER_WEBKIT_RENDERER_EXPORT_H_
+
+#if defined(COMPONENT_BUILD)
+#if defined(WIN32)
+
+#if defined(WEBKIT_RENDERER_IMPLEMENTATION)
+#define WEBKIT_RENDERER_EXPORT __declspec(dllexport)
+#else
+#define WEBKIT_RENDERER_EXPORT __declspec(dllimport)
+#endif  // defined(WEBKIT_RENDERER_IMPLEMENTATION)
+
+#else // defined(WIN32)
+#if defined(WEBKIT_RENDERER_IMPLEMENTATION)
+#define WEBKIT_RENDERER_EXPORT __attribute__((visibility("default")))
+#else
+#define WEBKIT_RENDERER_EXPORT
+#endif
+#endif
+
+#else // defined(COMPONENT_BUILD)
+#define WEBKIT_RENDERER_EXPORT
+#endif
+
+#endif  // WEBKIT_RENDERER_WEBKIT_RENDERER_EXPORT_H_
diff --git a/webkit/renderer/webpreferences_renderer.h b/webkit/renderer/webpreferences_renderer.h
index a6d714e..b546578 100644
--- a/webkit/renderer/webpreferences_renderer.h
+++ b/webkit/renderer/webpreferences_renderer.h
@@ -5,7 +5,7 @@
 #ifndef WEBKIT_RENDERER_WEBPREFERENCES_RENDERER_H_
 #define WEBKIT_RENDERER_WEBPREFERENCES_RENDERER_H_
 
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/renderer/webkit_renderer_export.h"
 
 namespace WebKit {
 class WebView;
@@ -15,8 +15,8 @@ struct WebPreferences;
 
 namespace webkit_glue {
 
-WEBKIT_GLUE_EXPORT void ApplyWebPreferences(const WebPreferences& prefs,
-                                            WebKit::WebView* web_view);
+WEBKIT_RENDERER_EXPORT void ApplyWebPreferences(const WebPreferences& prefs,
+                                                WebKit::WebView* web_view);
 
 }  // namespace webkit_glue