Changeset 85362 in webkit

Timestamp:

Apr 29, 2011 3:20:07 PM (13 years ago)

Author:

evan@chromium.org

Message:

2011-04-28 Evan Martin <​evan@chromium.org>

Reviewed by Tony Chang.

[chromium] support components build on Linux
​https://bugs.webkit.org/show_bug.cgi?id=59748

• WebKit.gyp: adjust tests to not be Windows-specific.
• public/WebCommon.h: add #defines to support Linux.
• public/linux/WebFontRenderStyle.h: expose Linux-specific API.
• tests/RunAllTests.cpp: adjust ifdefs to not be Windows-specific.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (5 diffs)
• public/WebCommon.h (modified) (1 diff)
• public/linux/WebFontRenderStyle.h (modified) (1 diff)
• tests/RunAllTests.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-28  Evan Martin  <evan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] support components build on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=59748
+
+        * WebKit.gyp: adjust tests to not be Windows-specific.
+        * public/WebCommon.h: add #defines to support Linux.
+        * public/linux/WebFontRenderStyle.h: expose Linux-specific API.
+        * tests/RunAllTests.cpp: adjust ifdefs to not be Windows-specific.
+
 2011-04-29  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -593 +593 @@
             ],
             'conditions': [
-                ['inside_chromium_build==1 and OS=="win"', {
+                ['inside_chromium_build==1', {
                     'type': '<(component)',
 
@@ -613 +613 @@
                                 '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
                                 '<(chromium_src_dir)/third_party/modp_b64/modp_b64.gyp:modp_b64',
-                                '<(chromium_src_dir)/third_party/nss/nss.gyp:*',
                                 '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
                                 '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
@@ -632 +631 @@
                                 'tests/WebUnitTests.cpp',   # Components test runner support.
                             ],
-                            'sources!' : [
+                            'sources!': [
                                 # We should not include files depending on webkit_support.
                                 'tests/CCThreadTest.cpp',
@@ -639 +638 @@
                                 'tests/WebFrameTest.cpp',
                                 'tests/WebPageSerializerTest.cpp',
+                            ],
+                            'conditions': [
+                                ['OS=="win" or OS=="mac"', {
+                                    'dependencies': [
+                                        '<(chromium_src_dir)/third_party/nss/nss.gyp:*',
+                                    ],
+                                }],
                             ]
                         }],
@@ -871 +877 @@
             ],
             'conditions': [
-                ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+                ['inside_chromium_build==1 and component=="shared_library"', {
                     'defines': [
                         'WEBKIT_DLL_UNITTEST',

trunk/Source/WebKit/chromium/public/WebCommon.h

@@ -66 +66 @@
 // Exported symbols need to be annotated with WEBKIT_API
 
-#if defined(WIN32) && defined(WEBKIT_DLL)
-    #if WEBKIT_IMPLEMENTATION
-        #define WEBKIT_API __declspec(dllexport)
+#if defined(WEBKIT_DLL)
+    #if defined(WIN32)
+        #if WEBKIT_IMPLEMENTATION
+            #define WEBKIT_API __declspec(dllexport)
+        #else
+            #define WEBKIT_API __declspec(dllimport)
+        #endif
     #else
-        #define WEBKIT_API __declspec(dllimport)
+        #define WEBKIT_API __attribute__((visibility("default")))
     #endif
 #else

trunk/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h

@@ -38 +38 @@
 namespace WebKit {
 
-struct WebFontRenderStyle {
+struct WEBKIT_API WebFontRenderStyle {
     // Each of the use* members below can take one of three values:
     //   0: off

trunk/Source/WebKit/chromium/tests/RunAllTests.cpp

@@ -36 +36 @@
 #include <webkit/support/webkit_support.h>
 
-#if defined(WIN32) && defined(WEBKIT_DLL_UNITTEST)
+#if defined(WEBKIT_DLL_UNITTEST)
 #include "WebUnitTests.h"
 #endif
@@ -50 +50 @@
     webkit_support::SetUpTestEnvironmentForUnitTests();
 
-#if defined(WIN32) && defined(WEBKIT_DLL_UNITTEST)
+#if defined(WEBKIT_DLL_UNITTEST)
     // For chromium multi-dll build, need to call webkit api to create a
     // TestSuite instance in webkit.dll and run all tests from there.