<?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>173997</bug_id>
          
          <creation_ts>2017-06-29 17:15:31 -0700</creation_ts>
          <short_desc>Add TextStream operators for Range, VisiblePosition, VisibleSelection, and ScrollAlignment</short_desc>
          <delta_ts>2017-06-29 17:56:19 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit 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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Megan Gardner">megan_gardner</reporter>
          <assigned_to name="Megan Gardner">megan_gardner</assigned_to>
          <cc>bdakin</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1324175</commentid>
    <comment_count>0</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2017-06-29 17:15:31 -0700</bug_when>
    <thetext>Some WebCore Logging</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324180</commentid>
    <comment_count>1</comment_count>
      <attachid>314193</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2017-06-29 17:18:44 -0700</bug_when>
    <thetext>Created attachment 314193
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324183</commentid>
    <comment_count>2</comment_count>
      <attachid>314193</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2017-06-29 17:26:06 -0700</bug_when>
    <thetext>Comment on attachment 314193
Patch

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

&gt; Source/WebCore/ChangeLog:3
&gt; +        Some WebCore Logging

Could we make this bug title a bit more descriptive, perhaps so it references VisibleSelection, RangeBoundaryPoint and ScrollAlignment?

&gt; Source/WebCore/ChangeLog:8
&gt; +        Just preserving logging I wrote for a bug that got punted, no tests needed.

...it might be helpful to reference the radar # here too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324185</commentid>
    <comment_count>3</comment_count>
      <attachid>314193</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2017-06-29 17:26:30 -0700</bug_when>
    <thetext>Comment on attachment 314193
Patch

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

&gt; Source/WebCore/ChangeLog:3
&gt; +        Some WebCore Logging

The title of the bug and the title in the changelogs needs to be more specific (perhaps &quot;Add TextStream operators for Range, VisiblePosition, VisibleSelection, and ScrollAlignment&quot;, or maybe &quot;Add TextStream operators for some editing classes&quot; since it actually covers more than just those).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324186</commentid>
    <comment_count>4</comment_count>
      <attachid>314195</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2017-06-29 17:29:33 -0700</bug_when>
    <thetext>Created attachment 314195
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324187</commentid>
    <comment_count>5</comment_count>
      <attachid>314195</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2017-06-29 17:31:37 -0700</bug_when>
    <thetext>Comment on attachment 314195
Patch

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

&gt; Source/WebCore/ChangeLog:8
&gt; +        Just preserving logging I wrote for &lt;rdar://problem/19005092&gt;

This isn&apos;t interesting to future readers of this Changelog. Maybe just say &quot;so they can be used with TextStream-based LOG_WITH_STREAM.

&gt; Source/WebCore/rendering/ScrollAlignment.cpp:62
&gt; +TextStream&amp; operator&lt;&lt;(TextStream&amp; ts, const ScrollAlignment::Behavior&amp; b)

No need to pass ScrollAlignment::Behavior as a reference. It&apos;s just an enum.

&gt; Source/WebCore/rendering/ScrollAlignment.cpp:84
&gt; +    return ts &lt;&lt; &quot;ScrollAlignment: visible: &quot; &lt;&lt; s.m_rectVisible &lt;&lt; &quot; hidden: &quot; &lt;&lt; s.m_rectHidden &lt;&lt; &quot; partial: &quot; &lt;&lt;s.m_rectPartial;

Missing space near the end.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324189</commentid>
    <comment_count>6</comment_count>
      <attachid>314196</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2017-06-29 17:38:58 -0700</bug_when>
    <thetext>Created attachment 314196
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324193</commentid>
    <comment_count>7</comment_count>
      <attachid>314196</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2017-06-29 17:41:51 -0700</bug_when>
    <thetext>Comment on attachment 314196
Patch

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

&gt; Source/WebCore/ChangeLog:8
&gt; +        Just preserving logging so they can be used with TextStream-based LOG_WITH_STREAM.

&quot;preserving logging&quot; for you, but that doesn&apos;t really make sense to future readers of your changelog.

&gt; Source/WebCore/rendering/ScrollAlignment.cpp:62
&gt; +TextStream&amp; operator&lt;&lt;(TextStream&amp; ts, const ScrollAlignment::Behavior b)

No need for const.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324196</commentid>
    <comment_count>8</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2017-06-29 17:56:19 -0700</bug_when>
    <thetext>https://trac.webkit.org/r218976</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314193</attachid>
            <date>2017-06-29 17:18:44 -0700</date>
            <delta_ts>2017-06-29 17:29:31 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-173997-20170629171843.patch</filename>
            <type>text/plain</type>
            <size>6657</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxODk3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA2LTI5ICBNZWdhbiBH
YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU29tZSBXZWJDb3Jl
IExvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTE3Mzk5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IEp1c3QgcHJlc2VydmluZyBsb2dnaW5nIEkgd3JvdGUgZm9yIGEgYnVnIHRoYXQgZ290IHB1bnRl
ZCwgbm8gdGVzdHMgbmVlZGVkLgorCisgICAgICAgICogZG9tL1JhbmdlLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIGRvbS9SYW5nZS5oOgorICAgICAgICAq
IGVkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmg6CisgICAgICAgICogZWRpdGluZy9WaXNpYmxlU2Vs
ZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIGVk
aXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5oOgorICAgICAgICAqIHJlbmRlcmluZy9TY3JvbGxBbGln
bm1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgICogcmVu
ZGVyaW5nL1Njcm9sbEFsaWdubWVudC5oOgorCiAyMDE3LTA2LTI5ICBNYXR0IExld2lzICA8amxl
d2lzM0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIxODk2
My4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAkocmV2aXNpb24gMjE4Mjk3KQorKysgU291cmNlL1dl
YkNvcmUvZG9tL1JhbmdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgyOCw2ICsxODI4LDE3IEBA
IEZsb2F0UmVjdCBSYW5nZTo6YWJzb2x1dGVCb3VuZGluZ1JlY3QoKSAKIHsKICAgICByZXR1cm4g
Ym91bmRpbmdSZWN0KENvb3JkaW5hdGVTcGFjZTo6QWJzb2x1dGUpOwogfQorICAgIAorVGV4dFN0
cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmFuZ2VCb3VuZGFyeVBvaW50
JiByKQoreworICAgIAorICAgIHJldHVybiB0cyA8PCByLnRvUG9zaXRpb24oKTsKK30KKyAgICAK
K1RleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJhbmdlJiByKQor
eworICAgIHJldHVybiB0cyA8PCAiUmFuZ2U6ICIgPDwgInN0YXJ0OiAiIDw8IHIuc3RhcnRQb3Np
dGlvbigpIDw8ICIgZW5kOiAiIDw8IHIuZW5kUG9zaXRpb24oKTsKK30KIAogfSAvLyBuYW1lc3Bh
Y2UgV2ViQ29yZQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAkocmV2aXNpb24gMjE4Mjk3KQorKysgU291
cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE4MCw2ICsxODAsMTAg
QEAgaW5saW5lIGJvb2wgZG9jdW1lbnRPcmRlckNvbXBhcmF0b3IoY29ucwogewogICAgIHJldHVy
biBSYW5nZTo6Y29tcGFyZUJvdW5kYXJ5UG9pbnRzKGNvbnN0X2Nhc3Q8Tm9kZSo+KGEpLCAwLCBj
b25zdF9jYXN0PE5vZGUqPihiKSwgMCkucmVsZWFzZVJldHVyblZhbHVlKCkgPCAwOwogfQorICAg
IAorVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiwgY29uc3QgUmFuZ2VCb3VuZGFy
eVBvaW50Jik7CisgICAgCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mLCBjb25z
dCBSYW5nZSYpOwogCiB9IC8vIG5hbWVzcGFjZQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0
aW5nL1Zpc2libGVQb3NpdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRp
bmcvVmlzaWJsZVBvc2l0aW9uLmgJKHJldmlzaW9uIDIxODI5NykKKysrIFNvdXJjZS9XZWJDb3Jl
L2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2NCw3ICsxNjQs
NyBAQCBib29sIGlzRmlyc3RWaXNpYmxlUG9zaXRpb25Jbk5vZGUoY29uc3QgCiBib29sIGlzTGFz
dFZpc2libGVQb3NpdGlvbkluTm9kZShjb25zdCBWaXNpYmxlUG9zaXRpb24mLCBjb25zdCBOb2Rl
Kik7CiAKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYsIEVBZmZpbml0eSk7Ci1U
ZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mLCBjb25zdCBWaXNpYmxlUG9zaXRpb24m
KTsKK1dFQkNPUkVfRVhQT1JUIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYsIGNv
bnN0IFZpc2libGVQb3NpdGlvbiYpOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKSW5kZXg6
IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcAkocmV2aXNpb24g
MjE4Mjk3KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcAko
d29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkVsZW1lbnQuaCIKICNp
bmNsdWRlICJIVE1MSW5wdXRFbGVtZW50LmgiCiAjaW5jbHVkZSAiVGV4dEl0ZXJhdG9yLmgiCisj
aW5jbHVkZSAiVGV4dFN0cmVhbS5oIgogI2luY2x1ZGUgIlZpc2libGVVbml0cy5oIgogI2luY2x1
ZGUgPHN0ZGlvLmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KQEAgLTcxOSw2ICs3MjAs
MTkgQEAgdm9pZCBWaXNpYmxlU2VsZWN0aW9uOjpzaG93VHJlZUZvclRoaXMoKQogICAgICAgICBl
bmQoKS5zaG93QW5jaG9yVHlwZUFuZE9mZnNldCgpOwogICAgIH0KIH0KKyAgICAKK1RleHRTdHJl
YW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9u
JiB2KQoreworICAgIFRleHRTdHJlYW06Okdyb3VwU2NvcGUgc2NvcGUoc3RyZWFtKTsKKyAgICBz
dHJlYW0gPDwgIlZpc2libGVTZWxlY3Rpb24gIiA8PCAmdjsKKyAgICAKKyAgICBzdHJlYW0uZHVt
cFByb3BlcnR5KCJiYXNlIiwgdi5iYXNlKCkpOworICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoImV4
dGVudCIsIHYuZXh0ZW50KCkpOworICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoInN0YXJ0Iiwgdi5z
dGFydCgpKTsKKyAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJlbmQiLCB2LmVuZCgpKTsKKyAgICAK
KyAgICByZXR1cm4gc3RyZWFtOworfQogCiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNvcmUv
ZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv
ZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmgJKHJldmlzaW9uIDIxODI5NykKKysrIFNvdXJjZS9X
ZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTIs
NiArMTUyLDggQEAgaW5saW5lIGJvb2wgb3BlcmF0b3IhPShjb25zdCBWaXNpYmxlU2VsZQogewog
ICAgIHJldHVybiAhKGEgPT0gYik7CiB9CisgICAgCitXRUJDT1JFX0VYUE9SVCBUZXh0U3RyZWFt
JiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJik7CiAKIH0g
Ly8gbmFtZXNwYWNlIFdlYkNvcmUKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Nj
cm9sbEFsaWdubWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1Njcm9sbEFsaWdubWVudC5jcHAJKHJldmlzaW9uIDIxODI5NykKKysrIFNvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9TY3JvbGxBbGlnbm1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0
NCw5IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2Nyb2xsQWxpZ25tZW50Lmgi
CiAKKyNpbmNsdWRlICJMb2dnaW5nLmgiCisjaW5jbHVkZSAiVGV4dFN0cmVhbS5oIgorCiBuYW1l
c3BhY2UgV2ViQ29yZSB7CiAKIGNvbnN0IFNjcm9sbEFsaWdubWVudCBTY3JvbGxBbGlnbm1lbnQ6
OmFsaWduQ2VudGVySWZOb3RWaXNpYmxlID0geyBCZWhhdmlvcjo6Tm9TY3JvbGwsIEJlaGF2aW9y
OjpBbGlnbkNlbnRlciwgQmVoYXZpb3I6Ok5vU2Nyb2xsIH07CkBAIC01NSw1ICs1OCwzMCBAQCBj
b25zdCBTY3JvbGxBbGlnbm1lbnQgU2Nyb2xsQWxpZ25tZW50OjphCiBjb25zdCBTY3JvbGxBbGln
bm1lbnQgU2Nyb2xsQWxpZ25tZW50OjphbGlnblJpZ2h0QWx3YXlzID0geyBCZWhhdmlvcjo6QWxp
Z25SaWdodCwgQmVoYXZpb3I6OkFsaWduUmlnaHQsIEJlaGF2aW9yOjpBbGlnblJpZ2h0IH07CiBj
b25zdCBTY3JvbGxBbGlnbm1lbnQgU2Nyb2xsQWxpZ25tZW50OjphbGlnbkxlZnRBbHdheXMgPSB7
IEJlaGF2aW9yOjpBbGlnbkxlZnQsIEJlaGF2aW9yOjpBbGlnbkxlZnQsIEJlaGF2aW9yOjpBbGln
bkxlZnQgfTsKIGNvbnN0IFNjcm9sbEFsaWdubWVudCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduQm90
dG9tQWx3YXlzID0geyBCZWhhdmlvcjo6QWxpZ25Cb3R0b20sIEJlaGF2aW9yOjpBbGlnbkJvdHRv
bSwgQmVoYXZpb3I6OkFsaWduQm90dG9tIH07CisgICAgCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8
KFRleHRTdHJlYW0mIHRzLCBjb25zdCBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yJiBiKQorewor
ICAgIHN3aXRjaCAoYikgeworICAgIGNhc2UgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6Tm9T
Y3JvbGw6CisgICAgICAgIHJldHVybiB0cyA8PCAiTm9TY3JvbGwiOworICAgIGNhc2UgU2Nyb2xs
QWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25DZW50ZXI6CisgICAgICAgIHJldHVybiB0cyA8PCAi
QWxpZ25DZW50ZXIiOworICAgIGNhc2UgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25U
b3A6CisgICAgICAgIHJldHVybiB0cyA8PCAiQWxpZ25Ub3AiOworICAgIGNhc2UgU2Nyb2xsQWxp
Z25tZW50OjpCZWhhdmlvcjo6QWxpZ25Cb3R0b206CisgICAgICAgIHJldHVybiB0cyA8PCAiQWxp
Z25Cb3R0b20iOworICAgIGNhc2UgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25MZWZ0
OgorICAgICAgICByZXR1cm4gdHMgPDwgIkFsaWduTGVmdCI7CisgICAgY2FzZSBTY3JvbGxBbGln
bm1lbnQ6OkJlaGF2aW9yOjpBbGlnblJpZ2h0OgorICAgICAgICByZXR1cm4gdHMgPDwgIkFsaWdu
UmlnaHQiOworICAgIGNhc2UgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25Ub0Nsb3Nl
c3RFZGdlOgorICAgICAgICByZXR1cm4gdHMgPDwgIkFsaWduVG9DbG9zZXN0RWRnZSI7CisgICAg
fQorfQorICAgIAorVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3Qg
U2Nyb2xsQWxpZ25tZW50JiBzKQoreworICAgIHJldHVybiB0cyA8PCAiU2Nyb2xsQWxpZ25tZW50
OiB2aXNpYmxlOiAiIDw8IHMubV9yZWN0VmlzaWJsZSA8PCAiIGhpZGRlbjogIiA8PCBzLm1fcmVj
dEhpZGRlbiA8PCAiIHBhcnRpYWw6ICIgPDxzLm1fcmVjdFBhcnRpYWw7Cit9CiAKIH07IC8vIG5h
bWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2Nyb2xsQWxp
Z25tZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Njcm9sbEFs
aWdubWVudC5oCShyZXZpc2lvbiAyMTgyOTcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
U2Nyb2xsQWxpZ25tZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDggQEAKICNwcmFn
bWEgb25jZQogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CisgICAgCitjbGFzcyBUZXh0U3RyZWFtOwog
CiBzdHJ1Y3QgU2Nyb2xsQWxpZ25tZW50IHsKIApAQCAtNzUsNSArNzcsOCBAQCBzdHJ1Y3QgU2Ny
b2xsQWxpZ25tZW50IHsKICAgICBCZWhhdmlvciBtX3JlY3RIaWRkZW47CiAgICAgQmVoYXZpb3Ig
bV9yZWN0UGFydGlhbDsKIH07CisgICAgCitXRUJDT1JFX0VYUE9SVCBUZXh0U3RyZWFtJiBvcGVy
YXRvcjw8KFRleHRTdHJlYW0mLCBjb25zdCBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yJik7CitX
RUJDT1JFX0VYUE9SVCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mLCBjb25zdCBT
Y3JvbGxBbGlnbm1lbnQmKTsKIAogfTsgLy8gbmFtZXNwYWNlIFdlYkNvcmUK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314195</attachid>
            <date>2017-06-29 17:29:33 -0700</date>
            <delta_ts>2017-06-29 17:38:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-173997-20170629172932.patch</filename>
            <type>text/plain</type>
            <size>6713</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxODk3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA2LTI5ICBNZWdhbiBH
YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFRleHRTdHJl
YW0gb3BlcmF0b3JzIGZvciBSYW5nZSwgVmlzaWJsZVBvc2l0aW9uLCBWaXNpYmxlU2VsZWN0aW9u
LCBhbmQgU2Nyb2xsQWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0xNzM5OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBKdXN0IHByZXNlcnZpbmcgbG9nZ2luZyBJIHdyb3RlIGZvciA8cmRhcjov
L3Byb2JsZW0vMTkwMDUwOTI+CisKKyAgICAgICAgKiBkb20vUmFuZ2UuY3BwOgorICAgICAgICAo
V2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgICogZG9tL1JhbmdlLmg6CisgICAgICAgICog
ZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaDoKKyAgICAgICAgKiBlZGl0aW5nL1Zpc2libGVTZWxl
Y3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgICogZWRp
dGluZy9WaXNpYmxlU2VsZWN0aW9uLmg6CisgICAgICAgICogcmVuZGVyaW5nL1Njcm9sbEFsaWdu
bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcjw8KToKKyAgICAgICAgKiByZW5k
ZXJpbmcvU2Nyb2xsQWxpZ25tZW50Lmg6CisKIDIwMTctMDYtMjkgIE1hdHQgTGV3aXMgIDxqbGV3
aXMzQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjE4OTYz
LgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy
Y2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCShyZXZpc2lvbiAyMTgyOTcpCisrKyBTb3VyY2UvV2Vi
Q29yZS9kb20vUmFuZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODI4LDYgKzE4MjgsMTcgQEAg
RmxvYXRSZWN0IFJhbmdlOjphYnNvbHV0ZUJvdW5kaW5nUmVjdCgpIAogewogICAgIHJldHVybiBi
b3VuZGluZ1JlY3QoQ29vcmRpbmF0ZVNwYWNlOjpBYnNvbHV0ZSk7CiB9CisgICAgCitUZXh0U3Ry
ZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBSYW5nZUJvdW5kYXJ5UG9pbnQm
IHIpCit7CisgICAgCisgICAgcmV0dXJuIHRzIDw8IHIudG9Qb3NpdGlvbigpOworfQorICAgIAor
VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmFuZ2UmIHIpCit7
CisgICAgcmV0dXJuIHRzIDw8ICJSYW5nZTogIiA8PCAic3RhcnQ6ICIgPDwgci5zdGFydFBvc2l0
aW9uKCkgPDwgIiBlbmQ6ICIgPDwgci5lbmRQb3NpdGlvbigpOworfQogCiB9IC8vIG5hbWVzcGFj
ZSBXZWJDb3JlCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oCShyZXZpc2lvbiAyMTgyOTcpCisrKyBTb3Vy
Y2UvV2ViQ29yZS9kb20vUmFuZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTgwLDYgKzE4MCwxMCBA
QCBpbmxpbmUgYm9vbCBkb2N1bWVudE9yZGVyQ29tcGFyYXRvcihjb25zCiB7CiAgICAgcmV0dXJu
IFJhbmdlOjpjb21wYXJlQm91bmRhcnlQb2ludHMoY29uc3RfY2FzdDxOb2RlKj4oYSksIDAsIGNv
bnN0X2Nhc3Q8Tm9kZSo+KGIpLCAwKS5yZWxlYXNlUmV0dXJuVmFsdWUoKSA8IDA7CiB9CisgICAg
CitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mLCBjb25zdCBSYW5nZUJvdW5kYXJ5
UG9pbnQmKTsKKyAgICAKK1RleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYsIGNvbnN0
IFJhbmdlJik7CiAKIH0gLy8gbmFtZXNwYWNlCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRp
bmcvVmlzaWJsZVBvc2l0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGlu
Zy9WaXNpYmxlUG9zaXRpb24uaAkocmV2aXNpb24gMjE4Mjk3KQorKysgU291cmNlL1dlYkNvcmUv
ZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTY0LDcgKzE2NCw3
IEBAIGJvb2wgaXNGaXJzdFZpc2libGVQb3NpdGlvbkluTm9kZShjb25zdCAKIGJvb2wgaXNMYXN0
VmlzaWJsZVBvc2l0aW9uSW5Ob2RlKGNvbnN0IFZpc2libGVQb3NpdGlvbiYsIGNvbnN0IE5vZGUq
KTsKIAogVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiwgRUFmZmluaXR5KTsKLVRl
eHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYsIGNvbnN0IFZpc2libGVQb3NpdGlvbiYp
OworV0VCQ09SRV9FWFBPUlQgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiwgY29u
c3QgVmlzaWJsZVBvc2l0aW9uJik7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApJbmRleDog
U291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwCShyZXZpc2lvbiAy
MTgyOTcpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwCSh3
b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiRWxlbWVudC5oIgogI2lu
Y2x1ZGUgIkhUTUxJbnB1dEVsZW1lbnQuaCIKICNpbmNsdWRlICJUZXh0SXRlcmF0b3IuaCIKKyNp
bmNsdWRlICJUZXh0U3RyZWFtLmgiCiAjaW5jbHVkZSAiVmlzaWJsZVVuaXRzLmgiCiAjaW5jbHVk
ZSA8c3RkaW8uaD4KICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgpAQCAtNzE5LDYgKzcyMCwx
OSBAQCB2b2lkIFZpc2libGVTZWxlY3Rpb246OnNob3dUcmVlRm9yVGhpcygpCiAgICAgICAgIGVu
ZCgpLnNob3dBbmNob3JUeXBlQW5kT2Zmc2V0KCk7CiAgICAgfQogfQorICAgIAorVGV4dFN0cmVh
bSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IFZpc2libGVTZWxlY3Rpb24m
IHYpCit7CisgICAgVGV4dFN0cmVhbTo6R3JvdXBTY29wZSBzY29wZShzdHJlYW0pOworICAgIHN0
cmVhbSA8PCAiVmlzaWJsZVNlbGVjdGlvbiAiIDw8ICZ2OworICAgIAorICAgIHN0cmVhbS5kdW1w
UHJvcGVydHkoImJhc2UiLCB2LmJhc2UoKSk7CisgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgiZXh0
ZW50Iiwgdi5leHRlbnQoKSk7CisgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgic3RhcnQiLCB2LnN0
YXJ0KCkpOworICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoImVuZCIsIHYuZW5kKCkpOworICAgIAor
ICAgIHJldHVybiBzdHJlYW07Cit9CiAKICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9l
ZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9l
ZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uaAkocmV2aXNpb24gMjE4Mjk3KQorKysgU291cmNlL1dl
YkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1Miw2
ICsxNTIsOCBAQCBpbmxpbmUgYm9vbCBvcGVyYXRvciE9KGNvbnN0IFZpc2libGVTZWxlCiB7CiAg
ICAgcmV0dXJuICEoYSA9PSBiKTsKIH0KKyAgICAKK1dFQkNPUkVfRVhQT1JUIFRleHRTdHJlYW0m
IG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYsIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mKTsKIAogfSAv
LyBuYW1lc3BhY2UgV2ViQ29yZQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2Ny
b2xsQWxpZ25tZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
U2Nyb2xsQWxpZ25tZW50LmNwcAkocmV2aXNpb24gMjE4Mjk3KQorKysgU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1Njcm9sbEFsaWdubWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0
LDkgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJTY3JvbGxBbGlnbm1lbnQuaCIK
IAorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKyNpbmNsdWRlICJUZXh0U3RyZWFtLmgiCisKIG5hbWVz
cGFjZSBXZWJDb3JlIHsKIAogY29uc3QgU2Nyb2xsQWxpZ25tZW50IFNjcm9sbEFsaWdubWVudDo6
YWxpZ25DZW50ZXJJZk5vdFZpc2libGUgPSB7IEJlaGF2aW9yOjpOb1Njcm9sbCwgQmVoYXZpb3I6
OkFsaWduQ2VudGVyLCBCZWhhdmlvcjo6Tm9TY3JvbGwgfTsKQEAgLTU1LDUgKzU4LDMwIEBAIGNv
bnN0IFNjcm9sbEFsaWdubWVudCBTY3JvbGxBbGlnbm1lbnQ6OmEKIGNvbnN0IFNjcm9sbEFsaWdu
bWVudCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduUmlnaHRBbHdheXMgPSB7IEJlaGF2aW9yOjpBbGln
blJpZ2h0LCBCZWhhdmlvcjo6QWxpZ25SaWdodCwgQmVoYXZpb3I6OkFsaWduUmlnaHQgfTsKIGNv
bnN0IFNjcm9sbEFsaWdubWVudCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduTGVmdEFsd2F5cyA9IHsg
QmVoYXZpb3I6OkFsaWduTGVmdCwgQmVoYXZpb3I6OkFsaWduTGVmdCwgQmVoYXZpb3I6OkFsaWdu
TGVmdCB9OwogY29uc3QgU2Nyb2xsQWxpZ25tZW50IFNjcm9sbEFsaWdubWVudDo6YWxpZ25Cb3R0
b21BbHdheXMgPSB7IEJlaGF2aW9yOjpBbGlnbkJvdHRvbSwgQmVoYXZpb3I6OkFsaWduQm90dG9t
LCBCZWhhdmlvcjo6QWxpZ25Cb3R0b20gfTsKKyAgICAKK1RleHRTdHJlYW0mIG9wZXJhdG9yPDwo
VGV4dFN0cmVhbSYgdHMsIGNvbnN0IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3ImIGIpCit7Cisg
ICAgc3dpdGNoIChiKSB7CisgICAgY2FzZSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpOb1Nj
cm9sbDoKKyAgICAgICAgcmV0dXJuIHRzIDw8ICJOb1Njcm9sbCI7CisgICAgY2FzZSBTY3JvbGxB
bGlnbm1lbnQ6OkJlaGF2aW9yOjpBbGlnbkNlbnRlcjoKKyAgICAgICAgcmV0dXJuIHRzIDw8ICJB
bGlnbkNlbnRlciI7CisgICAgY2FzZSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpBbGlnblRv
cDoKKyAgICAgICAgcmV0dXJuIHRzIDw8ICJBbGlnblRvcCI7CisgICAgY2FzZSBTY3JvbGxBbGln
bm1lbnQ6OkJlaGF2aW9yOjpBbGlnbkJvdHRvbToKKyAgICAgICAgcmV0dXJuIHRzIDw8ICJBbGln
bkJvdHRvbSI7CisgICAgY2FzZSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpBbGlnbkxlZnQ6
CisgICAgICAgIHJldHVybiB0cyA8PCAiQWxpZ25MZWZ0IjsKKyAgICBjYXNlIFNjcm9sbEFsaWdu
bWVudDo6QmVoYXZpb3I6OkFsaWduUmlnaHQ6CisgICAgICAgIHJldHVybiB0cyA8PCAiQWxpZ25S
aWdodCI7CisgICAgY2FzZSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpBbGlnblRvQ2xvc2Vz
dEVkZ2U6CisgICAgICAgIHJldHVybiB0cyA8PCAiQWxpZ25Ub0Nsb3Nlc3RFZGdlIjsKKyAgICB9
Cit9CisgICAgCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBT
Y3JvbGxBbGlnbm1lbnQmIHMpCit7CisgICAgcmV0dXJuIHRzIDw8ICJTY3JvbGxBbGlnbm1lbnQ6
IHZpc2libGU6ICIgPDwgcy5tX3JlY3RWaXNpYmxlIDw8ICIgaGlkZGVuOiAiIDw8IHMubV9yZWN0
SGlkZGVuIDw8ICIgcGFydGlhbDogIiA8PHMubV9yZWN0UGFydGlhbDsKK30KIAogfTsgLy8gbmFt
ZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TY3JvbGxBbGln
bm1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2Nyb2xsQWxp
Z25tZW50LmgJKHJldmlzaW9uIDIxODI5NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T
Y3JvbGxBbGlnbm1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsOCBAQAogI3ByYWdt
YSBvbmNlCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKKyAgICAKK2NsYXNzIFRleHRTdHJlYW07CiAK
IHN0cnVjdCBTY3JvbGxBbGlnbm1lbnQgewogCkBAIC03NSw1ICs3Nyw4IEBAIHN0cnVjdCBTY3Jv
bGxBbGlnbm1lbnQgewogICAgIEJlaGF2aW9yIG1fcmVjdEhpZGRlbjsKICAgICBCZWhhdmlvciBt
X3JlY3RQYXJ0aWFsOwogfTsKKyAgICAKK1dFQkNPUkVfRVhQT1JUIFRleHRTdHJlYW0mIG9wZXJh
dG9yPDwoVGV4dFN0cmVhbSYsIGNvbnN0IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3ImKTsKK1dF
QkNPUkVfRVhQT1JUIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYsIGNvbnN0IFNj
cm9sbEFsaWdubWVudCYpOwogCiB9OyAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314196</attachid>
            <date>2017-06-29 17:38:58 -0700</date>
            <delta_ts>2017-06-29 17:41:51 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-173997-20170629173857.patch</filename>
            <type>text/plain</type>
            <size>6720</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxODk3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA2LTI5ICBNZWdhbiBH
YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFRleHRTdHJl
YW0gb3BlcmF0b3JzIGZvciBSYW5nZSwgVmlzaWJsZVBvc2l0aW9uLCBWaXNpYmxlU2VsZWN0aW9u
LCBhbmQgU2Nyb2xsQWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0xNzM5OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBKdXN0IHByZXNlcnZpbmcgbG9nZ2luZyBzbyB0aGV5IGNhbiBiZSB1c2Vk
IHdpdGggVGV4dFN0cmVhbS1iYXNlZCBMT0dfV0lUSF9TVFJFQU0uCisKKyAgICAgICAgKiBkb20v
UmFuZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgICogZG9t
L1JhbmdlLmg6CisgICAgICAgICogZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaDoKKyAgICAgICAg
KiBlZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0
b3I8PCk6CisgICAgICAgICogZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmg6CisgICAgICAgICog
cmVuZGVyaW5nL1Njcm9sbEFsaWdubWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRv
cjw8KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2Nyb2xsQWxpZ25tZW50Lmg6CisKIDIwMTctMDYt
MjkgIE1hdHQgTGV3aXMgIDxqbGV3aXMzQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk
LCByb2xsaW5nIG91dCByMjE4OTYzLgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNw
cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCShyZXZpc2lvbiAy
MTgyOTcpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA
IC0xODI4LDYgKzE4MjgsMTYgQEAgRmxvYXRSZWN0IFJhbmdlOjphYnNvbHV0ZUJvdW5kaW5nUmVj
dCgpIAogewogICAgIHJldHVybiBib3VuZGluZ1JlY3QoQ29vcmRpbmF0ZVNwYWNlOjpBYnNvbHV0
ZSk7CiB9CisgICAgCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25z
dCBSYW5nZUJvdW5kYXJ5UG9pbnQmIHIpCit7CisgICAgcmV0dXJuIHRzIDw8IHIudG9Qb3NpdGlv
bigpOworfQorICAgIAorVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29u
c3QgUmFuZ2UmIHIpCit7CisgICAgcmV0dXJuIHRzIDw8ICJSYW5nZTogIiA8PCAic3RhcnQ6ICIg
PDwgci5zdGFydFBvc2l0aW9uKCkgPDwgIiBlbmQ6ICIgPDwgci5lbmRQb3NpdGlvbigpOworfQog
CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5n
ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oCShyZXZpc2lvbiAy
MTgyOTcpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAkod29ya2luZyBjb3B5KQpAQCAt
MTgwLDYgKzE4MCw5IEBAIGlubGluZSBib29sIGRvY3VtZW50T3JkZXJDb21wYXJhdG9yKGNvbnMK
IHsKICAgICByZXR1cm4gUmFuZ2U6OmNvbXBhcmVCb3VuZGFyeVBvaW50cyhjb25zdF9jYXN0PE5v
ZGUqPihhKSwgMCwgY29uc3RfY2FzdDxOb2RlKj4oYiksIDApLnJlbGVhc2VSZXR1cm5WYWx1ZSgp
IDwgMDsKIH0KKyAgICAKK1RleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYsIGNvbnN0
IFJhbmdlQm91bmRhcnlQb2ludCYpOworVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFt
JiwgY29uc3QgUmFuZ2UmKTsKIAogfSAvLyBuYW1lc3BhY2UKIApJbmRleDogU291cmNlL1dlYkNv
cmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y
ZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5oCShyZXZpc2lvbiAyMTgyOTcpCisrKyBTb3VyY2Uv
V2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQs
NyArMTY0LDcgQEAgYm9vbCBpc0ZpcnN0VmlzaWJsZVBvc2l0aW9uSW5Ob2RlKGNvbnN0IAogYm9v
bCBpc0xhc3RWaXNpYmxlUG9zaXRpb25Jbk5vZGUoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiwgY29u
c3QgTm9kZSopOwogCiBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mLCBFQWZmaW5p
dHkpOwotVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiwgY29uc3QgVmlzaWJsZVBv
c2l0aW9uJik7CitXRUJDT1JFX0VYUE9SVCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJl
YW0mLCBjb25zdCBWaXNpYmxlUG9zaXRpb24mKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQog
CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAJKHJl
dmlzaW9uIDIxODI5NykKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlv
bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJFbGVtZW50
LmgiCiAjaW5jbHVkZSAiSFRNTElucHV0RWxlbWVudC5oIgogI2luY2x1ZGUgIlRleHRJdGVyYXRv
ci5oIgorI2luY2x1ZGUgIlRleHRTdHJlYW0uaCIKICNpbmNsdWRlICJWaXNpYmxlVW5pdHMuaCIK
ICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CkBAIC03MTks
NiArNzIwLDE5IEBAIHZvaWQgVmlzaWJsZVNlbGVjdGlvbjo6c2hvd1RyZWVGb3JUaGlzKCkKICAg
ICAgICAgZW5kKCkuc2hvd0FuY2hvclR5cGVBbmRPZmZzZXQoKTsKICAgICB9CiB9CisgICAgCitU
ZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0cmVhbSwgY29uc3QgVmlzaWJsZVNl
bGVjdGlvbiYgdikKK3sKKyAgICBUZXh0U3RyZWFtOjpHcm91cFNjb3BlIHNjb3BlKHN0cmVhbSk7
CisgICAgc3RyZWFtIDw8ICJWaXNpYmxlU2VsZWN0aW9uICIgPDwgJnY7CisgICAgCisgICAgc3Ry
ZWFtLmR1bXBQcm9wZXJ0eSgiYmFzZSIsIHYuYmFzZSgpKTsKKyAgICBzdHJlYW0uZHVtcFByb3Bl
cnR5KCJleHRlbnQiLCB2LmV4dGVudCgpKTsKKyAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJzdGFy
dCIsIHYuc3RhcnQoKSk7CisgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgiZW5kIiwgdi5lbmQoKSk7
CisgICAgCisgICAgcmV0dXJuIHN0cmVhbTsKK30KIAogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9X
ZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5oCShyZXZpc2lvbiAyMTgyOTcpCisrKyBT
b3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uaAkod29ya2luZyBjb3B5KQpA
QCAtMTUyLDYgKzE1Miw4IEBAIGlubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgVmlzaWJsZVNl
bGUKIHsKICAgICByZXR1cm4gIShhID09IGIpOwogfQorICAgIAorV0VCQ09SRV9FWFBPUlQgVGV4
dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiwgY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYp
OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9TY3JvbGxBbGlnbm1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9TY3JvbGxBbGlnbm1lbnQuY3BwCShyZXZpc2lvbiAyMTgyOTcpCisrKyBTb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvU2Nyb2xsQWxpZ25tZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAt
NDQsNiArNDQsOSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNjcm9sbEFsaWdu
bWVudC5oIgogCisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlRleHRTdHJlYW0uaCIK
KwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjb25zdCBTY3JvbGxBbGlnbm1lbnQgU2Nyb2xsQWxp
Z25tZW50OjphbGlnbkNlbnRlcklmTm90VmlzaWJsZSA9IHsgQmVoYXZpb3I6Ok5vU2Nyb2xsLCBC
ZWhhdmlvcjo6QWxpZ25DZW50ZXIsIEJlaGF2aW9yOjpOb1Njcm9sbCB9OwpAQCAtNTUsNSArNTgs
MzAgQEAgY29uc3QgU2Nyb2xsQWxpZ25tZW50IFNjcm9sbEFsaWdubWVudDo6YQogY29uc3QgU2Ny
b2xsQWxpZ25tZW50IFNjcm9sbEFsaWdubWVudDo6YWxpZ25SaWdodEFsd2F5cyA9IHsgQmVoYXZp
b3I6OkFsaWduUmlnaHQsIEJlaGF2aW9yOjpBbGlnblJpZ2h0LCBCZWhhdmlvcjo6QWxpZ25SaWdo
dCB9OwogY29uc3QgU2Nyb2xsQWxpZ25tZW50IFNjcm9sbEFsaWdubWVudDo6YWxpZ25MZWZ0QWx3
YXlzID0geyBCZWhhdmlvcjo6QWxpZ25MZWZ0LCBCZWhhdmlvcjo6QWxpZ25MZWZ0LCBCZWhhdmlv
cjo6QWxpZ25MZWZ0IH07CiBjb25zdCBTY3JvbGxBbGlnbm1lbnQgU2Nyb2xsQWxpZ25tZW50Ojph
bGlnbkJvdHRvbUFsd2F5cyA9IHsgQmVoYXZpb3I6OkFsaWduQm90dG9tLCBCZWhhdmlvcjo6QWxp
Z25Cb3R0b20sIEJlaGF2aW9yOjpBbGlnbkJvdHRvbSB9OworICAgIAorVGV4dFN0cmVhbSYgb3Bl
cmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvciBi
KQoreworICAgIHN3aXRjaCAoYikgeworICAgIGNhc2UgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlv
cjo6Tm9TY3JvbGw6CisgICAgICAgIHJldHVybiB0cyA8PCAiTm9TY3JvbGwiOworICAgIGNhc2Ug
U2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25DZW50ZXI6CisgICAgICAgIHJldHVybiB0
cyA8PCAiQWxpZ25DZW50ZXIiOworICAgIGNhc2UgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6
QWxpZ25Ub3A6CisgICAgICAgIHJldHVybiB0cyA8PCAiQWxpZ25Ub3AiOworICAgIGNhc2UgU2Ny
b2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25Cb3R0b206CisgICAgICAgIHJldHVybiB0cyA8
PCAiQWxpZ25Cb3R0b20iOworICAgIGNhc2UgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxp
Z25MZWZ0OgorICAgICAgICByZXR1cm4gdHMgPDwgIkFsaWduTGVmdCI7CisgICAgY2FzZSBTY3Jv
bGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpBbGlnblJpZ2h0OgorICAgICAgICByZXR1cm4gdHMgPDwg
IkFsaWduUmlnaHQiOworICAgIGNhc2UgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25U
b0Nsb3Nlc3RFZGdlOgorICAgICAgICByZXR1cm4gdHMgPDwgIkFsaWduVG9DbG9zZXN0RWRnZSI7
CisgICAgfQorfQorICAgIAorVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywg
Y29uc3QgU2Nyb2xsQWxpZ25tZW50JiBzKQoreworICAgIHJldHVybiB0cyA8PCAiU2Nyb2xsQWxp
Z25tZW50OiB2aXNpYmxlOiAiIDw8IHMubV9yZWN0VmlzaWJsZSA8PCAiIGhpZGRlbjogIiA8PCBz
Lm1fcmVjdEhpZGRlbiA8PCAiIHBhcnRpYWw6ICIgPDwgcy5tX3JlY3RQYXJ0aWFsOworfQogCiB9
OyAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Nj
cm9sbEFsaWdubWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T
Y3JvbGxBbGlnbm1lbnQuaAkocmV2aXNpb24gMjE4Mjk3KQorKysgU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1Njcm9sbEFsaWdubWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0NCw4IEBA
CiAjcHJhZ21hIG9uY2UKIAogbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIAorY2xhc3MgVGV4dFN0
cmVhbTsKIAogc3RydWN0IFNjcm9sbEFsaWdubWVudCB7CiAKQEAgLTc1LDUgKzc3LDggQEAgc3Ry
dWN0IFNjcm9sbEFsaWdubWVudCB7CiAgICAgQmVoYXZpb3IgbV9yZWN0SGlkZGVuOwogICAgIEJl
aGF2aW9yIG1fcmVjdFBhcnRpYWw7CiB9OworICAgIAorV0VCQ09SRV9FWFBPUlQgVGV4dFN0cmVh
bSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiwgY29uc3QgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlv
cik7CitXRUJDT1JFX0VYUE9SVCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mLCBj
b25zdCBTY3JvbGxBbGlnbm1lbnQmKTsKIAogfTsgLy8gbmFtZXNwYWNlIFdlYkNvcmUK
</data>
<flag name="review"
          id="335099"
          type_id="1"
          status="+"
          setter="simon.fraser"
    />
          </attachment>
      

    </bug>

</bugzilla>