<?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>46208</bug_id>
          
          <creation_ts>2010-09-21 12:29:53 -0700</creation_ts>
          <short_desc>Implement --enable-accelerated-2d-canvas flag in DumpRenderTree</short_desc>
          <delta_ts>2010-09-23 07:51:37 -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>Tools / Tests</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>Windows 7</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="Stephen White">senorblanco</reporter>
          <assigned_to name="Stephen White">senorblanco</assigned_to>
          <cc>abarth</cc>
    
    <cc>dpranke</cc>
    
    <cc>eric</cc>
    
    <cc>kbr</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>282478</commentid>
    <comment_count>0</comment_count>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2010-09-21 12:29:53 -0700</bug_when>
    <thetext>In order to run the layout tests both with and without accelerated 2D canvas, we should have a flag that controls its behaviour at runtime.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282524</commentid>
    <comment_count>1</comment_count>
      <attachid>68284</attachid>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2010-09-21 13:34:51 -0700</bug_when>
    <thetext>Created attachment 68284
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282532</commentid>
    <comment_count>2</comment_count>
      <attachid>68284</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2010-09-21 13:46:54 -0700</bug_when>
    <thetext>Comment on attachment 68284
Patch

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

Looks good to me other than the nits noted below.

I have a patch in progress that adds essentially the same line to port/chromium.py plus handles the Chromium DRT case and the new baseline search path we&apos;ll want. I should have it ready inside an hour or so (I would&apos;ve finished it last night but I got derailed by another bug), so whichever of the two lands first can be coordinated with the other one.

&gt; WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:577
&gt; +        test_args.enable_accelerated_2d_canvas = self._options.enable_accelerated_2d_canvas

I don&apos;t think you need this.

&gt; WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:1663
&gt; +            dest=&quot;enable_accelerated_2d_canvas&quot;,

I don&apos;t think you need this, either.

&gt; WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py:360
&gt; +

Here you need to check if enable-accelerated-2d-canvas is not actually set (since there&apos;s no default value):

if hasattr(self._options, &apos;enable_accelerated_2d_canvas&apos;) and self._options.enable_accelerated_2d_canvas): ...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282594</commentid>
    <comment_count>3</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2010-09-21 15:48:23 -0700</bug_when>
    <thetext>See also bug 46208 for my patch to new-run-webkit-tests for the full support of GPU testing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282621</commentid>
    <comment_count>4</comment_count>
      <attachid>68284</attachid>
    <who name="David Levin">levin</who>
    <bug_when>2010-09-21 16:28:18 -0700</bug_when>
    <thetext>Comment on attachment 68284
Patch

