Changeset 160136 in webkit


Ignore:
Timestamp:
Dec 4, 2013 3:26:33 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[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:
Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160133 r160136  
     12013-12-04  Nick Diego Yamane  <nick.yamane@openbossa.org>
     2
     3        [WK2] Including SecItemShim.h should be guarded by ENABLE(SEC_ITEM_SHIM)
     4        https://bugs.webkit.org/show_bug.cgi?id=125255
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * UIProcess/WebProcessProxy.cpp:
     9        * WebProcess/WebProcess.cpp:
     10
    1112013-12-04  Oliver Hunt  <oliver@apple.com>
    212

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r160117 r160136  
    3232#include "PluginInfoStore.h"
    3333#include "PluginProcessManager.h"
    34 #include "SecItemShimProxy.h"
    3534#include "TextChecker.h"
    3635#include "TextCheckerState.h"
    … …  
    5554#endif
    5655
     56#if ENABLE(SEC_ITEM_SHIM)
     57#include "SecItemShimProxy.h"
     58#endif
     59
    5760using namespace WebCore;
    5861

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r160117 r160136  
    3333#include "Logging.h"
    3434#include "PluginProcessConnectionManager.h"
    35 #include "SecItemShim.h"
    3635#include "StatisticsData.h"
    3736#include "WebApplicationCacheManager.h"
    … …  
    9998#endif
    10099
     100#if ENABLE(SEC_ITEM_SHIM)
     101#include "SecItemShim.h"
     102#endif
    101103
    102104#if ENABLE(CUSTOM_PROTOCOLS)
Note: See TracChangeset for help on using the changeset viewer.