Title: [160290] trunk/Source/WebKit2
- Revision
- 160290
- Author
- commit-qu...@webkit.org
- Date
- 2013-12-08 10:26:15 -0800 (Sun, 08 Dec 2013)
Log Message
[WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM)
https://bugs.webkit.org/show_bug.cgi?id=125415
Patch by Brian Holt <brian.h...@samsung.com> on 2013-12-08
Reviewed by Gustavo Noronha Silva.
* NetworkProcess/NetworkProcess.cpp:
* UIProcess/Network/NetworkProcessProxy.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160289 => 160290)
--- trunk/Source/WebKit2/ChangeLog 2013-12-08 18:22:29 UTC (rev 160289)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-08 18:26:15 UTC (rev 160290)
@@ -1,3 +1,13 @@
+2013-12-08 Brian Holt <brian.h...@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 <s...@webkit.org>
[Cocoa] Make WKWebProcessPlugInController work with WKObject wrapping
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (160289 => 160290)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2013-12-08 18:22:29 UTC (rev 160289)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2013-12-08 18:26:15 UTC (rev 160290)
@@ -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"
@@ -48,6 +47,10 @@
#include <wtf/RunLoop.h>
#include <wtf/text/CString.h>
+#if ENABLE(SEC_ITEM_SHIM)
+#include "SecItemShim.h"
+#endif
+
using namespace WebCore;
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (160289 => 160290)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2013-12-08 18:22:29 UTC (rev 160289)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2013-12-08 18:26:15 UTC (rev 160290)
@@ -33,11 +33,14 @@
#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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
