<?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>89264</bug_id>
          
          <creation_ts>2012-06-15 19:05:14 -0700</creation_ts>
          <short_desc>Plumb Scrollbar button dimensions down to WebThemeEngine</short_desc>
          <delta_ts>2012-06-25 18:49:29 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>REOPENED</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>
          <dependson>89934</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Scott Graham">scottmg</reporter>
          <assigned_to name="Scott Graham">scottmg</assigned_to>
          <cc>abarth</cc>
    
    <cc>dglazkov</cc>
    
    <cc>fishd</cc>
    
    <cc>jamesr</cc>
    
    <cc>tkent+wkapi</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>650687</commentid>
    <comment_count>0</comment_count>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-15 19:05:14 -0700</bug_when>
    <thetext>[Chromium] Plumb Scrollbar button dimensions down to native_theme</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651620</commentid>
    <comment_count>1</comment_count>
      <attachid>148149</attachid>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-18 12:36:09 -0700</bug_when>
    <thetext>Created attachment 148149
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651623</commentid>
    <comment_count>2</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-18 12:41:02 -0700</bug_when>
    <thetext>Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651624</commentid>
    <comment_count>3</comment_count>
      <attachid>148151</attachid>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-18 12:43:18 -0700</bug_when>
    <thetext>Created attachment 148151
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651625</commentid>
    <comment_count>4</comment_count>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-18 12:43:53 -0700</bug_when>
    <thetext>(Requires https://chromiumcodereview.appspot.com/10532207/ to land on Chromium side first.)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651628</commentid>
    <comment_count>5</comment_count>
      <attachid>148149</attachid>
    <who name="James Robinson">jamesr</who>
    <bug_when>2012-06-18 12:47:29 -0700</bug_when>
    <thetext>Comment on attachment 148149
Patch

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

&gt; Source/Platform/chromium/public/win/WebThemeEngine.h:85
&gt; +    virtual int getScrollbarArrowSize(int partId) = 0;

the rest of this file seems to juse use &quot;int part&quot;, not partId.

is there a particular reason you want this to work only for the scrollbar arrow part IDs? android and linux let you ask for the size of any part

&gt; Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp:254
&gt; +    bool horz = scrollbar-&gt;orientation() == HorizontalScrollbar;
&gt; +    int standardGirth = PlatformSupport::getScrollbarArrowSize(horz ? DFCS_SCROLLLEFT : DFCS_SCROLLUP);

WebKit style is not to abbreviate variable names (and there&apos;s no column limit), so I&apos;d expect &quot;horz&quot; into &quot;horizontal&quot;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651629</commentid>
    <comment_count>6</comment_count>
      <attachid>148149</attachid>
    <who name="James Robinson">jamesr</who>
    <bug_when>2012-06-18 12:47:42 -0700</bug_when>
    <thetext>Comment on attachment 148149
Patch

stupid bugzilla</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651656</commentid>
    <comment_count>7</comment_count>
      <attachid>148159</attachid>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-18 13:25:42 -0700</bug_when>
    <thetext>Created attachment 148159
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651658</commentid>
    <comment_count>8</comment_count>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-18 13:26:56 -0700</bug_when>
    <thetext>(In reply to comment #5)
&gt; (From update of attachment 148149 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=148149&amp;action=review
&gt; 
&gt; &gt; Source/Platform/chromium/public/win/WebThemeEngine.h:85
&gt; &gt; +    virtual int getScrollbarArrowSize(int partId) = 0;
&gt; 
&gt; the rest of this file seems to juse use &quot;int part&quot;, not partId.

Done.

&gt; is there a particular reason you want this to work only for the scrollbar arrow part IDs? android and linux let you ask for the size of any part

Done.

&gt; 
&gt; &gt; Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp:254
&gt; &gt; +    bool horz = scrollbar-&gt;orientation() == HorizontalScrollbar;
&gt; &gt; +    int standardGirth = PlatformSupport::getScrollbarArrowSize(horz ? DFCS_SCROLLLEFT : DFCS_SCROLLUP);
&gt; 
&gt; WebKit style is not to abbreviate variable names (and there&apos;s no column limit), so I&apos;d expect &quot;horz&quot; into &quot;horizontal&quot;

Copied from above.

I realized I was using the wrong defines anyway per http://msdn.microsoft.com/en-us/library/windows/desktop/bb773210(v=vs.85).aspx so there&apos;s no distinction between horizontal/vertical anyway.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651664</commentid>
    <comment_count>9</comment_count>
      <attachid>148159</attachid>
    <who name="James Robinson">jamesr</who>
    <bug_when>2012-06-18 13:34:32 -0700</bug_when>
    <thetext>Comment on attachment 148159
Patch

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

&gt; Source/Platform/chromium/public/win/WebThemeEngine.h:85
&gt; +    virtual int getSize(int part) = 0;

Add a comment saying what the size means and what parts it can be queried for</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651697</commentid>
    <comment_count>10</comment_count>
      <attachid>148166</attachid>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-18 13:56:07 -0700</bug_when>
    <thetext>Created attachment 148166
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651698</commentid>
    <comment_count>11</comment_count>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-18 13:56:47 -0700</bug_when>
    <thetext>(In reply to comment #9)
&gt; (From update of attachment 148159 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=148159&amp;action=review
&gt; 
&gt; &gt; Source/Platform/chromium/public/win/WebThemeEngine.h:85
&gt; &gt; +    virtual int getSize(int part) = 0;
&gt; 
&gt; Add a comment saying what the size means and what parts it can be queried for

Done. Also made it a WebSize/IntSize because on writing the comment realized it made no sense to be an int.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651860</commentid>
    <comment_count>12</comment_count>
      <attachid>148166</attachid>
    <who name="James Robinson">jamesr</who>
    <bug_when>2012-06-18 16:20:40 -0700</bug_when>
    <thetext>Comment on attachment 148166
Patch

R=me. Guessing we want to hold off on commit-queue until the chromium side lands, right?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>651915</commentid>
    <comment_count>13</comment_count>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-18 17:37:15 -0700</bug_when>
    <thetext>(In reply to comment #12)
&gt; (From update of attachment 148166 [details])
&gt; R=me. Guessing we want to hold off on commit-queue until the chromium side lands, right?

Thanks. Yes, I&apos;ll ping you when this is safe to cq+.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>652778</commentid>
    <comment_count>14</comment_count>
    <who name="James Robinson">jamesr</who>
    <bug_when>2012-06-19 14:00:17 -0700</bug_when>
    <thetext>What chromium rev had the change?  Is it rolled into Source/WebKit/chromium/DEPS in the WebKit repo yet? (I&apos;m cautious since we don&apos;t have any cr-win EWS coverage).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>652867</commentid>
    <comment_count>15</comment_count>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-19 15:06:32 -0700</bug_when>
    <thetext>(In reply to comment #14)
&gt; What chromium rev had the change?  Is it rolled into Source/WebKit/chromium/DEPS in the WebKit repo yet? (I&apos;m cautious since we don&apos;t have any cr-win EWS coverage).

Shoot, you&apos;re right. I always forget about the backwards roll.

ftr, http://crrev.com/142993</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>653000</commentid>
    <comment_count>16</comment_count>
      <attachid>148166</attachid>
    <who name="James Robinson">jamesr</who>
    <bug_when>2012-06-19 17:00:11 -0700</bug_when>
    <thetext>Comment on attachment 148166
Patch

CQ minus since http://trac.webkit.org/browser/trunk/Source/WebKit/chromium/DEPS shows me 142842. Set cq? when it&apos;s ahead.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>656664</commentid>
    <comment_count>17</comment_count>
      <attachid>148166</attachid>
    <who name="Scott Graham">scottmg</who>
    <bug_when>2012-06-25 10:11:17 -0700</bug_when>
    <thetext>Comment on attachment 148166
Patch

143776 now</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>656795</commentid>
    <comment_count>18</comment_count>
      <attachid>148166</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-25 12:48:12 -0700</bug_when>
    <thetext>Comment on attachment 148166
Patch

Clearing flags on attachment: 148166

Committed r121176: &lt;http://trac.webkit.org/changeset/121176&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>656796</commentid>
    <comment_count>19</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-25 12:48:21 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>657141</commentid>
    <comment_count>20</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-25 18:49:29 -0700</bug_when>
    <thetext>Re-opened since this is blocked by 89934</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>148149</attachid>
            <date>2012-06-18 12:36:09 -0700</date>
            <delta_ts>2012-06-18 12:47:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-89264-20120618123608.patch</filename>
            <type>text/plain</type>
            <size>6664</size>
            <attacher name="Scott Graham">scottmg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v
Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA5NTNmMjllODQ2Zjhl
ZThhNGI0ZGRhZWM3NmRhNzQwZWI3ZmIzYzFjLi42MjNmMDFjZWYyNTIwMmMyMzIwM2UwM2E3YTU2
ZDU2ODYxMGRhZmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi
L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNi0xOCAg
U2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVt
XSBQbHVtYiBTY3JvbGxiYXIgYnV0dG9uIGRpbWVuc2lvbnMgdGhyb3VnaCBXZWJUaGVtZUVuZ2lu
ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkyNjQK
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSYXRoZXIg
dGhhbiB1c2luZyBtYWtpbmcgdGhlIGhlaWdodCBvZiB0aGUgc2Nyb2xsYmFyIGJ1dHRvbnMgdGhl
IHNhbWUKKyAgICAgICAgYXMgdGhlIHdpZHRoIG9mIHRoZSBzY3JvbGxiYXIsIGRlbGVnYXRlIHRv
IHRoZSBXZWJUaGVtZUVuZ2luZS4gVGhpcworICAgICAgICBhbGxvd3MgbWF0Y2hpbmcgdGhlIEF1
cmEgdGhlbWUgcmF0aGVyIHRoYW4gdGhlIHN0YW5kYXJkIFdpbmRvd3MgdGhlbWUuCisKKyAgICAg
ICAgKiBjaHJvbWl1bS9wdWJsaWMvd2luL1dlYlRoZW1lRW5naW5lLmg6CisgICAgICAgIChXZWJL
aXQpOgorICAgICAgICAoV2ViVGhlbWVFbmdpbmUpOgorCiAyMDEyLTA2LTE0ICBJYW4gVm9sbGlj
ayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQ2VydGFpbiBz
ZXR0aW5ncyBpbiBDQ1NldHRpbmdzIGNvdWxkIGJlIGdsb2JhbApkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDdmY2Y4
MzhhMzA1MzhlMzhmODk3Njk3MTRkMDY1N2Y0Njc3YTIwZmIuLjNjMWI4MmY5MzRiNWQ3Y2ZkMTFj
MDE4NTRkNmU4NGY1ZjhiZGEwNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv
ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0w
Ni0xOCAgU2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0No
cm9taXVtXSBQbHVtYiBTY3JvbGxiYXIgYnV0dG9uIGRpbWVuc2lvbnMgZG93biB0byBuYXRpdmVf
dGhlbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5
MjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmF0
aGVyIHRoYW4gdXNpbmcgbWFraW5nIHRoZSBoZWlnaHQgb2YgdGhlIHNjcm9sbGJhciBidXR0b25z
IHRoZSBzYW1lCisgICAgICAgIGFzIHRoZSB3aWR0aCBvZiB0aGUgc2Nyb2xsYmFyLCBkZWxlZ2F0
ZSB0byB0aGUgV2ViVGhlbWVFbmdpbmUuIFRoaXMKKyAgICAgICAgYWxsb3dzIG1hdGNoaW5nIHRo
ZSBBdXJhIHRoZW1lIHJhdGhlciB0aGFuIHRoZSBzdGFuZGFyZCBXaW5kb3dzIHRoZW1lLgorCisg
ICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgYm91bmRzIGFyZSBvdmVycmlkZGVuIGZvciBEUlQuCisK
KyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaDoKKyAgICAgICAg
KFBsYXRmb3JtU3VwcG9ydCk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFy
VGhlbWVDaHJvbWl1bVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNo
cm9taXVtV2luOjpidXR0b25TaXplKToKKwogMjAxMi0wNi0xNCAgSWFuIFZvbGxpY2sgIDx2b2xs
aWNrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENlcnRhaW4gc2V0dGluZ3Mg
aW4gQ0NTZXR0aW5ncyBjb3VsZCBiZSBnbG9iYWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv
Y2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5k
ZXggMzY5MjkxZjMxM2IwNjU1NjQzZjRmNWM2ZGRkMzhmOGIyYzkxODdjOS4uNDQyOTFiMzRmMWU5
MWQ0OWU4MGM4NDRmMDBiYTM0ZTI3YjdlMzY0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j
aHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNi0xOCAgU2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJv
bWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBQbHVtYiBTY3JvbGxiYXIgYnV0dG9uIGRp
bWVuc2lvbnMgZG93biB0byBuYXRpdmVfdGhlbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgUmF0aGVyIHRoYW4gdXNpbmcgbWFraW5nIHRoZSBoZWlnaHQg
b2YgdGhlIHNjcm9sbGJhciBidXR0b25zIHRoZSBzYW1lCisgICAgICAgIGFzIHRoZSB3aWR0aCBv
ZiB0aGUgc2Nyb2xsYmFyLCBkZWxlZ2F0ZSB0byB0aGUgV2ViVGhlbWVFbmdpbmUuIFRoaXMKKyAg
ICAgICAgYWxsb3dzIG1hdGNoaW5nIHRoZSBBdXJhIHRoZW1lIHJhdGhlciB0aGFuIHRoZSBzdGFu
ZGFyZCBXaW5kb3dzIHRoZW1lLgorCisgICAgICAgICogc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybVN1cHBvcnQ6OmdldFNjcm9sbGJhckFycm93U2l6
ZSk6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0wNi0xNCAgSWFuIFZvbGxpY2sgIDx2b2xs
aWNrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENlcnRhaW4gc2V0dGluZ3Mg
aW4gQ0NTZXR0aW5ncyBjb3VsZCBiZSBnbG9iYWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9y
bS9jaHJvbWl1bS9wdWJsaWMvd2luL1dlYlRoZW1lRW5naW5lLmggYi9Tb3VyY2UvUGxhdGZvcm0v
Y2hyb21pdW0vcHVibGljL3dpbi9XZWJUaGVtZUVuZ2luZS5oCmluZGV4IGQ4ODFkN2FmYTIxM2U4
YmYxNzQxMzQyMGMzNjhmNDI3OTRhNjc3ZTkuLjE3MWVjNjE2ZTY4MzVjMDFhZmM0YzJmYTI3ZDkx
ODVjZGNjMzY1MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMv
d2luL1dlYlRoZW1lRW5naW5lLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1Ymxp
Yy93aW4vV2ViVGhlbWVFbmdpbmUuaApAQCAtMzMsMTIgKzMzLDEwIEBACiAKICNpbmNsdWRlICIu
Li9XZWJDYW52YXMuaCIKICNpbmNsdWRlICIuLi9XZWJDb2xvci5oIgotI2luY2x1ZGUgIi4uL1dl
YlNpemUuaCIKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKIHN0cnVjdCBXZWJSZWN0Owotc3RydWN0
IFdlYlNpemU7CiAKIGNsYXNzIFdlYlRoZW1lRW5naW5lIHsKIHB1YmxpYzoKQEAgLTgzLDYgKzgx
LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwYWludFByb2dyZXNzQmFyKAogICAgICAg
ICBXZWJDYW52YXMqLCBjb25zdCBXZWJSZWN0JiBiYXJSZWN0LCBjb25zdCBXZWJSZWN0JiB2YWx1
ZVJlY3QsCiAgICAgICAgIGJvb2wgZGV0ZXJtaW5hdGUsIGRvdWJsZSBhbmltYXRlZFNlY29uZHMp
IHsgfQorCisgICAgdmlydHVhbCBpbnQgZ2V0U2Nyb2xsYmFyQXJyb3dTaXplKGludCBwYXJ0SWQp
ID0gMDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmggYi9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaAppbmRleCA5ZjNlZGI5OGQ5ZDAx
Y2FlODRkYjE4MDcyNTkxZTRmZjhjNDAzODkxLi4zZDJlYzEzNDJhMWE2ZjQ0YTYyYjkwM2UyNWI2
NTFjOTE0ZWUwZTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1
bS9QbGF0Zm9ybVN1cHBvcnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1
bS9QbGF0Zm9ybVN1cHBvcnQuaApAQCAtMTkxLDYgKzE5MSw3IEBAIHB1YmxpYzoKICAgICAgICAg
R3JhcGhpY3NDb250ZXh0KiwgaW50IHBhcnQsIGludCBzdGF0ZSwgaW50IGNsYXNzaWNTdGF0ZSwg
Y29uc3QgSW50UmVjdCYpOwogICAgIHN0YXRpYyB2b2lkIHBhaW50UHJvZ3Jlc3NCYXIoCiAgICAg
ICAgIEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmIGJhclJlY3QsIGNvbnN0IEludFJl
Y3QmIHZhbHVlUmVjdCwgYm9vbCBkZXRlcm1pbmF0ZSwgZG91YmxlIGFuaW1hdGVkU2Vjb25kcyk7
CisgICAgc3RhdGljIGludCBnZXRTY3JvbGxiYXJBcnJvd1NpemUoaW50IHBhcnRJZCk7CiAjZWxp
ZiBPUyhEQVJXSU4pCiAgICAgZW51bSBUaGVtZVBhaW50U3RhdGUgewogICAgICAgICBTdGF0ZURp
c2FibGVkLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Ny
b2xsYmFyVGhlbWVDaHJvbWl1bVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv
bWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtV2luLmNwcAppbmRleCBhMDgxOTgzNDc0OTFkY2M1
ZDhmMDIyYTEyMjg4OTBkNjU3N2ZlM2Y5Li4zMGE5MzA1OWZmNjc4Yzc5OWQxNjE3ZjY1ZTJmZjIx
ZTNkNjhiODgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9T
Y3JvbGxiYXJUaGVtZUNocm9taXVtV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtV2luLmNwcApAQCAtMjUwLDEzICsyNTAs
MTYgQEAgSW50U2l6ZSBTY3JvbGxiYXJUaGVtZUNocm9taXVtV2luOjpidXR0b25TaXplKFNjcm9s
bGJhclRoZW1lQ2xpZW50KiBzY3JvbGxiYXIpCiAKICAgICBpbnQgdGhpY2tuZXNzID0gc2Nyb2xs
YmFyVGhpY2tuZXNzKHNjcm9sbGJhci0+Y29udHJvbFNpemUoKSk7CiAKKyAgICBib29sIGhvcnog
PSBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcjsKKyAgICBp
bnQgc3RhbmRhcmRHaXJ0aCA9IFBsYXRmb3JtU3VwcG9ydDo6Z2V0U2Nyb2xsYmFyQXJyb3dTaXpl
KGhvcnogPyBERkNTX1NDUk9MTExFRlQgOiBERkNTX1NDUk9MTFVQKTsKKwogICAgIC8vIEluIGxh
eW91dCB0ZXN0IG1vZGUsIHdlIGZvcmNlIHRoZSBidXR0b24gImdpcnRoIiAoaS5lLiwgdGhlIGxl
bmd0aCBvZgogICAgIC8vIHRoZSBidXR0b24gYWxvbmcgdGhlIGF4aXMgb2YgdGhlIHNjcm9sbGJh
cikgdG8gYmUgYSBmaXhlZCBzaXplLgogICAgIC8vIEZJWE1FOiBUaGlzIGlzIHJldGFyZGVkISAg
c2Nyb2xsYmFyVGhpY2tuZXNzIGlzIGFscmVhZHkgZml4ZWQgaW4gbGF5b3V0CiAgICAgLy8gdGVz
dCBtb2RlIHNvIHRoYXQgc2hvdWxkIGJlIGVub3VnaCB0byByZXN1bHQgaW4gcmVwZWF0YWJsZSBy
ZXN1bHRzLCBidXQKICAgICAvLyBwcmVzZXJ2aW5nIHRoaXMgaGFjayBhdm9pZHMgaGF2aW5nIHRv
IHJlYmFzZWxpbmUgcGl4ZWwgdGVzdHMuCiAgICAgY29uc3QgaW50IGtMYXlvdXRUZXN0TW9kZUdp
cnRoID0gMTc7Ci0gICAgaW50IGdpcnRoID0gUGxhdGZvcm1TdXBwb3J0OjpsYXlvdXRUZXN0TW9k
ZSgpID8ga0xheW91dFRlc3RNb2RlR2lydGggOiB0aGlja25lc3M7CisgICAgaW50IGdpcnRoID0g
UGxhdGZvcm1TdXBwb3J0OjpsYXlvdXRUZXN0TW9kZSgpID8ga0xheW91dFRlc3RNb2RlR2lydGgg
OiBzdGFuZGFyZEdpcnRoOwogCiAgICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBI
b3Jpem9udGFsU2Nyb2xsYmFyKSB7CiAgICAgICAgIGludCB3aWR0aCA9IHNjcm9sbGJhci0+d2lk
dGgoKSA8IDIgKiBnaXJ0aCA/IHNjcm9sbGJhci0+d2lkdGgoKSAvIDIgOiBnaXJ0aDsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAgYi9T
b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCmluZGV4IGNkNTJm
YjYwMjE0YzRiMTZiMDRmYzkyOTA5NGVhZGZmOGM0YjUyNDYuLjA1ZmYyNmE0ZjA5MmZhZmEyYTJm
NDg3ODVlMzJlY2NkZmVjNDEyMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v
c3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv
UGxhdGZvcm1TdXBwb3J0LmNwcApAQCAtNDUyLDYgKzQ1MiwxMSBAQCB2b2lkIFBsYXRmb3JtU3Vw
cG9ydDo6cGFpbnRQcm9ncmVzc0JhcigKICAgICAgICAgZ2MtPnBsYXRmb3JtQ29udGV4dCgpLT5j
YW52YXMoKSwgYmFyUmVjdCwgdmFsdWVSZWN0LCBkZXRlcm1pbmF0ZSwgYW5pbWF0ZWRTZWNvbmRz
KTsKIH0KIAoraW50IFBsYXRmb3JtU3VwcG9ydDo6Z2V0U2Nyb2xsYmFyQXJyb3dTaXplKGludCBw
YXJ0SWQpCit7CisgICAgcmV0dXJuIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+dGhlbWVF
bmdpbmUoKS0+Z2V0U2Nyb2xsYmFyQXJyb3dTaXplKHBhcnRJZCk7Cit9CisKICNlbGlmIE9TKERB
UldJTikKIAogdm9pZCBQbGF0Zm9ybVN1cHBvcnQ6OnBhaW50U2Nyb2xsYmFyVGh1bWIoCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>148151</attachid>
            <date>2012-06-18 12:43:18 -0700</date>
            <delta_ts>2012-06-18 13:25:38 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-89264-20120618124318.patch</filename>
            <type>text/plain</type>
            <size>6617</size>
            <attacher name="Scott Graham">scottmg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v
Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA5NTNmMjllODQ2Zjhl
ZThhNGI0ZGRhZWM3NmRhNzQwZWI3ZmIzYzFjLi44ZjMzYTE4ZTYzYWVjZDJkZjI2NzMxZTM3Zjgy
ZDc1OWRmNDk1ZDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi
L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNi0xOCAg
U2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUGx1bWIgU2Ny
b2xsYmFyIGJ1dHRvbiBkaW1lbnNpb25zIHRocm91Z2ggV2ViVGhlbWVFbmdpbmUKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MjY0CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmF0aGVyIHRoYW4gbWFraW5n
IHRoZSBoZWlnaHQgb2YgdGhlIHNjcm9sbGJhciBidXR0b25zIHRoZSBzYW1lIGFzIHRoZQorICAg
ICAgICB3aWR0aCBvZiB0aGUgc2Nyb2xsYmFyLCBkZWxlZ2F0ZSB0byB0aGUgV2ViVGhlbWVFbmdp
bmUuIFRoaXMgYWxsb3dzCisgICAgICAgIG1hdGNoaW5nIHRoZSBBdXJhIHRoZW1lIHJhdGhlciB0
aGFuIHRoZSBzdGFuZGFyZCBXaW5kb3dzIHRoZW1lLgorCisgICAgICAgICogY2hyb21pdW0vcHVi
bGljL3dpbi9XZWJUaGVtZUVuZ2luZS5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdl
YlRoZW1lRW5naW5lKToKKwogMjAxMi0wNi0xNCAgSWFuIFZvbGxpY2sgIDx2b2xsaWNrQGNocm9t
aXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENlcnRhaW4gc2V0dGluZ3MgaW4gQ0NTZXR0
aW5ncyBjb3VsZCBiZSBnbG9iYWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv
ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZmNmODM4YTMwNTM4ZTM4Zjg5NzY5
NzE0ZDA2NTdmNDY3N2EyMGZiLi40YjY2ZjI2NGU5N2YwM2U1MDkxMWEzZGNmZWYwZWExZTM5ZDlj
NTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl
YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDYtMTggIFNjb3R0IEdyYWhh
bSAgPHNjb3R0bWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFBsdW1iIFNjcm9sbGJhciBidXR0
b24gZGltZW5zaW9ucyBkb3duIHRvIFdlYlRoZW1lRW5naW5lCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI2NAorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIG1ha2luZyB0aGUgaGVpZ2h0
IG9mIHRoZSBzY3JvbGxiYXIgYnV0dG9ucyB0aGUgc2FtZSBhcyB0aGUKKyAgICAgICAgd2lkdGgg
b2YgdGhlIHNjcm9sbGJhciwgZGVsZWdhdGUgdG8gdGhlIFdlYlRoZW1lRW5naW5lLiBUaGlzIGFs
bG93cworICAgICAgICBtYXRjaGluZyB0aGUgQXVyYSB0aGVtZSByYXRoZXIgdGhhbiB0aGUgc3Rh
bmRhcmQgV2luZG93cyB0aGVtZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGFzIGJvdW5kcyBh
cmUgb3ZlcnJpZGRlbiBmb3IgRFJULgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUGxh
dGZvcm1TdXBwb3J0Lmg6CisgICAgICAgIChQbGF0Zm9ybVN1cHBvcnQpOgorICAgICAgICAqIHBs
YXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1XaW4uY3BwOgorICAgICAgICAo
V2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uU2l6ZSk6CisKIDIwMTIt
MDYtMTQgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2No
cm9taXVtXSBDZXJ0YWluIHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xvYmFsCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL
aXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDM2OTI5MWYzMTNiMDY1NTY0M2Y0ZjVjNmRkZDM4
ZjhiMmM5MTg3YzkuLmVlZThmNjBlNzI0Y2MwYmVkNTY3MzJhNjY1NmE1NzkyNDUyZTFlNzEgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDYtMTggIFNj
b3R0IEdyYWhhbSAgPHNjb3R0bWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFBsdW1iIFNjcm9s
bGJhciBidXR0b24gZGltZW5zaW9ucyBkb3duIHRvIFdlYlRoZW1lRW5naW5lCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI2NAorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIG1ha2luZyB0
aGUgaGVpZ2h0IG9mIHRoZSBzY3JvbGxiYXIgYnV0dG9ucyB0aGUgc2FtZSBhcyB0aGUKKyAgICAg
ICAgd2lkdGggb2YgdGhlIHNjcm9sbGJhciwgZGVsZWdhdGUgdG8gdGhlIFdlYlRoZW1lRW5naW5l
LiBUaGlzIGFsbG93cworICAgICAgICBtYXRjaGluZyB0aGUgQXVyYSB0aGVtZSByYXRoZXIgdGhh
biB0aGUgc3RhbmRhcmQgV2luZG93cyB0aGVtZS4KKworICAgICAgICAqIHNyYy9QbGF0Zm9ybVN1
cHBvcnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1TdXBwb3J0OjpnZXRTY3JvbGxi
YXJBcnJvd1NpemUpOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDYtMTQgIElhbiBWb2xs
aWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBDZXJ0YWlu
IHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xvYmFsCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL3dpbi9XZWJUaGVtZUVuZ2luZS5oIGIvU291cmNl
L1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy93aW4vV2ViVGhlbWVFbmdpbmUuaAppbmRleCBkODgx
ZDdhZmEyMTNlOGJmMTc0MTM0MjBjMzY4ZjQyNzk0YTY3N2U5Li4xNzFlYzYxNmU2ODM1YzAxYWZj
NGMyZmEyN2Q5MTg1Y2RjYzM2NTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21p
dW0vcHVibGljL3dpbi9XZWJUaGVtZUVuZ2luZS5oCisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJv
bWl1bS9wdWJsaWMvd2luL1dlYlRoZW1lRW5naW5lLmgKQEAgLTMzLDEyICszMywxMCBAQAogCiAj
aW5jbHVkZSAiLi4vV2ViQ2FudmFzLmgiCiAjaW5jbHVkZSAiLi4vV2ViQ29sb3IuaCIKLSNpbmNs
dWRlICIuLi9XZWJTaXplLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBzdHJ1Y3QgV2ViUmVj
dDsKLXN0cnVjdCBXZWJTaXplOwogCiBjbGFzcyBXZWJUaGVtZUVuZ2luZSB7CiBwdWJsaWM6CkBA
IC04Myw2ICs4MSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRQcm9ncmVzc0Jh
cigKICAgICAgICAgV2ViQ2FudmFzKiwgY29uc3QgV2ViUmVjdCYgYmFyUmVjdCwgY29uc3QgV2Vi
UmVjdCYgdmFsdWVSZWN0LAogICAgICAgICBib29sIGRldGVybWluYXRlLCBkb3VibGUgYW5pbWF0
ZWRTZWNvbmRzKSB7IH0KKworICAgIHZpcnR1YWwgaW50IGdldFNjcm9sbGJhckFycm93U2l6ZShp
bnQgcGFydElkKSA9IDA7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgKaW5kZXggOWYz
ZWRiOThkOWQwMWNhZTg0ZGIxODA3MjU5MWU0ZmY4YzQwMzg5MS4uM2QyZWMxMzQyYTFhNmY0NGE2
MmI5MDNlMjViNjUxYzkxNGVlMGUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgKQEAgLTE5MSw2ICsxOTEsNyBAQCBwdWJsaWM6
CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dCosIGludCBwYXJ0LCBpbnQgc3RhdGUsIGludCBjbGFz
c2ljU3RhdGUsIGNvbnN0IEludFJlY3QmKTsKICAgICBzdGF0aWMgdm9pZCBwYWludFByb2dyZXNz
QmFyKAogICAgICAgICBHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JiBiYXJSZWN0LCBj
b25zdCBJbnRSZWN0JiB2YWx1ZVJlY3QsIGJvb2wgZGV0ZXJtaW5hdGUsIGRvdWJsZSBhbmltYXRl
ZFNlY29uZHMpOworICAgIHN0YXRpYyBpbnQgZ2V0U2Nyb2xsYmFyQXJyb3dTaXplKGludCBwYXJ0
SWQpOwogI2VsaWYgT1MoREFSV0lOKQogICAgIGVudW0gVGhlbWVQYWludFN0YXRlIHsKICAgICAg
ICAgU3RhdGVEaXNhYmxlZCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No
cm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1XaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bVdpbi5jcHAKaW5kZXggYTA4MTk4
MzQ3NDkxZGNjNWQ4ZjAyMmExMjI4ODkwZDY1NzdmZTNmOS4uMzBhOTMwNTlmZjY3OGM3OTlkMTYx
N2Y2NWUyZmYyMWUzZDY4Yjg4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Y2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bVdpbi5jcHAKQEAgLTI1
MCwxMyArMjUwLDE2IEBAIEludFNpemUgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9u
U2l6ZShTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyKQogCiAgICAgaW50IHRoaWNrbmVz
cyA9IHNjcm9sbGJhclRoaWNrbmVzcyhzY3JvbGxiYXItPmNvbnRyb2xTaXplKCkpOwogCisgICAg
Ym9vbCBob3J6ID0gc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxi
YXI7CisgICAgaW50IHN0YW5kYXJkR2lydGggPSBQbGF0Zm9ybVN1cHBvcnQ6OmdldFNjcm9sbGJh
ckFycm93U2l6ZShob3J6ID8gREZDU19TQ1JPTExMRUZUIDogREZDU19TQ1JPTExVUCk7CisKICAg
ICAvLyBJbiBsYXlvdXQgdGVzdCBtb2RlLCB3ZSBmb3JjZSB0aGUgYnV0dG9uICJnaXJ0aCIgKGku
ZS4sIHRoZSBsZW5ndGggb2YKICAgICAvLyB0aGUgYnV0dG9uIGFsb25nIHRoZSBheGlzIG9mIHRo
ZSBzY3JvbGxiYXIpIHRvIGJlIGEgZml4ZWQgc2l6ZS4KICAgICAvLyBGSVhNRTogVGhpcyBpcyBy
ZXRhcmRlZCEgIHNjcm9sbGJhclRoaWNrbmVzcyBpcyBhbHJlYWR5IGZpeGVkIGluIGxheW91dAog
ICAgIC8vIHRlc3QgbW9kZSBzbyB0aGF0IHNob3VsZCBiZSBlbm91Z2ggdG8gcmVzdWx0IGluIHJl
cGVhdGFibGUgcmVzdWx0cywgYnV0CiAgICAgLy8gcHJlc2VydmluZyB0aGlzIGhhY2sgYXZvaWRz
IGhhdmluZyB0byByZWJhc2VsaW5lIHBpeGVsIHRlc3RzLgogICAgIGNvbnN0IGludCBrTGF5b3V0
VGVzdE1vZGVHaXJ0aCA9IDE3OwotICAgIGludCBnaXJ0aCA9IFBsYXRmb3JtU3VwcG9ydDo6bGF5
b3V0VGVzdE1vZGUoKSA/IGtMYXlvdXRUZXN0TW9kZUdpcnRoIDogdGhpY2tuZXNzOworICAgIGlu
dCBnaXJ0aCA9IFBsYXRmb3JtU3VwcG9ydDo6bGF5b3V0VGVzdE1vZGUoKSA/IGtMYXlvdXRUZXN0
TW9kZUdpcnRoIDogc3RhbmRhcmRHaXJ0aDsKIAogICAgIGlmIChzY3JvbGxiYXItPm9yaWVudGF0
aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikgewogICAgICAgICBpbnQgd2lkdGggPSBzY3Jv
bGxiYXItPndpZHRoKCkgPCAyICogZ2lydGggPyBzY3JvbGxiYXItPndpZHRoKCkgLyAyIDogZ2ly
dGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBv
cnQuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcApp
bmRleCBjZDUyZmI2MDIxNGM0YjE2YjA0ZmM5MjkwOTRlYWRmZjhjNGI1MjQ2Li4wNWZmMjZhNGYw
OTJmYWZhMmEyZjQ4Nzg1ZTMyZWNjZGZlYzQxMjBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKQEAgLTQ1Miw2ICs0NTIsMTEgQEAgdm9pZCBQ
bGF0Zm9ybVN1cHBvcnQ6OnBhaW50UHJvZ3Jlc3NCYXIoCiAgICAgICAgIGdjLT5wbGF0Zm9ybUNv
bnRleHQoKS0+Y2FudmFzKCksIGJhclJlY3QsIHZhbHVlUmVjdCwgZGV0ZXJtaW5hdGUsIGFuaW1h
dGVkU2Vjb25kcyk7CiB9CiAKK2ludCBQbGF0Zm9ybVN1cHBvcnQ6OmdldFNjcm9sbGJhckFycm93
U2l6ZShpbnQgcGFydElkKQoreworICAgIHJldHVybiBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50
KCktPnRoZW1lRW5naW5lKCktPmdldFNjcm9sbGJhckFycm93U2l6ZShwYXJ0SWQpOworfQorCiAj
ZWxpZiBPUyhEQVJXSU4pCiAKIHZvaWQgUGxhdGZvcm1TdXBwb3J0OjpwYWludFNjcm9sbGJhclRo
dW1iKAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>148159</attachid>
            <date>2012-06-18 13:25:42 -0700</date>
            <delta_ts>2012-06-18 13:56:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-89264-20120618132542.patch</filename>
            <type>text/plain</type>
            <size>6469</size>
            <attacher name="Scott Graham">scottmg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v
Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA5NTNmMjllODQ2Zjhl
ZThhNGI0ZGRhZWM3NmRhNzQwZWI3ZmIzYzFjLi44ZjMzYTE4ZTYzYWVjZDJkZjI2NzMxZTM3Zjgy
ZDc1OWRmNDk1ZDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi
L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNi0xOCAg
U2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUGx1bWIgU2Ny
b2xsYmFyIGJ1dHRvbiBkaW1lbnNpb25zIHRocm91Z2ggV2ViVGhlbWVFbmdpbmUKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MjY0CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmF0aGVyIHRoYW4gbWFraW5n
IHRoZSBoZWlnaHQgb2YgdGhlIHNjcm9sbGJhciBidXR0b25zIHRoZSBzYW1lIGFzIHRoZQorICAg
ICAgICB3aWR0aCBvZiB0aGUgc2Nyb2xsYmFyLCBkZWxlZ2F0ZSB0byB0aGUgV2ViVGhlbWVFbmdp
bmUuIFRoaXMgYWxsb3dzCisgICAgICAgIG1hdGNoaW5nIHRoZSBBdXJhIHRoZW1lIHJhdGhlciB0
aGFuIHRoZSBzdGFuZGFyZCBXaW5kb3dzIHRoZW1lLgorCisgICAgICAgICogY2hyb21pdW0vcHVi
bGljL3dpbi9XZWJUaGVtZUVuZ2luZS5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdl
YlRoZW1lRW5naW5lKToKKwogMjAxMi0wNi0xNCAgSWFuIFZvbGxpY2sgIDx2b2xsaWNrQGNocm9t
aXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENlcnRhaW4gc2V0dGluZ3MgaW4gQ0NTZXR0
aW5ncyBjb3VsZCBiZSBnbG9iYWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv
ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZmNmODM4YTMwNTM4ZTM4Zjg5NzY5
NzE0ZDA2NTdmNDY3N2EyMGZiLi40YjY2ZjI2NGU5N2YwM2U1MDkxMWEzZGNmZWYwZWExZTM5ZDlj
NTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl
YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDYtMTggIFNjb3R0IEdyYWhh
bSAgPHNjb3R0bWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFBsdW1iIFNjcm9sbGJhciBidXR0
b24gZGltZW5zaW9ucyBkb3duIHRvIFdlYlRoZW1lRW5naW5lCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI2NAorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIG1ha2luZyB0aGUgaGVpZ2h0
IG9mIHRoZSBzY3JvbGxiYXIgYnV0dG9ucyB0aGUgc2FtZSBhcyB0aGUKKyAgICAgICAgd2lkdGgg
b2YgdGhlIHNjcm9sbGJhciwgZGVsZWdhdGUgdG8gdGhlIFdlYlRoZW1lRW5naW5lLiBUaGlzIGFs
bG93cworICAgICAgICBtYXRjaGluZyB0aGUgQXVyYSB0aGVtZSByYXRoZXIgdGhhbiB0aGUgc3Rh
bmRhcmQgV2luZG93cyB0aGVtZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGFzIGJvdW5kcyBh
cmUgb3ZlcnJpZGRlbiBmb3IgRFJULgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUGxh
dGZvcm1TdXBwb3J0Lmg6CisgICAgICAgIChQbGF0Zm9ybVN1cHBvcnQpOgorICAgICAgICAqIHBs
YXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1XaW4uY3BwOgorICAgICAgICAo
V2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uU2l6ZSk6CisKIDIwMTIt
MDYtMTQgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2No
cm9taXVtXSBDZXJ0YWluIHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xvYmFsCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL
aXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDM2OTI5MWYzMTNiMDY1NTY0M2Y0ZjVjNmRkZDM4
ZjhiMmM5MTg3YzkuLjU4MzYxNTgyODk0YzNhOGQ2NWFlZmUwNGMwNWE3M2M5NTU2NDA4NjAgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDYtMTggIFNj
b3R0IEdyYWhhbSAgPHNjb3R0bWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFBsdW1iIFNjcm9s
bGJhciBidXR0b24gZGltZW5zaW9ucyBkb3duIHRvIFdlYlRoZW1lRW5naW5lCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI2NAorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIG1ha2luZyB0
aGUgaGVpZ2h0IG9mIHRoZSBzY3JvbGxiYXIgYnV0dG9ucyB0aGUgc2FtZSBhcyB0aGUKKyAgICAg
ICAgd2lkdGggb2YgdGhlIHNjcm9sbGJhciwgZGVsZWdhdGUgdG8gdGhlIFdlYlRoZW1lRW5naW5l
LiBUaGlzIGFsbG93cworICAgICAgICBtYXRjaGluZyB0aGUgQXVyYSB0aGVtZSByYXRoZXIgdGhh
biB0aGUgc3RhbmRhcmQgV2luZG93cyB0aGVtZS4KKworICAgICAgICAqIHNyYy9QbGF0Zm9ybVN1
cHBvcnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1TdXBwb3J0OjpnZXRUaGVtZVBh
cnRTaXplKToKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA2LTE0ICBJYW4gVm9sbGljayAg
PHZvbGxpY2tAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQ2VydGFpbiBzZXR0
aW5ncyBpbiBDQ1NldHRpbmdzIGNvdWxkIGJlIGdsb2JhbApkaWZmIC0tZ2l0IGEvU291cmNlL1Bs
YXRmb3JtL2Nocm9taXVtL3B1YmxpYy93aW4vV2ViVGhlbWVFbmdpbmUuaCBiL1NvdXJjZS9QbGF0
Zm9ybS9jaHJvbWl1bS9wdWJsaWMvd2luL1dlYlRoZW1lRW5naW5lLmgKaW5kZXggZDg4MWQ3YWZh
MjEzZThiZjE3NDEzNDIwYzM2OGY0Mjc5NGE2NzdlOS4uNmNlMTM4Y2E5YWY3ZTkzZjBhMjY0MmJl
NzU3ZmZjZDE3ZWZiZGJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1
YmxpYy93aW4vV2ViVGhlbWVFbmdpbmUuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0v
cHVibGljL3dpbi9XZWJUaGVtZUVuZ2luZS5oCkBAIC0zMywxMiArMzMsMTAgQEAKIAogI2luY2x1
ZGUgIi4uL1dlYkNhbnZhcy5oIgogI2luY2x1ZGUgIi4uL1dlYkNvbG9yLmgiCi0jaW5jbHVkZSAi
Li4vV2ViU2l6ZS5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogc3RydWN0IFdlYlJlY3Q7Ci1z
dHJ1Y3QgV2ViU2l6ZTsKIAogY2xhc3MgV2ViVGhlbWVFbmdpbmUgewogcHVibGljOgpAQCAtODMs
NiArODEsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHBhaW50UHJvZ3Jlc3NCYXIoCiAg
ICAgICAgIFdlYkNhbnZhcyosIGNvbnN0IFdlYlJlY3QmIGJhclJlY3QsIGNvbnN0IFdlYlJlY3Qm
IHZhbHVlUmVjdCwKICAgICAgICAgYm9vbCBkZXRlcm1pbmF0ZSwgZG91YmxlIGFuaW1hdGVkU2Vj
b25kcykgeyB9CisKKyAgICB2aXJ0dWFsIGludCBnZXRTaXplKGludCBwYXJ0KSA9IDA7CiB9Owog
CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Y2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgKaW5kZXggOWYzZWRiOThkOWQwMWNhZTg0ZGIxODA3
MjU5MWU0ZmY4YzQwMzg5MS4uNzFiYTQ3YjNkZTI1NTFhNWEyZDczNmFjMjIxMDNkMzkzYzIyYjEw
MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1T
dXBwb3J0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1T
dXBwb3J0LmgKQEAgLTE5MSw2ICsxOTEsNyBAQCBwdWJsaWM6CiAgICAgICAgIEdyYXBoaWNzQ29u
dGV4dCosIGludCBwYXJ0LCBpbnQgc3RhdGUsIGludCBjbGFzc2ljU3RhdGUsIGNvbnN0IEludFJl
Y3QmKTsKICAgICBzdGF0aWMgdm9pZCBwYWludFByb2dyZXNzQmFyKAogICAgICAgICBHcmFwaGlj
c0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JiBiYXJSZWN0LCBjb25zdCBJbnRSZWN0JiB2YWx1ZVJl
Y3QsIGJvb2wgZGV0ZXJtaW5hdGUsIGRvdWJsZSBhbmltYXRlZFNlY29uZHMpOworICAgIHN0YXRp
YyBpbnQgZ2V0VGhlbWVQYXJ0U2l6ZShpbnQgcGFydCk7CiAjZWxpZiBPUyhEQVJXSU4pCiAgICAg
ZW51bSBUaGVtZVBhaW50U3RhdGUgewogICAgICAgICBTdGF0ZURpc2FibGVkLApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1
bVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVt
ZUNocm9taXVtV2luLmNwcAppbmRleCBhMDgxOTgzNDc0OTFkY2M1ZDhmMDIyYTEyMjg4OTBkNjU3
N2ZlM2Y5Li5hM2U5YWU0ODg0ZGZhYTJkYTQ2YmQ0MzIzNWIwOTk5NDg3NzJlZWRjIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9t
aXVtV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi
YXJUaGVtZUNocm9taXVtV2luLmNwcApAQCAtMjUwLDEzICsyNTAsMTUgQEAgSW50U2l6ZSBTY3Jv
bGxiYXJUaGVtZUNocm9taXVtV2luOjpidXR0b25TaXplKFNjcm9sbGJhclRoZW1lQ2xpZW50KiBz
Y3JvbGxiYXIpCiAKICAgICBpbnQgdGhpY2tuZXNzID0gc2Nyb2xsYmFyVGhpY2tuZXNzKHNjcm9s
bGJhci0+Y29udHJvbFNpemUoKSk7CiAKKyAgICBpbnQgc3RhbmRhcmRHaXJ0aCA9IFBsYXRmb3Jt
U3VwcG9ydDo6Z2V0VGhlbWVQYXJ0U2l6ZShTQlBfQVJST1dCVE4pOworCiAgICAgLy8gSW4gbGF5
b3V0IHRlc3QgbW9kZSwgd2UgZm9yY2UgdGhlIGJ1dHRvbiAiZ2lydGgiIChpLmUuLCB0aGUgbGVu
Z3RoIG9mCiAgICAgLy8gdGhlIGJ1dHRvbiBhbG9uZyB0aGUgYXhpcyBvZiB0aGUgc2Nyb2xsYmFy
KSB0byBiZSBhIGZpeGVkIHNpemUuCiAgICAgLy8gRklYTUU6IFRoaXMgaXMgcmV0YXJkZWQhICBz
Y3JvbGxiYXJUaGlja25lc3MgaXMgYWxyZWFkeSBmaXhlZCBpbiBsYXlvdXQKICAgICAvLyB0ZXN0
IG1vZGUgc28gdGhhdCBzaG91bGQgYmUgZW5vdWdoIHRvIHJlc3VsdCBpbiByZXBlYXRhYmxlIHJl
c3VsdHMsIGJ1dAogICAgIC8vIHByZXNlcnZpbmcgdGhpcyBoYWNrIGF2b2lkcyBoYXZpbmcgdG8g
cmViYXNlbGluZSBwaXhlbCB0ZXN0cy4KICAgICBjb25zdCBpbnQga0xheW91dFRlc3RNb2RlR2ly
dGggPSAxNzsKLSAgICBpbnQgZ2lydGggPSBQbGF0Zm9ybVN1cHBvcnQ6OmxheW91dFRlc3RNb2Rl
KCkgPyBrTGF5b3V0VGVzdE1vZGVHaXJ0aCA6IHRoaWNrbmVzczsKKyAgICBpbnQgZ2lydGggPSBQ
bGF0Zm9ybVN1cHBvcnQ6OmxheW91dFRlc3RNb2RlKCkgPyBrTGF5b3V0VGVzdE1vZGVHaXJ0aCA6
IHN0YW5kYXJkR2lydGg7CiAKICAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhv
cml6b250YWxTY3JvbGxiYXIpIHsKICAgICAgICAgaW50IHdpZHRoID0gc2Nyb2xsYmFyLT53aWR0
aCgpIDwgMiAqIGdpcnRoID8gc2Nyb2xsYmFyLT53aWR0aCgpIC8gMiA6IGdpcnRoOwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcCBiL1Nv
dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKaW5kZXggY2Q1MmZi
NjAyMTRjNGIxNmIwNGZjOTI5MDk0ZWFkZmY4YzRiNTI0Ni4uZDZmOGJlODU2OTM4NTMyM2UwMWIz
ZmJjNTQ0NGFjZjJjZDY4M2U0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z
cmMvUGxhdGZvcm1TdXBwb3J0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Q
bGF0Zm9ybVN1cHBvcnQuY3BwCkBAIC00NTIsNiArNDUyLDExIEBAIHZvaWQgUGxhdGZvcm1TdXBw
b3J0OjpwYWludFByb2dyZXNzQmFyKAogICAgICAgICBnYy0+cGxhdGZvcm1Db250ZXh0KCktPmNh
bnZhcygpLCBiYXJSZWN0LCB2YWx1ZVJlY3QsIGRldGVybWluYXRlLCBhbmltYXRlZFNlY29uZHMp
OwogfQogCitpbnQgUGxhdGZvcm1TdXBwb3J0OjpnZXRUaGVtZVBhcnRTaXplKGludCBwYXJ0KQor
eworICAgIHJldHVybiBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPnRoZW1lRW5naW5lKCkt
PmdldFNpemUocGFydCk7Cit9CisKICNlbGlmIE9TKERBUldJTikKIAogdm9pZCBQbGF0Zm9ybVN1
cHBvcnQ6OnBhaW50U2Nyb2xsYmFyVGh1bWIoCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>148166</attachid>
            <date>2012-06-18 13:56:07 -0700</date>
            <delta_ts>2012-06-25 12:48:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-89264-20120618135607.patch</filename>
            <type>text/plain</type>
            <size>6389</size>
            <attacher name="Scott Graham">scottmg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v
Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA5NTNmMjllODQ2Zjhl
ZThhNGI0ZGRhZWM3NmRhNzQwZWI3ZmIzYzFjLi44ZjMzYTE4ZTYzYWVjZDJkZjI2NzMxZTM3Zjgy
ZDc1OWRmNDk1ZDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi
L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNi0xOCAg
U2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUGx1bWIgU2Ny
b2xsYmFyIGJ1dHRvbiBkaW1lbnNpb25zIHRocm91Z2ggV2ViVGhlbWVFbmdpbmUKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MjY0CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmF0aGVyIHRoYW4gbWFraW5n
IHRoZSBoZWlnaHQgb2YgdGhlIHNjcm9sbGJhciBidXR0b25zIHRoZSBzYW1lIGFzIHRoZQorICAg
ICAgICB3aWR0aCBvZiB0aGUgc2Nyb2xsYmFyLCBkZWxlZ2F0ZSB0byB0aGUgV2ViVGhlbWVFbmdp
bmUuIFRoaXMgYWxsb3dzCisgICAgICAgIG1hdGNoaW5nIHRoZSBBdXJhIHRoZW1lIHJhdGhlciB0
aGFuIHRoZSBzdGFuZGFyZCBXaW5kb3dzIHRoZW1lLgorCisgICAgICAgICogY2hyb21pdW0vcHVi
bGljL3dpbi9XZWJUaGVtZUVuZ2luZS5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdl
YlRoZW1lRW5naW5lKToKKwogMjAxMi0wNi0xNCAgSWFuIFZvbGxpY2sgIDx2b2xsaWNrQGNocm9t
aXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENlcnRhaW4gc2V0dGluZ3MgaW4gQ0NTZXR0
aW5ncyBjb3VsZCBiZSBnbG9iYWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv
ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZmNmODM4YTMwNTM4ZTM4Zjg5NzY5
NzE0ZDA2NTdmNDY3N2EyMGZiLi40YjY2ZjI2NGU5N2YwM2U1MDkxMWEzZGNmZWYwZWExZTM5ZDlj
NTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl
YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDYtMTggIFNjb3R0IEdyYWhh
bSAgPHNjb3R0bWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFBsdW1iIFNjcm9sbGJhciBidXR0
b24gZGltZW5zaW9ucyBkb3duIHRvIFdlYlRoZW1lRW5naW5lCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI2NAorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIG1ha2luZyB0aGUgaGVpZ2h0
IG9mIHRoZSBzY3JvbGxiYXIgYnV0dG9ucyB0aGUgc2FtZSBhcyB0aGUKKyAgICAgICAgd2lkdGgg
b2YgdGhlIHNjcm9sbGJhciwgZGVsZWdhdGUgdG8gdGhlIFdlYlRoZW1lRW5naW5lLiBUaGlzIGFs
bG93cworICAgICAgICBtYXRjaGluZyB0aGUgQXVyYSB0aGVtZSByYXRoZXIgdGhhbiB0aGUgc3Rh
bmRhcmQgV2luZG93cyB0aGVtZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGFzIGJvdW5kcyBh
cmUgb3ZlcnJpZGRlbiBmb3IgRFJULgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUGxh
dGZvcm1TdXBwb3J0Lmg6CisgICAgICAgIChQbGF0Zm9ybVN1cHBvcnQpOgorICAgICAgICAqIHBs
YXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1XaW4uY3BwOgorICAgICAgICAo
V2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uU2l6ZSk6CisKIDIwMTIt
MDYtMTQgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2No
cm9taXVtXSBDZXJ0YWluIHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xvYmFsCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL
aXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDM2OTI5MWYzMTNiMDY1NTY0M2Y0ZjVjNmRkZDM4
ZjhiMmM5MTg3YzkuLjU4MzYxNTgyODk0YzNhOGQ2NWFlZmUwNGMwNWE3M2M5NTU2NDA4NjAgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDYtMTggIFNj
b3R0IEdyYWhhbSAgPHNjb3R0bWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFBsdW1iIFNjcm9s
bGJhciBidXR0b24gZGltZW5zaW9ucyBkb3duIHRvIFdlYlRoZW1lRW5naW5lCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI2NAorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIG1ha2luZyB0
aGUgaGVpZ2h0IG9mIHRoZSBzY3JvbGxiYXIgYnV0dG9ucyB0aGUgc2FtZSBhcyB0aGUKKyAgICAg
ICAgd2lkdGggb2YgdGhlIHNjcm9sbGJhciwgZGVsZWdhdGUgdG8gdGhlIFdlYlRoZW1lRW5naW5l
LiBUaGlzIGFsbG93cworICAgICAgICBtYXRjaGluZyB0aGUgQXVyYSB0aGVtZSByYXRoZXIgdGhh
biB0aGUgc3RhbmRhcmQgV2luZG93cyB0aGVtZS4KKworICAgICAgICAqIHNyYy9QbGF0Zm9ybVN1
cHBvcnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1TdXBwb3J0OjpnZXRUaGVtZVBh
cnRTaXplKToKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA2LTE0ICBJYW4gVm9sbGljayAg
PHZvbGxpY2tAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQ2VydGFpbiBzZXR0
aW5ncyBpbiBDQ1NldHRpbmdzIGNvdWxkIGJlIGdsb2JhbApkaWZmIC0tZ2l0IGEvU291cmNlL1Bs
YXRmb3JtL2Nocm9taXVtL3B1YmxpYy93aW4vV2ViVGhlbWVFbmdpbmUuaCBiL1NvdXJjZS9QbGF0
Zm9ybS9jaHJvbWl1bS9wdWJsaWMvd2luL1dlYlRoZW1lRW5naW5lLmgKaW5kZXggZDg4MWQ3YWZh
MjEzZThiZjE3NDEzNDIwYzM2OGY0Mjc5NGE2NzdlOS4uNjE4MjU2OWU3ZmE5YjliMDAwMjdlOGUz
Y2MxMTQ1YzlkOWY2NmRiOCAxMDA2NDQKLS0tIGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1
YmxpYy93aW4vV2ViVGhlbWVFbmdpbmUuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0v
cHVibGljL3dpbi9XZWJUaGVtZUVuZ2luZS5oCkBAIC04Myw2ICs4MywxMCBAQCBwdWJsaWM6CiAg
ICAgdmlydHVhbCB2b2lkIHBhaW50UHJvZ3Jlc3NCYXIoCiAgICAgICAgIFdlYkNhbnZhcyosIGNv
bnN0IFdlYlJlY3QmIGJhclJlY3QsIGNvbnN0IFdlYlJlY3QmIHZhbHVlUmVjdCwKICAgICAgICAg
Ym9vbCBkZXRlcm1pbmF0ZSwgZG91YmxlIGFuaW1hdGVkU2Vjb25kcykgeyB9CisKKyAgICAvLyBH
ZXQgZGltZW5zaW9ucyBvZiBhIHBhcnRpY3VsYXIgcGFydC4gT25seSBzdXBwb3J0cyBTQlBfQVJS
T1dCVE4KKyAgICAvLyBjdXJyZW50bHkuCisgICAgdmlydHVhbCBXZWJTaXplIGdldFNpemUoaW50
IHBhcnQpID0gMDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmggYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaAppbmRleCA5ZjNlZGI5
OGQ5ZDAxY2FlODRkYjE4MDcyNTkxZTRmZjhjNDAzODkxLi42OTRkZDU1NWYxNDE5NmIzNjJiOWY3
ZmU4NGNlNmRiOTRkYTE2MmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j
aHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j
aHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaApAQCAtMTkxLDYgKzE5MSw3IEBAIHB1YmxpYzoKICAg
ICAgICAgR3JhcGhpY3NDb250ZXh0KiwgaW50IHBhcnQsIGludCBzdGF0ZSwgaW50IGNsYXNzaWNT
dGF0ZSwgY29uc3QgSW50UmVjdCYpOwogICAgIHN0YXRpYyB2b2lkIHBhaW50UHJvZ3Jlc3NCYXIo
CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmIGJhclJlY3QsIGNvbnN0
IEludFJlY3QmIHZhbHVlUmVjdCwgYm9vbCBkZXRlcm1pbmF0ZSwgZG91YmxlIGFuaW1hdGVkU2Vj
b25kcyk7CisgICAgc3RhdGljIEludFNpemUgZ2V0VGhlbWVQYXJ0U2l6ZShpbnQgcGFydCk7CiAj
ZWxpZiBPUyhEQVJXSU4pCiAgICAgZW51bSBUaGVtZVBhaW50U3RhdGUgewogICAgICAgICBTdGF0
ZURpc2FibGVkLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v
U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j
aHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtV2luLmNwcAppbmRleCBhMDgxOTgzNDc0OTFk
Y2M1ZDhmMDIyYTEyMjg4OTBkNjU3N2ZlM2Y5Li5lNTI2ZGY2NDIyMmMyZDg1YzQ2MGU2YWRjOWM0
ODRhZjU3NTY3MDZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1
bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtV2luLmNwcApAQCAtMjUwLDEzICsy
NTAsMTUgQEAgSW50U2l6ZSBTY3JvbGxiYXJUaGVtZUNocm9taXVtV2luOjpidXR0b25TaXplKFNj
cm9sbGJhclRoZW1lQ2xpZW50KiBzY3JvbGxiYXIpCiAKICAgICBpbnQgdGhpY2tuZXNzID0gc2Ny
b2xsYmFyVGhpY2tuZXNzKHNjcm9sbGJhci0+Y29udHJvbFNpemUoKSk7CiAKKyAgICBpbnQgc3Rh
bmRhcmRHaXJ0aCA9IFBsYXRmb3JtU3VwcG9ydDo6Z2V0VGhlbWVQYXJ0U2l6ZShTQlBfQVJST1dC
VE4pLmhlaWdodCgpOworCiAgICAgLy8gSW4gbGF5b3V0IHRlc3QgbW9kZSwgd2UgZm9yY2UgdGhl
IGJ1dHRvbiAiZ2lydGgiIChpLmUuLCB0aGUgbGVuZ3RoIG9mCiAgICAgLy8gdGhlIGJ1dHRvbiBh
bG9uZyB0aGUgYXhpcyBvZiB0aGUgc2Nyb2xsYmFyKSB0byBiZSBhIGZpeGVkIHNpemUuCiAgICAg
Ly8gRklYTUU6IFRoaXMgaXMgcmV0YXJkZWQhICBzY3JvbGxiYXJUaGlja25lc3MgaXMgYWxyZWFk
eSBmaXhlZCBpbiBsYXlvdXQKICAgICAvLyB0ZXN0IG1vZGUgc28gdGhhdCBzaG91bGQgYmUgZW5v
dWdoIHRvIHJlc3VsdCBpbiByZXBlYXRhYmxlIHJlc3VsdHMsIGJ1dAogICAgIC8vIHByZXNlcnZp
bmcgdGhpcyBoYWNrIGF2b2lkcyBoYXZpbmcgdG8gcmViYXNlbGluZSBwaXhlbCB0ZXN0cy4KICAg
ICBjb25zdCBpbnQga0xheW91dFRlc3RNb2RlR2lydGggPSAxNzsKLSAgICBpbnQgZ2lydGggPSBQ
bGF0Zm9ybVN1cHBvcnQ6OmxheW91dFRlc3RNb2RlKCkgPyBrTGF5b3V0VGVzdE1vZGVHaXJ0aCA6
IHRoaWNrbmVzczsKKyAgICBpbnQgZ2lydGggPSBQbGF0Zm9ybVN1cHBvcnQ6OmxheW91dFRlc3RN
b2RlKCkgPyBrTGF5b3V0VGVzdE1vZGVHaXJ0aCA6IHN0YW5kYXJkR2lydGg7CiAKICAgICBpZiAo
c2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIpIHsKICAgICAg
ICAgaW50IHdpZHRoID0gc2Nyb2xsYmFyLT53aWR0aCgpIDwgMiAqIGdpcnRoID8gc2Nyb2xsYmFy
LT53aWR0aCgpIC8gMiA6IGdpcnRoOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1
bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Bs
YXRmb3JtU3VwcG9ydC5jcHAKaW5kZXggY2Q1MmZiNjAyMTRjNGIxNmIwNGZjOTI5MDk0ZWFkZmY4
YzRiNTI0Ni4uMzBjOGM5ZDcxODg1YWMzZGE5ZDcxMGZiOGEwMzEwZmQxZmM2OGFlYiAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAorKysg
Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCkBAIC00NTIs
NiArNDUyLDExIEBAIHZvaWQgUGxhdGZvcm1TdXBwb3J0OjpwYWludFByb2dyZXNzQmFyKAogICAg
ICAgICBnYy0+cGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygpLCBiYXJSZWN0LCB2YWx1ZVJlY3Qs
IGRldGVybWluYXRlLCBhbmltYXRlZFNlY29uZHMpOwogfQogCitJbnRTaXplIFBsYXRmb3JtU3Vw
cG9ydDo6Z2V0VGhlbWVQYXJ0U2l6ZShpbnQgcGFydCkKK3sKKyAgICByZXR1cm4gV2ViS2l0OjpQ
bGF0Zm9ybTo6Y3VycmVudCgpLT50aGVtZUVuZ2luZSgpLT5nZXRTaXplKHBhcnQpOworfQorCiAj
ZWxpZiBPUyhEQVJXSU4pCiAKIHZvaWQgUGxhdGZvcm1TdXBwb3J0OjpwYWludFNjcm9sbGJhclRo
dW1iKAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>