Source/WebCore:
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Mar 2015 18:03:10 +0000 (18:03 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Mar 2015 18:03:10 +0000 (18:03 +0000)
[Win] Increase TestWebKitAPI Test Coverage
https://bugs.webkit.org/show_bug.cgi?id=142433

Reviewed by Darin Adler.

Correct some build deficiencies that prevent TestWebKitAPI
from executing certain tests on Windows.

* WebCore.vcxproj/copyForwardingHeaders.cmd: Copy the interpreter
headers.
* css/CSSParser.h: Export necessary symbols
* css/CSSParserMode.h: Ditto.
* css/StyleProperties.h: Ditto.

Tools:
[Win] Increase TestWebKitAPI Test Coverage[Win] Increase TestWebKitAPI Test Coverage
https://bugs.webkit.org/show_bug.cgi?id=142433

Reviewed by Darin Adler.

Include more TestWebKitAPI tests when building for Windows. Also
fix a build error in MetaAllocator.cpp caused by one of the
Microsoft headers #defining 'small'.

* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters:
* TestWebKitAPI/Tests/WTF/MetaAllocator.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd
Source/WebCore/css/CSSParser.h
Source/WebCore/css/CSSParserMode.h
Source/WebCore/css/StyleProperties.h
Tools/ChangeLog
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters
Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp

index 4f3b00f..6d8ceb9 100644 (file)
@@ -1,3 +1,19 @@
+2015-03-07  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Increase TestWebKitAPI Test Coverage
+        https://bugs.webkit.org/show_bug.cgi?id=142433
+
+        Reviewed by Darin Adler.
+
+        Correct some build deficiencies that prevent TestWebKitAPI
+        from executing certain tests on Windows.
+
+        * WebCore.vcxproj/copyForwardingHeaders.cmd: Copy the interpreter
+        headers.
+        * css/CSSParser.h: Export necessary symbols
+        * css/CSSParserMode.h: Ditto.
+        * css/StyleProperties.h: Ditto.
+
 2015-03-07  David Kilzer  <ddkilzer@apple.com>
 
         Rename SOFT_LINK_FRAMEWORK_{HEADER,SOURCE} to SOFT_LINK_FRAMEWORK_FOR_{HEADER,SOURCE}
index bda476c..126eac5 100644 (file)
@@ -12,6 +12,7 @@ echo Copying Forwarding Headers...
 @mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\profiler"
 @mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\heap"
 @mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\inspector"
+@mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\interpreter"
 @mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\yarr"
 @mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCoreTestSupport"
 
@@ -107,6 +108,7 @@ echo Copying Forwarding Headers...
 @xcopy /y /d "%ProjectDir%..\ForwardingHeaders\profiler\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\profiler" >nul 2>nul
 @xcopy /y /d "%ProjectDir%..\ForwardingHeaders\heap\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\heap" >nul 2>nul
 @xcopy /y /d "%ProjectDir%..\ForwardingHeaders\inspector\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\inspector" >nul  2>nul
+@xcopy /y /d "%ProjectDir%..\ForwardingHeaders\interpreter\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\interpreter" >nul  2>nul
 @xcopy /y /d "%ProjectDir%..\ForwardingHeaders\yarr\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\yarr" >nul 2>nul
 
 @xcopy /y /d "%ProjectDir%..\testing\js\WebCoreTestSupport.h" "%CONFIGURATIONBUILDDIR%\include\WebCoreTestSupport" >nul 2>nul
index 07925f6..836fde9 100644 (file)
@@ -101,9 +101,9 @@ public:
         RefPtr<CSSCalcValue> m_calculation;
     };
 
-    CSSParser(const CSSParserContext&);
+    WEBCORE_EXPORT CSSParser(const CSSParserContext&);
 
-    ~CSSParser();
+    WEBCORE_EXPORT ~CSSParser();
 
     void parseSheet(StyleSheetContents*, const String&, int startLineNumber = 0, RuleSourceDataList* = nullptr, bool = false);
     PassRefPtr<StyleRuleBase> parseRule(StyleSheetContents*, const String&);
@@ -114,7 +114,7 @@ public:
     static bool parseSystemColor(RGBA32& color, const String&, Document*);
     static PassRefPtr<CSSValueList> parseFontFaceValue(const AtomicString&);
     PassRefPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, ValueWithCalculation&);
