<?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>57848</bug_id>
          
          <creation_ts>2011-04-05 08:01:17 -0700</creation_ts>
          <short_desc>[Chromium] allow concurrent Skia and CG datatypes</short_desc>
          <delta_ts>2011-04-13 23:26:20 -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>Platform</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>OS X 10.5</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="Cary Clark">caryclark</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>eric</cc>
    
    <cc>thakis</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>379565</commentid>
    <comment_count>0</comment_count>
    <who name="Cary Clark">caryclark</who>
    <bug_when>2011-04-05 08:01:17 -0700</bug_when>
    <thetext>The Chromium port is experimenting with running Skia as the WebKit rendering engine, and CoreGraphics as the UI rendering engine. This permits Chromium to unify its graphics story while leveraging OS X to draw elements like scrollbars and buttons.

Restructure the common graphics units, points and rectangles, to convert to Sk-types and CG-types at the same time.

A CL describing this change in more detail is forthcoming.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380318</commentid>
    <comment_count>1</comment_count>
      <attachid>88408</attachid>
    <who name="Cary Clark">caryclark</who>
    <bug_when>2011-04-06 06:47:10 -0700</bug_when>
    <thetext>Created attachment 88408
patch to change preprocessor conditions</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380413</commentid>
    <comment_count>2</comment_count>
      <attachid>88408</attachid>
    <who name="David Levin">levin</who>
    <bug_when>2011-04-06 08:43:16 -0700</bug_when>
    <thetext>Comment on attachment 88408
patch to change preprocessor conditions

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

&gt; WebCore/ChangeLog:12
&gt; +        https://bugs.webkit.org/show_bug.cgi?id=57848

Note that typically this is:
bug title
bug link

description if any

Per file comments (which may be ditto).

But ok this time.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380474</commentid>
    <comment_count>3</comment_count>
    <who name="Nico Weber">thakis</who>
    <bug_when>2011-04-06 09:25:32 -0700</bug_when>
    <thetext>Are these the only |#if PLATFORM(CG)| changes you will need?

Would it be worth to add USE(CG_PRIMITIVES) and define that if PLATFORM(CG) || (USE(SKIA)…), for less repetiton?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380565</commentid>
    <comment_count>4</comment_count>
    <who name="Cary Clark">caryclark</who>
    <bug_when>2011-04-06 10:27:18 -0700</bug_when>
    <thetext>Nico: There are other places where CG-specific code is required. However, these files together make up a nice chunk and are interdependent.

I thought about creating a new preprocessor definition, but did not see precedent for doing things that way. The current way, while verbose, is completely self-documenting, where USE(CG_PRIMITIVES) would hide slightly that this code is used when CoreGraphics is the platform graphics implementation, and when Skia+Chromium+Darwin is chosen.

However, I&apos;m happy to change it to match WebKit conventions.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380575</commentid>
    <comment_count>5</comment_count>
    <who name="Nico Weber">thakis</who>
    <bug_when>2011-04-06 10:35:12 -0700</bug_when>
    <thetext>I guess if levin is fine with it, then the current patch matches WebKit conventions; the other way just seemed cleaner to me personally.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>385157</commentid>
    <comment_count>6</comment_count>
      <attachid>89438</attachid>
    <who name="Cary Clark">caryclark</who>
    <bug_when>2011-04-13 12:49:22 -0700</bug_when>
    <thetext>Created attachment 89438
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>385169</commentid>
    <comment_count>7</comment_count>
      <attachid>89438</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2011-04-13 13:09:22 -0700</bug_when>
    <thetext>Comment on attachment 89438
Patch

LGTM.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>385545</commentid>
    <comment_count>8</comment_count>
      <attachid>89438</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-04-13 23:26:14 -0700</bug_when>
    <thetext>Comment on attachment 89438
Patch

Clearing flags on attachment: 89438

Committed r83818: &lt;http://trac.webkit.org/changeset/83818&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>385546</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-04-13 23:26:20 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>88408</attachid>
            <date>2011-04-06 06:47:10 -0700</date>
            <delta_ts>2011-04-13 12:49:17 -0700</delta_ts>
            <desc>patch to change preprocessor conditions</desc>
            <filename>patch.txt</filename>
            <type>text/plain</type>
            <size>8913</size>
            <attacher name="Cary Clark">caryclark</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n
