WebResourceLoader.messages.in should be ENABLE(NETWORK_PROCESS) guarded
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Sep 2013 08:18:53 +0000 (08:18 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Sep 2013 08:18:53 +0000 (08:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=121424

Reviewed by Alexey Proskuryakov.

Original patch by Balazs Kelemen <kbalazs@webkit.org>.

* CMakeLists.txt:
* DerivedSources.pri:
* GNUmakefile.am:
* GNUmakefile.list.am:
* WebProcess/Network/WebResourceLoader.messages.in: ENABLE(NETWORK_PROCESS) guard added.

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

Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/DerivedSources.pri
Source/WebKit2/GNUmakefile.am
Source/WebKit2/GNUmakefile.list.am
Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in

index f8935b9..24a2447 100644 (file)
@@ -576,6 +576,8 @@ set(WebKit2_MESSAGES_IN_FILES
 
     WebProcess/MediaCache/WebMediaCacheManager.messages.in
 
+    WebProcess/Network/WebResourceLoader.messages.in
+
     WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in
 
     WebProcess/Notifications/WebNotificationManager.messages.in
index 16ba94f..1af5691 100644 (file)
@@ -1,3 +1,18 @@
+2013-09-17  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        WebResourceLoader.messages.in should be ENABLE(NETWORK_PROCESS) guarded
+        https://bugs.webkit.org/show_bug.cgi?id=121424
+
+        Reviewed by Alexey Proskuryakov.
+
+        Original patch by Balazs Kelemen <kbalazs@webkit.org>.
+
+        * CMakeLists.txt:
+        * DerivedSources.pri:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * WebProcess/Network/WebResourceLoader.messages.in: ENABLE(NETWORK_PROCESS) guard added.
+
 2013-09-16  Manuel Rego Casasnovas  <rego@igalia.com>
 
         Unreviewed, fixing the GTK WK2 debug build after r155911.
index dc17faa..f33d868 100644 (file)
@@ -45,6 +45,7 @@ VPATH = \
     WebProcess/Geolocation \
     WebProcess/IconDatabase \
     WebProcess/MediaCache \
+    WebProcess/Network \
     WebProcess/NetworkInfo \
     WebProcess/Notifications \
     WebProcess/Plugins \
index 73b89e5..15c1d5b 100644 (file)
@@ -376,6 +376,7 @@ vpath %.messages.in = \
        $(WebKit2)/WebProcess/Geolocation \
        $(WebKit2)/WebProcess/IconDatabase \
        $(WebKit2)/WebProcess/MediaCache \
+       $(WebKit2)/WebProcess/Network \
        $(WebKit2)/WebProcess/NetworkInfo \
        $(WebKit2)/WebProcess/Notifications \
        $(WebKit2)/WebProcess/Plugins \
index 30487a8..955c51c 100644 (file)
@@ -237,6 +237,8 @@ webkit2_built_sources += \
        DerivedSources/WebKit2/WebProcessMessages.h \
        DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
        DerivedSources/WebKit2/WebProcessProxyMessages.h \
+       DerivedSources/WebKit2/WebResourceLoaderMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebResourceLoaderMessages.h \
        DerivedSources/WebKit2/WebSoupRequestManagerMessageReceiver.cpp \
        DerivedSources/WebKit2/WebSoupRequestManagerMessages.h \
        DerivedSources/WebKit2/WebSoupRequestManagerProxyMessageReceiver.cpp \
index 2ac2649..268a239 100644 (file)
@@ -20,6 +20,8 @@
 # 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.
 
+#if ENABLE(NETWORK_PROCESS)
+
 messages -> WebResourceLoader LegacyReceiver {
 
     CancelResourceLoader()
@@ -37,3 +39,5 @@ messages -> WebResourceLoader LegacyReceiver {
     // DidReceiveResource is for when we have the entire resource data available at once, such as when the resource is cached in memory
     DidReceiveResource(WebKit::ShareableResource::Handle resource, double finishTime)
 }
+
+#endif // ENABLE(NETWORK_PROCESS)