<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>125415</bug_id>
          
          <creation_ts>2013-12-08 08:01:33 -0800</creation_ts>
          <short_desc>[WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM)</short_desc>
          <delta_ts>2013-12-08 10:23:19 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit2</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>118231</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Brian Holt">brian.holt</reporter>
          <assigned_to name="Brian Holt">brian.holt</assigned_to>
          <cc>ap</cc>
    
    <cc>beidson</cc>
    
    <cc>buildbot</cc>
    
    <cc>commit-queue</cc>
    
    <cc>mrobinson</cc>
    
    <cc>rniwa</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>957622</commentid>
    <comment_count>0</comment_count>
    <who name="Brian Holt">brian.holt</who>
    <bug_when>2013-12-08 08:01:33 -0800</bug_when>
    <thetext>NetworkProcess.cpp and NetworkProcessProxy.cpp both include SecItemShim.h unguarded.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>957625</commentid>
    <comment_count>1</comment_count>
      <attachid>218690</attachid>
    <who name="Brian Holt">brian.holt</who>
    <bug_when>2013-12-08 08:13:54 -0800</bug_when>
    <thetext>Created attachment 218690
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>957630</commentid>
    <comment_count>2</comment_count>
      <attachid>218690</attachid>
    <who name="Gustavo Noronha (kov)">gustavo</who>
    <bug_when>2013-12-08 08:34:24 -0800</bug_when>
    <thetext>Comment on attachment 218690
Patch

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

&gt; Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp:41
&gt; -#include &quot;SecItemShimProxy.h&quot;
&gt;  #include &quot;WebContext.h&quot;
&gt;  #include &quot;WebProcessMessages.h&quot;
&gt;  #include &lt;wtf/RunLoop.h&gt;
&gt;  
&gt; +#if ENABLE(SEC_ITEM_SHIM)
&gt; +#include &quot;SecItemShim.h&quot;

SecItemShim.h != SecItemShimProxy.h, intended?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>957635</commentid>
    <comment_count>3</comment_count>
      <attachid>218690</attachid>
    <who name="Build Bot">buildbot</who>
    <bug_when>2013-12-08 08:49:48 -0800</bug_when>
    <thetext>Comment on attachment 218690
Patch

Attachment 218690 did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/46658037</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>957637</commentid>
    <comment_count>4</comment_count>
      <attachid>218690</attachid>
    <who name="Build Bot">buildbot</who>
    <bug_when>2013-12-08 09:05:08 -0800</bug_when>
    <thetext>Comment on attachment 218690
Patch

Attachment 218690 did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/46658040</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>957640</commentid>
    <comment_count>5</comment_count>
      <attachid>218693</attachid>
    <who name="Brian Holt">brian.holt</who>
    <bug_when>2013-12-08 09:20:11 -0800</bug_when>
    <thetext>Created attachment 218693
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>957645</commentid>
    <comment_count>6</comment_count>
      <attachid>218693</attachid>
    <who name="Brian Holt">brian.holt</who>
    <bug_when>2013-12-08 09:45:53 -0800</bug_when>
    <thetext>Comment on attachment 218693
Patch

Thanks for the review - could you set CQ+?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>957657</commentid>
    <comment_count>7</comment_count>
      <attachid>218693</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2013-12-08 10:23:17 -0800</bug_when>
    <thetext>Comment on attachment 218693
Patch

Clearing flags on attachment: 218693

Committed r160290: &lt;http://trac.webkit.org/changeset/160290&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>957658</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2013-12-08 10:23:19 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>218690</attachid>
            <date>2013-12-08 08:13:54 -0800</date>
            <delta_ts>2013-12-08 09:20:05 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-125415-20131208171352.patch</filename>
            <type>text/plain</type>
            <size>2253</size>
            <attacher name="Brian Holt">brian.holt</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmI2MmE4NjYwYWU1NWJk
