<?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>112651</bug_id>
          
          <creation_ts>2013-03-18 20:41:27 -0700</creation_ts>
          <short_desc>SVG image container size can survive cached reloads</short_desc>
          <delta_ts>2013-03-19 11:41:44 -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>SVG</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Philip Rogers">pdr</reporter>
          <assigned_to name="Philip Rogers">pdr</assigned_to>
          <cc>buildbot</cc>
    
    <cc>d-r</cc>
    
    <cc>fmalita</cc>
    
    <cc>rniwa</cc>
    
    <cc>schenney</cc>
    
    <cc>stephen.bannasch</cc>
    
    <cc>webkit.review.bot</cc>
    
    <cc>zimmermann</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>857889</commentid>
    <comment_count>0</comment_count>
      <attachid>193719</attachid>
    <who name="Philip Rogers">pdr</who>
    <bug_when>2013-03-18 20:41:27 -0700</bug_when>
    <thetext>Created attachment 193719
Testcase

SVG image container sizes can survive cached reloads if the container size is queried before the image is rendered. See the attached testcase for a minimized reproduction.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>857958</commentid>
    <comment_count>1</comment_count>
      <attachid>193736</attachid>
    <who name="Philip Rogers">pdr</who>
    <bug_when>2013-03-18 22:54:27 -0700</bug_when>
    <thetext>Created attachment 193736
Separate SVG image size and container size</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858106</commentid>
    <comment_count>2</comment_count>
      <attachid>193736</attachid>
    <who name="Build Bot">buildbot</who>
    <bug_when>2013-03-19 03:16:36 -0700</bug_when>
    <thetext>Comment on attachment 193736
Separate SVG image size and container size

Attachment 193736 did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-commit-queue.appspot.com/results/17066866

New failing tests:
fast/css/sticky/sticky-both-sides.html
fast/css/sticky/inline-sticky.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858228</commentid>
    <comment_count>3</comment_count>
      <attachid>193736</attachid>
    <who name="Stephen Chenney">schenney</who>
    <bug_when>2013-03-19 06:46:13 -0700</bug_when>
    <thetext>Comment on attachment 193736
Separate SVG image size and container size

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

The wk2 test is a flake, so don&apos;t worry about that. Otherwise I&apos;m basically happy, but it could do with a little polish.

&gt; Source/WebCore/svg/graphics/SVGImage.h:54
&gt; +    virtual IntSize size() const OVERRIDE { return m_intrinsicSize; }

Can this now be renamed &quot;instrinsicSize&quot; to make it clear what this size means?

&gt; LayoutTests/svg/as-image/svg-container-size-after-reload.html:2
&gt; +&lt;html&gt;

This kind of testing looks to be in the same format as the svg dynamic-tests or, more simply, the js pre/post test harness. Your loading some content and running some script and checking the values. Please try to convert to that format.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858444</commentid>
    <comment_count>4</comment_count>
      <attachid>193855</attachid>
    <who name="Philip Rogers">pdr</who>
    <bug_when>2013-03-19 10:39:14 -0700</bug_when>
    <thetext>Created attachment 193855
