Unreviewed, rolling out r93426.

http://trac.webkit.org/changeset/93426
https://bugs.webkit.org/show_bug.cgi?id=66607

Broke the Mac build by not building gtest.framework anymore
(Requested by andersca on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-08-19

Source/ThirdParty:

* gtest/README.WebKit:
* gtest/include/gtest/internal/gtest-port.h:
* gtest/msvc/gtest-md.vcproj:
* gtest/xcode/Config/General.xcconfig:
* gtest/xcode/gtest.xcodeproj/project.pbxproj:

Tools:

* TestWebKitAPI/Tests/WTF/StringOperators.cpp:

git-svn-id: svn://svn.chromium.org/blink/trunk@93451 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/ThirdParty/ChangeLog

+2011-08-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r93426.
+        http://trac.webkit.org/changeset/93426
+        https://bugs.webkit.org/show_bug.cgi?id=66607
+
+        Broke the Mac build by not building gtest.framework anymore
+        (Requested by andersca on #webkit).
+
+        * gtest/README.WebKit:
+        * gtest/include/gtest/internal/gtest-port.h:
+        * gtest/msvc/gtest-md.vcproj:
+        * gtest/xcode/Config/General.xcconfig:
+        * gtest/xcode/gtest.xcodeproj/project.pbxproj:
+
 2011-08-18  Dmitry Lomov  <dslomov@google.com>
 
         TestWebKitAPI breaks on Windows due to fast malloc incompatibility.

third_party/WebKit/Source/ThirdParty/gtest/README.WebKit

@@ -2,10 +2,5 @@ GTest v.1.5.0
 
 http://googletest.googlecode.com/svn/tags/release-1.5.0/ 
 
-2011-08-19 Dmitry Lomov (dslomov@google.com)
-      - WebKit port of gtest uses universal "new" and "delete" operators from JavaScriptCore.
-      - removed all dynamic targets from gtest.xcodeproject (we only build static libgtest.a 
-        and statically-linked gtest unit-test runner).
-
 2011-05-06 Dmitry Lomov (dslomov@google.com)
       gtest-md.vcproj upgraded to VS 2005 (8.0) format to match the rest of WebKit

third_party/WebKit/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h

@@ -177,24 +177,6 @@
 #include <sys/stat.h>
 #endif  // !_WIN32_WCE
 
-#include <wtf/Platform.h>
-
-#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
-#define JS_EXPORTDATA __declspec(dllimport)
-#define WEBKIT_EXPORTDATA __declspec(dllimport)
-#define WTF_EXPORT_PRIVATE
-#define JS_EXPORT_PRIVATE
-#define JS_EXPORTCLASS JS_EXPORTDATA
-#else
-#define JS_EXPORTDATA
-#define JS_EXPORTCLASS
-#define WEBKIT_EXPORTDATA
-#define WTF_EXPORT_PRIVATE
-#define JS_EXPORT_PRIVATE
-#endif
-
-#include <wtf/FastMalloc.h>
-
 #include <iostream>  // NOLINT
 #include <sstream>  // NOLINT
 #include <string>  // NOLINT

third_party/WebKit/Source/ThirdParty/gtest/msvc/gtest-md.vcproj

@@ -20,7 +20,7 @@
 			OutputDirectory="$(ConfigurationBuildDir)\lib"
 			IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)"
 			ConfigurationType="4"
-			InheritedPropertySheets=""$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops""
+			InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -40,7 +40,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
@@ -104,7 +103,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -166,7 +164,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
@@ -231,7 +228,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -293,7 +289,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +350,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"

third_party/WebKit/Source/ThirdParty/gtest/xcode/Config/General.xcconfig

@@ -10,8 +10,6 @@
 // Build for PPC and Intel, 32- and 64-bit
 ARCHS = i386 x86_64
 
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders/ForwardingHeaders ../ ../include/
-
 // Zerolink prevents link warnings so turn it off
 ZERO_LINK = NO
 

third_party/WebKit/Tools/ChangeLog

+2011-08-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r93426.
+        http://trac.webkit.org/changeset/93426
+        https://bugs.webkit.org/show_bug.cgi?id=66607
+
+        Broke the Mac build by not building gtest.framework anymore
+        (Requested by andersca on #webkit).
+
+        * TestWebKitAPI/Tests/WTF/StringOperators.cpp:
+
 2011-08-19  James Robinson  <jamesr@chromium.org>
 
         [chromium] Chromium GPU layout tests should use the normal process number selection, not force 1 worker

third_party/WebKit/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp

@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define JS_EXPORTDATA
 #define WTF_STRINGTYPEADAPTER_COPIED_WTF_STRING() (++wtfStringCopyCount)
 
 static int wtfStringCopyCount;