It looks like Dirk has some good points here. Other than those the patch looks fine.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282624</commentid>
    <comment_count>5</comment_count>
    <who name="Kenneth Russell">kbr</who>
    <bug_when>2010-09-21 16:30:03 -0700</bug_when>
    <thetext>(In reply to comment #3)
&gt; See also bug 46208 for my patch to new-run-webkit-tests for the full support of GPU testing.

Wrong bug ID?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282626</commentid>
    <comment_count>6</comment_count>
    <who name="Kenneth Russell">kbr</who>
    <bug_when>2010-09-21 16:31:23 -0700</bug_when>
    <thetext>(In reply to comment #5)
&gt; (In reply to comment #3)
&gt; &gt; See also bug 46208 for my patch to new-run-webkit-tests for the full support of GPU testing.
&gt; 
&gt; Wrong bug ID?

Looks like it should have been bug 46225.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282634</commentid>
    <comment_count>7</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2010-09-21 16:37:48 -0700</bug_when>
    <thetext>(In reply to comment #6)
&gt; (In reply to comment #5)
&gt; &gt; (In reply to comment #3)
&gt; &gt; &gt; See also bug 46208 for my patch to new-run-webkit-tests for the full support of GPU testing.
&gt; &gt; 
&gt; &gt; Wrong bug ID?
&gt; 
&gt; Looks like it should have been bug 46225.

Right. Sorry!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282910</commentid>
    <comment_count>8</comment_count>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2010-09-22 07:07:39 -0700</bug_when>
    <thetext>(In reply to comment #2)
&gt; (From update of attachment 68284 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=68284&amp;action=review
&gt; 
&gt; Looks good to me other than the nits noted below.
&gt; 
&gt; I have a patch in progress that adds essentially the same line to port/chromium.py plus handles the Chromium DRT case and the new baseline search path we&apos;ll want. I should have it ready inside an hour or so (I would&apos;ve finished it last night but I got derailed by another bug), so whichever of the two lands first can be coordinated with the other one.

OK, your patch looks good to me, so I&apos;m going to try your patch against the DRT changes in this patch, and if it all works I&apos;ll just revert all the python changes in this patch and resubmit.

&gt; &gt; WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:577
&gt; &gt; +        test_args.enable_accelerated_2d_canvas = self._options.enable_accelerated_2d_canvas
&gt; 
&gt; I don&apos;t think you need this.
&gt;
&gt; &gt; WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:1663
&gt; &gt; +            dest=&quot;enable_accelerated_2d_canvas&quot;,
&gt; 
&gt; I don&apos;t think you need this, either.
&gt; 
&gt; &gt; WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py:360
&gt; &gt; +
&gt; 
&gt; Here you need to check if enable-accelerated-2d-canvas is not actually set (since there&apos;s no default value):
&gt; 
&gt; if hasattr(self._options, &apos;enable_accelerated_2d_canvas&apos;) and self._options.enable_accelerated_2d_canvas): ...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>282924</commentid>
    <comment_count>9</comment_count>
      <attachid>68370</attachid>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2010-09-22 07:37:21 -0700</bug_when>
    <thetext>Created attachment 68370
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>283268</commentid>
    <comment_count>10</comment_count>
      <attachid>68370</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2010-09-22 14:55:27 -0700</bug_when>
    <thetext>Comment on attachment 68370
Patch

change looks good to me, but I&apos;m not a reviewer.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>283621</commentid>
    <comment_count>11</comment_count>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2010-09-23 07:24:40 -0700</bug_when>
    <thetext>Committed r68136: &lt;http://trac.webkit.org/changeset/68136&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>283634</commentid>
    <comment_count>12</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2010-09-23 07:51:37 -0700</bug_when>
    <thetext>http://trac.webkit.org/changeset/68136 might have broken Chromium Linux Release
The following changes are on the blame list:
http://trac.webkit.org/changeset/68136
http://trac.webkit.org/changeset/68137
http://trac.webkit.org/changeset/68138</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>68284</attachid>
            <date>2010-09-21 13:34:51 -0700</date>
            <delta_ts>2010-09-22 07:37:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-46208-20100921163449.patch</filename>
            <type>text/plain</type>
            <size>8608</size>
            <attacher name="Stephen White">senorblanco</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDY3OTc0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTAtMDktMjEgIFN0ZXBoZW4gV2hpdGUgIDxz
ZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IC0tZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZh
cyBmbGFnIGluIER1bXBSZW5kZXJUcmVlCisgICAgICAgIGFuZCBydW5fd2Via2l0X3Rlc3RzLnB5
LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMDgK
KworICAgICAgICBUaGlzIGZsYWcgYWxsb3dzIHRoZSBsYXlvdXQgdGVzdHMgdG8gYmUgcnVuIHdp
dGggb3Igd2l0aG91dCBhY2NlbGVyYXRlZAorICAgICAgICAyRCBjYW52YXMgcmVuZGVyaW5nLgor
CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwOgor
ICAgICAgICAobWFpbik6CisgICAgICAgIERlY2xhcmUgdGhlIG5ldyBmbGFnIHN0cmluZywgYW5k
IGNoZWNrIGZvciBpdCBvbiBzdGFydHVwLgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9t
aXVtL1Rlc3RTaGVsbC5jcHA6CisgICAgICAgIChUZXN0U2hlbGw6OlRlc3RTaGVsbCk6CisgICAg
ICAgIEFkZCBhIGJvb2xlYW4gZm9yIHRoZSBuZXcgZmxhZywgaW4gb3JkZXIgdG8gcHJlc2VydmUg
aXRzIHZhbHVlIG92ZXIKKyAgICAgICAgcHJlZmVyZW5jZXMgcmVzZXQuCisgICAgICAgIChUZXN0
U2hlbGw6OnJlc2V0V2ViU2V0dGluZ3MpOgorICAgICAgICBTZXQgdGhlIG5ldyBmbGFnIHRvIHRo
ZSBzdG9yZWQgdmFsdWUgb24gcmVzZXQuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p
dW0vVGVzdFNoZWxsLmg6CisgICAgICAgIChUZXN0U2hlbGw6OnNldEFjY2VsZXJhdGVkMmRDYW52
YXNFbmFibGVkKToKKyAgICAgICAgQWRkIGFuIGFjY2Vzc29yIGZvciB0aGUgbmV3IGZsYWcuCisg
ICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuY3BwOgorICAg
ICAgICAoV2ViUHJlZmVyZW5jZXM6OnJlc2V0KToKKyAgICAgICAgSW5pdGlhbGl6ZSB0aGUgbmV3
IGZsYWcgdG8gZmFsc2UuCisgICAgICAgIChXZWJQcmVmZXJlbmNlczo6YXBwbHlUbyk6CisgICAg
ICAgIENvcHkgdGhlIGZsYWcncyB2YWx1ZSB0byB0aGUgV2ViU2V0dGluZ3MuCisgICAgICAgICog
RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuaDoKKyAgICAgICAgQWRkIHRo
ZSBuZXcgZmxhZy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0
L2Nocm9taXVtLnB5OgorICAgICAgICBEZWNsYXJlIHRoZSBuZXcgZmxhZyAoYW5kIGl0cyBoZWxw
IHRleHQpLCBhbmQgY2hlY2sgZm9yIGl0IG9uIAorICAgICAgICBzdGFydHVwLgorICAgICAgICB0
ZXN0X3NoZWxsL0R1bXBSZW5kZXJUcmVlLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5
b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgIElmIHRoZSBuZXcgZmxhZyBp
cyBzZXQgaW4gdGVzdF9hcmdzLCBwYXNzIGl0IHRvCisgICAgICAgIHRlc3Rfc2hlbGwvRHVtcFJl
bmRlclRyZWUuCisKIDIwMTAtMDktMTcgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5v
cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KSW5kZXg6IFdlYktpdFRvb2xz
L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJlZS5jcHAJ
KHJldmlzaW9uIDY3OTQ4KQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v
RHVtcFJlbmRlclRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw3IEBAIHN0YXRp
YyBjb25zdCBjaGFyIG9wdGlvblRlc3RTaGVsbFtdID0gIi0KIHN0YXRpYyBjb25zdCBjaGFyIG9w
dGlvbkFsbG93RXh0ZXJuYWxQYWdlc1tdID0gIi0tYWxsb3ctZXh0ZXJuYWwtcGFnZXMiOwogc3Rh
dGljIGNvbnN0IGNoYXIgb3B0aW9uU3RhcnR1cERpYWxvZ1tdID0gIi0tdGVzdHNoZWxsLXN0YXJ0
dXAtZGlhbG9nIjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkNoZWNrTGF5b3V0VGVzdFN5c3Rl
bURlcHNbXSA9ICItLWNoZWNrLWxheW91dC10ZXN0LXN5cy1kZXBzIjsKK3N0YXRpYyBjb25zdCBj
aGFyIG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkMkRDYW52YXNbXSA9ICItLWVuYWJsZS1hY2NlbGVy
YXRlZC0yZC1jYW52YXMiOwogCiBzdGF0aWMgdm9pZCBydW5UZXN0KFRlc3RTaGVsbCYgc2hlbGws
IFRlc3RQYXJhbXMmIHBhcmFtcywgY29uc3Qgc3RyaW5nJiB0ZXN0TmFtZSwgYm9vbCB0ZXN0U2hl
bGxNb2RlKQogewpAQCAtOTIsNiArOTMsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJn
dltdKQogICAgIGJvb2wgdGVzdFNoZWxsTW9kZSA9IGZhbHNlOwogICAgIGJvb2wgYWxsb3dFeHRl
cm5hbFBhZ2VzID0gZmFsc2U7CiAgICAgYm9vbCBzdGFydHVwRGlhbG9nID0gZmFsc2U7CisgICAg
Ym9vbCBhY2NlbGVyYXRlZDJEQ2FudmFzRW5hYmxlZCA9IGZhbHNlOwogICAgIGZvciAoaW50IGkg
PSAxOyBpIDwgYXJnYzsgKytpKSB7CiAgICAgICAgIHN0cmluZyBhcmd1bWVudChhcmd2W2ldKTsK
ICAgICAgICAgaWYgKGFyZ3VtZW50ID09ICItIikKQEAgLTExMiw2ICsxMTQsOCBAQCBpbnQgbWFp
bihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAgICAgICAgc3RhcnR1cERpYWxvZyA9IHRy
dWU7CiAgICAgICAgIGVsc2UgaWYgKGFyZ3VtZW50ID09IG9wdGlvbkNoZWNrTGF5b3V0VGVzdFN5
c3RlbURlcHMpCiAgICAgICAgICAgICBleGl0KGNoZWNrTGF5b3V0VGVzdFN5c3RlbURlcGVuZGVu
Y2llcygpID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgICAgICAgZWxzZSBpZiAo
YXJndW1lbnQgPT0gb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWQyRENhbnZhcykKKyAgICAgICAgICAg
IGFjY2VsZXJhdGVkMkRDYW52YXNFbmFibGVkID0gdHJ1ZTsKICAgICAgICAgZWxzZSBpZiAoYXJn
dW1lbnQuc2l6ZSgpICYmIGFyZ3VtZW50WzBdID09ICctJykKICAgICAgICAgICAgIGZwcmludGYo
c3RkZXJyLCAiVW5rbm93biBvcHRpb246ICVzXG4iLCBhcmd2W2ldKTsKICAgICAgICAgZWxzZQpA
QCAtMTI4LDYgKzEzMiw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAg
eyAvLyBFeHBsaWNpdCBzY29wZSBmb3IgdGhlIFRlc3RTaGVsbCBpbnN0YW5jZS4KICAgICAgICAg
VGVzdFNoZWxsIHNoZWxsKHRlc3RTaGVsbE1vZGUpOwogICAgICAgICBzaGVsbC5zZXRBbGxvd0V4
dGVybmFsUGFnZXMoYWxsb3dFeHRlcm5hbFBhZ2VzKTsKKyAgICAgICAgc2hlbGwuc2V0QWNjZWxl
cmF0ZWQyZENhbnZhc0VuYWJsZWQoYWNjZWxlcmF0ZWQyRENhbnZhc0VuYWJsZWQpOwogICAgICAg
ICBpZiAoc2VydmVyTW9kZSAmJiAhdGVzdHMuc2l6ZSgpKSB7CiAgICAgICAgICAgICBwYXJhbXMu
cHJpbnRTZXBhcmF0b3JzID0gdHJ1ZTsKICAgICAgICAgICAgIGNoYXIgdGVzdFN0cmluZ1syMDQ4
XTsgLy8gMjA0OCBpcyB0aGUgc2FtZSBhcyB0aGUgc2l6ZXMgb2Ygb3RoZXIgcGxhdGZvcm1zLgpJ
bmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hl
bGwuY3BwCShyZXZpc2lvbiA2Nzk0OCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2No
cm9taXVtL1Rlc3RTaGVsbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDYgKzgzLDcgQEAgVGVz
dFNoZWxsOjpUZXN0U2hlbGwoYm9vbCB0ZXN0U2hlbGxNb2RlKQogICAgICwgbV9mb2N1c2VkV2lk
Z2V0KDApCiAgICAgLCBtX3Rlc3RTaGVsbE1vZGUodGVzdFNoZWxsTW9kZSkKICAgICAsIG1fYWxs
b3dFeHRlcm5hbFBhZ2VzKGZhbHNlKQorICAgICwgbV9hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxl
ZChmYWxzZSkKICAgICAsIG1fZGV2VG9vbHMoMCkKIHsKICAgICBXZWJSdW50aW1lRmVhdHVyZXM6
OmVuYWJsZUdlb2xvY2F0aW9uKHRydWUpOwpAQCAtMTU1LDYgKzE1Niw3IEBAIHZvaWQgVGVzdFNo
ZWxsOjpjbG9zZURldlRvb2xzKCkKIHZvaWQgVGVzdFNoZWxsOjpyZXNldFdlYlNldHRpbmdzKFdl
YlZpZXcmIHdlYlZpZXcpCiB7CiAgICAgbV9wcmVmcy5yZXNldCgpOworICAgIG1fcHJlZnMuYWNj
ZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQgPSBtX2FjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkOwog
ICAgIG1fcHJlZnMuYXBwbHlUbygmd2ViVmlldyk7CiB9CiAKSW5kZXg6IFdlYktpdFRvb2xzL0R1
bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5oCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRv
b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5oCShyZXZpc2lvbiA2Nzk0OCkK
KysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5oCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xMjMsNiArMTIzLDggQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dFeHRl
cm5hbFBhZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9hbGxvd0V4dGVybmFsUGFnZXM7IH0KICAgICB2
b2lkIHNldEFsbG93RXh0ZXJuYWxQYWdlcyhib29sIGFsbG93RXh0ZXJuYWxQYWdlcykgeyBtX2Fs
bG93RXh0ZXJuYWxQYWdlcyA9IGFsbG93RXh0ZXJuYWxQYWdlczsgfQogCisgICAgdm9pZCBzZXRB
Y2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9hY2NlbGVyYXRlZDJk
Q2FudmFzRW5hYmxlZCA9IGVuYWJsZWQ7IH0KKwogI2lmIGRlZmluZWQoT1NfV0lOKQogICAgIC8v
IEFjY2VzcyB0byB0aGUgZmluaXNoZWQgZXZlbnQuICBVc2VkIGJ5IHRoZSBzdGF0aWMgV2F0Y2hE
b2cgdGhyZWFkLgogICAgIEhBTkRMRSBmaW5pc2hlZEV2ZW50KCkgeyByZXR1cm4gbV9maW5pc2hl
ZEV2ZW50OyB9CkBAIC0xNzYsNiArMTc4LDcgQEAgcHJpdmF0ZToKICAgICBUZXN0UGFyYW1zIG1f
cGFyYW1zOwogICAgIGludCBtX3RpbWVvdXQ7IC8vIHRpbWVvdXQgdmFsdWUgaW4gbWlsbGlzZWNv
bmQKICAgICBib29sIG1fYWxsb3dFeHRlcm5hbFBhZ2VzOworICAgIGJvb2wgbV9hY2NlbGVyYXRl
ZDJkQ2FudmFzRW5hYmxlZDsKICAgICBXZWJQcmVmZXJlbmNlcyBtX3ByZWZzOwogCiAgICAgLy8g
TGlzdCBvZiBhbGwgd2luZG93cyBpbiB0aGlzIHByb2Nlc3MuCkluZGV4OiBXZWJLaXRUb29scy9E
dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuY3BwCShy
ZXZpc2lvbiA2Nzk0OCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dl
YlByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAwLDYgKzEwMCw3IEBAIHZvaWQg
V2ViUHJlZmVyZW5jZXM6OnJlc2V0KCkKICNlbmRpZgogCiAgICAgdGFic1RvTGlua3MgPSBmYWxz
ZTsKKyAgICBhY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCA9IGZhbHNlOwogfQogCiB2b2lkIFdl
YlByZWZlcmVuY2VzOjphcHBseVRvKFdlYlZpZXcqIHdlYlZpZXcpCkBAIC0xNTcsNSArMTU4LDcg
QEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6YXBwbHlUbyhXZWJWaWV3KiB3ZQogCiAgICAgLy8gRklY
TUU6IGNyYnVnLmNvbS81MTg3OQogICAgIHNldHRpbmdzLT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0
aW5nRW5hYmxlZChmYWxzZSk7CisKKyAgICBzZXR0aW5ncy0+c2V0QWNjZWxlcmF0ZWQyZENhbnZh
c0VuYWJsZWQoYWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQpOwogfQogCkluZGV4OiBXZWJLaXRU
b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5oCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmgJ
KHJldmlzaW9uIDY3OTQ4KQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v
V2ViUHJlZmVyZW5jZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNzUsNiArNzUsNyBAQCBzdHJ1Y3Qg
V2ViUHJlZmVyZW5jZXMgewogICAgIGJvb2wgYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS
THM7CiAgICAgV2ViS2l0OjpXZWJTZXR0aW5nczo6RWRpdGluZ0JlaGF2aW9yIGVkaXRpbmdCZWhh
dmlvcjsKICAgICBib29sIHRhYnNUb0xpbmtzOworICAgIGJvb2wgYWNjZWxlcmF0ZWQyZENhbnZh
c0VuYWJsZWQ7CiAKICAgICBXZWJQcmVmZXJlbmNlcygpIHsgcmVzZXQoKTsgfQogICAgIHZvaWQg
cmVzZXQoKTsKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz
L3J1bl93ZWJraXRfdGVzdHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy93
ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQkocmV2aXNpb24gNjc5NDgp
CisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0
X3Rlc3RzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC01NzQsNiArNTc0LDcgQEAgY2xhc3MgVGVzdFJ1
bm5lcjoKICAgICAgICAgICAgIHRlc3RfYXJncy5wbmdfcGF0aCA9IHBuZ19wYXRoCiAgICAgICAg
IHRlc3RfYXJncy5uZXdfYmFzZWxpbmUgPSBzZWxmLl9vcHRpb25zLm5ld19iYXNlbGluZQogICAg
ICAgICB0ZXN0X2FyZ3MucmVzZXRfcmVzdWx0cyA9IHNlbGYuX29wdGlvbnMucmVzZXRfcmVzdWx0
cworICAgICAgICB0ZXN0X2FyZ3MuZW5hYmxlX2FjY2VsZXJhdGVkXzJkX2NhbnZhcyA9IHNlbGYu
X29wdGlvbnMuZW5hYmxlX2FjY2VsZXJhdGVkXzJkX2NhbnZhcwogCiAgICAgICAgIHJldHVybiB0
ZXN0X2FyZ3MKIApAQCAtMTY1Nyw2ICsxNjU4LDEwIEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9u
ZSk6CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5vLXJldHJ5LWZhaWx1cmVzIiwg
YWN0aW9uPSJzdG9yZV9mYWxzZSIsCiAgICAgICAgICAgICBkZXN0PSJyZXRyeV9mYWlsdXJlcyIs
CiAgICAgICAgICAgICBoZWxwPSJEb24ndCByZS10cnkgYW55IHRlc3RzIHRoYXQgcHJvZHVjZSB1
bmV4cGVjdGVkIHJlc3VsdHMuIiksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWVu
YWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMiLAorICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV90
cnVlIiwKKyAgICAgICAgICAgIGRlc3Q9ImVuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXMiLAor
ICAgICAgICAgICAgaGVscD0iVXNlIHRoZSBhY2NlbGVyYXRlZCBwYXRoIHdoZW4gcmVuZGVyaW5n
IDJEIGNhbnZhcyBlbGVtZW50cy4iKSwKICAgICBdCiAKICAgICBtaXNjX29wdGlvbnMgPSBbCklu
ZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t
aXVtLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0
X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkJKHJldmlzaW9uIDY3OTQ4KQorKysgV2ViS2l0VG9vbHMv
U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQkod29ya2luZyBj
b3B5KQpAQCAtMzU0LDYgKzM1NCwxMCBAQCBjbGFzcyBDaHJvbWl1bURyaXZlcihiYXNlLkRyaXZl
cik6CiAKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5ncF9mYXVsdF9lcnJvcl9ib3g6CiAgICAg
ICAgICAgICBkcml2ZXJfYXJncy5hcHBlbmQoJy0tZ3AtZmF1bHQtZXJyb3ItYm94JykKKworICAg
ICAgICBpZiBzZWxmLl9vcHRpb25zLmVuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXM6CisgICAg
ICAgICAgICBkcml2ZXJfYXJncy5hcHBlbmQoJy0tZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZh
cycpCisKICAgICAgICAgcmV0dXJuIGRyaXZlcl9hcmdzCiAKICAgICBkZWYgc3RhcnQoc2VsZik6
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>68370</attachid>
            <date>2010-09-22 07:37:21 -0700</date>
            <delta_ts>2010-09-22 15:27:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-46208-20100922103719.patch</filename>
            <type>text/plain</type>
            <size>6475</size>
            <attacher name="Stephen White">senorblanco</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDY4MDM2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTAtMDktMjEgIFN0ZXBoZW4gV2hpdGUgIDxz
ZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IC0tZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZh
cyBmbGFnIGluIER1bXBSZW5kZXJUcmVlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMDgKKworICAgICAgICBUaGlzIGZsYWcgYWxsb3dzIHRoZSBs
YXlvdXQgdGVzdHMgdG8gYmUgcnVuIHdpdGggb3Igd2l0aG91dCBhY2NlbGVyYXRlZAorICAgICAg
ICAyRCBjYW52YXMgcmVuZGVyaW5nLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p
dW0vRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAobWFpbik6CisgICAgICAgIERlY2xhcmUg
dGhlIG5ldyBmbGFnIHN0cmluZywgYW5kIGNoZWNrIGZvciBpdCBvbiBzdGFydHVwLgorICAgICAg
ICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHA6CisgICAgICAgIChUZXN0
U2hlbGw6OlRlc3RTaGVsbCk6CisgICAgICAgIEFkZCBhIGJvb2xlYW4gZm9yIHRoZSBuZXcgZmxh
ZywgaW4gb3JkZXIgdG8gcHJlc2VydmUgaXRzIHZhbHVlIG92ZXIKKyAgICAgICAgcHJlZmVyZW5j
ZXMgcmVzZXQuCisgICAgICAgIChUZXN0U2hlbGw6OnJlc2V0V2ViU2V0dGluZ3MpOgorICAgICAg
ICBTZXQgdGhlIG5ldyBmbGFnIHRvIHRoZSBzdG9yZWQgdmFsdWUgb24gcmVzZXQuCisgICAgICAg
ICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmg6CisgICAgICAgIChUZXN0U2hl
bGw6OnNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKToKKyAgICAgICAgQWRkIGFuIGFjY2Vz
c29yIGZvciB0aGUgbmV3IGZsYWcuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v
V2ViUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViUHJlZmVyZW5jZXM6OnJlc2V0KToKKyAg
ICAgICAgSW5pdGlhbGl6ZSB0aGUgbmV3IGZsYWcgdG8gZmFsc2UuCisgICAgICAgIChXZWJQcmVm
ZXJlbmNlczo6YXBwbHlUbyk6CisgICAgICAgIENvcHkgdGhlIGZsYWcncyB2YWx1ZSB0byB0aGUg
V2ViU2V0dGluZ3MuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVy
ZW5jZXMuaDoKKyAgICAgICAgQWRkIHRoZSBuZXcgZmxhZy4KKwogMjAxMC0wOS0yMSAgRGlyayBQ
cmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBidWls
ZCBmaXguCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVu
ZGVyVHJlZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy
b21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCShyZXZpc2lvbiA2ODAzNikKKysrIFdlYktpdFRvb2xz
L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcAkod29ya2luZyBjb3B5
KQpAQCAtNDgsNiArNDgsNyBAQCBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25UZXN0U2hlbGxbXSA9
ICItCiBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25BbGxvd0V4dGVybmFsUGFnZXNbXSA9ICItLWFs
bG93LWV4dGVybmFsLXBhZ2VzIjsKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvblN0YXJ0dXBEaWFs
b2dbXSA9ICItLXRlc3RzaGVsbC1zdGFydHVwLWRpYWxvZyI7CiBzdGF0aWMgY29uc3QgY2hhciBv
cHRpb25DaGVja0xheW91dFRlc3RTeXN0ZW1EZXBzW10gPSAiLS1jaGVjay1sYXlvdXQtdGVzdC1z
eXMtZGVwcyI7CitzdGF0aWMgY29uc3QgY2hhciBvcHRpb25FbmFibGVBY2NlbGVyYXRlZDJEQ2Fu
dmFzW10gPSAiLS1lbmFibGUtYWNjZWxlcmF0ZWQtMmQtY2FudmFzIjsKIAogc3RhdGljIHZvaWQg
cnVuVGVzdChUZXN0U2hlbGwmIHNoZWxsLCBUZXN0UGFyYW1zJiBwYXJhbXMsIGNvbnN0IHN0cmlu
ZyYgdGVzdE5hbWUsIGJvb2wgdGVzdFNoZWxsTW9kZSkKIHsKQEAgLTkyLDYgKzkzLDcgQEAgaW50
IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICBib29sIHRlc3RTaGVsbE1vZGUgPSBm
YWxzZTsKICAgICBib29sIGFsbG93RXh0ZXJuYWxQYWdlcyA9IGZhbHNlOwogICAgIGJvb2wgc3Rh
cnR1cERpYWxvZyA9IGZhbHNlOworICAgIGJvb2wgYWNjZWxlcmF0ZWQyRENhbnZhc0VuYWJsZWQg
PSBmYWxzZTsKICAgICBmb3IgKGludCBpID0gMTsgaSA8IGFyZ2M7ICsraSkgewogICAgICAgICBz
dHJpbmcgYXJndW1lbnQoYXJndltpXSk7CiAgICAgICAgIGlmIChhcmd1bWVudCA9PSAiLSIpCkBA
IC0xMTIsNiArMTE0LDggQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICAg
ICAgICAgIHN0YXJ0dXBEaWFsb2cgPSB0cnVlOwogICAgICAgICBlbHNlIGlmIChhcmd1bWVudCA9
PSBvcHRpb25DaGVja0xheW91dFRlc3RTeXN0ZW1EZXBzKQogICAgICAgICAgICAgZXhpdChjaGVj
a0xheW91dFRlc3RTeXN0ZW1EZXBlbmRlbmNpZXMoKSA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJ
TFVSRSk7CisgICAgICAgIGVsc2UgaWYgKGFyZ3VtZW50ID09IG9wdGlvbkVuYWJsZUFjY2VsZXJh
dGVkMkRDYW52YXMpCisgICAgICAgICAgICBhY2NlbGVyYXRlZDJEQ2FudmFzRW5hYmxlZCA9IHRy
dWU7CiAgICAgICAgIGVsc2UgaWYgKGFyZ3VtZW50LnNpemUoKSAmJiBhcmd1bWVudFswXSA9PSAn
LScpCiAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIlVua25vd24gb3B0aW9uOiAlc1xuIiwg
YXJndltpXSk7CiAgICAgICAgIGVsc2UKQEAgLTEyOCw2ICsxMzIsNyBAQCBpbnQgbWFpbihpbnQg
YXJnYywgY2hhciogYXJndltdKQogICAgIHsgLy8gRXhwbGljaXQgc2NvcGUgZm9yIHRoZSBUZXN0
U2hlbGwgaW5zdGFuY2UuCiAgICAgICAgIFRlc3RTaGVsbCBzaGVsbCh0ZXN0U2hlbGxNb2RlKTsK
ICAgICAgICAgc2hlbGwuc2V0QWxsb3dFeHRlcm5hbFBhZ2VzKGFsbG93RXh0ZXJuYWxQYWdlcyk7
CisgICAgICAgIHNoZWxsLnNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGFjY2VsZXJhdGVk
MkRDYW52YXNFbmFibGVkKTsKICAgICAgICAgaWYgKHNlcnZlck1vZGUgJiYgIXRlc3RzLnNpemUo
KSkgewogICAgICAgICAgICAgcGFyYW1zLnByaW50U2VwYXJhdG9ycyA9IHRydWU7CiAgICAgICAg
ICAgICBjaGFyIHRlc3RTdHJpbmdbMjA0OF07IC8vIDIwNDggaXMgdGhlIHNhbWUgYXMgdGhlIHNp
emVzIG9mIG90aGVyIHBsYXRmb3Jtcy4KSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl
L2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJl
bmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAkocmV2aXNpb24gNjgwMzYpCisrKyBXZWJL
aXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCSh3b3JraW5nIGNv
cHkpCkBAIC04Myw2ICs4Myw3IEBAIFRlc3RTaGVsbDo6VGVzdFNoZWxsKGJvb2wgdGVzdFNoZWxs
TW9kZSkKICAgICAsIG1fZm9jdXNlZFdpZGdldCgwKQogICAgICwgbV90ZXN0U2hlbGxNb2RlKHRl
c3RTaGVsbE1vZGUpCiAgICAgLCBtX2FsbG93RXh0ZXJuYWxQYWdlcyhmYWxzZSkKKyAgICAsIG1f
YWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoZmFsc2UpCiAgICAgLCBtX2RldlRvb2xzKDApCiB7
CiAgICAgV2ViUnVudGltZUZlYXR1cmVzOjplbmFibGVHZW9sb2NhdGlvbih0cnVlKTsKQEAgLTE1
NSw2ICsxNTYsNyBAQCB2b2lkIFRlc3RTaGVsbDo6Y2xvc2VEZXZUb29scygpCiB2b2lkIFRlc3RT
aGVsbDo6cmVzZXRXZWJTZXR0aW5ncyhXZWJWaWV3JiB3ZWJWaWV3KQogewogICAgIG1fcHJlZnMu
cmVzZXQoKTsKKyAgICBtX3ByZWZzLmFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkID0gbV9hY2Nl
bGVyYXRlZDJkQ2FudmFzRW5hYmxlZDsKICAgICBtX3ByZWZzLmFwcGx5VG8oJndlYlZpZXcpOwog
fQogCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwu
aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0
U2hlbGwuaAkocmV2aXNpb24gNjgwMzYpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9j
aHJvbWl1bS9UZXN0U2hlbGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTIzLDYgKzEyMyw4IEBAIHB1
YmxpYzoKICAgICBib29sIGFsbG93RXh0ZXJuYWxQYWdlcygpIGNvbnN0IHsgcmV0dXJuIG1fYWxs
b3dFeHRlcm5hbFBhZ2VzOyB9CiAgICAgdm9pZCBzZXRBbGxvd0V4dGVybmFsUGFnZXMoYm9vbCBh
bGxvd0V4dGVybmFsUGFnZXMpIHsgbV9hbGxvd0V4dGVybmFsUGFnZXMgPSBhbGxvd0V4dGVybmFs
UGFnZXM7IH0KIAorICAgIHZvaWQgc2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9vbCBl
bmFibGVkKSB7IG1fYWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQgPSBlbmFibGVkOyB9CisKICNp
ZiBkZWZpbmVkKE9TX1dJTikKICAgICAvLyBBY2Nlc3MgdG8gdGhlIGZpbmlzaGVkIGV2ZW50LiAg
VXNlZCBieSB0aGUgc3RhdGljIFdhdGNoRG9nIHRocmVhZC4KICAgICBIQU5ETEUgZmluaXNoZWRF
dmVudCgpIHsgcmV0dXJuIG1fZmluaXNoZWRFdmVudDsgfQpAQCAtMTc2LDYgKzE3OCw3IEBAIHBy
aXZhdGU6CiAgICAgVGVzdFBhcmFtcyBtX3BhcmFtczsKICAgICBpbnQgbV90aW1lb3V0OyAvLyB0
aW1lb3V0IHZhbHVlIGluIG1pbGxpc2Vjb25kCiAgICAgYm9vbCBtX2FsbG93RXh0ZXJuYWxQYWdl
czsKKyAgICBib29sIG1fYWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQ7CiAgICAgV2ViUHJlZmVy
ZW5jZXMgbV9wcmVmczsKIAogICAgIC8vIExpc3Qgb2YgYWxsIHdpbmRvd3MgaW4gdGhpcyBwcm9j
ZXNzLgpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVy
ZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t
aXVtL1dlYlByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gNjgwMzYpCisrKyBXZWJLaXRUb29scy9E
dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkK
QEAgLTEwMCw2ICsxMDAsNyBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjpyZXNldCgpCiAjZW5kaWYK
IAogICAgIHRhYnNUb0xpbmtzID0gZmFsc2U7CisgICAgYWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJs
ZWQgPSBmYWxzZTsKIH0KIAogdm9pZCBXZWJQcmVmZXJlbmNlczo6YXBwbHlUbyhXZWJWaWV3KiB3
ZWJWaWV3KQpAQCAtMTU3LDUgKzE1OCw3IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6OmFwcGx5VG8o
V2ViVmlldyogd2UKIAogICAgIC8vIEZJWE1FOiBjcmJ1Zy5jb20vNTE4NzkKICAgICBzZXR0aW5n
cy0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoZmFsc2UpOworCisgICAgc2V0dGlu
Z3MtPnNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGFjY2VsZXJhdGVkMmRDYW52YXNFbmFi
bGVkKTsKIH0KIApJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2Vi
UHJlZmVyZW5jZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9j
aHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5oCShyZXZpc2lvbiA2ODAzNikKKysrIFdlYktpdFRvb2xz
L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmgJKHdvcmtpbmcgY29weSkK
QEAgLTc1LDYgKzc1LDcgQEAgc3RydWN0IFdlYlByZWZlcmVuY2VzIHsKICAgICBib29sIGFsbG93
VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzOwogICAgIFdlYktpdDo6V2ViU2V0dGluZ3M6OkVk
aXRpbmdCZWhhdmlvciBlZGl0aW5nQmVoYXZpb3I7CiAgICAgYm9vbCB0YWJzVG9MaW5rczsKKyAg
ICBib29sIGFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkOwogCiAgICAgV2ViUHJlZmVyZW5jZXMo
KSB7IHJlc2V0KCk7IH0KICAgICB2b2lkIHJlc2V0KCk7Cg==
</data>
<flag name="review"
          id="57878"
          type_id="1"
          status="+"
          setter="levin"
    />
          </attachment>
      

    </bug>

</bugzilla>