-    bool parseDeclaration(MutableStyleProperties*, const String&, PassRefPtr<CSSRuleSourceData>, StyleSheetContents* contextStyleSheet);
+    WEBCORE_EXPORT bool parseDeclaration(MutableStyleProperties*, const String&, PassRefPtr<CSSRuleSourceData>, StyleSheetContents* contextStyleSheet);
     static Ref<ImmutableStyleProperties> parseInlineStyleDeclaration(const String&, Element*);
     std::unique_ptr<MediaQuery> parseMediaQuery(const String&);
 
index fff83e9..1f29b84 100644 (file)
@@ -74,7 +74,7 @@ public:
 bool operator==(const CSSParserContext&, const CSSParserContext&);
 inline bool operator!=(const CSSParserContext& a, const CSSParserContext& b) { return !(a == b); }
 
-const CSSParserContext& strictCSSParserContext();
+WEBCORE_EXPORT const CSSParserContext& strictCSSParserContext();
 
 };
 
index d86f957..9e9cf22 100644 (file)
@@ -86,7 +86,7 @@ public:
     bool isEmpty() const { return !propertyCount(); }
     PropertyReference propertyAt(unsigned) const;
 
-    PassRefPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
+    WEBCORE_EXPORT PassRefPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
     WEBCORE_EXPORT String getPropertyValue(CSSPropertyID) const;
     bool propertyIsImportant(CSSPropertyID) const;
     String getPropertyShorthand(CSSPropertyID) const;
@@ -182,7 +182,7 @@ inline const StylePropertyMetadata* ImmutableStyleProperties::metadataArray() co
 
 class MutableStyleProperties : public StyleProperties {
 public:
-    static Ref<MutableStyleProperties> create(CSSParserMode = CSSQuirksMode);
+    WEBCORE_EXPORT static Ref<MutableStyleProperties> create(CSSParserMode = CSSQuirksMode);
     static Ref<MutableStyleProperties> create(const CSSProperty* properties, unsigned count);
 
     WEBCORE_EXPORT ~MutableStyleProperties();
index c572839..c0501fe 100644 (file)
@@ -1,3 +1,18 @@
+2015-03-07  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Increase TestWebKitAPI Test Coverage[Win] Increase TestWebKitAPI Test Coverage
+        https://bugs.webkit.org/show_bug.cgi?id=142433
+
+        Reviewed by Darin Adler.
+
+        Include more TestWebKitAPI tests when building for Windows. Also
+        fix a build error in MetaAllocator.cpp caused by one of the
+        Microsoft headers #defining 'small'.
+
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters:
+        * TestWebKitAPI/Tests/WTF/MetaAllocator.cpp:
+
 2015-03-06  Sam Weinig  <sam@webkit.org>
 
         [Content Extensions] Move compiling of content extensions to the UIProcess
index f8338aa..d551f03 100644 (file)
     <ClInclude Include="..\Counters.h" />
     <ClInclude Include="..\Test.h" />
     <ClInclude Include="..\TestsController.h" />
+    <ClInclude Include="..\Tests\WTF\MoveOnly.h" />
+    <ClInclude Include="..\Tests\WTF\RefLogger.h" />
     <ClInclude Include="..\win\HostWindow.h" />
     <ClInclude Include="..\win\TestWebKitAPIPrefix.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Counters.cpp" />
     <ClCompile Include="..\TestsController.cpp" />
+    <ClCompile Include="..\Tests\JavaScriptCore\VMInspector.cpp" />
+    <ClCompile Include="..\Tests\WebCore\CalculationValue.cpp" />
+    <ClCompile Include="..\Tests\WebCore\CSSParser.cpp" />
     <ClCompile Include="..\Tests\WebCore\LayoutUnit.cpp" />
+    <ClCompile Include="..\Tests\WebCore\TimeRanges.cpp" />
+    <ClCompile Include="..\Tests\WebCore\URL.cpp" />
     <ClCompile Include="..\Tests\WebCore\win\BitmapImage.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\Tests\WebKit\win\WebViewDestruction.cpp" />
+    <ClCompile Include="..\Tests\WTF\AtomicString.cpp" />
     <ClCompile Include="..\Tests\WTF\cf\RetainPtr.cpp" />
     <ClCompile Include="..\Tests\WTF\cf\RetainPtrHashing.cpp" />
     <ClCompile Include="..\Tests\WTF\CheckedArithmeticOperations.cpp" />
+    <ClCompile Include="..\Tests\WTF\CString.cpp" />
+    <ClCompile Include="..\Tests\WTF\Deque.cpp" />
     <ClCompile Include="..\Tests\WTF\Functional.cpp" />
     <ClCompile Include="..\Tests\WTF\HashMap.cpp" />
+    <ClCompile Include="..\Tests\WTF\HashSet.cpp" />
+    <ClCompile Include="..\Tests\WTF\IntegerToStringConversion.cpp" />
+    <ClCompile Include="..\Tests\WTF\ListHashSet.cpp" />
     <ClCompile Include="..\Tests\WTF\MD5.cpp" />
     <ClCompile Include="..\Tests\WTF\MathExtras.cpp" />
     <ClCompile Include="..\Tests\WTF\MediaTime.cpp" />
+    <ClCompile Include="..\Tests\WTF\MetaAllocator.cpp" />
+    <ClCompile Include="..\Tests\WTF\Optional.cpp" />
+    <ClCompile Include="..\Tests\WTF\RedBlackTree.cpp" />
     <ClCompile Include="..\Tests\WTF\Ref.cpp" />
+    <ClCompile Include="..\Tests\WTF\RefCounter.cpp" />
     <ClCompile Include="..\Tests\WTF\RefPtr.cpp" />
     <ClCompile Include="..\Tests\WTF\SHA1.cpp" />
     <ClCompile Include="..\Tests\WTF\SaturatedArithmeticOperations.cpp" />
+    <ClCompile Include="..\Tests\WTF\StringBuilder.cpp" />
     <ClCompile Include="..\Tests\WTF\StringHasher.cpp" />
+    <ClCompile Include="..\Tests\WTF\StringImpl.cpp" />
     <ClCompile Include="..\Tests\WTF\StringOperators.cpp" />
+    <ClCompile Include="..\Tests\WTF\StringView.cpp" />
+    <ClCompile Include="..\Tests\WTF\TemporaryChange.cpp" />
     <ClCompile Include="..\Tests\WTF\Vector.cpp" />
+    <ClCompile Include="..\Tests\WTF\WeakPtr.cpp" />
+    <ClCompile Include="..\Tests\WTF\WTFString.cpp" />
     <ClCompile Include="..\win\HostWindow.cpp" />
     <ClCompile Include="..\win\main.cpp" />
     <ClCompile Include="..\win\TestWebKitAPIPrefix.cpp">
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 49a5e6c..eb7c0a1 100644 (file)
@@ -19,6 +19,9 @@
     <Filter Include="Tests\WTF\cf">
       <UniqueIdentifier>{909ce22a-2223-4afa-af44-2d0153f13cc6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Tests\JavaScriptCore">
+      <UniqueIdentifier>{3d2548c0-f826-4e9f-aaea-c6dee792f9ae}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h" />
     <ClInclude Include="..\win\HostWindow.h">
       <Filter>win</Filter>
     </ClInclude>
-    <ClInclude Include="TestWebKitAPIPrefix.h" />
+    <ClInclude Include="..\win\TestWebKitAPIPrefix.h" />
+    <ClInclude Include="..\Tests\WTF\MoveOnly.h">
+      <Filter>Tests\WTF</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Tests\WTF\RefLogger.h">
+      <Filter>Tests\WTF</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Counters.cpp" />
     <ClCompile Include="..\Tests\WTF\cf\RetainPtrHashing.cpp">
       <Filter>Tests\WTF\cf</Filter>
     </ClCompile>
-    <ClCompile Include="TestWebKitAPIPrefix.cpp" />
+    <ClCompile Include="..\win\TestWebKitAPIPrefix.cpp" />
+    <ClCompile Include="..\Tests\WTF\AtomicString.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\CString.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\Deque.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\HashSet.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\IntegerToStringConversion.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\ListHashSet.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\MetaAllocator.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\Optional.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\RedBlackTree.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\RefCounter.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\StringBuilder.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\StringImpl.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\StringView.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\TemporaryChange.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\WeakPtr.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WTF\WTFString.cpp">
+      <Filter>Tests\WTF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WebCore\CalculationValue.cpp">
+      <Filter>Tests\WebCore</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WebCore\TimeRanges.cpp">
+      <Filter>Tests\WebCore</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WebCore\URL.cpp">
+      <Filter>Tests\WebCore</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\WebCore\CSSParser.cpp">
+      <Filter>Tests\WebCore</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tests\JavaScriptCore\VMInspector.cpp">
+      <Filter>Tests\JavaScriptCore</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="TestWebKitAPIPostBuild.cmd" />
index d53d146..59af4f8 100644 (file)
 #include <wtf/MetaAllocator.h>
 #include <wtf/Vector.h>
 
+#if OS(WINDOWS)
+#undef small
+#endif
+
 using namespace WTF;
 
 namespace TestWebKitAPI {