Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[WK2] Including SecItemShim.h should be guarded by ENABLE(SEC_ITEM_SHIM)
https://bugs.webkit.org/show_bug.cgi?id=125255

Patch by Nick Diego Yamane <nick.yamane@openbossa.org> on 2013-12-04
Reviewed by Anders Carlsson.

* UIProcess/WebProcessProxy.cpp:
* WebProcess/WebProcess.cpp:

Canonical link: https://commits.webkit.org/143362@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160136 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Nick Diego Yamane authored and webkit-commit-queue committed Dec 4, 2013
1 parent fec24ae commit e4de818
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
10 changes: 10 additions & 0 deletions Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
2013-12-04 Nick Diego Yamane <nick.yamane@openbossa.org>

[WK2] Including SecItemShim.h should be guarded by ENABLE(SEC_ITEM_SHIM)
https://bugs.webkit.org/show_bug.cgi?id=125255

Reviewed by Anders Carlsson.

* UIProcess/WebProcessProxy.cpp:
* WebProcess/WebProcess.cpp:

2013-12-04 Oliver Hunt <oliver@apple.com>

Refactor static getter function prototype to include thisValue in addition to the base object
Expand Down
5 changes: 4 additions & 1 deletion Source/WebKit2/UIProcess/WebProcessProxy.cpp
Expand Up @@ -31,7 +31,6 @@
#include "DownloadProxyMap.h"
#include "PluginInfoStore.h"
#include "PluginProcessManager.h"
#include "SecItemShimProxy.h"
#include "TextChecker.h"
#include "TextCheckerState.h"
#include "WebBackForwardListItem.h"
Expand All @@ -54,6 +53,10 @@
#include "PDFPlugin.h"
#endif

#if ENABLE(SEC_ITEM_SHIM)
#include "SecItemShimProxy.h"
#endif

using namespace WebCore;

#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, connection())
Expand Down
4 changes: 3 additions & 1 deletion Source/WebKit2/WebProcess/WebProcess.cpp
Expand Up @@ -32,7 +32,6 @@
#include "InjectedBundleUserMessageCoders.h"
#include "Logging.h"
#include "PluginProcessConnectionManager.h"
#include "SecItemShim.h"
#include "StatisticsData.h"
#include "WebApplicationCacheManager.h"
#include "WebConnectionToUIProcess.h"
Expand Down Expand Up @@ -98,6 +97,9 @@
#include "NetworkProcessConnection.h"
#endif

#if ENABLE(SEC_ITEM_SHIM)
#include "SecItemShim.h"
#endif

#if ENABLE(CUSTOM_PROTOCOLS)
#include "CustomProtocolManager.h"
Expand Down

0 comments on commit e4de818

Please sign in to comment.