CShyZXZpc2lvbiA4MzA0MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA
IC0xLDMgKzEsMzEgQEAKKzIwMTEtMDQtMDYgIENhcnkgQ2xhcmsgIDxjYXJ5Y2xhcmtAY2hyb21p
dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFRoZSBDaHJvbWl1bSBwb3J0IGlzIGV4cGVyaW1lbnRpbmcgd2l0aCBydW5uaW5nIFNraWEgYXMg
dGhlIFdlYktpdCByZW5kZXJpbmcgZW5naW5lLCBhbmQgQ29yZUdyYXBoaWNzCisgICAgICAgIGFz
IHRoZSBVSSByZW5kZXJpbmcgZW5naW5lLiBUaGlzIHBlcm1pdHMgQ2hyb21pdW0gdG8gdW5pZnkg
aXRzIGdyYXBoaWNzIHN0b3J5IHdoaWxlIGxldmVyYWdpbmcgT1MgWCB0bworICAgICAgICBkcmF3
IGVsZW1lbnRzIGxpa2Ugc2Nyb2xsYmFycyBhbmQgYnV0dG9ucy4KKworICAgICAgICBSZXN0cnVj
dHVyZSB0aGUgY29tbW9uIGdyYXBoaWNzIHVuaXRzLCBwb2ludHMsIGFuZCByZWN0YW5nbGVzLCB0
byBjb252ZXJ0IHRvIFNrLXR5cGVzIGFuZCBDRy10eXBlcyBhdAorICAgICAgICB0aGUgc2FtZSB0
aW1lLiBUaGlzIHJlcXVpcmVzIG9ubHkgYWRkaW5nIHRvIHRoZSBleGlzdGluZyBwcmVwcm9jZXNz
b3IgY29tbWFuZHMsIGFuZCB3aWxsIGhhdmUgbm8gZWZmZWN0CisgICAgICAgIG9uIGFueSBleGlz
dGluZyBwbGF0Zm9ybS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTU3ODQ4CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgcHJvdmlkZXMgbm8g
bmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBv
aW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0Lmg6CisgICAgICAg
ICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRTaXplLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh
cGhpY3MvSW50UG9pbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9JbnRSZWN0Lmg6
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW50U2l6ZS5oOgorICAgICAgICAqIHBsYXRm
b3JtL2dyYXBoaWNzL2NnL0Zsb2F0UG9pbnRDRy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh
cGhpY3MvY2cvRmxvYXRSZWN0Q0cuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nn
L0Zsb2F0U2l6ZUNHLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbnRQb2lu
dENHLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbnRSZWN0Q0cuY3BwOgor
ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0ludFNpemVDRy5jcHA6CisKIDIwMTEtMDQt
MDYgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg
UmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvRmxvYXRQb2ludC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp
Y3MvRmxvYXRQb2ludC5oCShyZXZpc2lvbiA4Mjk0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvRmxvYXRQb2ludC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw3ICszMSw3IEBACiAjaW5j
bHVkZSAiSW50UG9pbnQuaCIKICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogCi0jaWYgUExB
VEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IChVU0UoU0tJQSkgJiYgUExBVEZPUk0oQ0hS
T01JVU0pICYmIE9TKERBUldJTikpCiB0eXBlZGVmIHN0cnVjdCBDR1BvaW50IENHUG9pbnQ7CiAj
ZW5kaWYKIApAQCAtMTA5LDcgKzEwOSw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1feCAq
IG1feCArIG1feSAqIG1feTsKICAgICB9CiAKLSNpZiBQTEFURk9STShDRykKKyNpZiBQTEFURk9S
TShDRykgfHwgKFVTRShTS0lBKSAmJiBQTEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKSkK
ICAgICBGbG9hdFBvaW50KGNvbnN0IENHUG9pbnQmKTsKICAgICBvcGVyYXRvciBDR1BvaW50KCkg
Y29uc3Q7CiAjZW5kaWYKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0
LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaAko
cmV2aXNpb24gODI5NDIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5o
CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBACiAKICNpbmNsdWRlICJGbG9hdFBvaW50
LmgiCiAKLSNpZiBQTEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgKFVTRShTS0lBKSAm
JiBQTEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKSkKIHR5cGVkZWYgc3RydWN0IENHUmVj
dCBDR1JlY3Q7CiAjZW5kaWYKIApAQCAtMTM2LDcgKzEzNiw3IEBAIHB1YmxpYzoKICAgICB2b2lk
IGZpdFRvUG9pbnRzKGNvbnN0IEZsb2F0UG9pbnQmIHAwLCBjb25zdCBGbG9hdFBvaW50JiBwMSwg
Y29uc3QgRmxvYXRQb2ludCYgcDIpOwogICAgIHZvaWQgZml0VG9Qb2ludHMoY29uc3QgRmxvYXRQ
b2ludCYgcDAsIGNvbnN0IEZsb2F0UG9pbnQmIHAxLCBjb25zdCBGbG9hdFBvaW50JiBwMiwgY29u
c3QgRmxvYXRQb2ludCYgcDMpOwogCi0jaWYgUExBVEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cp
IHx8IChVU0UoU0tJQSkgJiYgUExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJTikpCiAgICAg
RmxvYXRSZWN0KGNvbnN0IENHUmVjdCYpOwogICAgIG9wZXJhdG9yIENHUmVjdCgpIGNvbnN0Owog
I2VuZGlmCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0U2l6ZS5oCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRTaXplLmgJKHJldmlzaW9u
IDgyOTQyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUuaAkod29ya2lu
ZyBjb3B5KQpAQCAtMzEsNyArMzEsNyBAQAogI2luY2x1ZGUgIkludFNpemUuaCIKICNpbmNsdWRl
IDx3dGYvTWF0aEV4dHJhcy5oPgogCi0jaWYgUExBVEZPUk0oQ0cpIHx8IChQTEFURk9STShXWCkg
JiYgT1MoREFSV0lOKSkKKyNpZiBQTEFURk9STShDRykgfHwgKFBMQVRGT1JNKFdYKSAmJiBPUyhE
QVJXSU4pKSB8fCAoVVNFKFNLSUEpICYmIFBMQVRGT1JNKENIUk9NSVVNKSAmJiBPUyhEQVJXSU4p
KQogdHlwZWRlZiBzdHJ1Y3QgQ0dTaXplIENHU2l6ZTsKICNlbmRpZgogCkBAIC04OSw3ICs4OSw3
IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1fd2lkdGggKiBtX3dpZHRoICsgbV9oZWlnaHQg
KiBtX2hlaWdodDsKICAgICB9CiAKLSNpZiBQTEFURk9STShDRykgfHwgKFBMQVRGT1JNKFdYKSAm
JiBPUyhEQVJXSU4pKQorI2lmIFBMQVRGT1JNKENHKSB8fCAoUExBVEZPUk0oV1gpICYmIE9TKERB
UldJTikpIHx8IChVU0UoU0tJQSkgJiYgUExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJTikp
CiAgICAgZXhwbGljaXQgRmxvYXRTaXplKGNvbnN0IENHU2l6ZSYpOyAvLyBkb24ndCBkbyB0aGlz
IGltcGxpY2l0bHkgc2luY2UgaXQncyBsb3NzeQogICAgIG9wZXJhdG9yIENHU2l6ZSgpIGNvbnN0
OwogI2VuZGlmCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ludFBvaW50LmgKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRQb2ludC5oCShyZXZpc2lv
biA4Mjk0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50UG9pbnQuaAkod29ya2lu
ZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQAogI2luY2x1ZGUgPFFEYXRhU3RyZWFtPgogI2VuZGlm
CiAKLSNpZiBQTEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgKFVTRShTS0lBKSAmJiBQ
TEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKSkKIHR5cGVkZWYgc3RydWN0IENHUG9pbnQg
Q0dQb2ludDsKICNlbmRpZgogCkBAIC0xMTQsNyArMTE0LDcgQEAgcHVibGljOgogICAgICAgICBy
ZXR1cm4gSW50UG9pbnQobV95LCBtX3gpOwogICAgIH0KIAotI2lmIFBMQVRGT1JNKENHKQorI2lm
IFBMQVRGT1JNKENHKSB8fCAoVVNFKFNLSUEpICYmIFBMQVRGT1JNKENIUk9NSVVNKSAmJiBPUyhE
QVJXSU4pKQogICAgIGV4cGxpY2l0IEludFBvaW50KGNvbnN0IENHUG9pbnQmKTsgLy8gZG9uJ3Qg
ZG8gdGhpcyBpbXBsaWNpdGx5IHNpbmNlIGl0J3MgbG9zc3kKICAgICBvcGVyYXRvciBDR1BvaW50
KCkgY29uc3Q7CiAjZW5kaWYKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50UmVj
dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50UmVjdC5oCShy
ZXZpc2lvbiA4Mjk0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50UmVjdC5oCSh3
b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBACiAjaW5jbHVkZSAiSW50UG9pbnQuaCIKICNp
bmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNpZiBQTEFURk9STShDRykKKyNpZiBQTEFURk9STShD
RykgfHwgKFVTRShTS0lBKSAmJiBQTEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKSkKIHR5
cGVkZWYgc3RydWN0IENHUmVjdCBDR1JlY3Q7CiAjZW5kaWYKIApAQCAtMTgyLDcgKzE4Miw3IEBA
IHB1YmxpYzoKICAgICBvcGVyYXRvciBFaW5hX1JlY3RhbmdsZSgpIGNvbnN0OwogI2VuZGlmCiAK
LSNpZiBQTEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgKFVTRShTS0lBKSAmJiBQTEFU
Rk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKSkKICAgICBvcGVyYXRvciBDR1JlY3QoKSBjb25z
dDsKICNlbmRpZgogCkBAIC0yMjgsNyArMjI4LDcgQEAgaW5saW5lIGJvb2wgb3BlcmF0b3IhPShj
b25zdCBJbnRSZWN0JiBhLAogICAgIHJldHVybiBhLmxvY2F0aW9uKCkgIT0gYi5sb2NhdGlvbigp
IHx8IGEuc2l6ZSgpICE9IGIuc2l6ZSgpOwogfQogCi0jaWYgUExBVEZPUk0oQ0cpCisjaWYgUExB
VEZPUk0oQ0cpIHx8IChVU0UoU0tJQSkgJiYgUExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJ
TikpCiBJbnRSZWN0IGVuY2xvc2luZ0ludFJlY3QoY29uc3QgQ0dSZWN0Jik7CiAjZW5kaWYKIApJ
bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRTaXplLmgKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRTaXplLmgJKHJldmlzaW9uIDgyOTQyKQorKysg
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRTaXplLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2
LDcgKzI2LDcgQEAKICNpZm5kZWYgSW50U2l6ZV9oCiAjZGVmaW5lIEludFNpemVfaAogCi0jaWYg
UExBVEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IChVU0UoU0tJQSkgJiYgUExBVEZPUk0o
Q0hST01JVU0pICYmIE9TKERBUldJTikpCiB0eXBlZGVmIHN0cnVjdCBDR1NpemUgQ0dTaXplOwog
I2VuZGlmCiAKQEAgLTEwOSw3ICsxMDksNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBJbnRT
aXplKG1faGVpZ2h0LCBtX3dpZHRoKTsKICAgICB9CiAKLSNpZiBQTEFURk9STShDRykKKyNpZiBQ
TEFURk9STShDRykgfHwgKFVTRShTS0lBKSAmJiBQTEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFS
V0lOKSkKICAgICBleHBsaWNpdCBJbnRTaXplKGNvbnN0IENHU2l6ZSYpOyAvLyBkb24ndCBkbyB0
aGlzIGltcGxpY2l0bHkgc2luY2UgaXQncyBsb3NzeQogICAgIG9wZXJhdG9yIENHU2l6ZSgpIGNv
bnN0OwogI2VuZGlmCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0Zsb2F0UG9p
bnRDRy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9GbG9h
dFBvaW50Q0cuY3BwCShyZXZpc2lvbiA4Mjk0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp
Y3MvY2cvRmxvYXRQb2ludENHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNyBAQAog
I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkZsb2F0UG9pbnQuaCIKIAotI2lmIFBMQVRG
T1JNKENHKQorI2lmIFBMQVRGT1JNKENHKSB8fCAoVVNFKFNLSUEpICYmIFBMQVRGT1JNKENIUk9N
SVVNKSAmJiBPUyhEQVJXSU4pKQogCiAjaW5jbHVkZSA8QXBwbGljYXRpb25TZXJ2aWNlcy9BcHBs
aWNhdGlvblNlcnZpY2VzLmg+CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cv
RmxvYXRSZWN0Q0cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
Y2cvRmxvYXRSZWN0Q0cuY3BwCShyZXZpc2lvbiA4Mjk0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvY2cvRmxvYXRSZWN0Q0cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw3
IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAKLSNpZiBQ
TEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgKFVTRShTS0lBKSAmJiBQTEFURk9STShD
SFJPTUlVTSkgJiYgT1MoREFSV0lOKSkKIAogI2luY2x1ZGUgPEFwcGxpY2F0aW9uU2VydmljZXMv
QXBwbGljYXRpb25TZXJ2aWNlcy5oPgogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L2NnL0Zsb2F0U2l6ZUNHLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL2NnL0Zsb2F0U2l6ZUNHLmNwcAkocmV2aXNpb24gODI5NDIpCisrKyBXZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL2NnL0Zsb2F0U2l6ZUNHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsNyAr
MjcsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkZsb2F0U2l6ZS5oIgogCi0j
aWYgUExBVEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IChVU0UoU0tJQSkgJiYgUExBVEZP
Uk0oQ0hST01JVU0pICYmIE9TKERBUldJTikpCiAKICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZp
Y2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9jZy9JbnRQb2ludENHLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2NnL0ludFBvaW50Q0cuY3BwCShyZXZpc2lvbiA4Mjk0MikKKysrIFdlYkNvcmUvcGxh
dGZvcm0vZ3JhcGhpY3MvY2cvSW50UG9pbnRDRy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcg
KzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJJbnRQb2ludC5oIgogCi0j
aWYgUExBVEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IChVU0UoU0tJQSkgJiYgUExBVEZP
Uk0oQ0hST01JVU0pICYmIE9TKERBUldJTikpCiAKICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZp
Y2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9jZy9JbnRSZWN0Q0cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY2cvSW50UmVjdENHLmNwcAkocmV2aXNpb24gODI5NDIpCisrKyBXZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL2NnL0ludFJlY3RDRy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2
LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAKLSNpZiBQ
TEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgKFVTRShTS0lBKSAmJiBQTEFURk9STShD
SFJPTUlVTSkgJiYgT1MoREFSV0lOKSkKIAogI2luY2x1ZGUgPEFwcGxpY2F0aW9uU2VydmljZXMv
QXBwbGljYXRpb25TZXJ2aWNlcy5oPgogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L2NnL0ludFNpemVDRy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9jZy9JbnRTaXplQ0cuY3BwCShyZXZpc2lvbiA4Mjk0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvY2cvSW50U2l6ZUNHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNyBA
QAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkludFNpemUuaCIKIAotI2lmIFBMQVRG
T1JNKENHKQorI2lmIFBMQVRGT1JNKENHKSB8fCAoVVNFKFNLSUEpICYmIFBMQVRGT1JNKENIUk9N
SVVNKSAmJiBPUyhEQVJXSU4pKQogCiAjaW5jbHVkZSA8QXBwbGljYXRpb25TZXJ2aWNlcy9BcHBs
aWNhdGlvblNlcnZpY2VzLmg+CiAK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>89438</attachid>
            <date>2011-04-13 12:49:22 -0700</date>
            <delta_ts>2011-04-13 23:26:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-57848-20110413154919.patch</filename>
            <type>text/plain</type>
            <size>9159</size>
            <attacher name="Cary Clark">caryclark</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNTg3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl
TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTEtMDQtMTMgIENhcnkgQ2xh
cmsgIDxjYXJ5Y2xhcmtAY2hyb21pdW0ub3JnPgorIAorICAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisgICAgICAgICAgCisgICAgICAgICBbQ2hyb21pdW1dIGFsbG93IGNvbmN1
cnJlbnQgU2tpYSBhbmQgQ0cgZGF0YXR5cGVzCisgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc4NDgKKworICAgICAgICAgVGhlIENocm9taXVtIHBvcnQg
aXMgZXhwZXJpbWVudGluZyB3aXRoIHJ1bm5pbmcgU2tpYSBhcyB0aGUgV2ViS2l0IHJlbmRlcmlu
ZyBlbmdpbmUsIGFuZCBDb3JlR3JhcGhpY3MKKyAgICAgICAgIGFzIHRoZSBVSSByZW5kZXJpbmcg
ZW5naW5lLiBUaGlzIHBlcm1pdHMgQ2hyb21pdW0gdG8gdW5pZnkgaXRzIGdyYXBoaWNzIHN0b3J5
IHdoaWxlIGxldmVyYWdpbmcgT1MgWCB0bworICAgICAgICAgZHJhdyBlbGVtZW50cyBsaWtlIHNj
cm9sbGJhcnMgYW5kIGJ1dHRvbnMuCisgCisgICAgICAgICBSZXN0cnVjdHVyZSB0aGUgY29tbW9u
IGdyYXBoaWNzIHVuaXRzLCBwb2ludHMsIGFuZCByZWN0YW5nbGVzLCB0byBjb252ZXJ0IHRvIFNr
LXR5cGVzIGFuZCBDRy10eXBlcyBhdAorICAgICAgICAgdGhlIHNhbWUgdGltZS4gVGhpcyByZXF1
aXJlcyBvbmx5IGFkZGluZyB0byB0aGUgZXhpc3RpbmcgcHJlcHJvY2Vzc29yIGNvbW1hbmRzLCBh
bmQgd2lsbCBoYXZlIG5vIGVmZmVjdAorICAgICAgICAgb24gYW55IGV4aXN0aW5nIHBsYXRmb3Jt
LgorICAgICAgICAgCisgICAgICAgICBFdmVudHVhbGx5LCBXVEZfVVNFX1NLSUFfT05fTUFDX0NI
Uk9NRSB3aWxsIGJlIGRlZmluZWQgdG8gZW5hYmxlIHRoaXMsIGJ1dCBmb3Igbm93LCB0aGVyZSdz
IG5vCisgICAgICAgICBmdW5jdGlvbmFsIGNoYW5nZS4KKyAKKyAgICAgICAgIE5vIG5ldyB0ZXN0
cyBhcyB0aGlzIHByb3ZpZGVzIG5vIG5ldyBmdW5jdGlvbmFsaXR5LgorIAorICAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50Lmg6IEFkZCBVU0UoU0tJQV9PTl9NQUNfQ0hST01F
KSB0byBtYWtlIENHIHR5cGUgYW5kIG9wZXJhdG9ycyB2aXNpYmxlCisgICAgICAgICB0byBhIFNr
aWEtYmFzZWQgQ2hyb21lIE1hYyBidWlsZC4KKyAgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv
RmxvYXRSZWN0Lmg6IERpdHRvLgorICAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFNp
emUuaDogRGl0dG8uCisgICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ludFBvaW50Lmg6IERp
dHRvLgorICAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9JbnRSZWN0Lmg6IERpdHRvLgorICAg
ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9JbnRTaXplLmg6IERpdHRvLgorICAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9jZy9GbG9hdFBvaW50Q0cuY3BwOiBEaXR0by4KKyAgICAgICAgICog
cGxhdGZvcm0vZ3JhcGhpY3MvY2cvRmxvYXRSZWN0Q0cuY3BwOiBEaXR0by4KKyAgICAgICAgICog
cGxhdGZvcm0vZ3JhcGhpY3MvY2cvRmxvYXRTaXplQ0cuY3BwOiBEaXR0by4KKyAgICAgICAgICog
cGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW50UG9pbnRDRy5jcHA6IERpdHRvLgorICAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9jZy9JbnRSZWN0Q0cuY3BwOiBEaXR0by4KKyAgICAgICAgICogcGxh
dGZvcm0vZ3JhcGhpY3MvY2cvSW50U2l6ZUNHLmNwcDogRGl0dG8uCisgCiAyMDExLTA0LTEyICBT
ZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmll
d2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL0Zsb2F0UG9pbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9ncmFwaGljcy9GbG9hdFBvaW50LmgJKHJldmlzaW9uIDgzNTg0KQorKysgU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw3
ICszMSw3IEBACiAjaW5jbHVkZSAiSW50UG9pbnQuaCIKICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJh
cy5oPgogCi0jaWYgUExBVEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IFVTRShTS0lBX09O
X01BQ19DSFJPTUUpCiB0eXBlZGVmIHN0cnVjdCBDR1BvaW50IENHUG9pbnQ7CiAjZW5kaWYKIApA
QCAtMTA5LDcgKzEwOSw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1feCAqIG1feCArIG1f
eSAqIG1feTsKICAgICB9CiAKLSNpZiBQTEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwg
VVNFKFNLSUFfT05fTUFDX0NIUk9NRSkKICAgICBGbG9hdFBvaW50KGNvbnN0IENHUG9pbnQmKTsK
ICAgICBvcGVyYXRvciBDR1BvaW50KCkgY29uc3Q7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCShyZXZpc2lvbiA4MzU4NCkKKysr
IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCSh3b3JraW5nIGNv
cHkpCkBAIC0yOSw3ICsyOSw3IEBACiAKICNpbmNsdWRlICJGbG9hdFBvaW50LmgiCiAKLSNpZiBQ
TEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgVVNFKFNLSUFfT05fTUFDX0NIUk9NRSkK
IHR5cGVkZWYgc3RydWN0IENHUmVjdCBDR1JlY3Q7CiAjZW5kaWYKIApAQCAtMTM3LDcgKzEzNyw3
IEBAIHB1YmxpYzoKICAgICB2b2lkIGZpdFRvUG9pbnRzKGNvbnN0IEZsb2F0UG9pbnQmIHAwLCBj
b25zdCBGbG9hdFBvaW50JiBwMSwgY29uc3QgRmxvYXRQb2ludCYgcDIpOwogICAgIHZvaWQgZml0
VG9Qb2ludHMoY29uc3QgRmxvYXRQb2ludCYgcDAsIGNvbnN0IEZsb2F0UG9pbnQmIHAxLCBjb25z
dCBGbG9hdFBvaW50JiBwMiwgY29uc3QgRmxvYXRQb2ludCYgcDMpOwogCi0jaWYgUExBVEZPUk0o
Q0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IFVTRShTS0lBX09OX01BQ19DSFJPTUUpCiAgICAgRmxv
YXRSZWN0KGNvbnN0IENHUmVjdCYpOwogICAgIG9wZXJhdG9yIENHUmVjdCgpIGNvbnN0OwogI2Vu
ZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUuaAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUu
aAkocmV2aXNpb24gODM1ODQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G
bG9hdFNpemUuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNyArMzEsNyBAQAogI2luY2x1ZGUgIklu
dFNpemUuaCIKICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogCi0jaWYgUExBVEZPUk0oQ0cp
IHx8IChQTEFURk9STShXWCkgJiYgT1MoREFSV0lOKSkKKyNpZiBQTEFURk9STShDRykgfHwgKFBM
QVRGT1JNKFdYKSAmJiBPUyhEQVJXSU4pKSB8fCBVU0UoU0tJQV9PTl9NQUNfQ0hST01FKQogdHlw
ZWRlZiBzdHJ1Y3QgQ0dTaXplIENHU2l6ZTsKICNlbmRpZgogCkBAIC04OSw3ICs4OSw3IEBAIHB1
YmxpYzoKICAgICAgICAgcmV0dXJuIG1fd2lkdGggKiBtX3dpZHRoICsgbV9oZWlnaHQgKiBtX2hl
aWdodDsKICAgICB9CiAKLSNpZiBQTEFURk9STShDRykgfHwgKFBMQVRGT1JNKFdYKSAmJiBPUyhE
QVJXSU4pKQorI2lmIFBMQVRGT1JNKENHKSB8fCAoUExBVEZPUk0oV1gpICYmIE9TKERBUldJTikp
IHx8IFVTRShTS0lBX09OX01BQ19DSFJPTUUpCiAgICAgZXhwbGljaXQgRmxvYXRTaXplKGNvbnN0
IENHU2l6ZSYpOyAvLyBkb24ndCBkbyB0aGlzIGltcGxpY2l0bHkgc2luY2UgaXQncyBsb3NzeQog
ICAgIG9wZXJhdG9yIENHU2l6ZSgpIGNvbnN0OwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRQb2ludC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ludFBvaW50LmgJKHJldmlzaW9uIDgzNTg0KQorKysgU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50UG9pbnQuaAkod29ya2luZyBjb3B5KQpA
QCAtMzIsNyArMzIsNyBAQAogI2luY2x1ZGUgPFFEYXRhU3RyZWFtPgogI2VuZGlmCiAKLSNpZiBQ
TEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgVVNFKFNLSUFfT05fTUFDX0NIUk9NRSkK
IHR5cGVkZWYgc3RydWN0IENHUG9pbnQgQ0dQb2ludDsKICNlbmRpZgogCkBAIC0xMTQsNyArMTE0
LDcgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gSW50UG9pbnQobV95LCBtX3gpOwogICAgIH0K
IAotI2lmIFBMQVRGT1JNKENHKQorI2lmIFBMQVRGT1JNKENHKSB8fCBVU0UoU0tJQV9PTl9NQUNf
Q0hST01FKQogICAgIGV4cGxpY2l0IEludFBvaW50KGNvbnN0IENHUG9pbnQmKTsgLy8gZG9uJ3Qg
ZG8gdGhpcyBpbXBsaWNpdGx5IHNpbmNlIGl0J3MgbG9zc3kKICAgICBvcGVyYXRvciBDR1BvaW50
KCkgY29uc3Q7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L0ludFJlY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9JbnRSZWN0LmgJKHJldmlzaW9uIDgzNTg0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvSW50UmVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBACiAjaW5j
bHVkZSAiSW50UG9pbnQuaCIKICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNpZiBQTEFURk9S
TShDRykKKyNpZiBQTEFURk9STShDRykgfHwgVVNFKFNLSUFfT05fTUFDX0NIUk9NRSkKIHR5cGVk
ZWYgc3RydWN0IENHUmVjdCBDR1JlY3Q7CiAjZW5kaWYKIApAQCAtMTgzLDcgKzE4Myw3IEBAIHB1
YmxpYzoKICAgICBvcGVyYXRvciBFaW5hX1JlY3RhbmdsZSgpIGNvbnN0OwogI2VuZGlmCiAKLSNp
ZiBQTEFURk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgVVNFKFNLSUFfT05fTUFDX0NIUk9N
RSkKICAgICBvcGVyYXRvciBDR1JlY3QoKSBjb25zdDsKICNlbmRpZgogCkBAIC0yMjksNyArMjI5
LDcgQEAgaW5saW5lIGJvb2wgb3BlcmF0b3IhPShjb25zdCBJbnRSZWN0JiBhLAogICAgIHJldHVy
biBhLmxvY2F0aW9uKCkgIT0gYi5sb2NhdGlvbigpIHx8IGEuc2l6ZSgpICE9IGIuc2l6ZSgpOwog
fQogCi0jaWYgUExBVEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IFVTRShTS0lBX09OX01B
Q19DSFJPTUUpCiBJbnRSZWN0IGVuY2xvc2luZ0ludFJlY3QoY29uc3QgQ0dSZWN0Jik7CiAjZW5k
aWYKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50U2l6ZS5oCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ludFNpemUuaAko
cmV2aXNpb24gODM1ODQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRT
aXplLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDcgQEAKICNpZm5kZWYgSW50U2l6ZV9o
CiAjZGVmaW5lIEludFNpemVfaAogCi0jaWYgUExBVEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cp
IHx8IFVTRShTS0lBX09OX01BQ19DSFJPTUUpCiB0eXBlZGVmIHN0cnVjdCBDR1NpemUgQ0dTaXpl
OwogI2VuZGlmCiAKQEAgLTEwOSw3ICsxMDksNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBJ
bnRTaXplKG1faGVpZ2h0LCBtX3dpZHRoKTsKICAgICB9CiAKLSNpZiBQTEFURk9STShDRykKKyNp
ZiBQTEFURk9STShDRykgfHwgVVNFKFNLSUFfT05fTUFDX0NIUk9NRSkKICAgICBleHBsaWNpdCBJ
bnRTaXplKGNvbnN0IENHU2l6ZSYpOyAvLyBkb24ndCBkbyB0aGlzIGltcGxpY2l0bHkgc2luY2Ug
aXQncyBsb3NzeQogICAgIG9wZXJhdG9yIENHU2l6ZSgpIGNvbnN0OwogI2VuZGlmCkluZGV4OiBT
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9GbG9hdFBvaW50Q0cuY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0Zsb2F0UG9pbnRD
Ry5jcHAJKHJldmlzaW9uIDgzNTg0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp
Y3MvY2cvRmxvYXRQb2ludENHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNyBAQAog
I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkZsb2F0UG9pbnQuaCIKIAotI2lmIFBMQVRG
T1JNKENHKQorI2lmIFBMQVRGT1JNKENHKSB8fCBVU0UoU0tJQV9PTl9NQUNfQ0hST01FKQogCiAj
aW5jbHVkZSA8QXBwbGljYXRpb25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CiAKSW5k
ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0Zsb2F0UmVjdENHLmNwcAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9GbG9hdFJl
Y3RDRy5jcHAJKHJldmlzaW9uIDgzNTg0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY2cvRmxvYXRSZWN0Q0cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw3IEBA
CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAKLSNpZiBQTEFU
Rk9STShDRykKKyNpZiBQTEFURk9STShDRykgfHwgVVNFKFNLSUFfT05fTUFDX0NIUk9NRSkKIAog
I2luY2x1ZGUgPEFwcGxpY2F0aW9uU2VydmljZXMvQXBwbGljYXRpb25TZXJ2aWNlcy5oPgogCklu
ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9GbG9hdFNpemVDRy5jcHAK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvRmxvYXRT
aXplQ0cuY3BwCShyZXZpc2lvbiA4MzU4NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2NnL0Zsb2F0U2l6ZUNHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNyBA
QAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkZsb2F0U2l6ZS5oIgogCi0jaWYgUExB
VEZPUk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IFVTRShTS0lBX09OX01BQ19DSFJPTUUpCiAK
ICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KIApJ
bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW50UG9pbnRDRy5jcHAK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW50UG9p
bnRDRy5jcHAJKHJldmlzaW9uIDgzNTg0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY2cvSW50UG9pbnRDRy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDcgQEAK
ICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJJbnRQb2ludC5oIgogCi0jaWYgUExBVEZP
Uk0oQ0cpCisjaWYgUExBVEZPUk0oQ0cpIHx8IFVTRShTS0lBX09OX01BQ19DSFJPTUUpCiAKICNp
bmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KIApJbmRl
eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW50UmVjdENHLmNwcAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbnRSZWN0Q0cu
Y3BwCShyZXZpc2lvbiA4MzU4NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L2NnL0ludFJlY3RDRy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDcgQEAKICNpbmNs
dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAKLSNpZiBQTEFURk9STShDRykK
KyNpZiBQTEFURk9STShDRykgfHwgVVNFKFNLSUFfT05fTUFDX0NIUk9NRSkKIAogI2luY2x1ZGUg
PEFwcGxpY2F0aW9uU2VydmljZXMvQXBwbGljYXRpb25TZXJ2aWNlcy5oPgogCkluZGV4OiBTb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbnRTaXplQ0cuY3BwCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ludFNpemVDRy5jcHAJKHJl
dmlzaW9uIDgzNTg0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW50
U2l6ZUNHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNyBAQAogI2luY2x1ZGUgImNv
bmZpZy5oIgogI2luY2x1ZGUgIkludFNpemUuaCIKIAotI2lmIFBMQVRGT1JNKENHKQorI2lmIFBM
QVRGT1JNKENHKSB8fCBVU0UoU0tJQV9PTl9NQUNfQ0hST01FKQogCiAjaW5jbHVkZSA8QXBwbGlj
YXRpb25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>