ZGFmOTNkZGM4ZWJjM2QxZGIyM2ZlYjMwOS4uN2ZmZTNjMGZjNjY3NGQ4MmFlZjg1M2VjZmUxOGY4
YmFlZDlhNTNkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTEyLTA4ICBCcmlh
biBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKworICAgICAgICBbV0syXSBHdWFyZCBp
bmNsdWRlIG9mIFNlY0l0ZW1TaGltLmggd2l0aCBFTkFCTEUoU0VDX0lURU1fU0hJTSkKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTQxNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdv
cmtQcm9jZXNzUHJveHkuY3BwOgorCiAyMDEzLTEyLTA3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtp
dC5vcmc+CiAKICAgICAgICAgW0NvY29hXSBNYWtlIFdLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xs
ZXIgd29yayB3aXRoIFdLT2JqZWN0IHdyYXBwaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0
Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3
b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXggOTA4ZDE5ODE5Y2M1YjEzODdiYmU5
YTE4MmQxNGVlOTRmMGU1ODg4My4uOTBhZTkyMzhhZjJkNTYyYjkxY2M4MGE0MTVmM2U3MDhiMDAy
MDBlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By
b2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j
ZXNzLmNwcApAQCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzUHJveHlN
ZXNzYWdlcy5oIgogI2luY2x1ZGUgIk5ldHdvcmtSZXNvdXJjZUxvYWRlci5oIgogI2luY2x1ZGUg
IlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0LmgiCi0jaW5jbHVkZSAiU2VjSXRlbVNoaW0uaCIKICNp
bmNsdWRlICJTdGF0aXN0aWNzRGF0YS5oIgogI2luY2x1ZGUgIldlYkNvbnRleHRNZXNzYWdlcy5o
IgogI2luY2x1ZGUgIldlYkNvb2tpZU1hbmFnZXIuaCIKQEAgLTQ4LDYgKzQ3LDEwIEBACiAjaW5j
bHVkZSA8d3RmL1J1bkxvb3AuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKKyNp
ZiBFTkFCTEUoU0VDX0lURU1fU0hJTSkKKyNpbmNsdWRlICJTZWNJdGVtU2hpbS5oIgorI2VuZGlm
CisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJv
eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQ
cm94eS5jcHAKaW5kZXggZGRlMGEyMTNiNzQ0MmM4NDJlMzE5MWJiNTBiZDRhZDliNDM1ZGQ3Mi4u
NWE2MWQwN2U5MDI0NWJlMDU2MWM5YTRjMzJlNTMyNjU0MjcyOTI3MyAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKKysr
IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5j
cHAKQEAgLTMzLDExICszMywxNCBAQAogI2luY2x1ZGUgIkRvd25sb2FkUHJveHlNZXNzYWdlcy5o
IgogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjaW5jbHVk
ZSAiTmV0d29ya1Byb2Nlc3NNZXNzYWdlcy5oIgotI2luY2x1ZGUgIlNlY0l0ZW1TaGltUHJveHku
aCIKICNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2Vz
LmgiCiAjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KIAorI2lmIEVOQUJMRShTRUNfSVRFTV9TSElN
KQorI2luY2x1ZGUgIlNlY0l0ZW1TaGltLmgiCisjZW5kaWYKKwogI2RlZmluZSBNRVNTQUdFX0NI
RUNLKGFzc2VydGlvbikgTUVTU0FHRV9DSEVDS19CQVNFKGFzc2VydGlvbiwgY29ubmVjdGlvbigp
KQogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>218693</attachid>
            <date>2013-12-08 09:20:11 -0800</date>
            <delta_ts>2013-12-08 10:23:17 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-125415-20131208182009.patch</filename>
            <type>text/plain</type>
            <size>2258</size>
            <attacher name="Brian Holt">brian.holt</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmI2MmE4NjYwYWU1NWJk
ZGFmOTNkZGM4ZWJjM2QxZGIyM2ZlYjMwOS4uN2ZmZTNjMGZjNjY3NGQ4MmFlZjg1M2VjZmUxOGY4
YmFlZDlhNTNkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTEyLTA4ICBCcmlh
biBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKworICAgICAgICBbV0syXSBHdWFyZCBp
bmNsdWRlIG9mIFNlY0l0ZW1TaGltLmggd2l0aCBFTkFCTEUoU0VDX0lURU1fU0hJTSkKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTQxNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdv
cmtQcm9jZXNzUHJveHkuY3BwOgorCiAyMDEzLTEyLTA3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtp
dC5vcmc+CiAKICAgICAgICAgW0NvY29hXSBNYWtlIFdLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xs
ZXIgd29yayB3aXRoIFdLT2JqZWN0IHdyYXBwaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0
Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3
b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXggOTA4ZDE5ODE5Y2M1YjEzODdiYmU5
YTE4MmQxNGVlOTRmMGU1ODg4My4uOTBhZTkyMzhhZjJkNTYyYjkxY2M4MGE0MTVmM2U3MDhiMDAy
MDBlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By
b2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j
ZXNzLmNwcApAQCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzUHJveHlN
ZXNzYWdlcy5oIgogI2luY2x1ZGUgIk5ldHdvcmtSZXNvdXJjZUxvYWRlci5oIgogI2luY2x1ZGUg
IlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0LmgiCi0jaW5jbHVkZSAiU2VjSXRlbVNoaW0uaCIKICNp
bmNsdWRlICJTdGF0aXN0aWNzRGF0YS5oIgogI2luY2x1ZGUgIldlYkNvbnRleHRNZXNzYWdlcy5o
IgogI2luY2x1ZGUgIldlYkNvb2tpZU1hbmFnZXIuaCIKQEAgLTQ4LDYgKzQ3LDEwIEBACiAjaW5j
bHVkZSA8d3RmL1J1bkxvb3AuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKKyNp
ZiBFTkFCTEUoU0VDX0lURU1fU0hJTSkKKyNpbmNsdWRlICJTZWNJdGVtU2hpbS5oIgorI2VuZGlm
CisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJv
eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQ
cm94eS5jcHAKaW5kZXggZGRlMGEyMTNiNzQ0MmM4NDJlMzE5MWJiNTBiZDRhZDliNDM1ZGQ3Mi4u
YzgxYzc0MTE5ZjZhNmE5NjAxYjAxMTU4YzAwOGI5YWU0NGFiYzYxZiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKKysr
IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5j
cHAKQEAgLTMzLDExICszMywxNCBAQAogI2luY2x1ZGUgIkRvd25sb2FkUHJveHlNZXNzYWdlcy5o
IgogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjaW5jbHVk
ZSAiTmV0d29ya1Byb2Nlc3NNZXNzYWdlcy5oIgotI2luY2x1ZGUgIlNlY0l0ZW1TaGltUHJveHku
aCIKICNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2Vz
LmgiCiAjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KIAorI2lmIEVOQUJMRShTRUNfSVRFTV9TSElN
KQorI2luY2x1ZGUgIlNlY0l0ZW1TaGltUHJveHkuaCIKKyNlbmRpZgorCiAjZGVmaW5lIE1FU1NB
R0VfQ0hFQ0soYXNzZXJ0aW9uKSBNRVNTQUdFX0NIRUNLX0JBU0UoYXNzZXJ0aW9uLCBjb25uZWN0
aW9uKCkpCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>