Changeset 183892 in webkit


Ignore:
Timestamp:
May 6, 2015, 3:32:36 PM (10 years ago)
Author:
achristensen@apple.com
Message:

[WinCairo] Compile error due to undefined symbols after r183868
​https://bugs.webkit.org/show_bug.cgi?id=144692

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> and Per Arne Vollan <​peavo@outlook.com> on 2015-05-06
Reviewed by Alex Christensen.

Speculative build fix. Add dummy PlatformDisplayWin.

  • PlatformWinCairo.cmake: Add PlatformDisplay.cpp to compilation.
  • platform/graphics/PlatformDisplay.cpp:

(WebCore::PlatformDisplay::createPlatformDisplay):

  • platform/graphics/PlatformDisplay.h:
  • platform/graphics/win/PlatformDisplayWin.h:

Add stubs to compile.

  • WebCore.vcxproj/WebCore.vcxproj
  • WebCore.vcxproj/WebCore.vcxproj.filters

Add new files to Windows build.

Location:
trunk/Source/WebCore
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r183891 r183892  
     12015-05-06  Carlos Garcia Campos  <cgarcia@igalia.com> and Per Arne Vollan  <peavo@outlook.com>
     2
     3        [WinCairo] Compile error due to undefined symbols after r183868
     4        https://bugs.webkit.org/show_bug.cgi?id=144692
     5
     6        Reviewed by Alex Christensen.
     7
     8        Speculative build fix. Add dummy PlatformDisplayWin.
     9
     10        * PlatformWinCairo.cmake: Add PlatformDisplay.cpp to compilation.
     11        * platform/graphics/PlatformDisplay.cpp:
     12        (WebCore::PlatformDisplay::createPlatformDisplay):
     13        * platform/graphics/PlatformDisplay.h:
     14        * platform/graphics/win/PlatformDisplayWin.h:
     15        Add stubs to compile.
     16        * WebCore.vcxproj/WebCore.vcxproj
     17        * WebCore.vcxproj/WebCore.vcxproj.filters
     18        Add new files to Windows build.
     19
    1202015-05-06  David Hyatt  <hyatt@apple.com>
    221

  • trunk/Source/WebCore/PlatformWinCairo.cmake

    r183807 r183892  
    3838    platform/graphics/GraphicsLayer.cpp
    3939    platform/graphics/ImageSource.cpp
     40    platform/graphics/PlatformDisplay.cpp
    4041    platform/graphics/ShadowBlur.cpp
    4142    platform/graphics/WOFFFileFormat.cpp

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r183866 r183892  
    76087608    <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp" />
    76097609    <ClCompile Include="..\platform\graphics\opengl\TemporaryOpenGLSetting.cpp" />
     7610    <ClCompile Include="..\platform\graphics\PlatformDisplay.cpp">
     7611      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     7612      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     7613      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     7614      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
     7615      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">false</ExcludedFromBuild>
     7616      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">false</ExcludedFromBuild>
     7617      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     7618      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     7619      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">false</ExcludedFromBuild>
     7620      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">false</ExcludedFromBuild>
     7621      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     7622      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     7623    </ClCompile>
    76107624    <ClCompile Include="..\platform\graphics\texmap\BitmapTexture.cpp">
    76117625      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    … …  
    1982419838    <ClInclude Include="..\platform\graphics\opengl\GLPlatformContext.h" />
    1982519839    <ClInclude Include="..\platform\graphics\opengl\GLPlatformSurface.h" />
     19840    <ClInclude Include="..\platform\graphics\PlatformDisplay.h" />
    1982619841    <ClInclude Include="..\platform\graphics\texmap\BitmapTexture.h" />
    1982719842    <ClInclude Include="..\platform\graphics\texmap\BitmapTextureGL.h" />
    … …  
    1985719872    <ClInclude Include="..\platform\graphics\VideoTrackPrivate.h" />
    1985819873    <ClInclude Include="..\platform\graphics\win\MediaPlayerPrivateMediaFoundation.h" />
     19874    <ClInclude Include="..\platform\graphics\win\PlatformDisplayWin.h" />
    1985919875    <ClInclude Include="..\platform\graphics\win\SharedGDIObject.h" />
    1986019876    <ClInclude Include="..\platform\HostWindow.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r183866 r183892  
    72747274      <Filter>platform\network</Filter>
    72757275    </ClCompile>
     7276    <ClCompile Include="..\platform\graphics\PlatformDisplay.cpp">
     7277      <Filter>platform\graphics</Filter>
     7278    </ClCompile>
    72767279  </ItemGroup>
    72777280  <ItemGroup>
    … …  
    1527215275    <ClInclude Include="..\platform\network\CacheValidation.h">
    1527315276      <Filter>platform\network</Filter>
     15277    </ClInclude>
     15278    <ClInclude Include="..\platform\graphics\PlatformDisplay.h">
     15279      <Filter>platform\graphics</Filter>
     15280    </ClInclude>
     15281    <ClInclude Include="..\platform\graphics\win\PlatformDisplayWin.h">
     15282      <Filter>platform\graphics\win</Filter>
    1527415283    </ClInclude>
    1527515284  </ItemGroup>

  • trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp

    r183868 r183892  
    3838#endif
    3939
     40#if PLATFORM(WIN)
     41#include "PlatformDisplayWin.h"
     42#endif
     43
    4044#if PLATFORM(GTK)
    4145#include <gdk/gdkx.h>
    … …  
    7074#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
    7175    return std::make_unique<PlatformDisplayX11>(static_cast<Display*>(ecore_x_display_get()));
     76#elif PLATFORM(WIN)
     77    return std::make_unique<PlatformDisplayWin>();
    7278#endif
    7379

  • trunk/Source/WebCore/platform/graphics/PlatformDisplay.h

    r183868 r183892  
    4949        Wayland,
    5050#endif
     51#if PLATFORM(WIN)
     52        Windows,
     53#endif
    5154    };
    5255
Note: See TracChangeset for help on using the changeset viewer.