Update per reviewer comments</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858445</commentid>
    <comment_count>5</comment_count>
    <who name="Philip Rogers">pdr</who>
    <bug_when>2013-03-19 10:42:50 -0700</bug_when>
    <thetext>(In reply to comment #3)
&gt; (From update of attachment 193736 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=193736&amp;action=review
&gt; 
&gt; The wk2 test is a flake, so don&apos;t worry about that. Otherwise I&apos;m basically happy, but it could do with a little polish.
&gt; 
&gt; &gt; Source/WebCore/svg/graphics/SVGImage.h:54
&gt; &gt; +    virtual IntSize size() const OVERRIDE { return m_intrinsicSize; }
&gt; 
&gt; Can this now be renamed &quot;instrinsicSize&quot; to make it clear what this size means?

I think this will unnecessarily increase code complexity. SVGImage is the only subclass of Image that has the intrinsic distinction.

&gt; 
&gt; &gt; LayoutTests/svg/as-image/svg-container-size-after-reload.html:2
&gt; &gt; +&lt;html&gt;
&gt; 
&gt; This kind of testing looks to be in the same format as the svg dynamic-tests or, more simply, the js pre/post test harness. Your loading some content and running some script and checking the values. Please try to convert to that format.

Agreed. This ended up making the test slightly smaller and more maintainable.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858491</commentid>
    <comment_count>6</comment_count>
    <who name="Stephen Chenney">schenney</who>
    <bug_when>2013-03-19 11:05:31 -0700</bug_when>
    <thetext>(In reply to comment #5)
&gt; (In reply to comment #3)
&gt; &gt; (From update of attachment 193736 [details] [details])
&gt; &gt; Can this now be renamed &quot;instrinsicSize&quot; to make it clear what this size means?
&gt; 
&gt; I think this will unnecessarily increase code complexity. SVGImage is the only subclass of Image that has the intrinsic distinction.

You&apos;re right. Disregard my comment.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858495</commentid>
    <comment_count>7</comment_count>
      <attachid>193855</attachid>
    <who name="Stephen Chenney">schenney</who>
    <bug_when>2013-03-19 11:07:14 -0700</bug_when>
    <thetext>Comment on attachment 193855
Update per reviewer comments

Great. R=me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858537</commentid>
    <comment_count>8</comment_count>
      <attachid>193855</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2013-03-19 11:41:40 -0700</bug_when>
    <thetext>Comment on attachment 193855
Update per reviewer comments

Clearing flags on attachment: 193855

Committed r146227: &lt;http://trac.webkit.org/changeset/146227&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858538</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2013-03-19 11:41:44 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>193719</attachid>
            <date>2013-03-18 20:41:27 -0700</date>
            <delta_ts>2013-03-18 20:41:27 -0700</delta_ts>
            <desc>Testcase</desc>
            <filename>test.html</filename>
            <type>text/html</type>
            <size>969</size>
            <attacher name="Philip Rogers">pdr</attacher>
            
              <data encoding="base64">PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHNjcmlwdD4KZnVuY3Rpb24gdGVzdChpbmMp
IHsKICAgIHZhciBkaXYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGl2Jyk7CiAgICBkaXYu
aW5uZXJIVE1MID0gIiI7CiAgICB2YXIgaW1nID0gbmV3IEltYWdlKCk7CiAgICBpbWcuc3JjID0g
ImRhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2
Zycgd2lkdGg9JzMwJyBoZWlnaHQ9JzMwJz48cmVjdCB3aWR0aD0nMTAwJScgaGVpZ2h0PScxMDAl
JyBmaWxsPSdncmVlbicvPjwvc3ZnPiI7CiAgICBpbWcub25sb2FkID0gZnVuY3Rpb24oKSB7CiAg
ICAgICAgdmFyIHdpZHRoID0gaW1nLndpZHRoOwogICAgICAgIHZhciBzcGFuID0gZG9jdW1lbnQu
Z2V0RWxlbWVudEJ5SWQoJ3NwYW4nKTsKICAgICAgICBzcGFuLmlubmVySFRNTCA9IHdpZHRoOwog
ICAgICAgIGlmIChpbmMpIHsKICAgICAgICAgICAgdmFyIG5ld1dpZHRoID0gd2lkdGggKyAxOwog
ICAgICAgICAgICBpbWcuc2V0QXR0cmlidXRlKCd3aWR0aCcsIG5ld1dpZHRoKTsKICAgICAgICB9
CiAgICAgICAgZGl2LmFwcGVuZENoaWxkKGltZyk7CiAgICB9Cn0KPC9zY3JpcHQ+CjwvaGVhZD4K
PGJvZHkgb25sb2FkPSJ0ZXN0KHRydWUpIj4KU1ZHIGltYWdlIGNvbnRhaW5lciBzaXplIGNhbiBz
dXJ2aXZlIHJlbG9hZHMuPGJyLz4KQ2xpY2sgdGhlIGJ1dHRvbiBhIGZldyB0aW1lcyBhbmQgbm90
aWNlIHRoZSBpbWFnZSBzaXplIGluY3JlYXNlcy4gUmVmcmVzaCB0aGUgcGFnZSBhbmQgbm90aWNl
IHRoZSBjb250YWluZXIgc2l6ZSBpcyBub3QgcmVzZXQuCjxici8+CjxidXR0b24gb25jbGljaz0i
dGVzdCh0cnVlKSI+TG9hZCBpbWFnZTwvYnV0dG9uPiBPcmlnaW5hbCBpbWFnZSB3aWR0aDogPHNw
YW4gaWQ9J3NwYW4nPjwvc3Bhbj4KPGRpdiBpZD0iZGl2Ij48L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193736</attachid>
            <date>2013-03-18 22:54:27 -0700</date>
            <delta_ts>2013-03-19 10:39:14 -0700</delta_ts>
            <desc>Separate SVG image size and container size</desc>
            <filename>112651.1.patch</filename>
            <type>text/plain</type>
            <size>8161</size>
            <attacher name="Philip Rogers">pdr</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NjE3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAzLTE4ICBQaGlsaXAg
Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgU2VwYXJhdGUgU1ZHIGltYWdlIHNp
emUgYW5kIGNvbnRhaW5lciBzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0xMTI2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBQcmV2aW91c2x5LCBTVkcgaW1hZ2VzIGNvdWxkIHJldGFpbiB0aGVpciBj
YWNoZWQgc2l6ZSBiZXR3ZWVuIHJlbG9hZHMgZHVlIHRvIGEgYnVnIHdoZXJlIGFuCisgICAgICAg
IG9sZCBjb250YWluZXIgc2l6ZSB3b3VsZCBiZSByZS11c2VkIGlmIHRoZSBpbWFnZSdzIG5ldyBj
b250YWluZXIgc2l6ZSBoYWQgbm90IGJlZW4gc2V0LgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2hh
bmdlcyBTVkdJbWFnZTo6c2l6ZSgpIHRvIHJldHVybiB0aGUgaW50cmluc2ljIHNpemUgb2YgdGhl
IGltYWdlIGJlZm9yZSBhCisgICAgICAgIGNvbnRhaW5lciBzaXplIGhhcyBiZWVuIHNldC4gU1ZH
SW1hZ2VDYWNoZTo6aW1hZ2VTaXplRm9yUmVuZGVyZXIgd2lsbCBub3cgcmV0dXJuIHRoZQorICAg
ICAgICBpbWFnZSdzIGludHJpbnNpYyBzaXplIGluc3RlYWQgb2YgYSBjYWNoZWQgdmFsdWUgaWYg
dGhlIGNvbnRhaW5lciBzaXplIGNhbm5vdCBiZSBsb29rZWQgdXAuCisgICAgICAgIEluIGphdmFz
Y3JpcHQsIHF1ZXJ5aW5nIFtTVkdJbWFnZV0ud2lkdGggd2lsbCBub3cgcmV0dXJuIGVpdGhlciB0
aGUgaW1hZ2UncyBpbnRyaW5zaWMgc2l6ZQorICAgICAgICBvciB0aGUgc2l6ZSBvZiAnaW1hZ2VG
b3JDb250YWluZXInLgorCisgICAgICAgIFRlc3Q6IHN2Zy9hcy1pbWFnZS9zdmctY29udGFpbmVy
LXNpemUtYWZ0ZXItcmVsb2FkLmh0bWwKKworICAgICAgICAqIHN2Zy9ncmFwaGljcy9TVkdJbWFn
ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdJbWFnZTo6c2V0Q29udGFpbmVyU2l6ZSk6Cisg
ICAgICAgIChXZWJDb3JlOjpTVkdJbWFnZTo6Y29udGFpbmVyU2l6ZSk6CisgICAgICAgIChXZWJD
b3JlOjpTVkdJbWFnZTo6ZHJhdyk6CisgICAgICAgIChXZWJDb3JlOjpTVkdJbWFnZTo6ZGF0YUNo
YW5nZWQpOgorICAgICAgICAqIHN2Zy9ncmFwaGljcy9TVkdJbWFnZS5oOgorCisgICAgICAgICAg
ICBUaGUgbWVtYmVyIHZhcmlhYmxlICdtX2ludHJpbnNpY1NpemUnIGhhcyBiZWVuIGFkZGVkIHRv
IHRyYWNrIHRoZSBpbWFnZSdzIGludHJpbnNpYworICAgICAgICAgICAgc2l6ZS4gVGhpcyB0ZXJt
IGNhbiBiZSBmb3VuZCBpbjogaHR0cDovL3d3dy53My5vcmcvVFIvY3NzMy1pbWFnZXMvI2RlZmF1
bHQtc2l6aW5nCisKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ltYWdlOjpzaXplKToKKyAgICAgICAg
KFNWR0ltYWdlKToKKyAgICAgICAgKiBzdmcvZ3JhcGhpY3MvU1ZHSW1hZ2VDYWNoZS5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpTVkdJbWFnZUNhY2hlOjppbWFnZVNpemVGb3JSZW5kZXJlcik6Cisg
ICAgICAgIChXZWJDb3JlOjpTVkdJbWFnZUNhY2hlOjppbWFnZUZvclJlbmRlcmVyKToKKworICAg
ICAgICAgICAgSW4gYm90aCBvZiB0aGVzZSBmdW5jdGlvbnMsIGltYWdlIGhhcyBiZWVuIHJlbmFt
ZWQgdG8gaW1hZ2VGb3JDb250YWluZXIgaGVyZSB0byBjbGFyaWZ5CisgICAgICAgICAgICB0aGF0
IHRoZSBjYWNoZWQgY29udGFpbmVyIHNpemUgaXMgYmVpbmcgcmV0dXJuZWQsIG5vdCB0aGUgaW1h
Z2UncyBpbnRyaW5zaWMgc2l6ZS4KKwogMjAxMy0wMy0xOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6
ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEJVSUxEIEZJWCAocjE0NjA4OCk6IFJlc291cmNlUmVx
dWVzdDo6Y2ZVUkxSZXF1ZXN0KCkgaXMgZGVmaW5lZCB0d2ljZSBvbiBpT1MKSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcAkocmV2aXNpb24gMTQ1OTM1KQorKysg
U291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcAkod29ya2luZyBjb3B5KQpA
QCAtNzQsMTIgKzc0LDEyIEBAIHZvaWQgU1ZHSW1hZ2U6OnNldENvbnRhaW5lclNpemUoY29uc3Qg
SW4KICAgICAgICAgcmV0dXJuOwogCiAgICAgRnJhbWVWaWV3KiB2aWV3ID0gZnJhbWVWaWV3KCk7
Ci0gICAgdmlldy0+cmVzaXplKHRoaXMtPnNpemUoKSk7CisgICAgdmlldy0+cmVzaXplKHRoaXMt
PmNvbnRhaW5lclNpemUoKSk7CiAKICAgICByZW5kZXJlci0+c2V0Q29udGFpbmVyU2l6ZShzaXpl
KTsKIH0KIAotSW50U2l6ZSBTVkdJbWFnZTo6c2l6ZSgpIGNvbnN0CitJbnRTaXplIFNWR0ltYWdl
Ojpjb250YWluZXJTaXplKCkgY29uc3QKIHsKICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0
dXJuIEludFNpemUoKTsKQEAgLTE5Miw3ICsxOTIsNyBAQCB2b2lkIFNWR0ltYWdlOjpkcmF3KEdy
YXBoaWNzQ29udGV4dCogY29uCiAgICAgY29udGV4dC0+dHJhbnNsYXRlKGRlc3RPZmZzZXQueCgp
LCBkZXN0T2Zmc2V0LnkoKSk7CiAgICAgY29udGV4dC0+c2NhbGUoc2NhbGUpOwogCi0gICAgdmll
dy0+cmVzaXplKHNpemUoKSk7CisgICAgdmlldy0+cmVzaXplKGNvbnRhaW5lclNpemUoKSk7CiAK
ICAgICBpZiAodmlldy0+bmVlZHNMYXlvdXQoKSkKICAgICAgICAgdmlldy0+bGF5b3V0KCk7CkBA
IC0zMzYsNiArMzM2LDkgQEAgYm9vbCBTVkdJbWFnZTo6ZGF0YUNoYW5nZWQoYm9vbCBhbGxEYXRh
UgogICAgICAgICBsb2FkZXItPmFjdGl2ZURvY3VtZW50TG9hZGVyKCktPndyaXRlcigpLT5iZWdp
bihLVVJMKCkpOyAvLyBjcmVhdGUgdGhlIGVtcHR5IGRvY3VtZW50CiAgICAgICAgIGxvYWRlci0+
YWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+d3JpdGVyKCktPmFkZERhdGEoZGF0YSgpLT5kYXRhKCks
IGRhdGEoKS0+c2l6ZSgpKTsKICAgICAgICAgbG9hZGVyLT5hY3RpdmVEb2N1bWVudExvYWRlcigp
LT53cml0ZXIoKS0+ZW5kKCk7CisKKyAgICAgICAgLy8gU2V0IHRoZSBpbnRyaW5zaWMgc2l6ZSBi
ZWZvcmUgYSBjb250YWluZXIgc2l6ZSBpcyBhdmFpbGFibGUuCisgICAgICAgIG1faW50cmluc2lj
U2l6ZSA9IGNvbnRhaW5lclNpemUoKTsKICAgICB9CiAKICAgICByZXR1cm4gbV9wYWdlOwpJbmRl
eDogU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmgKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmgJKHJldmlzaW9uIDE0NTkzNSkK
KysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdJbWFnZS5oCSh3b3JraW5nIGNvcHkp
CkBAIC01MSw3ICs1MSw3IEBAIHB1YmxpYzoKICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldygpIGNv
bnN0OwogCiAgICAgdmlydHVhbCBib29sIGlzU1ZHSW1hZ2UoKSBjb25zdCB7IHJldHVybiB0cnVl
OyB9Ci0gICAgdmlydHVhbCBJbnRTaXplIHNpemUoKSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFNp
emUgc2l6ZSgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1faW50cmluc2ljU2l6ZTsgfQogCiAg
ICAgdmlydHVhbCBib29sIGhhc1JlbGF0aXZlV2lkdGgoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJv
b2wgaGFzUmVsYXRpdmVIZWlnaHQoKSBjb25zdDsKQEAgLTcxLDYgKzcxLDcgQEAgcHJpdmF0ZToK
ICAgICB2aXJ0dWFsIFN0cmluZyBmaWxlbmFtZUV4dGVuc2lvbigpIGNvbnN0OwogCiAgICAgdmly
dHVhbCB2b2lkIHNldENvbnRhaW5lclNpemUoY29uc3QgSW50U2l6ZSYpOworICAgIEludFNpemUg
Y29udGFpbmVyU2l6ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCB1c2VzQ29udGFpbmVyU2l6
ZSgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUludHJp
bnNpY0RpbWVuc2lvbnMoTGVuZ3RoJiBpbnRyaW5zaWNXaWR0aCwgTGVuZ3RoJiBpbnRyaW5zaWNI
ZWlnaHQsIEZsb2F0U2l6ZSYgaW50cmluc2ljUmF0aW8pOwogCkBAIC05NCw2ICs5NSw3IEBAIHBy
aXZhdGU6CiAKICAgICBPd25QdHI8U1ZHSW1hZ2VDaHJvbWVDbGllbnQ+IG1fY2hyb21lQ2xpZW50
OwogICAgIE93blB0cjxQYWdlPiBtX3BhZ2U7CisgICAgSW50U2l6ZSBtX2ludHJpbnNpY1NpemU7
CiB9OwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2VDYWNo
ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdl
Q2FjaGUuY3BwCShyZXZpc2lvbiAxNDU5MzUpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhp
Y3MvU1ZHSW1hZ2VDYWNoZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc0LDkgKzc0LDkgQEAgSW50
U2l6ZSBTVkdJbWFnZUNhY2hlOjppbWFnZVNpemVGb3JSZW5kZQogICAgIGlmIChpdCA9PSBtX2lt
YWdlRm9yQ29udGFpbmVyTWFwLmVuZCgpKQogICAgICAgICByZXR1cm4gaW1hZ2VTaXplOwogCi0g
ICAgUmVmUHRyPFNWR0ltYWdlRm9yQ29udGFpbmVyPiBpbWFnZSA9IGl0LT52YWx1ZTsKLSAgICBB
U1NFUlQoIWltYWdlLT5zaXplKCkuaXNFbXB0eSgpKTsKLSAgICByZXR1cm4gaW1hZ2UtPnNpemUo
KTsKKyAgICBSZWZQdHI8U1ZHSW1hZ2VGb3JDb250YWluZXI+IGltYWdlRm9yQ29udGFpbmVyID0g
aXQtPnZhbHVlOworICAgIEFTU0VSVCghaW1hZ2VGb3JDb250YWluZXItPnNpemUoKS5pc0VtcHR5
KCkpOworICAgIHJldHVybiBpbWFnZUZvckNvbnRhaW5lci0+c2l6ZSgpOwogfQogCiAvLyBGSVhN
RTogVGhpcyBkb2Vzbid0IHRha2UgaW50byBhY2NvdW50IHRoZSBhbmltYXRpb24gdGltZWxpbmUg
c28gYW5pbWF0aW9ucyB3aWxsIG5vdApAQCAtOTAsOSArOTAsOSBAQCBJbWFnZSogU1ZHSW1hZ2VD
YWNoZTo6aW1hZ2VGb3JSZW5kZXJlcihjCiAgICAgaWYgKGl0ID09IG1faW1hZ2VGb3JDb250YWlu
ZXJNYXAuZW5kKCkpCiAgICAgICAgIHJldHVybiBJbWFnZTo6bnVsbEltYWdlKCk7CiAKLSAgICBS
ZWZQdHI8U1ZHSW1hZ2VGb3JDb250YWluZXI+IGltYWdlID0gaXQtPnZhbHVlOwotICAgIEFTU0VS
VCghaW1hZ2UtPnNpemUoKS5pc0VtcHR5KCkpOwotICAgIHJldHVybiBpbWFnZS5nZXQoKTsKKyAg
ICBSZWZQdHI8U1ZHSW1hZ2VGb3JDb250YWluZXI+IGltYWdlRm9yQ29udGFpbmVyID0gaXQtPnZh
bHVlOworICAgIEFTU0VSVCghaW1hZ2VGb3JDb250YWluZXItPnNpemUoKS5pc0VtcHR5KCkpOwor
ICAgIHJldHVybiBpbWFnZUZvckNvbnRhaW5lci5nZXQoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug
V2ViQ29yZQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91
dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ2MTc4KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDMtMTggIFBoaWxpcCBS
b2dlcnMgIDxwZHJAZ29vZ2xlLmNvbT4KKworICAgICAgICBTZXBhcmF0ZSBTVkcgaW1hZ2Ugc2l6
ZSBhbmQgY29udGFpbmVyIHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTExMjY1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgICogc3ZnL2FzLWltYWdlL3N2Zy1jb250YWluZXItc2l6ZS1hZnRlci1yZWxv
YWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBzdmcvYXMtaW1hZ2Uvc3ZnLWNvbnRh
aW5lci1zaXplLWFmdGVyLXJlbG9hZC5odG1sOiBBZGRlZC4KKwogMjAxMy0wMy0xOCAgU2ltb24g
RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBmYXN0L2RvbS9pY29u
LXVybC1wcm9wZXJ0eS5odG1sIGZhaWxzIG9uIE1hYyBhZnRlciByMTQ2MTczCkluZGV4OiBMYXlv
dXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWNvbnRhaW5lci1zaXplLWFmdGVyLXJlbG9hZC1leHBl
Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3N2Zy1jb250
YWluZXItc2l6ZS1hZnRlci1yZWxvYWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5
b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3N2Zy1jb250YWluZXItc2l6ZS1hZnRlci1yZWxvYWQtZXhw
ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEgQEAKK1BBU1M6IGV4cGVjdGVkIGlt
YWdlIHdpZHRoIHdhcyAxMDAsIGltYWdlIGFjdHVhbGx5IGhhZCB3aWR0aCAxMDAKSW5kZXg6IExh
eW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9zdmctY29udGFpbmVyLXNpemUtYWZ0ZXItcmVsb2FkLmh0
bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2FzLWltYWdlL3N2Zy1jb250YWluZXIt
c2l6ZS1hZnRlci1yZWxvYWQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3N2Zy9h
cy1pbWFnZS9zdmctY29udGFpbmVyLXNpemUtYWZ0ZXItcmVsb2FkLmh0bWwJKHdvcmtpbmcgY29w
eSkKQEAgLTAsMCArMSwzNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPCEt
LSBUZXN0IGZvciBXSzExMjY1MTogU1ZHIGltYWdlIGNvbnRhaW5lciBzaXplIHNob3VsZCBub3Qg
c3Vydml2ZSByZWxvYWRzLiAtLT4KKzwhLS0gVGhpcyB0ZXN0IHBhc3NlcyBpZiBQQVNTIGlzIHBy
aW50ZWQuIC0tPgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgIHRlc3RS
dW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworfQor
CitmdW5jdGlvbiBydW5UZXN0KCkgeworICAgIHZhciBpbWFnZTEgPSBuZXcgSW1hZ2UoKTsKKyAg
ICBpbWFnZTEuc3JjID0gImRhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHhtbG5zPSdodHRwOi8vd3d3
LnczLm9yZy8yMDAwL3N2Zycgd2lkdGg9JzEwMCcgaGVpZ2h0PScxMDAnPjxyZWN0IHdpZHRoPScx
MDAlJyBoZWlnaHQ9JzEwMCUnIGZpbGw9J2dyZWVuJy8+PC9zdmc+IjsKKyAgICBpbWFnZTEub25s
b2FkID0gZnVuY3Rpb24oKSB7CisgICAgICAgIGltYWdlMS5zZXRBdHRyaWJ1dGUoJ3dpZHRoJywg
aW1hZ2UxLndpZHRoICsgNTApOworICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGlt
YWdlMSk7CisgICAgICAgIHZhciBpbWFnZTIgPSBuZXcgSW1hZ2UoKTsKKyAgICAgICAgaW1hZ2Uy
LnNyYyA9IGltYWdlMS5zcmM7CisgICAgICAgIGltYWdlMi5vbmxvYWQgPSBmdW5jdGlvbigpIHsK
KyAgICAgICAgICAgIHZhciB3aWR0aCA9IGltYWdlMi53aWR0aDsKKyAgICAgICAgICAgIHZhciBy
ZXN1bHQgPSB3aWR0aCA9PSAxMDAgPyAiUEFTUyIgOiAiRkFJTCI7CisgICAgICAgICAgICBkb2N1
bWVudC53cml0ZShyZXN1bHQgKyAiOiBleHBlY3RlZCBpbWFnZSB3aWR0aCB3YXMgMTAwLCBpbWFn
ZSBhY3R1YWxseSBoYWQgd2lkdGggIiArIHdpZHRoKTsKKyAgICAgICAgICAgIGlmICh3aW5kb3cu
dGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKQorICAg
ICAgICB9CisgICAgfQorfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRl
c3QoKSI+CitGQUlMIDwhLS0gSWYgdGVzdCBkb2VzIG5vdCBydW4sIGZhaWwgLS0+Cis8L2JvZHk+
Cis8L2h0bWw+Cg==
</data>
<flag name="review"
          id="215350"
          type_id="1"
          status="-"
          setter="schenney"
    />
    <flag name="commit-queue"
          id="215351"
          type_id="3"
          status="-"
          setter="buildbot"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193855</attachid>
            <date>2013-03-19 10:39:14 -0700</date>
            <delta_ts>2013-03-19 11:41:40 -0700</delta_ts>
            <desc>Update per reviewer comments</desc>
            <filename>112651.2.patch</filename>
            <type>text/plain</type>
            <size>8056</size>
            <attacher name="Philip Rogers">pdr</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NjIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDEzLTAzLTE5ICBQaGlsaXAg
Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgU2VwYXJhdGUgU1ZHIGltYWdlIHNp
emUgYW5kIGNvbnRhaW5lciBzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0xMTI2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBQcmV2aW91c2x5LCBTVkcgaW1hZ2VzIGNvdWxkIHJldGFpbiB0aGVpciBj
YWNoZWQgc2l6ZSBiZXR3ZWVuIHJlbG9hZHMgZHVlIHRvIGEgYnVnIHdoZXJlIGFuCisgICAgICAg
IG9sZCBjb250YWluZXIgc2l6ZSB3b3VsZCBiZSByZS11c2VkIGlmIHRoZSBpbWFnZSdzIG5ldyBj
b250YWluZXIgc2l6ZSB3YXMgbm90IGF2YWlsYWJsZSB5ZXQuCisKKyAgICAgICAgVGhpcyBwYXRj
aCBjaGFuZ2VzIFNWR0ltYWdlOjpzaXplKCkgdG8gcmV0dXJuIHRoZSBpbnRyaW5zaWMgc2l6ZSBv
ZiB0aGUgaW1hZ2UgYmVmb3JlIGEKKyAgICAgICAgY29udGFpbmVyIHNpemUgaGFzIGJlZW4gc2V0
LiBTVkdJbWFnZUNhY2hlOjppbWFnZVNpemVGb3JSZW5kZXJlciB3aWxsIG5vdyByZXR1cm4gdGhl
CisgICAgICAgIGltYWdlJ3MgaW50cmluc2ljIHNpemUgaW5zdGVhZCBvZiBhIGNhY2hlZCB2YWx1
ZSBpZiB0aGUgY29udGFpbmVyIHNpemUgY2Fubm90IGJlIGxvb2tlZCB1cC4KKyAgICAgICAgSW4g
amF2YXNjcmlwdCwgcXVlcnlpbmcgW1NWR0ltYWdlXS53aWR0aCB3aWxsIG5vdyByZXR1cm4gZWl0
aGVyIHRoZSBpbWFnZSdzIGludHJpbnNpYyBzaXplCisgICAgICAgIG9yIHRoZSBzaXplIG9mICdp
bWFnZUZvckNvbnRhaW5lcicuCisKKyAgICAgICAgVGVzdDogc3ZnL2FzLWltYWdlL3N2Zy1jb250
YWluZXItc2l6ZS1hZnRlci1yZWxvYWQuaHRtbAorCisgICAgICAgICogc3ZnL2dyYXBoaWNzL1NW
R0ltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ltYWdlOjpzZXRDb250YWluZXJTaXpl
KToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ltYWdlOjpjb250YWluZXJTaXplKToKKyAgICAgICAg
KFdlYkNvcmU6OlNWR0ltYWdlOjpkcmF3KToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ltYWdlOjpk
YXRhQ2hhbmdlZCk6CisgICAgICAgICogc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmg6CisKKyAgICAg
ICAgICAgIFRoZSBtZW1iZXIgdmFyaWFibGUgJ21faW50cmluc2ljU2l6ZScgaGFzIGJlZW4gYWRk
ZWQgdG8gdHJhY2sgdGhlIGltYWdlJ3MgaW50cmluc2ljCisgICAgICAgICAgICBzaXplLiBUaGlz
IHRlcm0gY2FuIGJlIGZvdW5kIGluOiBodHRwOi8vd3d3LnczLm9yZy9UUi9jc3MzLWltYWdlcy8j
ZGVmYXVsdC1zaXppbmcKKworICAgICAgICAqIHN2Zy9ncmFwaGljcy9TVkdJbWFnZUNhY2hlLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ltYWdlQ2FjaGU6OmltYWdlU2l6ZUZvclJlbmRlcmVy
KToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ltYWdlQ2FjaGU6OmltYWdlRm9yUmVuZGVyZXIpOgor
CisgICAgICAgICAgICBJbiBib3RoIG9mIHRoZXNlIGZ1bmN0aW9ucywgaW1hZ2UgaGFzIGJlZW4g
cmVuYW1lZCB0byBpbWFnZUZvckNvbnRhaW5lciBoZXJlIHRvIGNsYXJpZnkKKyAgICAgICAgICAg
IHRoYXQgdGhlIGNhY2hlZCBjb250YWluZXIgc2l6ZSBpcyBiZWluZyByZXR1cm5lZCwgbm90IHRo
ZSBpbWFnZSdzIGludHJpbnNpYyBzaXplLgorCiAyMDEzLTAzLTE5ICBBbGVjIEZsZXR0ICA8YWxl
Y2ZsZXR0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbnNwZWN0b3I6IEluZGV4ZWREQiBjbGVh
ciBidXR0b24gYW5kIG1lbnUgaXRlbQpJbmRleDogU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNz
L1NWR0ltYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3Mv
U1ZHSW1hZ2UuY3BwCShyZXZpc2lvbiAxNDYxODIpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvZ3Jh
cGhpY3MvU1ZHSW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NCwxMiArNzQsMTIgQEAgdm9p
ZCBTVkdJbWFnZTo6c2V0Q29udGFpbmVyU2l6ZShjb25zdCBJbgogICAgICAgICByZXR1cm47CiAK
ICAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZVZpZXcoKTsKLSAgICB2aWV3LT5yZXNpemUodGhp
cy0+c2l6ZSgpKTsKKyAgICB2aWV3LT5yZXNpemUodGhpcy0+Y29udGFpbmVyU2l6ZSgpKTsKIAog
ICAgIHJlbmRlcmVyLT5zZXRDb250YWluZXJTaXplKHNpemUpOwogfQogCi1JbnRTaXplIFNWR0lt
YWdlOjpzaXplKCkgY29uc3QKK0ludFNpemUgU1ZHSW1hZ2U6OmNvbnRhaW5lclNpemUoKSBjb25z
dAogewogICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm4gSW50U2l6ZSgpOwpAQCAtMTky
LDcgKzE5Miw3IEBAIHZvaWQgU1ZHSW1hZ2U6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjb24KICAg
ICBjb250ZXh0LT50cmFuc2xhdGUoZGVzdE9mZnNldC54KCksIGRlc3RPZmZzZXQueSgpKTsKICAg
ICBjb250ZXh0LT5zY2FsZShzY2FsZSk7CiAKLSAgICB2aWV3LT5yZXNpemUoc2l6ZSgpKTsKKyAg
ICB2aWV3LT5yZXNpemUoY29udGFpbmVyU2l6ZSgpKTsKIAogICAgIGlmICh2aWV3LT5uZWVkc0xh
eW91dCgpKQogICAgICAgICB2aWV3LT5sYXlvdXQoKTsKQEAgLTMzNiw2ICszMzYsOSBAQCBib29s
IFNWR0ltYWdlOjpkYXRhQ2hhbmdlZChib29sIGFsbERhdGFSCiAgICAgICAgIGxvYWRlci0+YWN0
aXZlRG9jdW1lbnRMb2FkZXIoKS0+d3JpdGVyKCktPmJlZ2luKEtVUkwoKSk7IC8vIGNyZWF0ZSB0
aGUgZW1wdHkgZG9jdW1lbnQKICAgICAgICAgbG9hZGVyLT5hY3RpdmVEb2N1bWVudExvYWRlcigp
LT53cml0ZXIoKS0+YWRkRGF0YShkYXRhKCktPmRhdGEoKSwgZGF0YSgpLT5zaXplKCkpOwogICAg
ICAgICBsb2FkZXItPmFjdGl2ZURvY3VtZW50TG9hZGVyKCktPndyaXRlcigpLT5lbmQoKTsKKwor
ICAgICAgICAvLyBTZXQgdGhlIGludHJpbnNpYyBzaXplIGJlZm9yZSBhIGNvbnRhaW5lciBzaXpl
IGlzIGF2YWlsYWJsZS4KKyAgICAgICAgbV9pbnRyaW5zaWNTaXplID0gY29udGFpbmVyU2l6ZSgp
OwogICAgIH0KIAogICAgIHJldHVybiBtX3BhZ2U7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcv
Z3JhcGhpY3MvU1ZHSW1hZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvZ3Jh
cGhpY3MvU1ZHSW1hZ2UuaAkocmV2aXNpb24gMTQ2MTgyKQorKysgU291cmNlL1dlYkNvcmUvc3Zn
L2dyYXBoaWNzL1NWR0ltYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUxLDcgKzUxLDcgQEAgcHVi
bGljOgogICAgIEZyYW1lVmlldyogZnJhbWVWaWV3KCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIGJv
b2wgaXNTVkdJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KLSAgICB2aXJ0dWFsIEludFNp
emUgc2l6ZSgpIGNvbnN0OworICAgIHZpcnR1YWwgSW50U2l6ZSBzaXplKCkgY29uc3QgT1ZFUlJJ
REUgeyByZXR1cm4gbV9pbnRyaW5zaWNTaXplOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFzUmVs
YXRpdmVXaWR0aCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBoYXNSZWxhdGl2ZUhlaWdodCgp
IGNvbnN0OwpAQCAtNzEsNiArNzEsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgU3RyaW5nIGZp
bGVuYW1lRXh0ZW5zaW9uKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGFpbmVy
U2l6ZShjb25zdCBJbnRTaXplJik7CisgICAgSW50U2l6ZSBjb250YWluZXJTaXplKCkgY29uc3Q7
CiAgICAgdmlydHVhbCBib29sIHVzZXNDb250YWluZXJTaXplKCkgY29uc3QgeyByZXR1cm4gdHJ1
ZTsgfQogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlSW50cmluc2ljRGltZW5zaW9ucyhMZW5ndGgm
IGludHJpbnNpY1dpZHRoLCBMZW5ndGgmIGludHJpbnNpY0hlaWdodCwgRmxvYXRTaXplJiBpbnRy
aW5zaWNSYXRpbyk7CiAKQEAgLTk0LDYgKzk1LDcgQEAgcHJpdmF0ZToKIAogICAgIE93blB0cjxT
VkdJbWFnZUNocm9tZUNsaWVudD4gbV9jaHJvbWVDbGllbnQ7CiAgICAgT3duUHRyPFBhZ2U+IG1f
cGFnZTsKKyAgICBJbnRTaXplIG1faW50cmluc2ljU2l6ZTsKIH07CiB9CiAKSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdJbWFnZUNhY2hlLmNwcAo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT
b3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2VDYWNoZS5jcHAJKHJldmlzaW9uIDE0
NjE4MikKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdJbWFnZUNhY2hlLmNwcAko
d29ya2luZyBjb3B5KQpAQCAtNzQsOSArNzQsOSBAQCBJbnRTaXplIFNWR0ltYWdlQ2FjaGU6Omlt
YWdlU2l6ZUZvclJlbmRlCiAgICAgaWYgKGl0ID09IG1faW1hZ2VGb3JDb250YWluZXJNYXAuZW5k
KCkpCiAgICAgICAgIHJldHVybiBpbWFnZVNpemU7CiAKLSAgICBSZWZQdHI8U1ZHSW1hZ2VGb3JD
b250YWluZXI+IGltYWdlID0gaXQtPnZhbHVlOwotICAgIEFTU0VSVCghaW1hZ2UtPnNpemUoKS5p
c0VtcHR5KCkpOwotICAgIHJldHVybiBpbWFnZS0+c2l6ZSgpOworICAgIFJlZlB0cjxTVkdJbWFn
ZUZvckNvbnRhaW5lcj4gaW1hZ2VGb3JDb250YWluZXIgPSBpdC0+dmFsdWU7CisgICAgQVNTRVJU
KCFpbWFnZUZvckNvbnRhaW5lci0+c2l6ZSgpLmlzRW1wdHkoKSk7CisgICAgcmV0dXJuIGltYWdl
Rm9yQ29udGFpbmVyLT5zaXplKCk7CiB9CiAKIC8vIEZJWE1FOiBUaGlzIGRvZXNuJ3QgdGFrZSBp
bnRvIGFjY291bnQgdGhlIGFuaW1hdGlvbiB0aW1lbGluZSBzbyBhbmltYXRpb25zIHdpbGwgbm90
CkBAIC05MCw5ICs5MCw5IEBAIEltYWdlKiBTVkdJbWFnZUNhY2hlOjppbWFnZUZvclJlbmRlcmVy
KGMKICAgICBpZiAoaXQgPT0gbV9pbWFnZUZvckNvbnRhaW5lck1hcC5lbmQoKSkKICAgICAgICAg
cmV0dXJuIEltYWdlOjpudWxsSW1hZ2UoKTsKIAotICAgIFJlZlB0cjxTVkdJbWFnZUZvckNvbnRh
aW5lcj4gaW1hZ2UgPSBpdC0+dmFsdWU7Ci0gICAgQVNTRVJUKCFpbWFnZS0+c2l6ZSgpLmlzRW1w
dHkoKSk7Ci0gICAgcmV0dXJuIGltYWdlLmdldCgpOworICAgIFJlZlB0cjxTVkdJbWFnZUZvckNv
bnRhaW5lcj4gaW1hZ2VGb3JDb250YWluZXIgPSBpdC0+dmFsdWU7CisgICAgQVNTRVJUKCFpbWFn
ZUZvckNvbnRhaW5lci0+c2l6ZSgpLmlzRW1wdHkoKSk7CisgICAgcmV0dXJuIGltYWdlRm9yQ29u
dGFpbmVyLmdldCgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBMYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZp
c2lvbiAxNDYyMTkpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg
LTEsMyArMSwxMyBAQAorMjAxMy0wMy0xOSAgUGhpbGlwIFJvZ2VycyAgPHBkckBnb29nbGUuY29t
PgorCisgICAgICAgIFNlcGFyYXRlIFNWRyBpbWFnZSBzaXplIGFuZCBjb250YWluZXIgc2l6ZQor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNjUxCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdmcvYXMt
aW1hZ2Uvc3ZnLWNvbnRhaW5lci1zaXplLWFmdGVyLXJlbG9hZC1leHBlY3RlZC50eHQ6IEFkZGVk
LgorICAgICAgICAqIHN2Zy9hcy1pbWFnZS9zdmctY29udGFpbmVyLXNpemUtYWZ0ZXItcmVsb2Fk
Lmh0bWw6IEFkZGVkLgorCiAyMDEzLTAzLTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA
YXBwbGUuY29tPgogCiAgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6IG1fc2NoZWR1bGVkVGFza3NB
cmVTdXNwZW5kZWQKSW5kZXg6IExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9zdmctY29udGFpbmVy
LXNpemUtYWZ0ZXItcmVsb2FkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0
cy9zdmcvYXMtaW1hZ2Uvc3ZnLWNvbnRhaW5lci1zaXplLWFmdGVyLXJlbG9hZC1leHBlY3RlZC50
eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9zdmcvYXMtaW1hZ2Uvc3ZnLWNvbnRhaW5l
ci1zaXplLWFmdGVyLXJlbG9hZC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCAr
MSwxMCBAQAorVGVzdCBmb3IgV0sxMTI2NTE6IFNWRyBpbWFnZSBjb250YWluZXIgc2l6ZSBzaG91
bGQgbm90IHN1cnZpdmUgcmVsb2Fkcy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy
aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisK
K1BBU1MgaW1hZ2UyLndpZHRoIGlzIDEwMAorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1
ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9zdmct
Y29udGFpbmVyLXNpemUtYWZ0ZXItcmVsb2FkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz
dHMvc3ZnL2FzLWltYWdlL3N2Zy1jb250YWluZXItc2l6ZS1hZnRlci1yZWxvYWQuaHRtbAkocmV2
aXNpb24gMCkKKysrIExheW91dFRlc3RzL3N2Zy9hcy1pbWFnZS9zdmctY29udGFpbmVyLXNpemUt
YWZ0ZXItcmVsb2FkLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyOCBAQAorPCFET0NU
WVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVz
b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+Citqc1Rlc3RJc0FzeW5j
ID0gdHJ1ZTsKK2Rlc2NyaXB0aW9uKCJUZXN0IGZvciBXSzExMjY1MTogU1ZHIGltYWdlIGNvbnRh
aW5lciBzaXplIHNob3VsZCBub3Qgc3Vydml2ZSByZWxvYWRzLiIpOworCitmdW5jdGlvbiBydW5U
ZXN0KCkgeworICAgIHZhciBpbWFnZTEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW1hZ2Ux
Jyk7CisgICAgaW1hZ2UxLnNyYyA9ICJkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0naHR0
cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMDAnIGhlaWdodD0nMTAwJz48cmVjdCB3
aWR0aD0nMTAwJScgaGVpZ2h0PScxMDAlJyBmaWxsPSdncmVlbicvPjwvc3ZnPiI7CisgICAgaW1h
Z2UxLm9ubG9hZCA9IGZ1bmN0aW9uKCkgeworICAgICAgICBpbWFnZTEuc2V0QXR0cmlidXRlKCd3
aWR0aCcsIGltYWdlMS53aWR0aCArIDUwKTsKKyAgICAgICAgdmFyIGltYWdlMiA9IGRvY3VtZW50
LmdldEVsZW1lbnRCeUlkKCdpbWFnZTInKTsKKyAgICAgICAgaW1hZ2UyLnNyYyA9IGltYWdlMS5z
cmM7CisgICAgICAgIGltYWdlMi5vbmxvYWQgPSBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIHNo
b3VsZEJlKCJpbWFnZTIud2lkdGgiLCAiMTAwIik7CisgICAgICAgICAgICBmaW5pc2hKU1Rlc3Qo
KTsKKyAgICAgICAgfQorICAgIH0KK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2Fk
PSJydW5UZXN0KCkiPgorPGltZyBpZD0iaW1hZ2UxIj48aW1nIGlkPSJpbWFnZTIiPgorPHNjcmlw
dCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+
Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>