Skip to content
Permalink
Browse files
[GTK] Move WK2 shareable code out from gtk directories
https://bugs.webkit.org/show_bug.cgi?id=157135

Reviewed by Darin Adler.

Both NetworkProcessMain and InjectedBundle can go out from their respective gtk directories.

* NetworkProcess/gtk/NetworkProcessMainGtk.cpp:
(WebKit::NetworkProcessMainUnix): Deleted.
* NetworkProcess/soup/NetworkProcessMainSoup.cpp: Renamed from Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp.
(WebKit::NetworkProcessMainUnix):
* PlatformGTK.cmake: Update.
* WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp: Renamed from Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp.
(WebKit::InjectedBundle::initialize):
(WebKit::InjectedBundle::setBundleParameter):
(WebKit::InjectedBundle::setBundleParameters):
* WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp:
(WebKit::InjectedBundle::initialize): Deleted.
(WebKit::InjectedBundle::setBundleParameter): Deleted.
(WebKit::InjectedBundle::setBundleParameters): Deleted.


Canonical link: https://commits.webkit.org/175273@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@200233 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
csaavedra committed Apr 29, 2016
1 parent 8b36a33 commit 5bb3a4cfd36858926a457c472a6fa5686b5e2e93
@@ -1,3 +1,26 @@
2016-04-29 Claudio Saavedra <csaavedra@igalia.com>

[GTK] Move WK2 shareable code out from gtk directories
https://bugs.webkit.org/show_bug.cgi?id=157135

Reviewed by Darin Adler.

Both NetworkProcessMain and InjectedBundle can go out from their respective gtk directories.

* NetworkProcess/gtk/NetworkProcessMainGtk.cpp:
(WebKit::NetworkProcessMainUnix): Deleted.
* NetworkProcess/soup/NetworkProcessMainSoup.cpp: Renamed from Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp.
(WebKit::NetworkProcessMainUnix):
* PlatformGTK.cmake: Update.
* WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp: Renamed from Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp.
(WebKit::InjectedBundle::initialize):
(WebKit::InjectedBundle::setBundleParameter):
(WebKit::InjectedBundle::setBundleParameters):
* WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp:
(WebKit::InjectedBundle::initialize): Deleted.
(WebKit::InjectedBundle::setBundleParameter): Deleted.
(WebKit::InjectedBundle::setBundleParameters): Deleted.

2016-04-28 Dean Jackson <dino@apple.com>

RTL <select> popup menu is in the wrong location
@@ -25,10 +25,10 @@
*/

#include "config.h"
#include "NetworkProcessMainUnix.h"
#include "NetworkProcess.h"

#include "ChildProcessMain.h"
#include "NetworkProcess.h"
#include "NetworkProcessMainUnix.h"
#include <WebCore/SoupNetworkSession.h>
#include <libsoup/soup.h>

@@ -37,8 +37,7 @@ list(APPEND WebKit2_SOURCES
NetworkProcess/cache/NetworkCacheDataSoup.cpp
NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp

NetworkProcess/gtk/NetworkProcessMainGtk.cpp

NetworkProcess/soup/NetworkProcessMainSoup.cpp
NetworkProcess/soup/NetworkProcessSoup.cpp
NetworkProcess/soup/RemoteNetworkingContextSoup.cpp

@@ -332,7 +331,7 @@ list(APPEND WebKit2_SOURCES
WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp
WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp

WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp
WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp

WebProcess/MediaCache/WebMediaKeyStorageManager.cpp

0 comments on commit 5bb3a4c

Please sign in to comment.