[WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM)
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Dec 2013 18:26:15 +0000 (18:26 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Dec 2013 18:26:15 +0000 (18:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=125415

Patch by Brian Holt <brian.holt@samsung.com> on 2013-12-08
Reviewed by Gustavo Noronha Silva.

* NetworkProcess/NetworkProcess.cpp:
* UIProcess/Network/NetworkProcessProxy.cpp:

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

Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/NetworkProcess.cpp
Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp

index fb62a86..51e8f0e 100644 (file)
@@ -1,3 +1,13 @@
+2013-12-08  Brian Holt  <brian.holt@samsung.com>
+
+        [WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM)
+        https://bugs.webkit.org/show_bug.cgi?id=125415
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+
 2013-12-07  Sam Weinig  <sam@webkit.org>
 
         [Cocoa] Make WKWebProcessPlugInController work with WKObject wrapping
index 908d198..90ae923 100644 (file)
@@ -39,7 +39,6 @@
 #include "NetworkProcessProxyMessages.h"
 #include "NetworkResourceLoader.h"
 #include "RemoteNetworkingContext.h"
-#include "SecItemShim.h"
 #include "StatisticsData.h"
 #include "WebContextMessages.h"
 #include "WebCookieManager.h"
 #include <wtf/RunLoop.h>
 #include <wtf/text/CString.h>
 
+#if ENABLE(SEC_ITEM_SHIM)
+#include "SecItemShim.h"
+#endif
+
 using namespace WebCore;
 
 namespace WebKit {
index dde0a21..c81c741 100644 (file)
 #include "DownloadProxyMessages.h"
 #include "NetworkProcessCreationParameters.h"
 #include "NetworkProcessMessages.h"
-#include "SecItemShimProxy.h"
 #include "WebContext.h"
 #include "WebProcessMessages.h"
 #include <wtf/RunLoop.h>
 
+#if ENABLE(SEC_ITEM_SHIM)
+#include "SecItemShimProxy.h"
+#endif
+
 #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, connection())
 
 using namespace WebCore;