Skip to site navigation (Press enter)

[webkit-changes] [187816] trunk/Source/WebCore

ossy Mon, 03 Aug 2015 23:44:35 -0700

Title: [187816] trunk/Source/WebCore

Revision: 187816
Author: [email protected]
Date: 2015-08-03 23:44:19 -0700 (Mon, 03 Aug 2015)

Log Message

Fix the all-in-one build on Linux after r187659
https://bugs.webkit.org/show_bug.cgi?id=147557


Reviewed by Alex Christensen.

Removed MediaFeatureNames.cpp from the all-in-one build, because it caused build failures on Linux.
Additionally removed css/MediaAllInOne.cpp since it is unused.

* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* css/CSSAllInOne.cpp:
* css/MediaAllInOne.cpp: Removed.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
trunk/Source/WebCore/css/CSSAllInOne.cpp

Removed Paths

trunk/Source/WebCore/css/MediaAllInOne.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (187815 => 187816)


--- trunk/Source/WebCore/ChangeLog	2015-08-04 06:27:12 UTC (rev 187815)
+++ trunk/Source/WebCore/ChangeLog	2015-08-04 06:44:19 UTC (rev 187816)
@@ -1,3 +1,18 @@
+2015-08-03  Csaba Osztrogonác  <[email protected]>
+
+        Fix the all-in-one build on Linux after r187659
+        https://bugs.webkit.org/show_bug.cgi?id=147557
+
+        Reviewed by Alex Christensen.
+
+        Removed MediaFeatureNames.cpp from the all-in-one build, because it caused build failures on Linux.
+        Additionally removed css/MediaAllInOne.cpp since it is unused.
+
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * css/CSSAllInOne.cpp:
+        * css/MediaAllInOne.cpp: Removed.
+
 2015-08-03  Benjamin Poulain  <[email protected]>
 
         Returns inconsistent types for el.style.property and el.style.getPropertyValue('color')

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (187815 => 187816)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2015-08-04 06:27:12 UTC (rev 187815)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2015-08-04 06:44:19 UTC (rev 187816)
@@ -10167,28 +10167,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\css\MediaAllInOne.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\css\MediaFeatureNames.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="..\css\MediaFeatureNames.cpp" />
     <ClCompile Include="..\css\MediaList.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (187815 => 187816)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2015-08-04 06:27:12 UTC (rev 187815)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2015-08-04 06:44:19 UTC (rev 187816)
@@ -2232,9 +2232,6 @@
     <ClCompile Include="..\css\LengthFunctions.cpp">
       <Filter>css</Filter>
     </ClCompile>
-    <ClCompile Include="..\css\MediaAllInOne.cpp">
-      <Filter>css</Filter>
-    </ClCompile>
     <ClCompile Include="..\css\MediaFeatureNames.cpp">
       <Filter>css</Filter>
     </ClCompile>

Modified: trunk/Source/WebCore/css/CSSAllInOne.cpp (187815 => 187816)


--- trunk/Source/WebCore/css/CSSAllInOne.cpp	2015-08-04 06:27:12 UTC (rev 187815)
+++ trunk/Source/WebCore/css/CSSAllInOne.cpp	2015-08-04 06:44:19 UTC (rev 187816)
@@ -92,7 +92,6 @@
 #include "FontLoader.cpp"
 #include "InspectorCSSOMWrappers.cpp"
 #include "LengthFunctions.cpp"
-#include "MediaFeatureNames.cpp"
 #include "MediaList.cpp"
 #include "MediaQuery.cpp"
 #include "MediaQueryEvaluator.cpp"

Deleted: trunk/Source/WebCore/css/MediaAllInOne.cpp (187815 => 187816)


--- trunk/Source/WebCore/css/MediaAllInOne.cpp	2015-08-04 06:27:12 UTC (rev 187815)
+++ trunk/Source/WebCore/css/MediaAllInOne.cpp	2015-08-04 06:44:19 UTC (rev 187816)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This all-in-one cpp file cuts down on template bloat to allow us to build our Windows release build.
-
-#include "MediaFeatureNames.cpp"
-#include "MediaList.cpp"
-#include "MediaQuery.cpp"
-#include "MediaQueryEvaluator.cpp"
-#include "MediaQueryExp.cpp"
-#include "MediaQueryList.cpp"
-#include "MediaQueryMatcher.cpp"

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes