<?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>141857</bug_id>
          
          <creation_ts>2015-02-20 16:18:31 -0800</creation_ts>
          <short_desc>REGRESSION (r177494): -webkit-mask-image: with data URI fails on non-local files</short_desc>
          <delta_ts>2015-04-20 23:48:26 -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>CSS</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>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Simon Fraser (smfr)">simon.fraser</reporter>
          <assigned_to name="Simon Fraser (smfr)">simon.fraser</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>jonlee</cc>
    
    <cc>krit</cc>
    
    <cc>mihnea</cc>
    
    <cc>sabouhallawa</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>stavila</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1070861</commentid>
    <comment_count>0</comment_count>
      <attachid>247007</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2015-02-20 16:18:31 -0800</bug_when>
    <thetext>Created attachment 247007
Testcase

r177494 broke -webkit-mask-image: with data URIs for non-local files.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1070863</commentid>
    <comment_count>1</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2015-02-20 16:20:15 -0800</bug_when>
    <thetext>rdar://problem/19738198</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1070946</commentid>
    <comment_count>2</comment_count>
    <who name="Dirk Schulze">krit</who>
    <bug_when>2015-02-20 20:41:27 -0800</bug_when>
    <thetext>(In reply to comment #0)
&gt; Created attachment 247007 [details]
&gt; Testcase
&gt; 
&gt; r177494 broke -webkit-mask-image: with data URIs for non-local files.

What do you mean with &quot;for non-local&quot;? I know that we added tests to confirm that data URIs are not broken. Did you break down the issue to r177494?

Question to the test, does masking itself not work or is the image not loaded correctly? If I interpret the test correctly then the former.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1071241</commentid>
    <comment_count>3</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2015-02-23 10:34:19 -0800</bug_when>
    <thetext>(In reply to comment #2)
&gt; (In reply to comment #0)
&gt; &gt; Created attachment 247007 [details]
&gt; &gt; Testcase
&gt; &gt; 
&gt; &gt; r177494 broke -webkit-mask-image: with data URIs for non-local files.
&gt; What do you mean with &quot;for non-local&quot;?

We don&apos;t do same-origin testing for file: urls, so to see the bug you have to load from an http(s) url.

&gt; I know that we added tests to confirm
&gt; that data URIs are not broken. Did you break down the issue to r177494?

Yes, it was blamed to that revision.

&gt; Question to the test, does masking itself not work or is the image not
&gt; loaded correctly? If I interpret the test correctly then the former.

The masking doesn&apos;t work (second square with little arrows is missing in a nightly).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1071253</commentid>
    <comment_count>4</comment_count>
      <attachid>247128</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2015-02-23 10:58:50 -0800</bug_when>
    <thetext>Created attachment 247128
provisional patch, needs test</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1071254</commentid>
    <comment_count>5</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-02-23 11:00:32 -0800</bug_when>
    <thetext>Attachment 247128 did not pass style-queue:


ERROR: Source/WebCore/ChangeLog:8:  You should remove the &apos;No new tests&apos; and either add and list tests, or explain why no new tests were possible.  [changelog/nonewtests] [5]
Total errors found: 1 in 3 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1071774</commentid>
    <comment_count>6</comment_count>
      <attachid>247128</attachid>
    <who name="Dirk Schulze">krit</who>
    <bug_when>2015-02-24 13:48:29 -0800</bug_when>
    <thetext>Comment on attachment 247128
provisional patch, needs test

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

&gt; Source/WebCore/css/CSSParser.cpp:9584
&gt; +        if (protocolIs(value-&gt;string, &quot;data&quot;))

I need to ask Radu here as well, but is special casing &quot;data&quot; going to be future proof? Are there other things to consider?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1073071</commentid>
    <comment_count>7</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2015-02-28 13:36:41 -0800</bug_when>
    <thetext>Dirk, any update?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1074910</commentid>
    <comment_count>8</comment_count>
      <attachid>247128</attachid>
    <who name="Radu Stavila">stavila</who>
    <bug_when>2015-03-06 06:24:41 -0800</bug_when>
    <thetext>Comment on attachment 247128
provisional patch, needs test

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

I think this should be ok. Thanks for taking care of this, Simon.

&gt; Source/WebCore/css/CSSParser.cpp:9587
&gt; +            resourceValue = CSSPrimitiveValue::create(completeURL(value-&gt;string));

This might also need the CSSPrimitiveValue::CSS_URI second parameter.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1086919</commentid>
    <comment_count>9</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2015-04-20 15:08:36 -0700</bug_when>
    <thetext>This also broke mobile twitter:
https://mobile.twitter.com/Paul2eD/status/580757901377048577</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1086932</commentid>
    <comment_count>10</comment_count>
      <attachid>251196</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2015-04-20 15:45:58 -0700</bug_when>
    <thetext>Created attachment 251196
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1086999</commentid>
    <comment_count>11</comment_count>
      <attachid>251196</attachid>
    <who name="Dirk Schulze">krit</who>
    <bug_when>2015-04-20 22:59:51 -0700</bug_when>
    <thetext>Comment on attachment 251196
Patch

LGTM</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1087004</commentid>
    <comment_count>12</comment_count>
      <attachid>251196</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-04-20 23:48:21 -0700</bug_when>
    <thetext>Comment on attachment 251196
Patch

Clearing flags on attachment: 251196

Committed r183053: &lt;http://trac.webkit.org/changeset/183053&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1087005</commentid>
    <comment_count>13</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-04-20 23:48:26 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>247007</attachid>
            <date>2015-02-20 16:18:31 -0800</date>
            <delta_ts>2015-02-20 16:18:31 -0800</delta_ts>
            <desc>Testcase</desc>
            <filename>itunes-play-button.html</filename>
            <type>text/html</type>
            <size>3585</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">PCFET0NUWVBFIGh0bWw+Cgo8aHRtbD4KPGhlYWQ+CiAgICA8c3R5bGU+CiAgICAgICAgCiAgICAg
ICAgCiAgICAgICAgLmJveCB7CiAgICAgICAgICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICAg
ICAgICAgaGVpZ2h0OiAxMDBweDsKICAgICAgICAgICAgd2lkdGg6IDEwMHB4OwogICAgICAgICAg
ICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOwogICAgICAgICAgICBtYXJnaW46IDEwcHg7CiAgICAg
ICAgfQoKICAgICAgICAuYmFja2dyb3VuZC5ib3ggewogICAgICAgICAgICBiYWNrZ3JvdW5kLWlt
YWdlOiB1cmwoZGF0YTppbWFnZS9wbmc7YmFzZTY0LGlWQk9SdzBLR2dvQUFBQU5TVWhFVWdBQUFB
Y0FBQUFKQ0FZQUFBRCtXRGFqQUFBQUdYUkZXSFJUYjJaMGQyRnlaUUJCWkc5aVpTQkpiV0ZuWlZK
bFlXUjVjY2xsUEFBQUEzaHBWRmgwV0UxTU9tTnZiUzVoWkc5aVpTNTRiWEFBQUFBQUFEdy9lSEJo
WTJ0bGRDQmlaV2RwYmowaTc3dS9JaUJwWkQwaVZ6Vk5NRTF3UTJWb2FVaDZjbVZUZWs1VVkzcHJZ
emxrSWo4K0lEeDRPbmh0Y0cxbGRHRWdlRzFzYm5NNmVEMGlZV1J2WW1VNmJuTTZiV1YwWVM4aUlI
ZzZlRzF3ZEdzOUlrRmtiMkpsSUZoTlVDQkRiM0psSURVdU15MWpNREV4SURZMkxqRTBOVFkyTVN3
Z01qQXhNaTh3TWk4d05pMHhORG8xTmpveU55QWdJQ0FnSUNBZ0lqNGdQSEprWmpwU1JFWWdlRzFz
Ym5NNmNtUm1QU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh4T1RrNUx6QXlMekl5TFhKa1ppMXpl
VzUwWVhndGJuTWpJajRnUEhKa1pqcEVaWE5qY21sd2RHbHZiaUJ5WkdZNllXSnZkWFE5SWlJZ2VH
MXNibk02ZUcxd1RVMDlJbWgwZEhBNkx5OXVjeTVoWkc5aVpTNWpiMjB2ZUdGd0x6RXVNQzl0YlM4
aUlIaHRiRzV6T25OMFVtVm1QU0pvZEhSd09pOHZibk11WVdSdlltVXVZMjl0TDNoaGNDOHhMakF2
YzFSNWNHVXZVbVZ6YjNWeVkyVlNaV1lqSWlCNGJXeHVjenA0YlhBOUltaDBkSEE2THk5dWN5NWha
RzlpWlM1amIyMHZlR0Z3THpFdU1DOGlJSGh0Y0UxTk9rOXlhV2RwYm1Gc1JHOWpkVzFsYm5SSlJE
MGllRzF3TG1ScFpEcGtNMlUwTjJJNVlpMDFOemxoTFRRM1l6Y3RZVGN4WkMwek1UazVNR1kwTWpo
bE5URWlJSGh0Y0UxTk9rUnZZM1Z0Wlc1MFNVUTlJbmh0Y0M1a2FXUTZSVGRCTURFME1ETTBNakpC
TVRGRk5FSTRNVUZDUmtWQlJUVTJNVFpCTWpVaUlIaHRjRTFOT2tsdWMzUmhibU5sU1VROUluaHRj
QzVwYVdRNlJUZEJNREUwTURJME1qSkJNVEZGTkVJNE1VRkNSa1ZCUlRVMk1UWkJNalVpSUhodGNE
cERjbVZoZEc5eVZHOXZiRDBpUVdSdlltVWdVR2h2ZEc5emFHOXdJRU5ESURJd01UUWdLRTFoWTJs
dWRHOXphQ2tpUGlBOGVHMXdUVTA2UkdWeWFYWmxaRVp5YjIwZ2MzUlNaV1k2YVc1emRHRnVZMlZK
UkQwaWVHMXdMbWxwWkRvM1kyRTRNR0psTXkwd05HTTNMVFEyTnpBdE9UWmlaQzA1TkROaE9ESXla
all5WkdRaUlITjBVbVZtT21SdlkzVnRaVzUwU1VROUluaHRjQzVrYVdRNlpETmxORGRpT1dJdE5U
YzVZUzAwTjJNM0xXRTNNV1F0TXpFNU9UQm1OREk0WlRVeElpOCtJRHd2Y21SbU9rUmxjMk55YVhC
MGFXOXVQaUE4TDNKa1pqcFNSRVkrSUR3dmVEcDRiWEJ0WlhSaFBpQThQM2h3WVdOclpYUWdaVzVr
UFNKeUlqOCtPd2lpbHdBQUFHWkpSRUZVZU5waXRLbzg1c2ZBd0xDSkFRdGdBdUtOUUx3ZGlGV3dT
WUtBQnhCZkJlSTJJT1pCbHdRQk5pQ3VCT0xyUUJ3SkVtREJZcFVNRUM4RFluVnNraytCdUJTSVZ5
QkwvZ0xpUGlCdUJlSXZ5TWJ1QU9KY0lMNkRiQVJJMGgrWFB3RUNEQUNURlJCdGJoYWNxZ0FBQUFC
SlJVNUVya0pnZ2c9PSk7CiAgICAgICAgfQogICAgICAgIAogICAgICAgIC5tYXNrZWQuYm94IHsK
ICAgICAgICAgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1cmwoZGF0YTppbWFnZS9wbmc7YmFzZTY0
LGlWQk9SdzBLR2dvQUFBQU5TVWhFVWdBQUFBY0FBQUFKQ0FZQUFBRCtXRGFqQUFBQUdYUkZXSFJU
YjJaMGQyRnlaUUJCWkc5aVpTQkpiV0ZuWlZKbFlXUjVjY2xsUEFBQUEzaHBWRmgwV0UxTU9tTnZi
UzVoWkc5aVpTNTRiWEFBQUFBQUFEdy9lSEJoWTJ0bGRDQmlaV2RwYmowaTc3dS9JaUJwWkQwaVZ6
Vk5NRTF3UTJWb2FVaDZjbVZUZWs1VVkzcHJZemxrSWo4K0lEeDRPbmh0Y0cxbGRHRWdlRzFzYm5N
NmVEMGlZV1J2WW1VNmJuTTZiV1YwWVM4aUlIZzZlRzF3ZEdzOUlrRmtiMkpsSUZoTlVDQkRiM0ps
SURVdU15MWpNREV4SURZMkxqRTBOVFkyTVN3Z01qQXhNaTh3TWk4d05pMHhORG8xTmpveU55QWdJ
Q0FnSUNBZ0lqNGdQSEprWmpwU1JFWWdlRzFzYm5NNmNtUm1QU0pvZEhSd09pOHZkM2QzTG5jekxt
OXlaeTh4T1RrNUx6QXlMekl5TFhKa1ppMXplVzUwWVhndGJuTWpJajRnUEhKa1pqcEVaWE5qY21s
d2RHbHZiaUJ5WkdZNllXSnZkWFE5SWlJZ2VHMXNibk02ZUcxd1RVMDlJbWgwZEhBNkx5OXVjeTVo
Wkc5aVpTNWpiMjB2ZUdGd0x6RXVNQzl0YlM4aUlIaHRiRzV6T25OMFVtVm1QU0pvZEhSd09pOHZi
bk11WVdSdlltVXVZMjl0TDNoaGNDOHhMakF2YzFSNWNHVXZVbVZ6YjNWeVkyVlNaV1lqSWlCNGJX
eHVjenA0YlhBOUltaDBkSEE2THk5dWN5NWhaRzlpWlM1amIyMHZlR0Z3THpFdU1DOGlJSGh0Y0Ux
Tk9rOXlhV2RwYm1Gc1JHOWpkVzFsYm5SSlJEMGllRzF3TG1ScFpEcGtNMlUwTjJJNVlpMDFOemxo
TFRRM1l6Y3RZVGN4WkMwek1UazVNR1kwTWpobE5URWlJSGh0Y0UxTk9rUnZZM1Z0Wlc1MFNVUTlJ
bmh0Y0M1a2FXUTZSVGRCTURFME1ETTBNakpCTVRGRk5FSTRNVUZDUmtWQlJUVTJNVFpCTWpVaUlI
aHRjRTFOT2tsdWMzUmhibU5sU1VROUluaHRjQzVwYVdRNlJUZEJNREUwTURJME1qSkJNVEZGTkVJ
NE1VRkNSa1ZCUlRVMk1UWkJNalVpSUhodGNEcERjbVZoZEc5eVZHOXZiRDBpUVdSdlltVWdVR2h2
ZEc5emFHOXdJRU5ESURJd01UUWdLRTFoWTJsdWRHOXphQ2tpUGlBOGVHMXdUVTA2UkdWeWFYWmxa
RVp5YjIwZ2MzUlNaV1k2YVc1emRHRnVZMlZKUkQwaWVHMXdMbWxwWkRvM1kyRTRNR0psTXkwd05H
TTNMVFEyTnpBdE9UWmlaQzA1TkROaE9ESXlaall5WkdRaUlITjBVbVZtT21SdlkzVnRaVzUwU1VR
OUluaHRjQzVrYVdRNlpETmxORGRpT1dJdE5UYzVZUzAwTjJNM0xXRTNNV1F0TXpFNU9UQm1OREk0
WlRVeElpOCtJRHd2Y21SbU9rUmxjMk55YVhCMGFXOXVQaUE4TDNKa1pqcFNSRVkrSUR3dmVEcDRi
WEJ0WlhSaFBpQThQM2h3WVdOclpYUWdaVzVrUFNKeUlqOCtPd2lpbHdBQUFHWkpSRUZVZU5waXRL
bzg1c2ZBd0xDSkFRdGdBdUtOUUx3ZGlGV3dTWUtBQnhCZkJlSTJJT1pCbHdRQk5pQ3VCT0xyUUJ3
SkVtREJZcFVNRUM4RFluVnNraytCdUJTSVZ5QkwvZ0xpUGlCdUJlSXZ5TWJ1QU9KY0lMNkRiQVJJ
MGgrWFB3RUNEQUNURlJCdGJoYWNxZ0FBQUFCSlJVNUVya0pnZ2c9PSk7CiAgICAgICAgfQogICAg
ICAgIAogICAgPC9zdHlsZT4KPC9oZWFkPgo8Ym9keT4KCjxwPlNob3VsZCBiZSBhIDJuZCBtYXNr
ZWQgc3F1YXJlIGJlbG93LiBUaGlzIG5lZWRzIHRvIGJlIGEgbm9uLWxvY2FsIGZpbGUgdG8gdGVz
dDwvcD4KICAgIDxkaXYgY2xhc3M9ImJhY2tncm91bmQgYm94Ij4KICAgIDwvZGl2PgoKICAgIDxk
aXYgY2xhc3M9Im1hc2tlZCBib3giPgogICAgPC9kaXY+Cgo8L2JvZHk+CjwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>247128</attachid>
            <date>2015-02-23 10:58:50 -0800</date>
            <delta_ts>2015-04-20 15:45:52 -0700</delta_ts>
            <desc>provisional patch, needs test</desc>
            <filename>bug-141857-20150223105839.patch</filename>
            <type>text/plain</type>
            <size>2900</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU2ZDg4Y2I2YzM2M2Uw
YmY0ZTlkYmVmN2IxM2U5ODg3YjUyMzBlNy4uMDFlNGI2ZGI0NDVkMjM5NDUwOTg4Y2EwYThiMDM0
NzllMGJkMzVkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTIzICBTaW1v
biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04g
KHIxNzc0OTQpOiAtd2Via2l0LW1hc2staW1hZ2U6IHdpdGggZGF0YSBVUkkgZmFpbHMgb24gbm9u
LWxvY2FsIGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNDE4NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZU1hc2tJbWFnZSk6CisgICAgICAg
ICogc3ZnL1NWR1VSSVJlZmVyZW5jZS5oOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVVJJUmVmZXJl
bmNlOjppc0V4dGVybmFsVVJJUmVmZXJlbmNlKToKKwogMjAxNS0wMi0yMCAgQnJlbnQgRnVsZ2hh
bSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBSRUdSRVNTSU9OOiBTY3Jv
bGwgc25hcCBwb2ludHMgYnJva2VuIGFmdGVyIHIxODAwMTgKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5j
cHAKaW5kZXggOWFhNjYxOWJhOTZiNTY0YWI4M2IzYWY0ODdmMjVkYTIwZTU3YTAyMi4uYjk0ZTc5
OWQzOGE1ODE1N2I3N2JlYzhiMTIzMzc2NTFhNGYwZTRiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNl
ci5jcHAKQEAgLTk1NzQsMTYgKzk1NzQsMjMgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlTWFza0lt
YWdlKENTU1BhcnNlclZhbHVlTGlzdCYgdmFsdWVMaXN0LCBSZWZQdHI8Q1NTVmFsdWU+Jgogewog
ICAgIG91dFZhbHVlID0gbnVsbHB0cjsKICAgICBDU1NQYXJzZXJWYWx1ZSogdmFsdWUgPSB2YWx1
ZUxpc3QuY3VycmVudCgpOwotICAgIGlmICh2YWx1ZS0+aWQgPT0gQ1NTVmFsdWVOb25lKQorICAg
IGlmICh2YWx1ZS0+aWQgPT0gQ1NTVmFsdWVOb25lKSB7CiAgICAgICAgIG91dFZhbHVlID0gV2Vi
S2l0Q1NTUmVzb3VyY2VWYWx1ZTo6Y3JlYXRlKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZp
ZXJWYWx1ZShDU1NWYWx1ZU5vbmUpKTsKLSAgICBlbHNlIGlmICh2YWx1ZS0+dW5pdCA9PSBDU1NQ
cmltaXRpdmVWYWx1ZTo6Q1NTX1VSSSkKLSAgICAgICAgb3V0VmFsdWUgPSBXZWJLaXRDU1NSZXNv
dXJjZVZhbHVlOjpjcmVhdGUoQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShjb21wbGV0ZVVSTCh2
YWx1ZS0+c3RyaW5nKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19VUkkpKTsKLSAgICBlbHNlIHsK
LSAgICAgICAgUmVmUHRyPENTU1ZhbHVlPiBmaWxsSW1hZ2VWYWx1ZTsKLSAgICAgICAgaWYgKHBh
cnNlRmlsbEltYWdlKHZhbHVlTGlzdCwgZmlsbEltYWdlVmFsdWUpKQotICAgICAgICAgICAgb3V0
VmFsdWUgPSBXZWJLaXRDU1NSZXNvdXJjZVZhbHVlOjpjcmVhdGUoZmlsbEltYWdlVmFsdWUpOwor
ICAgICAgICByZXR1cm4gb3V0VmFsdWUuZ2V0KCk7CiAgICAgfQogCisgICAgUmVmUHRyPENTU1Zh
bHVlPiByZXNvdXJjZVZhbHVlOworICAgIGlmICh2YWx1ZS0+dW5pdCA9PSBDU1NQcmltaXRpdmVW
YWx1ZTo6Q1NTX1VSSSkgeworICAgICAgICBpZiAocHJvdG9jb2xJcyh2YWx1ZS0+c3RyaW5nLCAi
ZGF0YSIpKQorICAgICAgICAgICAgcGFyc2VGaWxsSW1hZ2UodmFsdWVMaXN0LCByZXNvdXJjZVZh
bHVlKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgcmVzb3VyY2VWYWx1ZSA9IENTU1ByaW1p
dGl2ZVZhbHVlOjpjcmVhdGUoY29tcGxldGVVUkwodmFsdWUtPnN0cmluZykpOworICAgIH0gZWxz
ZQorICAgICAgICBwYXJzZUZpbGxJbWFnZSh2YWx1ZUxpc3QsIHJlc291cmNlVmFsdWUpOworCisg
ICAgaWYgKHJlc291cmNlVmFsdWUpCisgICAgICAgIG91dFZhbHVlID0gV2ViS2l0Q1NTUmVzb3Vy
Y2VWYWx1ZTo6Y3JlYXRlKHJlc291cmNlVmFsdWUpOworCiAgICAgcmV0dXJuIG91dFZhbHVlLmdl
dCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVVJJUmVmZXJlbmNl
LmggYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVVJJUmVmZXJlbmNlLmgKaW5kZXggOTBiYjFiNDk4
NDkzMWYyNjc0OGVhZGJiMDMzM2MwYjI1YWY2ODJmNC4uMDFmOTkzN2YxOGY3MDk3ZTBiYWFiYzZj
ZTllYjRmZTE2MTAxNzJkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VSSVJl
ZmVyZW5jZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVUklSZWZlcmVuY2UuaApAQCAt
NDgsNiArNDgsNyBAQCBwdWJsaWM6CiAKICAgICAgICAgLy8gSWYgdGhlIFVSSSBtYXRjaGVzIG91
ciBkb2N1bWVudHMgVVJMLCB3ZSdyZSBkZWFsaW5nIHdpdGggYSBsb2NhbCByZWZlcmVuY2UuCiAg
ICAgICAgIFVSTCB1cmwgPSBkb2N1bWVudC5jb21wbGV0ZVVSTCh1cmkpOworICAgICAgICBBU1NF
UlQoIXVybC5wcm90b2NvbElzRGF0YSgpKTsKICAgICAgICAgcmV0dXJuICFlcXVhbElnbm9yaW5n
RnJhZ21lbnRJZGVudGlmaWVyKHVybCwgZG9jdW1lbnQudXJsKCkpOwogICAgIH0KIAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>251196</attachid>
            <date>2015-04-20 15:45:58 -0700</date>
            <delta_ts>2015-04-20 23:48:21 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-141857-20150420154456.patch</filename>
            <type>text/plain</type>
            <size>5392</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODEyMGY0MTZiYmE1MGEz
MDVjMTE4YjY2MWQ0NmY0YzViMzM3MTFlOC4uYWU5ZDA5MTI5YTQ2ZDcyOTYxOTAxMjQ2YmJjZjVh
NTEwNGQ4ZTcyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE1LTA0LTIwICBTaW1v
biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJFR1JFU1NJT04g
KHIxNzc0OTQpOiAtd2Via2l0LW1hc2staW1hZ2U6IHdpdGggZGF0YSBVUkkgZmFpbHMgb24gbm9u
LWxvY2FsIGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNDE4NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAg
ICAgCisgICAgICAgIHIxNzc0OTQgcmVncmVzc2VkIGxvYWRpbmcgb2YgZGF0YSBVUklzIGluIG1h
c2tzIHdpdGggcmVtb3RlIGNvbnRlbnQsIHRyaWdnZXJpbmcKKyAgICAgICAgYSBjcm9zcy1kb21h
aW4gZXJyb3Igd2hpY2ggb2NjdXJzIGJlY2F1c2UgdGhlIG1hc2sgbG9hZGluZyBoYXBwZW5lZCB2
aWEgYSBzZXBhcmF0ZQorICAgICAgICBTVkdEb2N1bWVudC4KKyAgICAgICAgCisgICAgICAgIEZp
eCBieSBjaGVja2luZyBmb3IgZGF0YSBVUklzIGF0IHBhcnNpbmcgdGltZSwgd2hpY2ggaXMgd2hh
dCB3ZSB1c2VkIHRvIGRvLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvY3NzL2RhdGEtdXJp
LW1hc2suaHRtbAorCisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJD
b3JlOjpDU1NQYXJzZXI6OnBhcnNlTWFza0ltYWdlKToKKyAgICAgICAgKiBzdmcvU1ZHVVJJUmVm
ZXJlbmNlLmg6CisgICAgICAgIChXZWJDb3JlOjpTVkdVUklSZWZlcmVuY2U6OmlzRXh0ZXJuYWxV
UklSZWZlcmVuY2UpOgorCisyMDE1LTA0LTIwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA
YXBwbGUuY29tPgorCiAgICAgICAgIFNldHRpbmcgaW5saW5lIHN0eWxlIHRvIHRoZSBzYW1lIHZh
bHVlIGl0IGFscmVhZHkgaGFzIHRyaWdnZXJzIGEgc3R5bGUgcmVjYWxjCiAgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5MjIKIApkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT
UGFyc2VyLmNwcAppbmRleCA0ZjJjZGYxMTdjYzU3ZjRhZjA0M2VhYTk0NTI2N2E2ZWUxY2YxOWY0
Li5kODZmZmVkMjc1NDY2NDBjZWQyOTFmMTJkZWIxYzhkOTJhYzgwMTFkIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv
Q1NTUGFyc2VyLmNwcApAQCAtOTc2NSwxNiArOTc2NSwyMyBAQCBib29sIENTU1BhcnNlcjo6cGFy
c2VNYXNrSW1hZ2UoQ1NTUGFyc2VyVmFsdWVMaXN0JiB2YWx1ZUxpc3QsIFJlZlB0cjxDU1NWYWx1
ZT4mCiB7CiAgICAgb3V0VmFsdWUgPSBudWxscHRyOwogICAgIENTU1BhcnNlclZhbHVlKiB2YWx1
ZSA9IHZhbHVlTGlzdC5jdXJyZW50KCk7Ci0gICAgaWYgKHZhbHVlLT5pZCA9PSBDU1NWYWx1ZU5v
bmUpCisgICAgaWYgKHZhbHVlLT5pZCA9PSBDU1NWYWx1ZU5vbmUpIHsKICAgICAgICAgb3V0VmFs
dWUgPSBXZWJLaXRDU1NSZXNvdXJjZVZhbHVlOjpjcmVhdGUoY3NzVmFsdWVQb29sKCkuY3JlYXRl
SWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9uZSkpOwotICAgIGVsc2UgaWYgKHZhbHVlLT51bml0
ID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfVVJJKQotICAgICAgICBvdXRWYWx1ZSA9IFdlYktp
dENTU1Jlc291cmNlVmFsdWU6OmNyZWF0ZShDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKGNvbXBs
ZXRlVVJMKHZhbHVlLT5zdHJpbmcpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1VSSSkpOwotICAg
IGVsc2UgewotICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+IGZpbGxJbWFnZVZhbHVlOwotICAgICAg
ICBpZiAocGFyc2VGaWxsSW1hZ2UodmFsdWVMaXN0LCBmaWxsSW1hZ2VWYWx1ZSkpCi0gICAgICAg
ICAgICBvdXRWYWx1ZSA9IFdlYktpdENTU1Jlc291cmNlVmFsdWU6OmNyZWF0ZShmaWxsSW1hZ2VW
YWx1ZSk7CisgICAgICAgIHJldHVybiBvdXRWYWx1ZS5nZXQoKTsKICAgICB9CiAKKyAgICBSZWZQ
dHI8Q1NTVmFsdWU+IHJlc291cmNlVmFsdWU7CisgICAgaWYgKHZhbHVlLT51bml0ID09IENTU1By
aW1pdGl2ZVZhbHVlOjpDU1NfVVJJKSB7CisgICAgICAgIGlmIChwcm90b2NvbElzKHZhbHVlLT5z
dHJpbmcsICJkYXRhIikpCisgICAgICAgICAgICBwYXJzZUZpbGxJbWFnZSh2YWx1ZUxpc3QsIHJl
c291cmNlVmFsdWUpOworICAgICAgICBlbHNlCisgICAgICAgICAgICByZXNvdXJjZVZhbHVlID0g
Q1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShjb21wbGV0ZVVSTCh2YWx1ZS0+c3RyaW5nKSwgQ1NT
UHJpbWl0aXZlVmFsdWU6OkNTU19VUkkpOworICAgIH0gZWxzZQorICAgICAgICBwYXJzZUZpbGxJ
bWFnZSh2YWx1ZUxpc3QsIHJlc291cmNlVmFsdWUpOworCisgICAgaWYgKHJlc291cmNlVmFsdWUp
CisgICAgICAgIG91dFZhbHVlID0gV2ViS2l0Q1NTUmVzb3VyY2VWYWx1ZTo6Y3JlYXRlKHJlc291
cmNlVmFsdWUpOworCiAgICAgcmV0dXJuIG91dFZhbHVlLmdldCgpOwogfQogCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVVJJUmVmZXJlbmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9z
dmcvU1ZHVVJJUmVmZXJlbmNlLmgKaW5kZXggMDNlYzkyMWEyNmQ0MGE2M2Q2NmJiZjE2YzVkM2Nl
NzhhMjI2MzUxNy4uN2IwMjFhNzI5ODQyNmVmMzc3NDFkMGRhZTU3MmZlNDYyZmVjNjU5MyAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VSSVJlZmVyZW5jZS5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3N2Zy9TVkdVUklSZWZlcmVuY2UuaApAQCAtNDUsNiArNDUsNyBAQCBwdWJsaWM6
CiAKICAgICAgICAgLy8gSWYgdGhlIFVSSSBtYXRjaGVzIG91ciBkb2N1bWVudHMgVVJMLCB3ZSdy
ZSBkZWFsaW5nIHdpdGggYSBsb2NhbCByZWZlcmVuY2UuCiAgICAgICAgIFVSTCB1cmwgPSBkb2N1
bWVudC5jb21wbGV0ZVVSTCh1cmkpOworICAgICAgICBBU1NFUlQoIXVybC5wcm90b2NvbElzRGF0
YSgpKTsKICAgICAgICAgcmV0dXJuICFlcXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKHVy
bCwgZG9jdW1lbnQudXJsKCkpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDcyNDZmNzY0Y2QwOTRiZTc3ZjZl
MTJkZWFiOGQwZWFjOTAzY2ZkOTMuLmI2YmE4OWU0NTBmNDg4OTgzYjIzOTVhZGIxZDY5NDc4NDE2
NTIxYjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNS0wNC0yMCAgU2ltb24gRnJhc2VyICA8
c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTc3NDk0KTog
LXdlYmtpdC1tYXNrLWltYWdlOiB3aXRoIGRhdGEgVVJJIGZhaWxzIG9uIG5vbi1sb2NhbCBmaWxl
cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxODU3
CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAg
ICBSZWYgdGVzdCB3aXRoIGEgbWFza2VkIGdyZWVuIHNxdWFyZS4gSGFzIHRvIGJlIGFuIGh0dHAg
dGVzdCB0byB0cmlnZ2VyIHRoZQorICAgICAgICBvcmlnaW4gY2hlY2tpbmcuCisgICAgICAgIAor
ICAgICAgICAqIGh0dHAvdGVzdHMvY3NzL2RhdGEtdXJpLW1hc2stZXhwZWN0ZWQuaHRtbDogQWRk
ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvZGF0YS11cmktbWFzay5odG1sOiBBZGRlZC4K
KwogMjAxNS0wNC0yMCAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAg
U2hvdWxkIG5vdCBsaXN0IHRoZXNlIHRlc3RzIHR3aWNlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9jc3MvZGF0YS11cmktbWFzay1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9jc3MvZGF0YS11cmktbWFzay1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1v
ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
LjZjZjViY2FiZDFlNjE5ZTM1YzZmMDMwOTkyNTAxNDNkYzYzMDZkMzgKLS0tIC9kZXYvbnVsbAor
KysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9kYXRhLXVyaS1tYXNrLWV4cGVjdGVkLmh0
bWwKQEAgLTAsMCArMSwxNiBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorPGhlYWQ+Cisg
ICAgPHN0eWxlPgorICAgICAgICAubWFza2VkIHsKKyAgICAgICAgICAgIGhlaWdodDogMTAwcHg7
CisgICAgICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9y
OiBncmVlbjsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8
ZGl2IGNsYXNzPSJtYXNrZWQiPjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZGF0YS11cmktbWFzay5odG1sIGIvTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9jc3MvZGF0YS11cmktbWFzay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0
CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU5ZjBmYWZi
ZTk3NDk2YzNlZTkzZTEzNGRmMTkzNmYwMTllMDJlZGEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv
dXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9kYXRhLXVyaS1tYXNrLmh0bWwKQEAgLTAsMCArMSwxNyBA
QAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAg
ICAubWFza2VkIHsKKyAgICAgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgICB3aWR0
aDogMTAwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAgICAg
ICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJsKGRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxSMGxHT0Rs
aEFRQUJBSUFBQVAvLy8vLy8veUg1QkFFS0FBRUFMQUFBQUFBQkFBRUFBQUlDUkFFQU93PT0pOwor
ICAgICAgICB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgY2xhc3M9
Im1hc2tlZCI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>