Skip to content

Commit

Permalink
[CMake] Sync unified build with Cocoa ports
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=188732

Reviewed by Tim Horton.

Source/WebCore:

For iOS, disambiguate between ::WebEvent declared in PlatformKeyboardEvent.h and
WebCore::WebEvent declared in WebEvent.h. It's expected that we'll have to deal with random
issues like this when modifying unrelated source files in higher-level projects, since any
change to the sources list changes which files get bundled together, and headers from
lower-level projects that were not included before may now be included together.

* platform/PlatformKeyboardEvent.h:
(WebCore::PlatformKeyboardEvent::event const):

Source/WebKit:

Sync unified build with Cocoa ports. This enables unified build for WebKit/Platform and
WebKit/Shared.

Lots of files need to be moved around since the existing Sources.txt was not copied from
CMakeLists.txt. This replaces the Sources.txt with the sources list from CMakeList.txt.
Files that are not built for Cocoa are moved to SourcesGTK.txt, SourcesWPE.txt, and
PlatformWin.cmake. Files that are built only on Cocoa are moved to SourcesCocoa.txt. There's
plenty of room to determine if many of these files really need to be platform-specific in
the future, but let's not change that now.

Unfortunately, several files under Shared and PluginProcess need to be un-unified to be
usable for GTK's WebKitPluginProcess2. I've never managed to understand why, but it won't
link otherwise. Fortunately, this only affects a few files (listed in
PluginProcessGTK2_SOURCES), only a couple dozen of which are cross-platform.

* CMakeLists.txt:
* PlatformWin.cmake:
* Sources.txt:
* SourcesCocoa.txt:
* SourcesGTK.txt:
* SourcesWPE.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@235098 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
[email protected] committed Aug 20, 2018
1 parent 5678782 commit a2b5df8
Show file tree
Hide file tree
Showing 11 changed files with 345 additions and 727 deletions.
16 changes: 16 additions & 0 deletions Source/WebCore/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
2018-08-20 Michael Catanzaro <[email protected]>

[CMake] Sync unified build with Cocoa ports
https://bugs.webkit.org/show_bug.cgi?id=188732

Reviewed by Tim Horton.

For iOS, disambiguate between ::WebEvent declared in PlatformKeyboardEvent.h and
WebCore::WebEvent declared in WebEvent.h. It's expected that we'll have to deal with random
issues like this when modifying unrelated source files in higher-level projects, since any
change to the sources list changes which files get bundled together, and headers from
lower-level projects that were not included before may now be included together.

* platform/PlatformKeyboardEvent.h:
(WebCore::PlatformKeyboardEvent::event const):

2018-08-20 David Kilzer <[email protected]>

REGRESSION (r223192): Remove invalid `path` for Modules/geolocation/ios folder
Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/platform/PlatformKeyboardEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ namespace WebCore {
#if !PLATFORM(IOS)
NSEvent* macEvent() const { return m_macEvent.get(); }
#else
WebEvent *event() const { return m_Event.get(); }
::WebEvent *event() const { return m_Event.get(); }
#endif
#endif

Expand Down Expand Up @@ -199,7 +199,7 @@ namespace WebCore {
#if !PLATFORM(IOS)
RetainPtr<NSEvent> m_macEvent;
#else
RetainPtr<WebEvent> m_Event;
RetainPtr<::WebEvent> m_Event;
#endif
#endif
#if PLATFORM(GTK)
Expand Down
Loading

0 comments on commit a2b5df8

Please sign in to comment.