<?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>111304</bug_id>
          
          <creation_ts>2013-03-04 05:38:16 -0800</creation_ts>
          <short_desc>-webkit-image-set should consider Frame::pageZoomFactor()</short_desc>
          <delta_ts>2014-02-05 11:20:16 -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>CSS</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>NEW</bug_status>
          <resolution></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>81698</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Allan Sandfeld Jensen">allan.jensen</reporter>
          <assigned_to name="Allan Sandfeld Jensen">allan.jensen</assigned_to>
          <cc>bdakin</cc>
    
    <cc>eoconnor</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>kenneth</cc>
    
    <cc>koivisto</cc>
    
    <cc>macpherson</cc>
    
    <cc>menard</cc>
    
    <cc>ojan.autocc</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>846360</commentid>
    <comment_count>0</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-04 05:38:16 -0800</bug_when>
    <thetext>-webkit-image-set currently only considers deviceScaleFactor, if it also supported pageZoomFactor it would mean we could pick higher resolution images on zoomed pages.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>846364</commentid>
    <comment_count>1</comment_count>
      <attachid>191211</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-04 05:41:15 -0800</bug_when>
    <thetext>Created attachment 191211
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>846384</commentid>
    <comment_count>2</comment_count>
    <who name="Kenneth Rohde Christiansen">kenneth</who>
    <bug_when>2013-03-04 05:59:08 -0800</bug_when>
    <thetext>How does this interact with loading. Do we have to always reload both versions, or can we zoom in and end up in the situation that the high res version isnt loaded?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>846398</commentid>
    <comment_count>3</comment_count>
      <attachid>191218</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-04 06:11:07 -0800</bug_when>
    <thetext>Created attachment 191218
Patch

