<?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>180936</bug_id>
          
          <creation_ts>2017-12-18 10:50:55 -0800</creation_ts>
          <short_desc>Conditionally forward declare NSMapTable SPI</short_desc>
          <delta_ts>2017-12-18 13:24:00 -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>Web Template Framework</component>
          <version>WebKit Local 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>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Daniel Bates">dbates</reporter>
          <assigned_to name="Daniel Bates">dbates</assigned_to>
          <cc>benjamin</cc>
    
    <cc>cdumez</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>mitz</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1382796</commentid>
    <comment_count>0</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2017-12-18 10:50:55 -0800</bug_when>
    <thetext>Remove include of obsolete header NSMapTablePriv.h.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1382797</commentid>
    <comment_count>1</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2017-12-18 10:51:15 -0800</bug_when>
    <thetext>&lt;rdar://problem/35037796&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1382801</commentid>
    <comment_count>2</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2017-12-18 11:07:09 -0800</bug_when>
    <thetext>(In reply to Daniel Bates from comment #0)
&gt; Remove include of obsolete header NSMapTablePriv.h.

Actually, we need to continue including this header for a bit longer.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1382802</commentid>
    <comment_count>3</comment_count>
      <attachid>329655</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2017-12-18 11:07:55 -0800</bug_when>
    <thetext>Created attachment 329655
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1382821</commentid>
    <comment_count>4</comment_count>
      <attachid>329655</attachid>
    <who name="">mitz</who>
    <bug_when>2017-12-18 12:13:13 -0800</bug_when>
    <thetext>Comment on attachment 329655
Patch

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

&gt; Source/WTF/wtf/spi/cocoa/NSMapTableSPI.h:28
&gt; +#if USE(APPLE_INTERNAL_SDK) &amp;&amp; PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MAX_ALLOWED &lt; 120000

This has the effect of using the below declarations in the __IPHONE_OS_VERSION_MAX_ALLOWED &gt;= 120000 case. But I think we shouldn’t make those declarations in that case, because they are already bade in NSMapTable.h, which we import above. My understanding is that the entire SPI header is only needed for older SDK versions (which don’t have the declarations in their NSMapTable.h), so it would be nice to express that with guards around the entire thing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1382835</commentid>
    <comment_count>5</comment_count>
      <attachid>329662</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2017-12-18 13:01:51 -0800</bug_when>
    <thetext>Created attachment 329662
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1382837</commentid>
    <comment_count>6</comment_count>
      <attachid>329663</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2017-12-18 13:02:57 -0800</bug_when>
    <thetext>Created attachment 329663
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1382847</commentid>
    <comment_count>7</comment_count>
      <attachid>329663</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2017-12-18 13:23:59 -0800</bug_when>
    <thetext>Comment on attachment 329663
Patch

Clearing flags on attachment: 329663

Committed r226073: &lt;https://trac.webkit.org/changeset/226073&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1382848</commentid>
    <comment_count>8</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2017-12-18 13:24:00 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>329655</attachid>
            <date>2017-12-18 11:07:55 -0800</date>
            <delta_ts>2017-12-18 13:01:49 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-180936-20171218110754.patch</filename>
            <type>text/plain</type>
            <size>1179</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGMyMWU5YTZmZTZjZDQxODQzZGY5N2Iy
NmViZWIwMmFiYzA2OGJkMjguLjNmYTk4NDIxNTAzNGM5MWNhZDllOTZkZjQyMjNmYmU1MzZmNWFi
MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMTItMTggIERhbmllbCBCYXRlcyAgPGRhYmF0
ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENvbmRpdGlvbmFsbHkgaW5jbHVkZSBoZWFkZXIgTlNN
YXBUYWJsZVByaXYuaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MTgwOTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTAzNzc5Nj4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9zcGkvY29jb2Ev
TlNNYXBUYWJsZVNQSS5oOgorCiAyMDE3LTEyLTE4ICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZl
ZHJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bRGFyd2luXSBEbyBub3QgZGVmaW5lIG1h
Y2ggZXhjZXB0aW9ucyBmb3IgR1RLKwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvc3BpL2Nv
Y29hL05TTWFwVGFibGVTUEkuaCBiL1NvdXJjZS9XVEYvd3RmL3NwaS9jb2NvYS9OU01hcFRhYmxl
U1BJLmgKaW5kZXggZTdjMWExNDc5OGUxNmY0ODU5YTY0YzBkZDY1ODY3ZGVkYTdkYzY0NC4uN2Ni
NjRjN2VkMjQ3NmIyN2ExMTQ3MzhmNzQyMDA2YjZmZDFhNzJmZCAxMDA2NDQKLS0tIGEvU291cmNl
L1dURi93dGYvc3BpL2NvY29hL05TTWFwVGFibGVTUEkuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9z
cGkvY29jb2EvTlNNYXBUYWJsZVNQSS5oCkBAIC0yNSw3ICsyNSw3IEBACiAKICNpbXBvcnQgPEZv
dW5kYXRpb24vTlNNYXBUYWJsZS5oPgogCi0jaWYgUExBVEZPUk0oSU9TKSAmJiBVU0UoQVBQTEVf
SU5URVJOQUxfU0RLKQorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspICYmIFBMQVRGT1JNKElP
UykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCA8IDEyMDAwMAogI2ltcG9ydCA8
Rm91bmRhdGlvbi9OU01hcFRhYmxlUHJpdi5oPgogI2VuZGlmCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>329662</attachid>
            <date>2017-12-18 13:01:51 -0800</date>
            <delta_ts>2017-12-18 13:02:55 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-180936-20171218130150.patch</filename>
            <type>text/plain</type>
            <size>1349</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGMyMWU5YTZmZTZjZDQxODQzZGY5N2Iy
NmViZWIwMmFiYzA2OGJkMjguLjNmYTk4NDIxNTAzNGM5MWNhZDllOTZkZjQyMjNmYmU1MzZmNWFi
MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMTItMTggIERhbmllbCBCYXRlcyAgPGRhYmF0
ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENvbmRpdGlvbmFsbHkgaW5jbHVkZSBoZWFkZXIgTlNN
YXBUYWJsZVByaXYuaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MTgwOTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTAzNzc5Nj4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9zcGkvY29jb2Ev
TlNNYXBUYWJsZVNQSS5oOgorCiAyMDE3LTEyLTE4ICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZl
ZHJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bRGFyd2luXSBEbyBub3QgZGVmaW5lIG1h
Y2ggZXhjZXB0aW9ucyBmb3IgR1RLKwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvc3BpL2Nv
Y29hL05TTWFwVGFibGVTUEkuaCBiL1NvdXJjZS9XVEYvd3RmL3NwaS9jb2NvYS9OU01hcFRhYmxl
U1BJLmgKaW5kZXggZTdjMWExNDc5OGUxNmY0ODU5YTY0YzBkZDY1ODY3ZGVkYTdkYzY0NC4uOGE2
ZDY0ZTNkY2UzZmViNTRjMzViOGI0Y2RmN2Q0NDVkYzVlMTVkMiAxMDA2NDQKLS0tIGEvU291cmNl
L1dURi93dGYvc3BpL2NvY29hL05TTWFwVGFibGVTUEkuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9z
cGkvY29jb2EvTlNNYXBUYWJsZVNQSS5oCkBAIC0yNSw3ICsyNSw5IEBACiAKICNpbXBvcnQgPEZv
dW5kYXRpb24vTlNNYXBUYWJsZS5oPgogCi0jaWYgUExBVEZPUk0oSU9TKSAmJiBVU0UoQVBQTEVf
SU5URVJOQUxfU0RLKQorI2lmIFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9N
QVhfQUxMT1dFRCA8IDEyMDAwMAorCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBv
cnQgPEZvdW5kYXRpb24vTlNNYXBUYWJsZVByaXYuaD4KICNlbmRpZgogCkBAIC0zNiwzICszOCw1
IEBAIHZvaWQgTlNNYXBJbnNlcnQoTlNNYXBUYWJsZSAqLCBjb25zdCB2b2lkICprZXksIGNvbnN0
IHZvaWQgKnZhbHVlKTsKIHZvaWQgTlNNYXBSZW1vdmUoTlNNYXBUYWJsZSAqLCBjb25zdCB2b2lk
ICprZXkpOwogCiBXVEZfRVhURVJOX0NfRU5ECisKKyNlbmRpZgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>329663</attachid>
            <date>2017-12-18 13:02:57 -0800</date>
            <delta_ts>2017-12-18 13:23:59 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-180936-20171218130256.patch</filename>
            <type>text/plain</type>
            <size>1348</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGMyMWU5YTZmZTZjZDQxODQzZGY5N2Iy
NmViZWIwMmFiYzA2OGJkMjguLjE0NjRiN2ZmZGI5Nzk0OGU3YmFjMjk4OGQ0OWU0NWY4YmU3ODk0
ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMTItMTggIERhbmllbCBCYXRlcyAgPGRhYmF0
ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENvbmRpdGlvbmFsbHkgZm9yd2FyZCBkZWNsYXJlIE5T
TWFwVGFibGUgU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xODA5MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1MDM3Nzk2PgorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL3NwaS9jb2NvYS9O
U01hcFRhYmxlU1BJLmg6CisKIDIwMTctMTItMTggIENsYXVkaW8gU2FhdmVkcmEgIDxjc2FhdmVk
cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtEYXJ3aW5dIERvIG5vdCBkZWZpbmUgbWFj
aCBleGNlcHRpb25zIGZvciBHVEsrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9zcGkvY29j
b2EvTlNNYXBUYWJsZVNQSS5oIGIvU291cmNlL1dURi93dGYvc3BpL2NvY29hL05TTWFwVGFibGVT
UEkuaAppbmRleCBlN2MxYTE0Nzk4ZTE2ZjQ4NTlhNjRjMGRkNjU4NjdkZWRhN2RjNjQ0Li44YTZk
NjRlM2RjZTNmZWI1NGMzNWI4YjRjZGY3ZDQ0NWRjNWUxNWQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V1RGL3d0Zi9zcGkvY29jb2EvTlNNYXBUYWJsZVNQSS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL3Nw
aS9jb2NvYS9OU01hcFRhYmxlU1BJLmgKQEAgLTI1LDcgKzI1LDkgQEAKIAogI2ltcG9ydCA8Rm91
bmRhdGlvbi9OU01hcFRhYmxlLmg+CiAKLSNpZiBQTEFURk9STShJT1MpICYmIFVTRShBUFBMRV9J
TlRFUk5BTF9TREspCisjaWYgUExBVEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01B
WF9BTExPV0VEIDwgMTIwMDAwCisKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogI2ltcG9y
dCA8Rm91bmRhdGlvbi9OU01hcFRhYmxlUHJpdi5oPgogI2VuZGlmCiAKQEAgLTM2LDMgKzM4LDUg
QEAgdm9pZCBOU01hcEluc2VydChOU01hcFRhYmxlICosIGNvbnN0IHZvaWQgKmtleSwgY29uc3Qg
dm9pZCAqdmFsdWUpOwogdm9pZCBOU01hcFJlbW92ZShOU01hcFRhYmxlICosIGNvbnN0IHZvaWQg
KmtleSk7CiAKIFdURl9FWFRFUk5fQ19FTkQKKworI2VuZGlmCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>