Bug 125415 - [WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM)
Summary: [WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM)
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit2 (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Brian Holt
URL:
Keywords:
Depends on:
Blocks: 118231
  Show dependency treegraph
 
Reported: 2013-12-08 08:01 PST by Brian Holt
Modified: 2013-12-08 10:23 PST (History)
6 users (show)

See Also:


Attachments
Patch (2.20 KB, patch)
2013-12-08 08:13 PST, Brian Holt
no flags Details | Formatted Diff | Diff
Patch (2.21 KB, patch)
2013-12-08 09:20 PST, Brian Holt
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Brian Holt 2013-12-08 08:01:33 PST
NetworkProcess.cpp and NetworkProcessProxy.cpp both include SecItemShim.h unguarded.
Comment 1 Brian Holt 2013-12-08 08:13:54 PST
Created attachment 218690 [details]
Patch
Comment 2 Gustavo Noronha (kov) 2013-12-08 08:34:24 PST
Comment on attachment 218690 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=218690&action=review

> Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp:41
> -#include "SecItemShimProxy.h"
>  #include "WebContext.h"
>  #include "WebProcessMessages.h"
>  #include <wtf/RunLoop.h>
>  
> +#if ENABLE(SEC_ITEM_SHIM)
> +#include "SecItemShim.h"

SecItemShim.h != SecItemShimProxy.h, intended?
Comment 3 Build Bot 2013-12-08 08:49:48 PST
Comment on attachment 218690 [details]
Patch

Attachment 218690 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/46658037
Comment 4 Build Bot 2013-12-08 09:05:08 PST
Comment on attachment 218690 [details]
Patch

Attachment 218690 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/46658040
Comment 5 Brian Holt 2013-12-08 09:20:11 PST
Created attachment 218693 [details]
Patch
Comment 6 Brian Holt 2013-12-08 09:45:53 PST
Comment on attachment 218693 [details]
Patch

Thanks for the review - could you set CQ+?
Comment 7 WebKit Commit Bot 2013-12-08 10:23:17 PST
Comment on attachment 218693 [details]
Patch

Clearing flags on attachment: 218693

Committed r160290: <http://trac.webkit.org/changeset/160290>
Comment 8 WebKit Commit Bot 2013-12-08 10:23:19 PST
All reviewed patches have been landed.  Closing bug.