Now with a test</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>846408</commentid>
    <comment_count>4</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-04 06:19:33 -0800</bug_when>
    <thetext>(In reply to comment #2)
&gt; How does this interact with loading. Do we have to always reload both versions, or can we zoom in and end up in the situation that the high res version isnt loaded?

We don&apos;t load the higher resolution image until it is needed. Essentially this behaves in similar way as if you changed the CSS content property to a new image. So yes, zooming in will cause the image to be loaded. Note that this is WK1 style zooming though, and a full restyle and repaint is also performed on each zoom step.

It does not work with pinch zoom yet, and would require some refactoring before that is possible.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>846442</commentid>
    <comment_count>5</comment_count>
      <attachid>191231</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-04 06:50:52 -0800</bug_when>
    <thetext>Created attachment 191231
Patch

Avoid rerequesting images when the scale changes in a way that does not affect the choice of image</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>846664</commentid>
    <comment_count>6</comment_count>
    <who name="Beth Dakin">bdakin</who>
    <bug_when>2013-03-04 11:30:07 -0800</bug_when>
    <thetext>I definitely think this feature is interesting, but it should be opt-in somehow. All ports may not want to do this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>846718</commentid>
    <comment_count>7</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-04 12:20:51 -0800</bug_when>
    <thetext>(In reply to comment #6)
&gt; I definitely think this feature is interesting, but it should be opt-in somehow. All ports may not want to do this.

That could get complicated with options, this is just the easiest of the fixme&apos;s for image-set. The other include responding to pageScaleFactor and even CSS transforms. I was under the impression the intention of the image-set feature was exactly to be able to do this at some point.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>855184</commentid>
    <comment_count>8</comment_count>
      <attachid>193119</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-14 07:37:54 -0700</bug_when>
    <thetext>Created attachment 193119
Patch

Moved calculation of scaleFactor to a separate method where any ports that wishes different image-set behavior can east change it</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>861412</commentid>
    <comment_count>9</comment_count>
    <who name="Kenneth Rohde Christiansen">kenneth</who>
    <bug_when>2013-03-22 06:48:04 -0700</bug_when>
    <thetext>(In reply to comment #8)
&gt; Created an attachment (id=193119) [details]
&gt; Patch
&gt; 
&gt; Moved calculation of scaleFactor to a separate method where any ports that wishes different image-set behavior can east change it

Shouldn&apos;t you make this opt in instead of opt out. Why not discuss this on www-style?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>861418</commentid>
    <comment_count>10</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-22 07:05:53 -0700</bug_when>
    <thetext>(In reply to comment #9)
&gt; (In reply to comment #8)
&gt; &gt; Created an attachment (id=193119) [details] [details]
&gt; &gt; Patch
&gt; &gt; 
&gt; &gt; Moved calculation of scaleFactor to a separate method where any ports that wishes different image-set behavior can east change it
&gt; 
&gt; Shouldn&apos;t you make this opt in instead of opt out. Why not discuss this on www-style?

Well, it already is discussed and image-set is meant to take all scaling into account. This only allows for ports that wants to NOT follow the specification.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>861710</commentid>
    <comment_count>11</comment_count>
    <who name="Beth Dakin">bdakin</who>
    <bug_when>2013-03-22 11:35:40 -0700</bug_when>
    <thetext>(In reply to comment #10)
&gt; (In reply to comment #9)
&gt; &gt; (In reply to comment #8)
&gt; &gt; &gt; Created an attachment (id=193119) [details] [details] [details]
&gt; &gt; &gt; Patch
&gt; &gt; &gt; 
&gt; &gt; &gt; Moved calculation of scaleFactor to a separate method where any ports that wishes different image-set behavior can east change it
&gt; &gt; 
&gt; &gt; Shouldn&apos;t you make this opt in instead of opt out. Why not discuss this on www-style?
&gt; 
&gt; Well, it already is discussed and image-set is meant to take all scaling into account. This only allows for ports that wants to NOT follow the specification.

But realistically, opting into this all the time could be a burden for a slow device on a slow network. Also, are you seeing flashes when the transition to the larger image happens? If the larger image takes a while to download or decode, we need a seamless transition between the two.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>861747</commentid>
    <comment_count>12</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-22 12:13:29 -0700</bug_when>
    <thetext>(In reply to comment #11)
&gt; (In reply to comment #10)
&gt; &gt; (In reply to comment #9)
&gt; &gt; &gt; (In reply to comment #8)
&gt; &gt; &gt; &gt; Created an attachment (id=193119) [details] [details] [details] [details]
&gt; &gt; &gt; &gt; Patch
&gt; &gt; &gt; &gt; 
&gt; &gt; &gt; &gt; Moved calculation of scaleFactor to a separate method where any ports that wishes different image-set behavior can east change it
&gt; &gt; &gt; 
&gt; &gt; &gt; Shouldn&apos;t you make this opt in instead of opt out. Why not discuss this on www-style?
&gt; &gt; 
&gt; &gt; Well, it already is discussed and image-set is meant to take all scaling into account. This only allows for ports that wants to NOT follow the specification.
&gt; 
&gt; But realistically, opting into this all the time could be a burden for a slow device on a slow network. Also, are you seeing flashes when the transition to the larger image happens? If the larger image takes a while to download or decode, we need a seamless transition between the two.

That is might happen. You often see a flash anyway because pageZoom does a full relayout. The potential delay is also why I am not including other types of scaling yet. PageZoom is essentially only used by desktop computers when doing old CTRL+Plus scaling.

Ideally we should move resolving the image-set higher up. You could also imagine getting a timeout on one image and need to fetch the next best options, or that you still have the old one and the new one isn&apos;t ready. This is however bigger refactoring. This was just the easiest part that is still useful.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>976991</commentid>
    <comment_count>13</comment_count>
      <attachid>193119</attachid>
    <who name="Andreas Kling">kling</who>
    <bug_when>2014-02-05 11:20:16 -0800</bug_when>
    <thetext>Comment on attachment 193119
Patch

Clearing review flag on patches from before 2014. If this patch is still relevant, please reset the r? flag.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>191211</attachid>
            <date>2013-03-04 05:41:15 -0800</date>
            <delta_ts>2013-03-04 06:11:02 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-111304-20130304143634.patch</filename>
            <type>text/plain</type>
            <size>2781</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZjNmVkYjJkYWE2ZTBh
ZDkxMzU1MWQxMmQwMDAzNTU4ZTU5NjYwNi4uZmI1MmQ2NjQwMTNiODJlNzBmNTdlOTA1YmJhOTEz
NGIxNzBjODBjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAzLTA0ICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIC13
ZWJraXQtaW1hZ2Utc2V0IHNob3VsZCBjb25zaWRlciBGcmFtZTo6cGFnZVpvb21GYWN0b3IoKQor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMzA0CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFrZSBGcmFt
ZTo6cGFnZVpvb21GYWN0b3IoKSBpbnRvIGNvbnNpZGVyYXRpb24gd2hlbiBwaWNraW5nIGltYWdl
cyBmcm9tIHRoZSBpbWFnZS1zZXQuCisgICAgICAgIFRoaXMgbWVhbnMgd2UgY2FuIHBpY2sgaGln
aGVyIHJlc29sdXRpb24gaW1hZ2VzIG9uIHpvb21lZCBwYWdlcy4KKworICAgICAgICAqIGNzcy9D
U1NJbWFnZVNldFZhbHVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ltYWdlU2V0VmFsdWU6
OmNhY2hlZEltYWdlU2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ltYWdlU2V0VmFsdWU6OmNh
Y2hlZE9yUGVuZGluZ0ltYWdlU2V0KToKKwogMjAxMy0wMy0wNCAgTWFyamEgSMO2bHR0w6QgIDxt
YXJqYUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBBZGQgYSAiY29udGV4dCB0eXBlIiBw
YXJhbWV0ZXIgdG8gR2V0VGVtcGxhdGUgYW5kIENvbmZpZ3VyZVY4U29tZXRoaW5nVGVtcGxhdGUg
ZnVuY3Rpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1
ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1ZS5jcHAKaW5kZXggN2E2
MDI2YmFhODQzMWU5OTY1YTk5ZmQ0MjllZTYzYmNiYWVkMTBjZC4uYWJkOTQwZmM1MzQ2MjYzYjZl
ZWE3OTg1MzYxNzVlMDY3M2E3YzI5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NT
U0ltYWdlU2V0VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVNldFZh
bHVlLmNwcApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlUmVxdWVz
dC5oIgogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMuaCIKICNpbmNs
dWRlICJEb2N1bWVudC5oIgorI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgog
I2luY2x1ZGUgIlN0eWxlQ2FjaGVkSW1hZ2VTZXQuaCIKICNpbmNsdWRlICJTdHlsZVBlbmRpbmdJ
bWFnZS5oIgpAQCAtMTA0LDYgKzEwNSw5IEBAIFN0eWxlQ2FjaGVkSW1hZ2VTZXQqIENTU0ltYWdl
U2V0VmFsdWU6OmNhY2hlZEltYWdlU2V0KENhY2hlZFJlc291cmNlTG9hZGVyKiBsb2FkCiAgICAg
ZWxzZQogICAgICAgICBtX3NjYWxlRmFjdG9yID0gMTsKIAorICAgIGlmIChGcmFtZSogZnJhbWUg
PSBkb2N1bWVudC0+ZnJhbWUoKSkKKyAgICAgICAgbV9zY2FsZUZhY3RvciAqPSBmcmFtZS0+cGFn
ZVpvb21GYWN0b3IoKTsKKwogICAgIGlmICghbV9pbWFnZXNJblNldC5zaXplKCkpCiAgICAgICAg
IGZpbGxJbWFnZVNldCgpOwogCkBAIC0xMjgsMTIgKzEzMiwxNCBAQCBTdHlsZUltYWdlKiBDU1NJ
bWFnZVNldFZhbHVlOjpjYWNoZWRPclBlbmRpbmdJbWFnZVNldChEb2N1bWVudCogZG9jdW1lbnQp
CiAgICAgaWYgKCFtX2ltYWdlU2V0KQogICAgICAgICBtX2ltYWdlU2V0ID0gU3R5bGVQZW5kaW5n
SW1hZ2U6OmNyZWF0ZSh0aGlzKTsKICAgICBlbHNlIGlmIChkb2N1bWVudCAmJiAhbV9pbWFnZVNl
dC0+aXNQZW5kaW5nSW1hZ2UoKSkgewotICAgICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9
IDE7CisgICAgICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gMTsKICAgICAgICAgaWYgKFBhZ2UqIHBh
Z2UgPSBkb2N1bWVudC0+cGFnZSgpKQotICAgICAgICAgICAgZGV2aWNlU2NhbGVGYWN0b3IgPSBw
YWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpOworICAgICAgICAgICAgc2NhbGVGYWN0b3IgPSBwYWdl
LT5kZXZpY2VTY2FsZUZhY3RvcigpOworICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gZG9jdW1l
bnQtPmZyYW1lKCkpCisgICAgICAgICAgICBzY2FsZUZhY3RvciAqPSBmcmFtZS0+cGFnZVpvb21G
YWN0b3IoKTsKIAotICAgICAgICAvLyBJZiB0aGUgZGV2aWNlU2NhbGVGYWN0b3IgaGFzIGNoYW5n
ZWQsIHdlIG1heSBub3QgaGF2ZSB0aGUgYmVzdCBpbWFnZSBsb2FkZWQsIHNvIHdlIGhhdmUgdG8g
cmUtYXNzZXNzLgotICAgICAgICBpZiAoZGV2aWNlU2NhbGVGYWN0b3IgIT0gbV9zY2FsZUZhY3Rv
cikgeworICAgICAgICAvLyBJZiB0aGUgc2NhbGVGYWN0b3IgaGFzIGNoYW5nZWQsIHdlIG1heSBu
b3QgaGF2ZSB0aGUgYmVzdCBpbWFnZSBsb2FkZWQsIHNvIHdlIGhhdmUgdG8gcmUtYXNzZXNzLgor
ICAgICAgICBpZiAoc2NhbGVGYWN0b3IgIT0gbV9zY2FsZUZhY3RvcikgewogICAgICAgICAgICAg
bV9hY2Nlc3NlZEJlc3RGaXRJbWFnZSA9IGZhbHNlOwogICAgICAgICAgICAgbV9pbWFnZVNldCA9
IFN0eWxlUGVuZGluZ0ltYWdlOjpjcmVhdGUodGhpcyk7CiAgICAgICAgIH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>191218</attachid>
            <date>2013-03-04 06:11:07 -0800</date>
            <delta_ts>2013-03-04 06:50:47 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-111304-20130304150626.patch</filename>
            <type>text/plain</type>
            <size>5419</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZjNmVkYjJkYWE2ZTBh
ZDkxMzU1MWQxMmQwMDAzNTU4ZTU5NjYwNi4uZmRkNmJlMmI5NmZhYzEzYTZhZmY1YzY1YjBlNmMx
MzliYjdjODk5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTA0ICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIC13
ZWJraXQtaW1hZ2Utc2V0IHNob3VsZCBjb25zaWRlciBGcmFtZTo6cGFnZVpvb21GYWN0b3IoKQor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMzA0CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFrZSBGcmFt
ZTo6cGFnZVpvb21GYWN0b3IoKSBpbnRvIGNvbnNpZGVyYXRpb24gd2hlbiBwaWNraW5nIGltYWdl
cyBmcm9tIHRoZSBpbWFnZS1zZXQuCisgICAgICAgIFRoaXMgbWVhbnMgd2UgY2FuIHBpY2sgaGln
aGVyIHJlc29sdXRpb24gaW1hZ2VzIG9uIHpvb21lZCBwYWdlcy4KKworICAgICAgICBUZXN0OiBm
YXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20uaHRtbAorCisgICAgICAgICogY3NzL0NTU0ltYWdl
U2V0VmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW1hZ2VTZXRWYWx1ZTo6Y2FjaGVk
SW1hZ2VTZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW1hZ2VTZXRWYWx1ZTo6Y2FjaGVkT3JQ
ZW5kaW5nSW1hZ2VTZXQpOgorCiAyMDEzLTAzLTA0ICBNYXJqYSBIw7ZsdHTDpCAgPG1hcmphQGNo
cm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIEFkZCBhICJjb250ZXh0IHR5cGUiIHBhcmFtZXRl
ciB0byBHZXRUZW1wbGF0ZSBhbmQgQ29uZmlndXJlVjhTb21ldGhpbmdUZW1wbGF0ZSBmdW5jdGlv
bnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVNldFZhbHVlLmNwcCBi
L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVNldFZhbHVlLmNwcAppbmRleCA3YTYwMjZiYWE4
NDMxZTk5NjVhOTlmZDQyOWVlNjNiY2JhZWQxMGNkLi5hYmQ5NDBmYzUzNDYyNjNiNmVlYTc5ODUz
NjE3NWUwNjczYTdjMjlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VT
ZXRWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ltYWdlU2V0VmFsdWUuY3Bw
CkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmgiCiAj
aW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0SW5pdGlhdG9ycy5oIgogI2luY2x1ZGUgIkRv
Y3VtZW50LmgiCisjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVk
ZSAiU3R5bGVDYWNoZWRJbWFnZVNldC5oIgogI2luY2x1ZGUgIlN0eWxlUGVuZGluZ0ltYWdlLmgi
CkBAIC0xMDQsNiArMTA1LDkgQEAgU3R5bGVDYWNoZWRJbWFnZVNldCogQ1NTSW1hZ2VTZXRWYWx1
ZTo6Y2FjaGVkSW1hZ2VTZXQoQ2FjaGVkUmVzb3VyY2VMb2FkZXIqIGxvYWQKICAgICBlbHNlCiAg
ICAgICAgIG1fc2NhbGVGYWN0b3IgPSAxOwogCisgICAgaWYgKEZyYW1lKiBmcmFtZSA9IGRvY3Vt
ZW50LT5mcmFtZSgpKQorICAgICAgICBtX3NjYWxlRmFjdG9yICo9IGZyYW1lLT5wYWdlWm9vbUZh
Y3RvcigpOworCiAgICAgaWYgKCFtX2ltYWdlc0luU2V0LnNpemUoKSkKICAgICAgICAgZmlsbElt
YWdlU2V0KCk7CiAKQEAgLTEyOCwxMiArMTMyLDE0IEBAIFN0eWxlSW1hZ2UqIENTU0ltYWdlU2V0
VmFsdWU6OmNhY2hlZE9yUGVuZGluZ0ltYWdlU2V0KERvY3VtZW50KiBkb2N1bWVudCkKICAgICBp
ZiAoIW1faW1hZ2VTZXQpCiAgICAgICAgIG1faW1hZ2VTZXQgPSBTdHlsZVBlbmRpbmdJbWFnZTo6
Y3JlYXRlKHRoaXMpOwogICAgIGVsc2UgaWYgKGRvY3VtZW50ICYmICFtX2ltYWdlU2V0LT5pc1Bl
bmRpbmdJbWFnZSgpKSB7Ci0gICAgICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0gMTsKKyAg
ICAgICAgZmxvYXQgc2NhbGVGYWN0b3IgPSAxOwogICAgICAgICBpZiAoUGFnZSogcGFnZSA9IGRv
Y3VtZW50LT5wYWdlKCkpCi0gICAgICAgICAgICBkZXZpY2VTY2FsZUZhY3RvciA9IHBhZ2UtPmRl
dmljZVNjYWxlRmFjdG9yKCk7CisgICAgICAgICAgICBzY2FsZUZhY3RvciA9IHBhZ2UtPmRldmlj
ZVNjYWxlRmFjdG9yKCk7CisgICAgICAgIGlmIChGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJh
bWUoKSkKKyAgICAgICAgICAgIHNjYWxlRmFjdG9yICo9IGZyYW1lLT5wYWdlWm9vbUZhY3Rvcigp
OwogCi0gICAgICAgIC8vIElmIHRoZSBkZXZpY2VTY2FsZUZhY3RvciBoYXMgY2hhbmdlZCwgd2Ug
bWF5IG5vdCBoYXZlIHRoZSBiZXN0IGltYWdlIGxvYWRlZCwgc28gd2UgaGF2ZSB0byByZS1hc3Nl
c3MuCi0gICAgICAgIGlmIChkZXZpY2VTY2FsZUZhY3RvciAhPSBtX3NjYWxlRmFjdG9yKSB7Cisg
ICAgICAgIC8vIElmIHRoZSBzY2FsZUZhY3RvciBoYXMgY2hhbmdlZCwgd2UgbWF5IG5vdCBoYXZl
IHRoZSBiZXN0IGltYWdlIGxvYWRlZCwgc28gd2UgaGF2ZSB0byByZS1hc3Nlc3MuCisgICAgICAg
IGlmIChzY2FsZUZhY3RvciAhPSBtX3NjYWxlRmFjdG9yKSB7CiAgICAgICAgICAgICBtX2FjY2Vz
c2VkQmVzdEZpdEltYWdlID0gZmFsc2U7CiAgICAgICAgICAgICBtX2ltYWdlU2V0ID0gU3R5bGVQ
ZW5kaW5nSW1hZ2U6OmNyZWF0ZSh0aGlzKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGI5NmU0YmM4ZGUy
OGNhOGVhOGU5ODRiMGIyZDMwYzhjYmMzYzcyNDEuLjUyNDlkMjk4NWUyMDM5ZTQxNjk4NmQ3NTc0
MGNjMTNiMjIxNTdkZTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wMy0wNCAgQWxsYW4g
U2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KKworICAgICAgICAtd2Vi
a2l0LWltYWdlLXNldCBzaG91bGQgY29uc2lkZXIgRnJhbWU6OnBhZ2Vab29tRmFjdG9yKCkKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTMwNAorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgdGhhdCB0
aGUgaGlnaGVyLXJlc29sdXRpb24gaW1hZ2UgaXMgY2hvc2VuIGFmdGVyIGEgcGFnZSB6b29tLgor
CisgICAgICAgICogZmFzdC9jc3MvaW1hZ2Utc2V0LXBhZ2Vab29tLWV4cGVjdGVkLmh0bWw6IEFk
ZGVkLgorICAgICAgICAqIGZhc3QvY3NzL2ltYWdlLXNldC1wYWdlWm9vbS5odG1sOiBBZGRlZC4K
KwogMjAxMy0wMy0wNCAgS2ludWtvIFlhc3VkYSAgPGtpbnVrb0BjaHJvbWl1bS5vcmc+CiAKICAg
ICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkLCByZW1vdmluZyBmYWlsdXJlIHRlc3QgZXhwZWN0
YXRpb25zIGZvciBwYXNzaW5nIHNvZnR3YXJlY29tcG9zaXRpbmcgdGVzdHMuCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20tZXhwZWN0ZWQuaHRtbCBi
L0xheW91dFRlc3RzL2Zhc3QvY3NzL2ltYWdlLXNldC1wYWdlWm9vbS1leHBlY3RlZC5odG1sCm5l
dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAuLjZhMWI0ZmJjNzhiYmMwZWMwNWVjMjliNDczOTBjNzI1MDQ3MDE2ZGUKLS0tIC9k
ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20tZXhw
ZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI2IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KKyAg
ICBmdW5jdGlvbiBydW5UZXN0KCkgeworICAgICAgICBpZiAoIXdpbmRvdy5ldmVudFNlbmRlcikK
KyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBldmVudFNlbmRlci56b29tUGFnZUluKCk7
CisgICAgfQorICAgIHJ1blRlc3QoKTsKKzwvc2NyaXB0PgorCis8c3R5bGU+CisgICAgI2ZvbyB7
CisgICAgICAgIHdpZHRoOjEwMHB4OworICAgICAgICBoZWlnaHQ6MTAwcHg7CisgICAgICAgIGNv
bnRlbnQ6IHVybCgnLi4vaGlkcGkvcmVzb3VyY2VzL2dyZWVuLTIwMC1weC1zcXVhcmUucG5nJyk7
CisgICAgfQorPC9zdHlsZT4KKzwvaGVhZD4KKworPGJvZHkgaWQ9ImJvZHkiPgorICAgIDxkaXY+
VGhpcyB0ZXN0IHBhc3NlcyBpZiB0aGUgZGl2IGJlbG93IGlzIGEgYmx1ZSAxMDBweCBzcXVhcmUg
d2hlbiB1bnpvb21lZCwgYW5kIGlmIGl0IGlzIGEgMTAwcHggZ3JlZW4gc3F1YXJlIGFmdGVyIHpv
b21pbmcgaW4uPC9kaXY+CisgICAgPGRpdiBpZD1mb28+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20uaHRt
bCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ltYWdlLXNldC1wYWdlWm9vbS5odG1sCm5ldyBmaWxl
IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAuLjQ3NGM5ZmViNzViODZiNGI5YzNlMjQ4Njc3MGQzMTYxMThlYjIzNzgKLS0tIC9kZXYvbnVs
bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20uaHRtbApAQCAt
MCwwICsxLDI2IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KKyAgICBmdW5jdGlvbiBydW5U
ZXN0KCkgeworICAgICAgICBpZiAoIXdpbmRvdy5ldmVudFNlbmRlcikKKyAgICAgICAgICAgIHJl
dHVybjsKKworICAgICAgICBldmVudFNlbmRlci56b29tUGFnZUluKCk7CisgICAgfQorICAgIHJ1
blRlc3QoKTsKKzwvc2NyaXB0PgorCis8c3R5bGU+CisgICAgI2ZvbyB7CisgICAgICAgIHdpZHRo
OjEwMHB4OworICAgICAgICBoZWlnaHQ6MTAwcHg7CisgICAgICAgIGNvbnRlbnQ6IC13ZWJraXQt
aW1hZ2Utc2V0KHVybCgnLi4vaGlkcGkvcmVzb3VyY2VzL2JsdWUtMTAwLXB4LXNxdWFyZS5wbmcn
KSAxeCwgdXJsKCcuLi9oaWRwaS9yZXNvdXJjZXMvZ3JlZW4tMjAwLXB4LXNxdWFyZS5wbmcnKSAy
eCk7CisgICAgfQorPC9zdHlsZT4KKzwvaGVhZD4KKworPGJvZHkgaWQ9ImJvZHkiPgorICAgIDxk
aXY+VGhpcyB0ZXN0IHBhc3NlcyBpZiB0aGUgZGl2IGJlbG93IGlzIGEgYmx1ZSAxMDBweCBzcXVh
cmUgd2hlbiB1bnpvb21lZCwgYW5kIGlmIGl0IGlzIGEgMTAwcHggZ3JlZW4gc3F1YXJlIGFmdGVy
IHpvb21pbmcgaW4uPC9kaXY+CisgICAgPGRpdiBpZD1mb28+PC9kaXY+Cis8L2JvZHk+Cis8L2h0
bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>191231</attachid>
            <date>2013-03-04 06:50:52 -0800</date>
            <delta_ts>2013-03-14 07:37:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-111304-20130304154611.patch</filename>
            <type>text/plain</type>
            <size>8188</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZjNmVkYjJkYWE2ZTBh
ZDkxMzU1MWQxMmQwMDAzNTU4ZTU5NjYwNi4uMzA1NGM4NWVhMjkxZTZkOGYyMzM4OGIyNDE1NjQ2
M2M4YjFkYWRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTA0ICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIC13
ZWJraXQtaW1hZ2Utc2V0IHNob3VsZCBjb25zaWRlciBGcmFtZTo6cGFnZVpvb21GYWN0b3IoKQor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMzA0CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFrZSBGcmFt
ZTo6cGFnZVpvb21GYWN0b3IoKSBpbnRvIGNvbnNpZGVyYXRpb24gd2hlbiBwaWNraW5nIGltYWdl
cyBmcm9tIHRoZSBpbWFnZS1zZXQuCisgICAgICAgIFRoaXMgbWVhbnMgd2UgY2FuIHBpY2sgaGln
aGVyIHJlc29sdXRpb24gaW1hZ2VzIG9uIHpvb21lZCBwYWdlcy4KKworICAgICAgICBTaW5jZSBw
YWdlWm9vbUZhY3RvciBjYW4gYmUgY2hhbmdlZCBtb3JlIG9mdGVuLCBhbiBvcHRpbWl6YXRpb24g
aXMgYWRkZWQgdG8gYXZvaWQKKyAgICAgICAgcmVsb2FkaW5nIHdoZW4gcGFnZVpvb21GYWN0b3Ig
ZG9lcyBub3QgYWZmZWN0IHRoZSBiZXN0SW1hZ2VGb3JTY2FsZUZhY3Rvci4KKworICAgICAgICBU
ZXN0OiBmYXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20uaHRtbAorCisgICAgICAgICogY3NzL0NT
U0ltYWdlU2V0VmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW1hZ2VTZXRWYWx1ZTo6
YmVzdEltYWdlRm9yU2NhbGVGYWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW1hZ2VTZXRW
YWx1ZTo6Y2FjaGVkSW1hZ2VTZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW1hZ2VTZXRWYWx1
ZTo6Y2FjaGVkT3JQZW5kaW5nSW1hZ2VTZXQpOgorICAgICAgICAqIGNzcy9DU1NJbWFnZVNldFZh
bHVlLmg6CisgICAgICAgIChDU1NJbWFnZVNldFZhbHVlKToKKwogMjAxMy0wMy0wNCAgTWFyamEg
SMO2bHR0w6QgIDxtYXJqYUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBBZGQgYSAiY29u
dGV4dCB0eXBlIiBwYXJhbWV0ZXIgdG8gR2V0VGVtcGxhdGUgYW5kIENvbmZpZ3VyZVY4U29tZXRo
aW5nVGVtcGxhdGUgZnVuY3Rpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT
SW1hZ2VTZXRWYWx1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1ZS5j
cHAKaW5kZXggN2E2MDI2YmFhODQzMWU5OTY1YTk5ZmQ0MjllZTYzYmNiYWVkMTBjZC4uYmU3NTE5
OWM2YTk4ZTM0MmYyODIzNDA2ZjQ2NmU0NGQ5N2IwMGE5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvY3NzL0NTU0ltYWdlU2V0VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D
U1NJbWFnZVNldFZhbHVlLmNwcApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIkNhY2hlZFJl
c291cmNlUmVxdWVzdC5oIgogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRv
cnMuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgorI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVk
ZSAiUGFnZS5oIgogI2luY2x1ZGUgIlN0eWxlQ2FjaGVkSW1hZ2VTZXQuaCIKICNpbmNsdWRlICJT
dHlsZVBlbmRpbmdJbWFnZS5oIgpAQCAtODIsMTMgKzgzLDEzIEBAIHZvaWQgQ1NTSW1hZ2VTZXRW
YWx1ZTo6ZmlsbEltYWdlU2V0KCkKICAgICBzdGQ6OnNvcnQobV9pbWFnZXNJblNldC5iZWdpbigp
LCBtX2ltYWdlc0luU2V0LmVuZCgpLCBDU1NJbWFnZVNldFZhbHVlOjpjb21wYXJlQnlTY2FsZUZh
Y3Rvcik7CiB9CiAKLUNTU0ltYWdlU2V0VmFsdWU6OkltYWdlV2l0aFNjYWxlIENTU0ltYWdlU2V0
VmFsdWU6OmJlc3RJbWFnZUZvclNjYWxlRmFjdG9yKCkKK0NTU0ltYWdlU2V0VmFsdWU6OkltYWdl
V2l0aFNjYWxlIENTU0ltYWdlU2V0VmFsdWU6OmJlc3RJbWFnZUZvclNjYWxlRmFjdG9yKGZsb2F0
IHNjYWxlRmFjdG9yKQogewogICAgIEltYWdlV2l0aFNjYWxlIGltYWdlOwogICAgIHNpemVfdCBu
dW1iZXJPZkltYWdlcyA9IG1faW1hZ2VzSW5TZXQuc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90IGkg
PSAwOyBpIDwgbnVtYmVyT2ZJbWFnZXM7ICsraSkgewogICAgICAgICBpbWFnZSA9IG1faW1hZ2Vz
SW5TZXQuYXQoaSk7Ci0gICAgICAgIGlmIChpbWFnZS5zY2FsZUZhY3RvciA+PSBtX3NjYWxlRmFj
dG9yKQorICAgICAgICBpZiAoaW1hZ2Uuc2NhbGVGYWN0b3IgPj0gc2NhbGVGYWN0b3IpCiAgICAg
ICAgICAgICByZXR1cm4gaW1hZ2U7CiAgICAgfQogICAgIHJldHVybiBpbWFnZTsKQEAgLTEwNCwx
NCArMTA1LDE3IEBAIFN0eWxlQ2FjaGVkSW1hZ2VTZXQqIENTU0ltYWdlU2V0VmFsdWU6OmNhY2hl
ZEltYWdlU2V0KENhY2hlZFJlc291cmNlTG9hZGVyKiBsb2FkCiAgICAgZWxzZQogICAgICAgICBt
X3NjYWxlRmFjdG9yID0gMTsKIAorICAgIGlmIChGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJh
bWUoKSkKKyAgICAgICAgbV9zY2FsZUZhY3RvciAqPSBmcmFtZS0+cGFnZVpvb21GYWN0b3IoKTsK
KwogICAgIGlmICghbV9pbWFnZXNJblNldC5zaXplKCkpCiAgICAgICAgIGZpbGxJbWFnZVNldCgp
OwogCiAgICAgaWYgKCFtX2FjY2Vzc2VkQmVzdEZpdEltYWdlKSB7Ci0gICAgICAgIC8vIEZJWE1F
OiBJbiB0aGUgZnV0dXJlLCB3ZSB3YW50IHRvIHRha2UgbXVjaCBtb3JlIHRoYW4gZGV2aWNlU2Nh
bGVGYWN0b3IgaW50byBhY291bnQgaGVyZS4gCi0gICAgICAgIC8vIEFsbCBmb3JtcyBvZiBzY2Fs
ZSBzaG91bGQgYmUgaW5jbHVkZWQ6IFBhZ2U6OnBhZ2VTY2FsZUZhY3RvcigpLCBGcmFtZTo6cGFn
ZVpvb21GYWN0b3IoKSwKLSAgICAgICAgLy8gYW5kIGFueSBDU1MgdHJhbnNmb3Jtcy4gaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNjk4Ci0gICAgICAgIEltYWdlV2l0
aFNjYWxlIGltYWdlID0gYmVzdEltYWdlRm9yU2NhbGVGYWN0b3IoKTsKKyAgICAgICAgLy8gRklY
TUU6IEluIHRoZSBmdXR1cmUsIHdlIHdhbnQgdG8gdGFrZSBtdWNoIG1vcmUgdGhhbiBkZXZpY2VT
Y2FsZUZhY3RvciBhbmQgcGFnZVpvb21GYWN0b3IKKyAgICAgICAgLy8gaW50byBhY291bnQgaGVy
ZS4gQWxsIGZvcm1zIG9mIHNjYWxlIHNob3VsZCBiZSBpbmNsdWRlZDogUGFnZTo6cGFnZVNjYWxl
RmFjdG9yKCkgYW5kIGFueQorICAgICAgICAvLyBDU1MgdHJhbnNmb3Jtcy4gaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNjk4CisgICAgICAgIEltYWdlV2l0aFNjYWxl
IGltYWdlID0gYmVzdEltYWdlRm9yU2NhbGVGYWN0b3IobV9zY2FsZUZhY3Rvcik7CiAgICAgICAg
IENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdChkb2N1bWVudC0+
Y29tcGxldGVVUkwoaW1hZ2UuaW1hZ2VVUkwpKSk7CiAgICAgICAgIHJlcXVlc3Quc2V0SW5pdGlh
dG9yKGNhY2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMoKS5jc3MpOwogICAgICAgICBpZiAo
Q2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkSW1hZ2U+IGNhY2hlZEltYWdlID0gbG9hZGVyLT5y
ZXF1ZXN0SW1hZ2UocmVxdWVzdCkpIHsKQEAgLTEyOCwxNCArMTMyLDE5IEBAIFN0eWxlSW1hZ2Uq
IENTU0ltYWdlU2V0VmFsdWU6OmNhY2hlZE9yUGVuZGluZ0ltYWdlU2V0KERvY3VtZW50KiBkb2N1
bWVudCkKICAgICBpZiAoIW1faW1hZ2VTZXQpCiAgICAgICAgIG1faW1hZ2VTZXQgPSBTdHlsZVBl
bmRpbmdJbWFnZTo6Y3JlYXRlKHRoaXMpOwogICAgIGVsc2UgaWYgKGRvY3VtZW50ICYmICFtX2lt
YWdlU2V0LT5pc1BlbmRpbmdJbWFnZSgpKSB7Ci0gICAgICAgIGZsb2F0IGRldmljZVNjYWxlRmFj
dG9yID0gMTsKKyAgICAgICAgZmxvYXQgc2NhbGVGYWN0b3IgPSAxOwogICAgICAgICBpZiAoUGFn
ZSogcGFnZSA9IGRvY3VtZW50LT5wYWdlKCkpCi0gICAgICAgICAgICBkZXZpY2VTY2FsZUZhY3Rv
ciA9IHBhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCk7Ci0KLSAgICAgICAgLy8gSWYgdGhlIGRldmlj
ZVNjYWxlRmFjdG9yIGhhcyBjaGFuZ2VkLCB3ZSBtYXkgbm90IGhhdmUgdGhlIGJlc3QgaW1hZ2Ug
bG9hZGVkLCBzbyB3ZSBoYXZlIHRvIHJlLWFzc2Vzcy4KLSAgICAgICAgaWYgKGRldmljZVNjYWxl
RmFjdG9yICE9IG1fc2NhbGVGYWN0b3IpIHsKLSAgICAgICAgICAgIG1fYWNjZXNzZWRCZXN0Rml0
SW1hZ2UgPSBmYWxzZTsKLSAgICAgICAgICAgIG1faW1hZ2VTZXQgPSBTdHlsZVBlbmRpbmdJbWFn
ZTo6Y3JlYXRlKHRoaXMpOworICAgICAgICAgICAgc2NhbGVGYWN0b3IgPSBwYWdlLT5kZXZpY2VT
Y2FsZUZhY3RvcigpOworICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQtPmZyYW1l
KCkpCisgICAgICAgICAgICBzY2FsZUZhY3RvciAqPSBmcmFtZS0+cGFnZVpvb21GYWN0b3IoKTsK
KworICAgICAgICAvLyBJZiB0aGUgc2NhbGVGYWN0b3IgaGFzIGNoYW5nZWQsIHdlIG1heSBub3Qg
aGF2ZSB0aGUgYmVzdCBpbWFnZSBsb2FkZWQsIHNvIHdlIGhhdmUgdG8gcmUtYXNzZXNzLgorICAg
ICAgICBpZiAoc2NhbGVGYWN0b3IgIT0gbV9zY2FsZUZhY3RvcikgeworICAgICAgICAgICAgaWYg
KG1faW1hZ2VTZXQtPmltYWdlU2NhbGVGYWN0b3IoKSAhPSBiZXN0SW1hZ2VGb3JTY2FsZUZhY3Rv
cihzY2FsZUZhY3Rvcikuc2NhbGVGYWN0b3IpIHsKKyAgICAgICAgICAgICAgICBtX2FjY2Vzc2Vk
QmVzdEZpdEltYWdlID0gZmFsc2U7CisgICAgICAgICAgICAgICAgbV9pbWFnZVNldCA9IFN0eWxl
UGVuZGluZ0ltYWdlOjpjcmVhdGUodGhpcyk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAg
ICAgICAgICBtX3NjYWxlRmFjdG9yID0gc2NhbGVGYWN0b3I7CiAgICAgICAgIH0KICAgICB9CiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVNldFZhbHVlLmggYi9Tb3Vy
Y2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1ZS5oCmluZGV4IGE3OTFkMWVhMTc3ZmJmMWMz
OGI2ZWViMTczNDk1OTViOGYxYzAzZDIuLmQwZjY1ZGEwMGY1OWQyZDE4ZjZlYzYxYWQ4MGNjYjM1
YWVlMDIyYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVNldFZhbHVl
LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ltYWdlU2V0VmFsdWUuaApAQCAtNjgsNyAr
NjgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXBvcnREZXNjZW5kYW50TWVtb3J5VXNhZ2UoTWVt
b3J5T2JqZWN0SW5mbyopIGNvbnN0OwogCiBwcm90ZWN0ZWQ6Ci0gICAgSW1hZ2VXaXRoU2NhbGUg
YmVzdEltYWdlRm9yU2NhbGVGYWN0b3IoKTsKKyAgICBJbWFnZVdpdGhTY2FsZSBiZXN0SW1hZ2VG
b3JTY2FsZUZhY3RvcihmbG9hdCBzY2FsZUZhY3Rvcik7CiAKIHByaXZhdGU6CiAgICAgQ1NTSW1h
Z2VTZXRWYWx1ZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGI5NmU0YmM4ZGUyOGNhOGVhOGU5ODRiMGIyZDMwYzhjYmMz
YzcyNDEuLjUyNDlkMjk4NWUyMDM5ZTQxNjk4NmQ3NTc0MGNjMTNiMjIxNTdkZTUgMTAwNjQ0Ci0t
LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNSBAQAorMjAxMy0wMy0wNCAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4u
amVuc2VuQGRpZ2lhLmNvbT4KKworICAgICAgICAtd2Via2l0LWltYWdlLXNldCBzaG91bGQgY29u
c2lkZXIgRnJhbWU6OnBhZ2Vab29tRmFjdG9yKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTMwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgdGhhdCB0aGUgaGlnaGVyLXJlc29sdXRpb24gaW1h
Z2UgaXMgY2hvc2VuIGFmdGVyIGEgcGFnZSB6b29tLgorCisgICAgICAgICogZmFzdC9jc3MvaW1h
Z2Utc2V0LXBhZ2Vab29tLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3Nz
L2ltYWdlLXNldC1wYWdlWm9vbS5odG1sOiBBZGRlZC4KKwogMjAxMy0wMy0wNCAgS2ludWtvIFlh
c3VkYSAgPGtpbnVrb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmll
d2VkLCByZW1vdmluZyBmYWlsdXJlIHRlc3QgZXhwZWN0YXRpb25zIGZvciBwYXNzaW5nIHNvZnR3
YXJlY29tcG9zaXRpbmcgdGVzdHMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9p
bWFnZS1zZXQtcGFnZVpvb20tZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2lt
YWdlLXNldC1wYWdlWm9vbS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjZhMWI0ZmJjNzhiYmMw
ZWMwNWVjMjliNDczOTBjNzI1MDQ3MDE2ZGUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0
cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20tZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI2
IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KKyAgICBmdW5jdGlvbiBydW5UZXN0KCkgewor
ICAgICAgICBpZiAoIXdpbmRvdy5ldmVudFNlbmRlcikKKyAgICAgICAgICAgIHJldHVybjsKKwor
ICAgICAgICBldmVudFNlbmRlci56b29tUGFnZUluKCk7CisgICAgfQorICAgIHJ1blRlc3QoKTsK
Kzwvc2NyaXB0PgorCis8c3R5bGU+CisgICAgI2ZvbyB7CisgICAgICAgIHdpZHRoOjEwMHB4Owor
ICAgICAgICBoZWlnaHQ6MTAwcHg7CisgICAgICAgIGNvbnRlbnQ6IHVybCgnLi4vaGlkcGkvcmVz
b3VyY2VzL2dyZWVuLTIwMC1weC1zcXVhcmUucG5nJyk7CisgICAgfQorPC9zdHlsZT4KKzwvaGVh
ZD4KKworPGJvZHkgaWQ9ImJvZHkiPgorICAgIDxkaXY+VGhpcyB0ZXN0IHBhc3NlcyBpZiB0aGUg
ZGl2IGJlbG93IGlzIGEgYmx1ZSAxMDBweCBzcXVhcmUgd2hlbiB1bnpvb21lZCwgYW5kIGlmIGl0
IGlzIGEgMTAwcHggZ3JlZW4gc3F1YXJlIGFmdGVyIHpvb21pbmcgaW4uPC9kaXY+CisgICAgPGRp
diBpZD1mb28+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3Nz
L2ltYWdlLXNldC1wYWdlWm9vbS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ3NGM5ZmViNzViODZiNGI5YzNl
MjQ4Njc3MGQzMTYxMThlYjIzNzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0
L2Nzcy9pbWFnZS1zZXQtcGFnZVpvb20uaHRtbApAQCAtMCwwICsxLDI2IEBACis8aHRtbD4KKzxo
ZWFkPgorPHNjcmlwdD4KKyAgICBmdW5jdGlvbiBydW5UZXN0KCkgeworICAgICAgICBpZiAoIXdp
bmRvdy5ldmVudFNlbmRlcikKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBldmVudFNl
bmRlci56b29tUGFnZUluKCk7CisgICAgfQorICAgIHJ1blRlc3QoKTsKKzwvc2NyaXB0PgorCis8
c3R5bGU+CisgICAgI2ZvbyB7CisgICAgICAgIHdpZHRoOjEwMHB4OworICAgICAgICBoZWlnaHQ6
MTAwcHg7CisgICAgICAgIGNvbnRlbnQ6IC13ZWJraXQtaW1hZ2Utc2V0KHVybCgnLi4vaGlkcGkv
cmVzb3VyY2VzL2JsdWUtMTAwLXB4LXNxdWFyZS5wbmcnKSAxeCwgdXJsKCcuLi9oaWRwaS9yZXNv
dXJjZXMvZ3JlZW4tMjAwLXB4LXNxdWFyZS5wbmcnKSAyeCk7CisgICAgfQorPC9zdHlsZT4KKzwv
aGVhZD4KKworPGJvZHkgaWQ9ImJvZHkiPgorICAgIDxkaXY+VGhpcyB0ZXN0IHBhc3NlcyBpZiB0
aGUgZGl2IGJlbG93IGlzIGEgYmx1ZSAxMDBweCBzcXVhcmUgd2hlbiB1bnpvb21lZCwgYW5kIGlm
IGl0IGlzIGEgMTAwcHggZ3JlZW4gc3F1YXJlIGFmdGVyIHpvb21pbmcgaW4uPC9kaXY+CisgICAg
PGRpdiBpZD1mb28+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193119</attachid>
            <date>2013-03-14 07:37:54 -0700</date>
            <delta_ts>2014-02-05 11:20:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-111304-20130314153258.patch</filename>
            <type>text/plain</type>
            <size>8801</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQ3NThmNjA4YWJkNTUx
NjQ5ODNhNjdiNjBhMzgzYjMyZDhhMTc3MS4uYjA3ZWEwZDhhNDNjYzljNzBlYmMwMTBlZjUyNGZh
NzYzOTUzYTllMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEzLTAzLTE0ICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgogCisgICAgICAgIC13
ZWJraXQtaW1hZ2Utc2V0IHNob3VsZCBjb25zaWRlciBGcmFtZTo6cGFnZVpvb21GYWN0b3IoKQor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMzA0CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFrZSBGcmFt
ZTo6cGFnZVpvb21GYWN0b3IoKSBpbnRvIGNvbnNpZGVyYXRpb24gd2hlbiBwaWNraW5nIGltYWdl
cyBmcm9tIHRoZSBpbWFnZS1zZXQuCisgICAgICAgIFRoaXMgbWVhbnMgd2UgY2FuIHBpY2sgaGln
aGVyIHJlc29sdXRpb24gaW1hZ2VzIG9uIHpvb21lZCBwYWdlcy4KKworICAgICAgICBTaW5jZSBw
YWdlWm9vbUZhY3RvciBjYW4gYmUgY2hhbmdlZCBtb3JlIG9mdGVuLCBhbiBvcHRpbWl6YXRpb24g
aXMgYWRkZWQgdG8gYXZvaWQKKyAgICAgICAgcmVsb2FkaW5nIHdoZW4gcGFnZVpvb21GYWN0b3Ig
ZG9lcyBub3QgYWZmZWN0IHRoZSBiZXN0SW1hZ2VGb3JTY2FsZUZhY3Rvci4KKworICAgICAgICBU
aGUgbWV0aG9kIHNjYWxlRmFjdG9yRm9yRG9jdW1lbnQoKSBoYXMgYmVlbiBpbnRyb2R1Y2VkIHRv
IG1ha2UgdGhpcyBiZWhhdmlvdXIgZWFzeSAKKyAgICAgICAgdG8gY29uZmlndXJlIGZvciBhbnkg
cG9ydCB0aGF0IHdpc2hlcyB0byByZXN0cmFpbiBpbWFnZS1zZXQgdG8gb25seSByZXNwb25kIHRv
IGRldmljZQorICAgICAgICBwaXhlbCByYXRpby4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9p
bWFnZS1zZXQtcGFnZVpvb20uaHRtbAorCisgICAgICAgICogY3NzL0NTU0ltYWdlU2V0VmFsdWUu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW1hZ2VTZXRWYWx1ZTo6YmVzdEltYWdlRm9yU2Nh
bGVGYWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW1hZ2VTZXRWYWx1ZTo6c2NhbGVGYWN0
b3JGb3JEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NJbWFnZVNldFZhbHVlOjpjYWNo
ZWRJbWFnZVNldCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NJbWFnZVNldFZhbHVlOjpjYWNoZWRP
clBlbmRpbmdJbWFnZVNldCk6CisgICAgICAgICogY3NzL0NTU0ltYWdlU2V0VmFsdWUuaDoKKyAg
ICAgICAgKENTU0ltYWdlU2V0VmFsdWUpOgorCisyMDEzLTAzLTE0ICBBbGxhbiBTYW5kZmVsZCBK
ZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCiAgICAgICAgIFtRdF0gQWRkIHN1cHBv
cnQgZm9yIHRpbGVkIHNoYWRvdyBibHVyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD05MDA4MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv
Q1NTSW1hZ2VTZXRWYWx1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1
ZS5jcHAKaW5kZXggN2E2MDI2YmFhODQzMWU5OTY1YTk5ZmQ0MjllZTYzYmNiYWVkMTBjZC4uZjQw
MmFkMDc1MDMwMzU4YjAxNTljNWJjMjc3NmQ4ZTZlNWIyYjFhNSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvY3NzL0NTU0ltYWdlU2V0VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz
cy9DU1NJbWFnZVNldFZhbHVlLmNwcApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIkNhY2hl
ZFJlc291cmNlUmVxdWVzdC5oIgogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlUmVxdWVzdEluaXRp
YXRvcnMuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgorI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5j
bHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlN0eWxlQ2FjaGVkSW1hZ2VTZXQuaCIKICNpbmNsdWRl
ICJTdHlsZVBlbmRpbmdJbWFnZS5oIgpAQCAtODIsMzYgKzgzLDQ2IEBAIHZvaWQgQ1NTSW1hZ2VT
ZXRWYWx1ZTo6ZmlsbEltYWdlU2V0KCkKICAgICBzdGQ6OnNvcnQobV9pbWFnZXNJblNldC5iZWdp
bigpLCBtX2ltYWdlc0luU2V0LmVuZCgpLCBDU1NJbWFnZVNldFZhbHVlOjpjb21wYXJlQnlTY2Fs
ZUZhY3Rvcik7CiB9CiAKLUNTU0ltYWdlU2V0VmFsdWU6OkltYWdlV2l0aFNjYWxlIENTU0ltYWdl
U2V0VmFsdWU6OmJlc3RJbWFnZUZvclNjYWxlRmFjdG9yKCkKK0NTU0ltYWdlU2V0VmFsdWU6Oklt
YWdlV2l0aFNjYWxlIENTU0ltYWdlU2V0VmFsdWU6OmJlc3RJbWFnZUZvclNjYWxlRmFjdG9yKGZs
b2F0IHNjYWxlRmFjdG9yKQogewogICAgIEltYWdlV2l0aFNjYWxlIGltYWdlOwogICAgIHNpemVf
dCBudW1iZXJPZkltYWdlcyA9IG1faW1hZ2VzSW5TZXQuc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90
IGkgPSAwOyBpIDwgbnVtYmVyT2ZJbWFnZXM7ICsraSkgewogICAgICAgICBpbWFnZSA9IG1faW1h
Z2VzSW5TZXQuYXQoaSk7Ci0gICAgICAgIGlmIChpbWFnZS5zY2FsZUZhY3RvciA+PSBtX3NjYWxl
RmFjdG9yKQorICAgICAgICBpZiAoaW1hZ2Uuc2NhbGVGYWN0b3IgPj0gc2NhbGVGYWN0b3IpCiAg
ICAgICAgICAgICByZXR1cm4gaW1hZ2U7CiAgICAgfQogICAgIHJldHVybiBpbWFnZTsKIH0KIAor
ZmxvYXQgQ1NTSW1hZ2VTZXRWYWx1ZTo6c2NhbGVGYWN0b3JGb3JEb2N1bWVudChEb2N1bWVudCog
ZG9jdW1lbnQpCit7CisgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oZG9jdW1l
bnQpOworCisgICAgZmxvYXQgc2NhbGVGYWN0b3IgPSAxOworICAgIGlmIChQYWdlKiBwYWdlID0g
ZG9jdW1lbnQtPnBhZ2UoKSkKKyAgICAgICAgc2NhbGVGYWN0b3IgKj0gcGFnZS0+ZGV2aWNlU2Nh
bGVGYWN0b3IoKTsKKyAgICBpZiAoRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQtPmZyYW1lKCkpCisg
ICAgICAgIHNjYWxlRmFjdG9yICo9IGZyYW1lLT5wYWdlWm9vbUZhY3RvcigpOworCisgICAgLy8g
RklYTUU6IEluIHRoZSBmdXR1cmUsIHdlIHdhbnQgdG8gdGFrZSBtdWNoIG1vcmUgdGhhbiBkZXZp
Y2VTY2FsZUZhY3RvciBhbmQgcGFnZVpvb21GYWN0b3IKKyAgICAvLyBpbnRvIGFjb3VudCBoZXJl
LiBBbGwgZm9ybXMgb2Ygc2NhbGUgc2hvdWxkIGJlIGluY2x1ZGVkOiBQYWdlOjpwYWdlU2NhbGVG
YWN0b3IoKSBhbmQgYW55CisgICAgLy8gQ1NTIHRyYW5zZm9ybXMuIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTY5OAorICAgIHJldHVybiBzY2FsZUZhY3RvcjsKK30K
KwogU3R5bGVDYWNoZWRJbWFnZVNldCogQ1NTSW1hZ2VTZXRWYWx1ZTo6Y2FjaGVkSW1hZ2VTZXQo
Q2FjaGVkUmVzb3VyY2VMb2FkZXIqIGxvYWRlcikKIHsKICAgICBBU1NFUlQobG9hZGVyKTsKIAog
ICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGxvYWRlci0+ZG9jdW1lbnQoKTsKLSAgICBpZiAoUGFn
ZSogcGFnZSA9IGRvY3VtZW50LT5wYWdlKCkpCi0gICAgICAgIG1fc2NhbGVGYWN0b3IgPSBwYWdl
LT5kZXZpY2VTY2FsZUZhY3RvcigpOwotICAgIGVsc2UKLSAgICAgICAgbV9zY2FsZUZhY3RvciA9
IDE7CisgICAgbV9zY2FsZUZhY3RvciA9IHNjYWxlRmFjdG9yRm9yRG9jdW1lbnQoZG9jdW1lbnQp
OwogCiAgICAgaWYgKCFtX2ltYWdlc0luU2V0LnNpemUoKSkKICAgICAgICAgZmlsbEltYWdlU2V0
KCk7CiAKICAgICBpZiAoIW1fYWNjZXNzZWRCZXN0Rml0SW1hZ2UpIHsKLSAgICAgICAgLy8gRklY
TUU6IEluIHRoZSBmdXR1cmUsIHdlIHdhbnQgdG8gdGFrZSBtdWNoIG1vcmUgdGhhbiBkZXZpY2VT
Y2FsZUZhY3RvciBpbnRvIGFjb3VudCBoZXJlLiAKLSAgICAgICAgLy8gQWxsIGZvcm1zIG9mIHNj
YWxlIHNob3VsZCBiZSBpbmNsdWRlZDogUGFnZTo6cGFnZVNjYWxlRmFjdG9yKCksIEZyYW1lOjpw
YWdlWm9vbUZhY3RvcigpLAotICAgICAgICAvLyBhbmQgYW55IENTUyB0cmFuc2Zvcm1zLiBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE2OTgKLSAgICAgICAgSW1hZ2VX
aXRoU2NhbGUgaW1hZ2UgPSBiZXN0SW1hZ2VGb3JTY2FsZUZhY3RvcigpOworICAgICAgICBJbWFn
ZVdpdGhTY2FsZSBpbWFnZSA9IGJlc3RJbWFnZUZvclNjYWxlRmFjdG9yKG1fc2NhbGVGYWN0b3Ip
OwogICAgICAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChSZXNvdXJjZVJlcXVlc3Qo
ZG9jdW1lbnQtPmNvbXBsZXRlVVJMKGltYWdlLmltYWdlVVJMKSkpOwogICAgICAgICByZXF1ZXN0
LnNldEluaXRpYXRvcihjYWNoZWRSZXNvdXJjZVJlcXVlc3RJbml0aWF0b3JzKCkuY3NzKTsKICAg
ICAgICAgaWYgKENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZEltYWdlPiBjYWNoZWRJbWFnZSA9
IGxvYWRlci0+cmVxdWVzdEltYWdlKHJlcXVlc3QpKSB7CkBAIC0xMjgsMTQgKzEzOSwxNSBAQCBT
dHlsZUltYWdlKiBDU1NJbWFnZVNldFZhbHVlOjpjYWNoZWRPclBlbmRpbmdJbWFnZVNldChEb2N1
bWVudCogZG9jdW1lbnQpCiAgICAgaWYgKCFtX2ltYWdlU2V0KQogICAgICAgICBtX2ltYWdlU2V0
ID0gU3R5bGVQZW5kaW5nSW1hZ2U6OmNyZWF0ZSh0aGlzKTsKICAgICBlbHNlIGlmIChkb2N1bWVu
dCAmJiAhbV9pbWFnZVNldC0+aXNQZW5kaW5nSW1hZ2UoKSkgewotICAgICAgICBmbG9hdCBkZXZp
Y2VTY2FsZUZhY3RvciA9IDE7Ci0gICAgICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQtPnBh
Z2UoKSkKLSAgICAgICAgICAgIGRldmljZVNjYWxlRmFjdG9yID0gcGFnZS0+ZGV2aWNlU2NhbGVG
YWN0b3IoKTsKLQotICAgICAgICAvLyBJZiB0aGUgZGV2aWNlU2NhbGVGYWN0b3IgaGFzIGNoYW5n
ZWQsIHdlIG1heSBub3QgaGF2ZSB0aGUgYmVzdCBpbWFnZSBsb2FkZWQsIHNvIHdlIGhhdmUgdG8g
cmUtYXNzZXNzLgotICAgICAgICBpZiAoZGV2aWNlU2NhbGVGYWN0b3IgIT0gbV9zY2FsZUZhY3Rv
cikgewotICAgICAgICAgICAgbV9hY2Nlc3NlZEJlc3RGaXRJbWFnZSA9IGZhbHNlOwotICAgICAg
ICAgICAgbV9pbWFnZVNldCA9IFN0eWxlUGVuZGluZ0ltYWdlOjpjcmVhdGUodGhpcyk7CisgICAg
ICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gc2NhbGVGYWN0b3JGb3JEb2N1bWVudChkb2N1bWVudCk7
CisKKyAgICAgICAgLy8gSWYgdGhlIHNjYWxlRmFjdG9yIGhhcyBjaGFuZ2VkLCB3ZSBtYXkgbm90
IGhhdmUgdGhlIGJlc3QgaW1hZ2UgbG9hZGVkLCBzbyB3ZSBoYXZlIHRvIHJlLWFzc2Vzcy4KKyAg
ICAgICAgaWYgKHNjYWxlRmFjdG9yICE9IG1fc2NhbGVGYWN0b3IpIHsKKyAgICAgICAgICAgIGlm
IChtX2ltYWdlU2V0LT5pbWFnZVNjYWxlRmFjdG9yKCkgIT0gYmVzdEltYWdlRm9yU2NhbGVGYWN0
b3Ioc2NhbGVGYWN0b3IpLnNjYWxlRmFjdG9yKSB7CisgICAgICAgICAgICAgICAgbV9hY2Nlc3Nl
ZEJlc3RGaXRJbWFnZSA9IGZhbHNlOworICAgICAgICAgICAgICAgIG1faW1hZ2VTZXQgPSBTdHls
ZVBlbmRpbmdJbWFnZTo6Y3JlYXRlKHRoaXMpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAg
ICAgICAgICAgbV9zY2FsZUZhY3RvciA9IHNjYWxlRmFjdG9yOwogICAgICAgICB9CiAgICAgfQog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1ZS5oIGIvU291
cmNlL1dlYkNvcmUvY3NzL0NTU0ltYWdlU2V0VmFsdWUuaAppbmRleCBhNzkxZDFlYTE3N2ZiZjFj
MzhiNmVlYjE3MzQ5NTk1YjhmMWMwM2QyLi5iMjlkYzk0YjU0ZWRkNDAxMDQwNmFjZDUxMjk1MmVi
ZjlkNDNjMGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1
ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVNldFZhbHVlLmgKQEAgLTY4LDcg
KzY4LDggQEAgcHVibGljOgogICAgIHZvaWQgcmVwb3J0RGVzY2VuZGFudE1lbW9yeVVzYWdlKE1l
bW9yeU9iamVjdEluZm8qKSBjb25zdDsKIAogcHJvdGVjdGVkOgotICAgIEltYWdlV2l0aFNjYWxl
IGJlc3RJbWFnZUZvclNjYWxlRmFjdG9yKCk7CisgICAgSW1hZ2VXaXRoU2NhbGUgYmVzdEltYWdl
Rm9yU2NhbGVGYWN0b3IoZmxvYXQgc2NhbGVGYWN0b3IpOworICAgIHN0YXRpYyBmbG9hdCBzY2Fs
ZUZhY3RvckZvckRvY3VtZW50KERvY3VtZW50Kik7CiAKIHByaXZhdGU6CiAgICAgQ1NTSW1hZ2VT
ZXRWYWx1ZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCmluZGV4IDkwODZjZTkwOWQ0OGY4ZjRjMGVhZDhjN2MyYzlmMmM2M2I0MmMw
ODguLjU2MTAxZTA3NzU5YzdkZDY5NzExY2NhMmE2NjkzNzk5NjE2Njc4MjQgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxNSBAQAorMjAxMy0wMy0xNCAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVu
c2VuQGRpZ2lhLmNvbT4KKworICAgICAgICAtd2Via2l0LWltYWdlLXNldCBzaG91bGQgY29uc2lk
ZXIgRnJhbWU6OnBhZ2Vab29tRmFjdG9yKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTExMTMwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRlc3QgdGhhdCB0aGUgaGlnaGVyLXJlc29sdXRpb24gaW1hZ2Ug
aXMgY2hvc2VuIGFmdGVyIGEgcGFnZSB6b29tLgorCisgICAgICAgICogZmFzdC9jc3MvaW1hZ2Ut
c2V0LXBhZ2Vab29tLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3NzL2lt
YWdlLXNldC1wYWdlWm9vbS5odG1sOiBBZGRlZC4KKwogMjAxMy0wMy0xNCAgWm9sdGFuIEFydmFp
ICA8emFydmFpQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBbUXRdIFVucmV2aWV3ZWQgZ2Fy
ZGVuaW5nLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhZ2Va
b29tLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFnZVpv
b20tZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42YTFiNGZiYzc4YmJjMGVjMDVlYzI5YjQ3Mzkw
YzcyNTA0NzAxNmRlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1h
Z2Utc2V0LXBhZ2Vab29tLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPGh0bWw+Cis8
aGVhZD4KKzxzY3JpcHQ+CisgICAgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgaWYgKCF3
aW5kb3cuZXZlbnRTZW5kZXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgZXZlbnRT
ZW5kZXIuem9vbVBhZ2VJbigpOworICAgIH0KKyAgICBydW5UZXN0KCk7Cis8L3NjcmlwdD4KKwor
PHN0eWxlPgorICAgICNmb28geworICAgICAgICB3aWR0aDoxMDBweDsKKyAgICAgICAgaGVpZ2h0
OjEwMHB4OworICAgICAgICBjb250ZW50OiB1cmwoJy4uL2hpZHBpL3Jlc291cmNlcy9ncmVlbi0y
MDAtcHgtc3F1YXJlLnBuZycpOworICAgIH0KKzwvc3R5bGU+Cis8L2hlYWQ+CisKKzxib2R5IGlk
PSJib2R5Ij4KKyAgICA8ZGl2PlRoaXMgdGVzdCBwYXNzZXMgaWYgdGhlIGRpdiBiZWxvdyBpcyBh
IGJsdWUgMTAwcHggc3F1YXJlIHdoZW4gdW56b29tZWQsIGFuZCBpZiBpdCBpcyBhIDEwMHB4IGdy
ZWVuIHNxdWFyZSBhZnRlciB6b29taW5nIGluLjwvZGl2PgorICAgIDxkaXYgaWQ9Zm9vPjwvZGl2
PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1h
Z2Utc2V0LXBhZ2Vab29tLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFn
ZVpvb20uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40NzRjOWZlYjc1Yjg2YjRiOWMzZTI0ODY3NzBkMzE2MTE4
ZWIyMzc4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0
LXBhZ2Vab29tLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+
CisgICAgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgaWYgKCF3aW5kb3cuZXZlbnRTZW5k
ZXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgZXZlbnRTZW5kZXIuem9vbVBhZ2VJ
bigpOworICAgIH0KKyAgICBydW5UZXN0KCk7Cis8L3NjcmlwdD4KKworPHN0eWxlPgorICAgICNm
b28geworICAgICAgICB3aWR0aDoxMDBweDsKKyAgICAgICAgaGVpZ2h0OjEwMHB4OworICAgICAg
ICBjb250ZW50OiAtd2Via2l0LWltYWdlLXNldCh1cmwoJy4uL2hpZHBpL3Jlc291cmNlcy9ibHVl
LTEwMC1weC1zcXVhcmUucG5nJykgMXgsIHVybCgnLi4vaGlkcGkvcmVzb3VyY2VzL2dyZWVuLTIw
MC1weC1zcXVhcmUucG5nJykgMngpOworICAgIH0KKzwvc3R5bGU+Cis8L2hlYWQ+CisKKzxib2R5
IGlkPSJib2R5Ij4KKyAgICA8ZGl2PlRoaXMgdGVzdCBwYXNzZXMgaWYgdGhlIGRpdiBiZWxvdyBp
cyBhIGJsdWUgMTAwcHggc3F1YXJlIHdoZW4gdW56b29tZWQsIGFuZCBpZiBpdCBpcyBhIDEwMHB4
IGdyZWVuIHNxdWFyZSBhZnRlciB6b29taW5nIGluLjwvZGl2PgorICAgIDxkaXYgaWQ9Zm9vPjwv
ZGl2PgorPC9ib2R5PgorPC9odG1sPgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>