<?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>48486</bug_id>
          
          <creation_ts>2010-10-27 17:16:22 -0700</creation_ts>
          <short_desc>[GTK] Move button rendering from gtk{2,3}drawing.cpp to RenderThemeGtk</short_desc>
          <delta_ts>2010-12-20 23:09:00 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKitGTK</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>Gtk</keywords>
          <priority>P3</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>47836</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Martin Robinson">mrobinson</reporter>
          <assigned_to name="Martin Robinson">mrobinson</assigned_to>
          <cc>eric</cc>
    
    <cc>gustavo</cc>
    
    <cc>webkit.review.bot</cc>
    
    <cc>xan.lopez</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>300722</commentid>
    <comment_count>0</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2010-10-27 17:16:22 -0700</bug_when>
    <thetext>We want to move button rendering from gtk{2,3}drawing.cpp to RenderThemeGtk, which an important step in moving away from the Mozilla theme drawing code and fixing menu list rendering.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>300773</commentid>
    <comment_count>1</comment_count>
      <attachid>72125</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2010-10-27 18:29:52 -0700</bug_when>
    <thetext>Created attachment 72125
Patch for this issue</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>300776</commentid>
    <comment_count>2</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2010-10-27 18:31:32 -0700</bug_when>
    <thetext>Attachment 72125 did not pass style-queue:

Failed to run &quot;[&apos;WebKitTools/Scripts/check-webkit-style&apos;]&quot; exit_code: 1
WebCore/platform/gtk/RenderThemeGtk.cpp:473:  Use 0 instead of NULL.  [readability/null] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>300781</commentid>
    <comment_count>3</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2010-10-27 18:35:06 -0700</bug_when>
    <thetext>(In reply to comment #2)
&gt; If any of these errors are false positives, please file a bug against check-webkit-style.

This is a false positive. We need to add an exception for gtk_widget_style_get.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>301549</commentid>
    <comment_count>4</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2010-10-28 20:08:59 -0700</bug_when>
    <thetext>Attachment 72125 did not build on gtk:
Build output: http://queues.webkit.org/results/4748081</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>303895</commentid>
    <comment_count>5</comment_count>
      <attachid>72789</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2010-11-02 22:06:43 -0700</bug_when>
    <thetext>Created attachment 72789
Patch with slightly different design</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>303896</commentid>
    <comment_count>6</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2010-11-02 22:08:13 -0700</bug_when>
    <thetext>Attachment 72789 did not pass style-queue:

Failed to run &quot;[&apos;WebKitTools/Scripts/check-webkit-style&apos;, &apos;--diff-files&apos;, u&apos;WebCore/ChangeLog&apos;, u&apos;WebCore/platform/gtk/RenderThemeGtk.cpp&apos;]&quot; exit_code: 1
WebCore/platform/gtk/RenderThemeGtk.cpp:473:  Use 0 instead of NULL.  [readability/null] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>304715</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2010-11-04 09:45:32 -0700</bug_when>
    <thetext>Attachment 72789 did not build on gtk:
Build output: http://queues.webkit.org/results/5164016</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>317564</commentid>
    <comment_count>8</comment_count>
      <attachid>72789</attachid>
    <who name="Gustavo Noronha (kov)">gustavo</who>
    <bug_when>2010-12-06 04:58:05 -0800</bug_when>
    <thetext>Comment on attachment 72789
Patch with slightly different design

This one looks right to me, now I&apos;ll review the one it depends on (doh).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>322267</commentid>
    <comment_count>9</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2010-12-14 15:14:49 -0800</bug_when>
    <thetext>Attachment 72789 was posted by a committer and has review+, assigning to Martin Robinson for commit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>324836</commentid>
    <comment_count>10</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2010-12-20 22:58:25 -0800</bug_when>
    <thetext>r74132.  Please close your bugs after landing. :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>324852</commentid>
    <comment_count>11</comment_count>
      <attachid>72789</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2010-12-20 23:09:00 -0800</bug_when>
    <thetext>Comment on attachment 72789
Patch with slightly different design

Sorry. Will try to be better about this in the future.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>72125</attachid>
            <date>2010-10-27 18:29:52 -0700</date>
            <delta_ts>2010-11-02 22:06:39 -0700</delta_ts>
            <desc>Patch for this issue</desc>
            <filename>bug-48486-20101027182954.patch</filename>
            <type>text/plain</type>
            <size>3749</size>
            <attacher name="Martin Robinson">mrobinson</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg
MjllN2YzZjEzNjQzYTFhYjQ0ZTI5Y2YxNjRhMTIwMjAyOWFkY2EzZC4uZjVjNjg2ODNlYjUyOTBl
ZDVmYzVjNmUwY2ZiNDgzZjBhMDMyM2JkZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK
KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0xMC0yNyAgTWFy
dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gTW92ZSBidXR0b24gcmVuZGVyaW5n
IGZyb20gZ3RrezIsM31kcmF3aW5nLmNwcCB0byBSZW5kZXJUaGVtZUd0aworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg0ODYKKworICAgICAgICBJbXBs
ZW1lbnQgYnV0dG9uIHJlbmRlcmluZyBpbiBSZW5kZXJUaGVtZUd0ay4gVGhlIGltcGxlbWVudGF0
aW9uCisgICAgICAgIGZyb20gZ3RrezIsM31kcmF3aW5nLmNwcCB3aWxsIGJlIHJlbW92ZWQgb25j
ZSBtZW51IGxpc3QgYnV0dG9uIHJlbmRlcmluZworICAgICAgICBpcyBpbXBsZW1lbnRlZCBpbiBS
ZW5kZXJUaGVtZUd0ayBhcyB3ZWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgdGhpcyBz
aG91bGQgbm90IGNoYW5nZSBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3Rr
L1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpw
YWludEJ1dHRvbik6IEFkZCBhbiBpbXBsZW1lbnRhdGlvbiBvZiBidXR0b24KKyAgICAgICAgcmVu
ZGVyaW5nIHRoYXQgdXNlcyBXaWRnZXRSZW5kZXJpbmdDb250ZXh0LgorCiAyMDEwLTEwLTE4ICBN
YXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Jl
bmRlclRoZW1lR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNw
cAppbmRleCA5ZTY2MzllMGZlZmFkMzFjZmYzZGJkYTA5OWQzNzViNDAwNzA0MDg1Li5iY2QwY2Jj
NGMwYzdlOWQ3YmRlNjRkMjhkNjE5NmRlODM1NjY5ZDYwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs
YXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv
UmVuZGVyVGhlbWVHdGsuY3BwCkBAIC0zNjksOSArMzY5LDUzIEBAIHZvaWQgUmVuZGVyVGhlbWVH
dGs6OmFkanVzdEJ1dHRvblN0eWxlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yLCBSZW5kZXJT
dHlsZSoKICAgICAgICAgc3R5bGUtPnNldExpbmVIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxM
aW5lSGVpZ2h0KCkpOwogfQogCi1ib29sIFJlbmRlclRoZW1lR3RrOjpwYWludEJ1dHRvbihSZW5k
ZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcmVjdCkKK2Jv
b2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50QnV0dG9uKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25z
dCBQYWludEluZm8mIGluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgcmV0dXJuIHBh
aW50UmVuZGVyT2JqZWN0KE1PWl9HVEtfQlVUVE9OLCBvLCBpLmNvbnRleHQsIHJlY3QsIEdUS19S
RUxJRUZfTk9STUFMKTsKKyAgICBpZiAoaW5mby5jb250ZXh0LT5wYWludGluZ0Rpc2FibGVkKCkp
CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIEd0a1dpZGdldCogd2lkZ2V0ID0gZ3RrQnV0
dG9uKCk7CisgICAgSW50U2l6ZSBmb2N1c1NocmluazsKKyAgICBJbnRTaXplIGJ1dHRvblNocmlu
azsKKworICAgIEd0a1N0YXRlVHlwZSBzdGF0ZSA9IGdldEd0a1N0YXRlVHlwZShvYmplY3QpOwor
ICAgIGd0a193aWRnZXRfc2V0X3N0YXRlKHdpZGdldCwgc3RhdGUpOworICAgIGd0a193aWRnZXRf
c2V0X2RpcmVjdGlvbih3aWRnZXQsIGd0a1RleHREaXJlY3Rpb24ob2JqZWN0LT5zdHlsZSgpLT5k
aXJlY3Rpb24oKSkpOworCisgICAgaWYgKGlzRm9jdXNlZChvYmplY3QpKSB7CisgICAgICAgIGlm
IChpc0VuYWJsZWQob2JqZWN0KSkgeworI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigyLCAyMiwgMCkK
KyAgICAgICAgICAgIEdUS19XSURHRVRfU0VUX0ZMQUdTKHdpZGdldCwgR1RLX0hBU19GT0NVUyk7
CisjZW5kaWYKKyAgICAgICAgICAgIGdfb2JqZWN0X3NldCh3aWRnZXQsICJoYXMtZm9jdXMiLCBU
UlVFLCBOVUxMKTsKKyAgICAgICAgfQorCisgICAgICAgIGdib29sZWFuIGludGVyaW9yRm9jdXMg
PSAwLCBmb2N1c1dpZHRoID0gMCwgZm9jdXNQYWRkaW5nID0gMDsKKyAgICAgICAgZ3RrX3dpZGdl
dF9zdHlsZV9nZXQod2lkZ2V0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJp
b3ItZm9jdXMiLCAmaW50ZXJpb3JGb2N1cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ImZvY3VzLWxpbmUtd2lkdGgiLCAmZm9jdXNXaWR0aCwKKyAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgImZvY3VzLXBhZGRpbmciLCAmZm9jdXNQYWRkaW5nLCBOVUxMKTsKKyAgICAgICAgLy8g
SWYgd2UgYXJlIHVzaW5nIGV4dGVyaW9yIGZvY3VzLCB3ZSBzaHJpbmsgdGhlIGJ1dHRvbiByZWN0
IGRvd24gYmVmb3JlCisgICAgICAgIC8vIGRyYXdpbmcuIElmIHdlIGFyZSB1c2luZyBpbnRlcmlv
ciBmb2N1cyB3ZSBzaHJpbmsgdGhlIGZvY3VzIHJlY3QuIFRoaXMKKyAgICAgICAgLy8gYXBwcm9h
Y2ggb3JpZ2luYXRlcyBmcm9tIHRoZSBNb3ppbGxhIHRoZW1lIGRyYXdpbmcgY29kZSAoZ3RrMmRy
YXdpbmcuYykuCisgICAgICAgIGlmIChpbnRlcmlvckZvY3VzKSB7CisgICAgICAgICAgICBHdGtT
dHlsZSogc3R5bGUgPSBndGtfd2lkZ2V0X2dldF9zdHlsZSh3aWRnZXQpOworICAgICAgICAgICAg
Zm9jdXNTaHJpbmsgPSBJbnRTaXplKHN0eWxlLT54dGhpY2tuZXNzICsgZm9jdXNQYWRkaW5nLCBz
dHlsZS0+eXRoaWNrbmVzcyArIGZvY3VzUGFkZGluZyk7CisgICAgICAgIH0gZWxzZQorICAgICAg
ICAgICAgYnV0dG9uU2hyaW5rID0gSW50U2l6ZShmb2N1c1dpZHRoICsgZm9jdXNQYWRkaW5nLCBm
b2N1c1dpZHRoICsgZm9jdXNQYWRkaW5nKTsKKyAgICB9CisKKyAgICBXaWRnZXRSZW5kZXJpbmdD
b250ZXh0IHdpZGdldENvbnRleHQoaW5mby5jb250ZXh0LCByZWN0KTsKKyAgICB3aWRnZXRDb250
ZXh0Lmd0a1BhaW50Qm94KHdpZGdldCwgc3RhdGUsIHN0YXRlID09IEdUS19TVEFURV9BQ1RJVkUg
PyBHVEtfU0hBRE9XX0lOIDogR1RLX1NIQURPV19PVVQsCisgICAgICAgICJidXR0b24iLCBidXR0
b25TaHJpbmspOworICAgIGlmIChpc0ZvY3VzZWQob2JqZWN0KSkKKyAgICAgICAgd2lkZ2V0Q29u
dGV4dC5ndGtQYWludEZvY3VzKHdpZGdldCwgc3RhdGUsICJidXR0b24iLCBmb2N1c1Nocmluayk7
CisKKyNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMiwgMjIsIDApCisgICAgR1RLX1dJREdFVF9VTlNF
VF9GTEFHUyh3aWRnZXQsIEdUS19IQVNfRk9DVVMpOworI2VuZGlmCisgICAgZ19vYmplY3Rfc2V0
KHdpZGdldCwgImhhcy1mb2N1cyIsIEZBTFNFLCBOVUxMKTsKKyAgICByZXR1cm4gZmFsc2U7CiB9
CiAKIHN0YXRpYyB2b2lkIGdldENvbWJvQm94UGFkZGluZyhSZW5kZXJTdHlsZSogc3R5bGUsIGlu
dCYgbGVmdCwgaW50JiB0b3AsIGludCYgcmlnaHQsIGludCYgYm90dG9tKQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>72789</attachid>
            <date>2010-11-02 22:06:43 -0700</date>
            <delta_ts>2010-12-20 23:09:00 -0800</delta_ts>
            <desc>Patch with slightly different design</desc>
            <filename>bug-48486-20101102220641.patch</filename>
            <type>text/plain</type>
            <size>3893</size>
            <attacher name="Martin Robinson">mrobinson</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg
Y2FmZDQ2NjdhMGQyODlmYzc0YWUyNjA0ODRkOWEwNzA0ZWY5MzE2Ni4uMzlhYmY5ZjAyY2ZlZDlk
MWY0MWU5ODRiNjE3Y2ZhZWFjNDBkMzRiOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK
KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0xMC0yNyAgTWFy
dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gTW92ZSBidXR0b24gcmVuZGVyaW5n
IGZyb20gZ3RrezIsM31kcmF3aW5nLmNwcCB0byBSZW5kZXJUaGVtZUd0aworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg0ODYKKworICAgICAgICBJbXBs
ZW1lbnQgYnV0dG9uIHJlbmRlcmluZyBpbiBSZW5kZXJUaGVtZUd0ay4gVGhlIGltcGxlbWVudGF0
aW9uCisgICAgICAgIGZyb20gZ3RrezIsM31kcmF3aW5nLmNwcCB3aWxsIGJlIHJlbW92ZWQgb25j
ZSBtZW51IGxpc3QgYnV0dG9uIHJlbmRlcmluZworICAgICAgICBpcyBpbXBsZW1lbnRlZCBpbiBS
ZW5kZXJUaGVtZUd0ayBhcyB3ZWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgdGhpcyBz
aG91bGQgbm90IGNoYW5nZSBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3Rr
L1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpw
YWludEJ1dHRvbik6IEFkZCBhbiBpbXBsZW1lbnRhdGlvbiBvZiBidXR0b24KKyAgICAgICAgcmVu
ZGVyaW5nIHRoYXQgdXNlcyBXaWRnZXRSZW5kZXJpbmdDb250ZXh0LgorCiAyMDEwLTEwLTE4ICBN
YXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Jl
bmRlclRoZW1lR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNw
cAppbmRleCAzMjA1OTQxYzBjYmE2MmQ0NzdmZDc4ZjY2ZDRlN2U1MzIwOTcxNjZkLi4zYTY0Mzc4
NzQzOGE1OTA1MTdiYjQxOWNhM2RkMGFlM2U5NzdlNmMxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs
YXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv
UmVuZGVyVGhlbWVHdGsuY3BwCkBAIC0zNjksOSArMzY5LDU2IEBAIHZvaWQgUmVuZGVyVGhlbWVH
dGs6OmFkanVzdEJ1dHRvblN0eWxlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yLCBSZW5kZXJT
dHlsZSoKICAgICAgICAgc3R5bGUtPnNldExpbmVIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxM
aW5lSGVpZ2h0KCkpOwogfQogCi1ib29sIFJlbmRlclRoZW1lR3RrOjpwYWludEJ1dHRvbihSZW5k
ZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcmVjdCkKK2Jv
b2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50QnV0dG9uKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25z
dCBQYWludEluZm8mIGluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgcmV0dXJuIHBh
aW50UmVuZGVyT2JqZWN0KE1PWl9HVEtfQlVUVE9OLCBvLCBpLmNvbnRleHQsIHJlY3QsIEdUS19S
RUxJRUZfTk9STUFMKTsKKyAgICBpZiAoaW5mby5jb250ZXh0LT5wYWludGluZ0Rpc2FibGVkKCkp
CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIEd0a1dpZGdldCogd2lkZ2V0ID0gZ3RrQnV0
dG9uKCk7CisgICAgSW50UmVjdCBidXR0b25SZWN0KEludFBvaW50KCksIHJlY3Quc2l6ZSgpKTsK
KyAgICBJbnRSZWN0IGZvY3VzUmVjdChidXR0b25SZWN0KTsKKworICAgIEd0a1N0YXRlVHlwZSBz
dGF0ZSA9IGdldEd0a1N0YXRlVHlwZShvYmplY3QpOworICAgIGd0a193aWRnZXRfc2V0X3N0YXRl
KHdpZGdldCwgc3RhdGUpOworICAgIGd0a193aWRnZXRfc2V0X2RpcmVjdGlvbih3aWRnZXQsIGd0
a1RleHREaXJlY3Rpb24ob2JqZWN0LT5zdHlsZSgpLT5kaXJlY3Rpb24oKSkpOworCisgICAgaWYg
KGlzRm9jdXNlZChvYmplY3QpKSB7CisgICAgICAgIGlmIChpc0VuYWJsZWQob2JqZWN0KSkgewor
I2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigyLCAyMiwgMCkKKyAgICAgICAgICAgIEdUS19XSURHRVRf
U0VUX0ZMQUdTKHdpZGdldCwgR1RLX0hBU19GT0NVUyk7CisjZW5kaWYKKyAgICAgICAgICAgIGdf
b2JqZWN0X3NldCh3aWRnZXQsICJoYXMtZm9jdXMiLCBUUlVFLCBOVUxMKTsKKyAgICAgICAgfQor
CisgICAgICAgIGdib29sZWFuIGludGVyaW9yRm9jdXMgPSAwLCBmb2N1c1dpZHRoID0gMCwgZm9j
dXNQYWRkaW5nID0gMDsKKyAgICAgICAgZ3RrX3dpZGdldF9zdHlsZV9nZXQod2lkZ2V0LAorICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJpb3ItZm9jdXMiLCAmaW50ZXJpb3JGb2N1
cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImZvY3VzLWxpbmUtd2lkdGgiLCAmZm9j
dXNXaWR0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImZvY3VzLXBhZGRpbmciLCAm
Zm9jdXNQYWRkaW5nLCBOVUxMKTsKKyAgICAgICAgLy8gSWYgd2UgYXJlIHVzaW5nIGV4dGVyaW9y
IGZvY3VzLCB3ZSBzaHJpbmsgdGhlIGJ1dHRvbiByZWN0IGRvd24gYmVmb3JlCisgICAgICAgIC8v
IGRyYXdpbmcuIElmIHdlIGFyZSB1c2luZyBpbnRlcmlvciBmb2N1cyB3ZSBzaHJpbmsgdGhlIGZv
Y3VzIHJlY3QuIFRoaXMKKyAgICAgICAgLy8gYXBwcm9hY2ggb3JpZ2luYXRlcyBmcm9tIHRoZSBN
b3ppbGxhIHRoZW1lIGRyYXdpbmcgY29kZSAoZ3RrMmRyYXdpbmcuYykuCisgICAgICAgIGlmIChp
bnRlcmlvckZvY3VzKSB7CisgICAgICAgICAgICBHdGtTdHlsZSogc3R5bGUgPSBndGtfd2lkZ2V0
X2dldF9zdHlsZSh3aWRnZXQpOworICAgICAgICAgICAgZm9jdXNSZWN0LmluZmxhdGVYKC1zdHls
ZS0+eHRoaWNrbmVzcyAtIGZvY3VzUGFkZGluZyk7CisgICAgICAgICAgICBmb2N1c1JlY3QuaW5m
bGF0ZVkoLXN0eWxlLT55dGhpY2tuZXNzIC0gZm9jdXNQYWRkaW5nKTsKKyAgICAgICAgfSBlbHNl
IHsKKyAgICAgICAgICAgIGJ1dHRvblJlY3QuaW5mbGF0ZVgoLWZvY3VzV2lkdGggLSBmb2N1c1Bh
ZGRpbmcpOworICAgICAgICAgICAgYnV0dG9uUmVjdC5pbmZsYXRlWSgtZm9jdXNQYWRkaW5nIC0g
Zm9jdXNQYWRkaW5nKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIFdpZGdldFJlbmRlcmluZ0Nv
bnRleHQgd2lkZ2V0Q29udGV4dChpbmZvLmNvbnRleHQsIHJlY3QpOworICAgIEd0a1NoYWRvd1R5
cGUgc2hhZG93VHlwZSA9IHN0YXRlID09IEdUS19TVEFURV9BQ1RJVkUgPyBHVEtfU0hBRE9XX0lO
IDogR1RLX1NIQURPV19PVVQ7CisgICAgd2lkZ2V0Q29udGV4dC5ndGtQYWludEJveChidXR0b25S
ZWN0LCB3aWRnZXQsIHN0YXRlLCBzaGFkb3dUeXBlLCAiYnV0dG9uIik7CisgICAgaWYgKGlzRm9j
dXNlZChvYmplY3QpKQorICAgICAgICB3aWRnZXRDb250ZXh0Lmd0a1BhaW50Rm9jdXMoZm9jdXNS
ZWN0LCB3aWRnZXQsIHN0YXRlLCAiYnV0dG9uIik7CisKKyNpZiAhR1RLX0NIRUNLX1ZFUlNJT04o
MiwgMjIsIDApCisgICAgR1RLX1dJREdFVF9VTlNFVF9GTEFHUyh3aWRnZXQsIEdUS19IQVNfRk9D
VVMpOworI2VuZGlmCisgICAgZ19vYmplY3Rfc2V0KHdpZGdldCwgImhhcy1mb2N1cyIsIEZBTFNF
LCBOVUxMKTsKKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIHN0YXRpYyB2b2lkIGdldENvbWJvQm94
UGFkZGluZyhSZW5kZXJTdHlsZSogc3R5bGUsIGludCYgbGVmdCwgaW50JiB0b3AsIGludCYgcmln
aHQsIGludCYgYm90dG9tKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>