<?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>106013</bug_id>
          
          <creation_ts>2013-01-03 06:10:30 -0800</creation_ts>
          <short_desc>[Qt] Support kerning in fast path font rendering</short_desc>
          <delta_ts>2013-03-19 09:09:53 -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>Text</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>112704</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Allan Sandfeld Jensen">allan.jensen</reporter>
          <assigned_to name="Allan Sandfeld Jensen">allan.jensen</assigned_to>
          <cc>dglazkov</cc>
    
    <cc>jturcotte</cc>
    
    <cc>noam</cc>
    
    <cc>pierre.rossi</cc>
    
    <cc>webkit-ews</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>799342</commentid>
    <comment_count>0</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-01-03 06:10:30 -0800</bug_when>
    <thetext>The fast path font rendering has support for kerning, but to do so requires the SimpleFontData::applyTransforms method. Fortunately the method is available in QRawFont under the name advancesForGlyphIndexes. By tweaking the GlyphBufferGlyph and GlyphBufferAdvance types similar to what Safari does, this method can be called directly.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>799346</commentid>
    <comment_count>1</comment_count>
      <attachid>181169</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-01-03 06:14:41 -0800</bug_when>
    <thetext>Created attachment 181169
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>799354</commentid>
    <comment_count>2</comment_count>
      <attachid>181169</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-01-03 06:25:07 -0800</bug_when>
    <thetext>Comment on attachment 181169
Patch

This patch is missing a change to ensure kerning is set on QRawFont.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>799390</commentid>
    <comment_count>3</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-01-03 08:43:54 -0800</bug_when>
    <thetext>Actually it seems I have tested this incorrectly last time, or there have been a regression in Qt. QRawFont::advancesForGlyphIndexes does not currently perform kerning.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>855220</commentid>
    <comment_count>4</comment_count>
      <attachid>193128</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-14 08:36:21 -0700</bug_when>
    <thetext>Created attachment 193128
Patch

Updated to new proposed Qt 5.1 API</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858081</commentid>
    <comment_count>5</comment_count>
      <attachid>193769</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-19 02:28:34 -0700</bug_when>
    <thetext>Created attachment 193769
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858093</commentid>
    <comment_count>6</comment_count>
      <attachid>193769</attachid>
    <who name="EFL EWS Bot">eflews.bot</who>
    <bug_when>2013-03-19 02:50:29 -0700</bug_when>
    <thetext>Comment on attachment 193769
Patch

Attachment 193769 did not pass efl-ews (efl):
Output: http://webkit-commit-queue.appspot.com/results/17238256</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858094</commentid>
    <comment_count>7</comment_count>
      <attachid>193769</attachid>
    <who name="Early Warning System Bot">webkit-ews</who>
    <bug_when>2013-03-19 02:51:12 -0700</bug_when>
    <thetext>Comment on attachment 193769
Patch

Attachment 193769 did not pass qt-ews (qt):
Output: http://webkit-commit-queue.appspot.com/results/17116699</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858096</commentid>
    <comment_count>8</comment_count>
      <attachid>193769</attachid>
    <who name="Early Warning System Bot">webkit-ews</who>
    <bug_when>2013-03-19 02:56:07 -0700</bug_when>
    <thetext>Comment on attachment 193769
Patch

Attachment 193769 did not pass qt-wk2-ews (qt):
Output: http://webkit-commit-queue.appspot.com/results/17247024</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858097</commentid>
    <comment_count>9</comment_count>
      <attachid>193769</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2013-03-19 02:56:16 -0700</bug_when>
    <thetext>Comment on attachment 193769
Patch

Attachment 193769 did not pass chromium-ews (chromium-xvfb):
Output: http://webkit-commit-queue.appspot.com/results/17194461</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858100</commentid>
    <comment_count>10</comment_count>
      <attachid>193769</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2013-03-19 03:03:01 -0700</bug_when>
    <thetext>Comment on attachment 193769
Patch

Attachment 193769 did not pass cr-linux-debug-ews (chromium-xvfb):
Output: http://webkit-commit-queue.appspot.com/results/17194463</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858102</commentid>
    <comment_count>11</comment_count>
      <attachid>193772</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-19 03:06:13 -0700</bug_when>
    <thetext>Created attachment 193772
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858105</commentid>
    <comment_count>12</comment_count>
      <attachid>193772</attachid>
    <who name="EFL EWS Bot">eflews.bot</who>
    <bug_when>2013-03-19 03:14:24 -0700</bug_when>
    <thetext>Comment on attachment 193772
Patch

Attachment 193772 did not pass efl-ews (efl):
Output: http://webkit-commit-queue.appspot.com/results/17160655</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858115</commentid>
    <comment_count>13</comment_count>
      <attachid>193774</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-19 03:28:50 -0700</bug_when>
    <thetext>Created attachment 193774
Patch

Do not use QT_VERSION_CHECK() in parts that other ports needs to parse</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858156</commentid>
    <comment_count>14</comment_count>
      <attachid>193774</attachid>
    <who name="Pierre Rossi">pierre.rossi</who>
    <bug_when>2013-03-19 04:22:37 -0700</bug_when>
    <thetext>Comment on attachment 193774
Patch

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

LGTM

&gt; Source/WebCore/platform/graphics/GlyphBuffer.h:95
&gt; +struct GlyphBufferAdvance : public QPointF {

Just out of curiosity, why not use QSizeF here ? Wouldn&apos;t a simple typedef do the trick even since the function signatures match already ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858161</commentid>
    <comment_count>15</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-19 04:34:28 -0700</bug_when>
    <thetext>(In reply to comment #14)
&gt; (From update of attachment 193774 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=193774&amp;action=review
&gt; 
&gt; LGTM
&gt; 
&gt; &gt; Source/WebCore/platform/graphics/GlyphBuffer.h:95
&gt; &gt; +struct GlyphBufferAdvance : public QPointF {
&gt; 
&gt; Just out of curiosity, why not use QSizeF here ? Wouldn&apos;t a simple typedef do the trick even since the function signatures match already ?

The problem is that QRawFont::advancesForGlyphIndexes takes a pointer to an QPointF array as an argument. So I want a GlyphBufferAdvance class that is also makes for a valid QPointF pointer.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858209</commentid>
    <comment_count>16</comment_count>
      <attachid>193774</attachid>
    <who name="Pierre Rossi">pierre.rossi</who>
    <bug_when>2013-03-19 06:16:47 -0700</bug_when>
    <thetext>Comment on attachment 193774
Patch

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

&gt;&gt;&gt; Source/WebCore/platform/graphics/GlyphBuffer.h:95
&gt;&gt;&gt; +struct GlyphBufferAdvance : public QPointF {
&gt;&gt; 
&gt;&gt; Just out of curiosity, why not use QSizeF here ? Wouldn&apos;t a simple typedef do the trick even since the function signatures match already ?
&gt; 
&gt; The problem is that QRawFont::advancesForGlyphIndexes takes a pointer to an QPointF array as an argument. So I want a GlyphBufferAdvance class that is also makes for a valid QPointF pointer.

Right. So there is no way around it indeed. so now we could also save a line in Font::drawGlyphs in FontQt.cpp ;)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858243</commentid>
    <comment_count>17</comment_count>
      <attachid>193818</attachid>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-19 07:00:44 -0700</bug_when>
    <thetext>Created attachment 193818
Patch

Moving enabling kerning by default to a separate patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858328</commentid>
    <comment_count>18</comment_count>
      <attachid>193818</attachid>
    <who name="Jocelyn Turcotte">jturcotte</who>
    <bug_when>2013-03-19 08:59:06 -0700</bug_when>
    <thetext>Comment on attachment 193818
Patch

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

&gt; Source/WebCore/platform/graphics/SimpleFontData.h:209
&gt; +#elif PLATFORM(QT) &amp;&amp; QT_VERSION &gt;= 0x050100

QT_VERSION_CHECK?

&gt; Source/WebCore/platform/graphics/WidthIterator.h:69
&gt; +#elif PLATFORM(QT) &amp;&amp; QT_VERSION &gt;= 0x050100

ditto

LGTM too for the rest, r=me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>858331</commentid>
    <comment_count>19</comment_count>
    <who name="Allan Sandfeld Jensen">allan.jensen</who>
    <bug_when>2013-03-19 09:03:08 -0700</bug_when>
    <thetext>Committed r146209: &lt;http://trac.webkit.org/changeset/146209&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>181169</attachid>
            <date>2013-01-03 06:14:41 -0800</date>
            <delta_ts>2013-03-14 08:36:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-106013-20130103151115.patch</filename>
            <type>text/plain</type>
            <size>5525</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ2NzNmYjQ3YmQxODk2
ZTE4OTllYTg4YmIyZGUyYzVlNGZlNTk5ZC4uYzYyMjFhZTBhYjNmMjBlZjg5MTg5Mjc2M2QyNDJl
ZjU3ZGZkMWE0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAxLTAzICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR
dF0gU3VwcG9ydCBrZXJuaW5nIGluIGZhc3QgcGF0aCBmb250IHJlbmRlcmluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2MDEzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gc3VwcG9ydCBrZXJuaW5n
IGluIHRoZSBmYXN0IGZvbnQgcGF0aCB3ZSBuZWVkIHRvIGltcGxlbWVudCBTaW1wbGVGb250RGF0
YTo6YXBwbHlUcmFuc2Zvcm1zLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgdHlw
ZXMgdXNlZCBieSB0aGUgZmFzdCBwYXRoIEdseXBoQnVmZmVyIHRvIG1hdGNoIHRob3NlIHVzZWQg
YnkgUXQsCisgICAgICAgIGFuZCBpbXBsZW1lbnRzIFNpbXBsZUZvbnREYXRhOjphcHBseVRyYW5z
Zm9ybXMgdXNpbmcgUVJhd0ZvbnQ6OmFkdmFuY2VzRm9yR2x5cGhJbmRleGVzLgorCisgICAgICAg
ICogcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaDoKKyAgICAgICAgKFdlYkNvcmUpOgor
ICAgICAgICAoR2x5cGhCdWZmZXJBZHZhbmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVm
ZmVyQWR2YW5jZTo6R2x5cGhCdWZmZXJBZHZhbmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBo
QnVmZmVyQWR2YW5jZTo6c2V0V2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXJB
ZHZhbmNlOjp3aWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6Omhl
aWdodCk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlcjo6YWRkKToKKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oOgorICAgICAgICAoU2ltcGxlRm9udERh
dGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaDoKKyAgICAg
ICAgKFdlYkNvcmU6OldpZHRoSXRlcmF0b3I6OnN1cHBvcnRzVHlwZXNldHRpbmdGZWF0dXJlcyk6
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6YXBwbHlUcmFuc2Zvcm1zKToKKyAgICAg
ICAgKFdlYkNvcmUpOgorCiAyMDEzLTAxLTAzICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1bS5v
cmc+CiAKICAgICAgICAgc2VhbWxlc3MgaWZyYW1lcyBkb24ndCBpbmhlcml0IHN0eWxlcyB3aGVu
IHNyY2RvYyBpcyB1c2VkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9HbHlwaEJ1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5
cGhCdWZmZXIuaAppbmRleCA1ZmVhZmIxNDAyYzU2ZDYzODkyMTNkYmIyYTZkZDk3ZGNmOWI3NGYx
Li4zYWVjMDhlNjVlMGJmOTFkNTIwMTZmNTU5MGVlYTM1YjM4MzdhMmQzIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKQEAgLTU2LDYgKzU2LDgg
QEAgY2xhc3MgU2ltcGxlRm9udERhdGE7CiB0eXBlZGVmIGNhaXJvX2dseXBoX3QgR2x5cGhCdWZm
ZXJHbHlwaDsKICNlbGlmIE9TKFdJTkNFKQogdHlwZWRlZiB3Y2hhcl90IEdseXBoQnVmZmVyR2x5
cGg7CisjZWxpZiBQTEFURk9STShRVCkKK3R5cGVkZWYgcXVpbnQzMiBHbHlwaEJ1ZmZlckdseXBo
OwogI2Vsc2UKIHR5cGVkZWYgR2x5cGggR2x5cGhCdWZmZXJHbHlwaDsKICNlbmRpZgpAQCAtODks
NiArOTEsMTggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBmbG9hdCBhZHZhbmNlOwogfTsKKyNl
bGlmIFBMQVRGT1JNKFFUKQorc3RydWN0IEdseXBoQnVmZmVyQWR2YW5jZSA6IHB1YmxpYyBRUG9p
bnRGIHsKK3B1YmxpYzoKKyAgICBHbHlwaEJ1ZmZlckFkdmFuY2UoY29uc3QgUVBvaW50RiYgYWR2
YW5jZSkKKyAgICAgICAgOiBRUG9pbnRGKGFkdmFuY2UpCisgICAgeworICAgIH0KKworICAgIHZv
aWQgc2V0V2lkdGgocXJlYWwgd2lkdGgpIHsgUVBvaW50Rjo6c2V0WCh3aWR0aCk7IH0KKyAgICBx
cmVhbCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIFFQb2ludEY6OngoKTsgfQorICAgIHFyZWFsIGhl
aWdodCgpIGNvbnN0IHsgcmV0dXJuIFFQb2ludEY6OnkoKTsgfQorfTsKICNlbHNlCiB0eXBlZGVm
IEZsb2F0U2l6ZSBHbHlwaEJ1ZmZlckFkdmFuY2U7CiAjZW5kaWYKQEAgLTE1Niw2ICsxNzAsOCBA
QCBwdWJsaWM6CiAgICAgICAgIG1fYWR2YW5jZXMuYXBwZW5kKGFkdmFuY2UpOwogI2VsaWYgT1Mo
V0lOQ0UpCiAgICAgICAgIG1fYWR2YW5jZXMuYXBwZW5kKHdpZHRoKTsKKyNlbGlmIFBMQVRGT1JN
KFFUKQorICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZChRUG9pbnRGKHdpZHRoLCAwKSk7CiAjZWxz
ZQogICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZChGbG9hdFNpemUod2lkdGgsIDApKTsKICNlbmRp
ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9u
dERhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRh
LmgKaW5kZXggNDFmODAxNWQxM2UyZTU0ZTY5ODYwMjEwMzMyNjQ1YjlhODJlMzAyOS4uMmQzMjBi
ZjZiYmNlZTgzNDcwMWIzNGNkNmRlZDIxM2FkZmQ0NTNhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oCkBAIC0xOTksNiArMTk5LDkg
QEAgcHVibGljOgogICAgIGJvb2wgY2FuUmVuZGVyQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2Uo
Y29uc3QgVUNoYXIqLCBzaXplX3QpIGNvbnN0OwogI2VuZGlmCiAKKyNpZiBQTEFURk9STShRVCkK
KyAgICBib29sIGFwcGx5VHJhbnNmb3JtcyhHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMsIEdseXBo
QnVmZmVyQWR2YW5jZSogYWR2YW5jZXMsIHNpemVfdCBnbHlwaENvdW50LCBUeXBlc2V0dGluZ0Zl
YXR1cmVzKSBjb25zdDsKKyNlbHNlCiAgICAgYm9vbCBhcHBseVRyYW5zZm9ybXMoR2x5cGhCdWZm
ZXJHbHlwaCogZ2x5cGhzLCBHbHlwaEJ1ZmZlckFkdmFuY2UqIGFkdmFuY2VzLCBzaXplX3QgZ2x5
cGhDb3VudCwgVHlwZXNldHRpbmdGZWF0dXJlcyB0eXBlc2V0dGluZ0ZlYXR1cmVzKSBjb25zdAog
ICAgIHsKICNpZiAhUExBVEZPUk0oTUFDKSB8fCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJ
UkVEIDw9IDEwODAKQEAgLTIxMyw2ICsyMTYsNyBAQCBwdWJsaWM6CiAgICAgcmV0dXJuIHdrQ1RG
b250VHJhbnNmb3JtR2x5cGhzKG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBnbHlwaHMsIHJlaW50
ZXJwcmV0X2Nhc3Q8Q0dTaXplKj4oYWR2YW5jZXMpLCBnbHlwaENvdW50LCBvcHRpb25zKTsKICNl
bmRpZgogICAgIH0KKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oUVQpCiAgICAgUVJhd0ZvbnQgZ2V0
UXRSYXdGb250KCkgY29uc3QgeyByZXR1cm4gbV9wbGF0Zm9ybURhdGEucmF3Rm9udCgpOyB9CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9y
LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgKaW5k
ZXggMTk5NmEwOTc4M2VjNDQzMTNhM2UyOWJiZjgzMmYwYmRkNWM3MmIyYS4uYWRjZTQzYTU0NzAz
MmNhMzkyNzczNGJjOTg2NGRjOWVhNTg3NTBhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaApAQCAtNjEsNyArNjEsOSBAQCBwdWJsaWM6
CiAKICAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c1R5cGVzZXR0aW5nRmVhdHVyZXMoY29uc3QgRm9u
dCYgZm9udCkKICAgICB7Ci0jaWYgIVBMQVRGT1JNKE1BQykgfHwgX19NQUNfT1NfWF9WRVJTSU9O
X01JTl9SRVFVSVJFRCA8PSAxMDgwCisjaWYgUExBVEZPUk0oUVQpCisgICAgICAgIHJldHVybiAh
KGZvbnQudHlwZXNldHRpbmdGZWF0dXJlcygpICYgfihLZXJuaW5nIHwgTGlnYXR1cmVzKSk7Cisj
ZWxpZiAhUExBVEZPUk0oTUFDKSB8fCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDw9
IDEwODAKICAgICAgICAgcmV0dXJuICFmb250LnR5cGVzZXR0aW5nRmVhdHVyZXMoKTsKICNlbHNl
CiAgICAgICAgIGlmICghZm9udC5pc1ByaW50ZXJGb250KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9TaW1wbGVGb250RGF0YVF0LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwCmluZGV4
IDQ0MDk5YjNlYjJjMTk4ZGM0MTBiZDc2Y2YyZmQwZTI2NzE1ZjA5MDguLjdmMjkwNDg0MDVlOGVk
NTAyMjAyZjE3YjllZjczMjBjOGE2ZjZkNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwCkBAIC01OCw2ICs1
OCwxMSBAQCBmbG9hdCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1XaWR0aEZvckdseXBoKEdseXBo
IGdseXBoKSBjb25zdAogICAgIHJldHVybiBhZHZhbmNlcy5hdCgwKS54KCk7CiB9CiAKK2Jvb2wg
U2ltcGxlRm9udERhdGE6OmFwcGx5VHJhbnNmb3JtcyhHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMs
IEdseXBoQnVmZmVyQWR2YW5jZSogYWR2YW5jZXMsIHNpemVfdCBnbHlwaENvdW50LCBUeXBlc2V0
dGluZ0ZlYXR1cmVzKSBjb25zdAoreworICAgIHJldHVybiBtX3BsYXRmb3JtRGF0YS5yYXdGb250
KCkuYWR2YW5jZXNGb3JHbHlwaEluZGV4ZXMoZ2x5cGhzLCBhZHZhbmNlcywgZ2x5cGhDb3VudCk7
Cit9CisKIFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpjcmVhdGVT
Y2FsZWRGb250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxv
YXQgc2NhbGVGYWN0b3IpIGNvbnN0CiB7CiAgICAgY29uc3QgZmxvYXQgc2NhbGVkU2l6ZSA9IGxy
b3VuZGYoZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkU2l6ZSgpICogc2NhbGVGYWN0b3IpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193128</attachid>
            <date>2013-03-14 08:36:21 -0700</date>
            <delta_ts>2013-03-19 02:28:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-106013-20130314163125.patch</filename>
            <type>text/plain</type>
            <size>6076</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQ3NThmNjA4YWJkNTUx
NjQ5ODNhNjdiNjBhMzgzYjMyZDhhMTc3MS4uMzU5NWFkY2Q1ODEyY2IxYjhjMDEyNGFjZjRmYjc2
MTYwMzg3NGRjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAxLTAzICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR
dF0gU3VwcG9ydCBrZXJuaW5nIGluIGZhc3QgcGF0aCBmb250IHJlbmRlcmluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2MDEzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gc3VwcG9ydCBrZXJuaW5n
IGluIHRoZSBmYXN0IGZvbnQgcGF0aCB3ZSBuZWVkIHRvIGltcGxlbWVudCBTaW1wbGVGb250RGF0
YTo6YXBwbHlUcmFuc2Zvcm1zLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgdHlw
ZXMgdXNlZCBieSB0aGUgZmFzdCBwYXRoIEdseXBoQnVmZmVyIHRvIG1hdGNoIHRob3NlIHVzZWQg
YnkgUXQsCisgICAgICAgIGFuZCBpbXBsZW1lbnRzIFNpbXBsZUZvbnREYXRhOjphcHBseVRyYW5z
Zm9ybXMgdXNpbmcgUVJhd0ZvbnQ6OmFkdmFuY2VzRm9yR2x5cGhJbmRleGVzLgorCisgICAgICAg
ICogcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaDoKKyAgICAgICAgKFdlYkNvcmUpOgor
ICAgICAgICAoR2x5cGhCdWZmZXJBZHZhbmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVm
ZmVyQWR2YW5jZTo6R2x5cGhCdWZmZXJBZHZhbmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBo
QnVmZmVyQWR2YW5jZTo6c2V0V2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXJB
ZHZhbmNlOjp3aWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6Omhl
aWdodCk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlcjo6YWRkKToKKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oOgorICAgICAgICAoU2ltcGxlRm9udERh
dGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaDoKKyAgICAg
ICAgKFdlYkNvcmU6OldpZHRoSXRlcmF0b3I6OnN1cHBvcnRzVHlwZXNldHRpbmdGZWF0dXJlcyk6
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6YXBwbHlUcmFuc2Zvcm1zKToKKyAgICAg
ICAgKFdlYkNvcmUpOgorCiAyMDEzLTAzLTE0ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxh
bi5qZW5zZW5AZGlnaWEuY29tPgogCiAgICAgICAgIFtRdF0gQWRkIHN1cHBvcnQgZm9yIHRpbGVk
IHNoYWRvdyBibHVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9HbHlwaEJ1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhC
dWZmZXIuaAppbmRleCA1ZmVhZmIxNDAyYzU2ZDYzODkyMTNkYmIyYTZkZDk3ZGNmOWI3NGYxLi4z
YWVjMDhlNjVlMGJmOTFkNTIwMTZmNTU5MGVlYTM1YjM4MzdhMmQzIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5oCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKQEAgLTU2LDYgKzU2LDggQEAg
Y2xhc3MgU2ltcGxlRm9udERhdGE7CiB0eXBlZGVmIGNhaXJvX2dseXBoX3QgR2x5cGhCdWZmZXJH
bHlwaDsKICNlbGlmIE9TKFdJTkNFKQogdHlwZWRlZiB3Y2hhcl90IEdseXBoQnVmZmVyR2x5cGg7
CisjZWxpZiBQTEFURk9STShRVCkKK3R5cGVkZWYgcXVpbnQzMiBHbHlwaEJ1ZmZlckdseXBoOwog
I2Vsc2UKIHR5cGVkZWYgR2x5cGggR2x5cGhCdWZmZXJHbHlwaDsKICNlbmRpZgpAQCAtODksNiAr
OTEsMTggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBmbG9hdCBhZHZhbmNlOwogfTsKKyNlbGlm
IFBMQVRGT1JNKFFUKQorc3RydWN0IEdseXBoQnVmZmVyQWR2YW5jZSA6IHB1YmxpYyBRUG9pbnRG
IHsKK3B1YmxpYzoKKyAgICBHbHlwaEJ1ZmZlckFkdmFuY2UoY29uc3QgUVBvaW50RiYgYWR2YW5j
ZSkKKyAgICAgICAgOiBRUG9pbnRGKGFkdmFuY2UpCisgICAgeworICAgIH0KKworICAgIHZvaWQg
c2V0V2lkdGgocXJlYWwgd2lkdGgpIHsgUVBvaW50Rjo6c2V0WCh3aWR0aCk7IH0KKyAgICBxcmVh
bCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIFFQb2ludEY6OngoKTsgfQorICAgIHFyZWFsIGhlaWdo
dCgpIGNvbnN0IHsgcmV0dXJuIFFQb2ludEY6OnkoKTsgfQorfTsKICNlbHNlCiB0eXBlZGVmIEZs
b2F0U2l6ZSBHbHlwaEJ1ZmZlckFkdmFuY2U7CiAjZW5kaWYKQEAgLTE1Niw2ICsxNzAsOCBAQCBw
dWJsaWM6CiAgICAgICAgIG1fYWR2YW5jZXMuYXBwZW5kKGFkdmFuY2UpOwogI2VsaWYgT1MoV0lO
Q0UpCiAgICAgICAgIG1fYWR2YW5jZXMuYXBwZW5kKHdpZHRoKTsKKyNlbGlmIFBMQVRGT1JNKFFU
KQorICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZChRUG9pbnRGKHdpZHRoLCAwKSk7CiAjZWxzZQog
ICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZChGbG9hdFNpemUod2lkdGgsIDApKTsKICNlbmRpZgpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERh
dGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmgK
aW5kZXggMWVkZjMxMGQzYTdlOWE0ZWJmODZjYzg0MzgxOGY1ZjNmYmI3ZTYxNS4uMmVlY2QyYTFm
OTI2ZmM2MTg3NDk5OGUzNTNhY2EyM2JhZGY4ODBiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oCkBAIC0yMDEsNiArMjAxLDkgQEAg
cHVibGljOgogICAgIGJvb2wgY2FuUmVuZGVyQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2UoY29u
c3QgVUNoYXIqLCBzaXplX3QpIGNvbnN0OwogI2VuZGlmCiAKKyNpZiBQTEFURk9STShRVCkKKyAg
ICBib29sIGFwcGx5VHJhbnNmb3JtcyhHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMsIEdseXBoQnVm
ZmVyQWR2YW5jZSogYWR2YW5jZXMsIHNpemVfdCBnbHlwaENvdW50LCBUeXBlc2V0dGluZ0ZlYXR1
cmVzKSBjb25zdDsKKyNlbHNlCiAgICAgYm9vbCBhcHBseVRyYW5zZm9ybXMoR2x5cGhCdWZmZXJH
bHlwaCogZ2x5cGhzLCBHbHlwaEJ1ZmZlckFkdmFuY2UqIGFkdmFuY2VzLCBzaXplX3QgZ2x5cGhD
b3VudCwgVHlwZXNldHRpbmdGZWF0dXJlcyB0eXBlc2V0dGluZ0ZlYXR1cmVzKSBjb25zdAogICAg
IHsKICNpZiAhUExBVEZPUk0oTUFDKSB8fCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE
IDw9IDEwODAKQEAgLTIxNCw2ICsyMTcsNyBAQCBwdWJsaWM6CiAgICAgcmV0dXJuIHdrQ1RGb250
VHJhbnNmb3JtR2x5cGhzKG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBnbHlwaHMsIHJlaW50ZXJw
cmV0X2Nhc3Q8Q0dTaXplKj4oYWR2YW5jZXMpLCBnbHlwaENvdW50LCBvcHRpb25zKTsKICNlbmRp
ZgogICAgIH0KKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oUVQpCiAgICAgUVJhd0ZvbnQgZ2V0UXRS
YXdGb250KCkgY29uc3QgeyByZXR1cm4gbV9wbGF0Zm9ybURhdGEucmF3Rm9udCgpOyB9CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgKaW5kZXgg
MTk5NmEwOTc4M2VjNDQzMTNhM2UyOWJiZjgzMmYwYmRkNWM3MmIyYS4uODI1YmJlYjg5ZjYyOTgz
YTVmNjdmMjlmYjg1ZmNhMzE2ZjUwYmE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaApAQCAtNjEsMTMgKzYxLDE1IEBAIHB1YmxpYzoK
IAogICAgIHN0YXRpYyBib29sIHN1cHBvcnRzVHlwZXNldHRpbmdGZWF0dXJlcyhjb25zdCBGb250
JiBmb250KQogICAgIHsKLSNpZiAhUExBVEZPUk0oTUFDKSB8fCBfX01BQ19PU19YX1ZFUlNJT05f
TUlOX1JFUVVJUkVEIDw9IDEwODAKLSAgICAgICAgcmV0dXJuICFmb250LnR5cGVzZXR0aW5nRmVh
dHVyZXMoKTsKLSNlbHNlCisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05f
TUlOX1JFUVVJUkVEID4gMTA4MAogICAgICAgICBpZiAoIWZvbnQuaXNQcmludGVyRm9udCgpKQog
ICAgICAgICAgICAgcmV0dXJuICFmb250LnR5cGVzZXR0aW5nRmVhdHVyZXMoKTsKIAogICAgICAg
ICByZXR1cm4gIShmb250LnR5cGVzZXR0aW5nRmVhdHVyZXMoKSAmIH4oS2VybmluZyB8IExpZ2F0
dXJlcykpOworI2VsaWYgUExBVEZPUk0oUVQpICYmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9D
SEVDSyg1LCAxLCAwKQorICAgICAgICByZXR1cm4gIShmb250LnR5cGVzZXR0aW5nRmVhdHVyZXMo
KSAmIH5LZXJuaW5nKTsKKyNlbHNlCisgICAgICAgIHJldHVybiAhZm9udC50eXBlc2V0dGluZ0Zl
YXR1cmVzKCk7CiAjZW5kaWYKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwIGIvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHAKaW5kZXggZGM5ZWE5MjIz
YTFiNzgwZWIxOWM5MGRiNzBmYzIxNWRiYzM2ZmZkOS4uYTk5ZDcwNDRhOThmNmM2YWJlZDI4NzU4
MzMyMDBkZjUzMDM2ZDljOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHAKQEAgLTU4LDYgKzU4LDE5IEBAIGZs
b2F0IFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybVdpZHRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNv
bnN0CiAgICAgcmV0dXJuIGFkdmFuY2VzLmF0KDApLngoKTsKIH0KIAorYm9vbCBTaW1wbGVGb250
RGF0YTo6YXBwbHlUcmFuc2Zvcm1zKEdseXBoQnVmZmVyR2x5cGgqIGdseXBocywgR2x5cGhCdWZm
ZXJBZHZhbmNlKiBhZHZhbmNlcywgc2l6ZV90IGdseXBoQ291bnQsIFR5cGVzZXR0aW5nRmVhdHVy
ZXMgZmVhdHVyZXMpIGNvbnN0Cit7CisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNL
KDUsIDEsIDApCisgICAgUVJhd0ZvbnQ6OkxheW91dEZsYWdzIGZsYWdzID0gUVJhd0ZvbnQ6OlNl
cGFyYXRlQWR2YW5jZXM7CisgICAgaWYgKGZlYXR1cmVzICYgS2VybmluZykKKyAgICAgICAgZmxh
Z3MgfD0gUVJhd0ZvbnQ6Oktlcm5lZEFkdmFuY2VzOworICAgIHJldHVybiBtX3BsYXRmb3JtRGF0
YS5yYXdGb250KCkuYWR2YW5jZXNGb3JHbHlwaEluZGV4ZXMoZ2x5cGhzLCBhZHZhbmNlcywgZ2x5
cGhDb3VudCwgZmxhZ3MpOworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0oZmVhdHVyZXMpOworICAg
IHJldHVybiBtX3BsYXRmb3JtRGF0YS5yYXdGb250KCkuYWR2YW5jZXNGb3JHbHlwaEluZGV4ZXMo
Z2x5cGhzLCBhZHZhbmNlcywgZ2x5cGhDb3VudCk7CisjZW5kaWYKK30KKwogUGFzc1JlZlB0cjxT
aW1wbGVGb250RGF0YT4gU2ltcGxlRm9udERhdGE6OmNyZWF0ZVNjYWxlZEZvbnREYXRhKGNvbnN0
IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBmbG9hdCBzY2FsZUZhY3RvcikgY29u
c3QKIHsKICAgICBjb25zdCBmbG9hdCBzY2FsZWRTaXplID0gbHJvdW5kZihmb250RGVzY3JpcHRp
b24uY29tcHV0ZWRTaXplKCkgKiBzY2FsZUZhY3Rvcik7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193769</attachid>
            <date>2013-03-19 02:28:34 -0700</date>
            <delta_ts>2013-03-19 03:06:07 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-106013-20130319102332.patch</filename>
            <type>text/plain</type>
            <size>7759</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVkNDk0OTZkNGVkZmUx
YjkxZjE5ZTE3MmM1YTY5YmI1ZDU0NDQ0ZS4uNGY5Y2FhNjczNDNjN2YyZmFlNmMzNTIzY2IwYjhm
ZDQ3YzYzMWUxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTAzLTE5ICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR
dF0gU3VwcG9ydCBrZXJuaW5nIGluIGZhc3QgcGF0aCBmb250IHJlbmRlcmluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2MDEzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gc3VwcG9ydCBrZXJuaW5n
IGluIHRoZSBmYXN0IGZvbnQgcGF0aCB3ZSBuZWVkIHRvIGltcGxlbWVudCBTaW1wbGVGb250RGF0
YTo6YXBwbHlUcmFuc2Zvcm1zLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgdHlw
ZXMgdXNlZCBieSB0aGUgZmFzdCBwYXRoIEdseXBoQnVmZmVyIHRvIG1hdGNoIHRob3NlIHVzZWQg
YnkgUXQsCisgICAgICAgIGFuZCBpbXBsZW1lbnRzIFNpbXBsZUZvbnREYXRhOjphcHBseVRyYW5z
Zm9ybXMgdXNpbmcgUVJhd0ZvbnQ6OmFkdmFuY2VzRm9yR2x5cGhJbmRleGVzLgorCisgICAgICAg
IEZhc3Qga2VybmluZyBpcyBvbmx5IGF2YWlsYWJsZSBmb3IgUXQgNS4xIGFuZCB1cC4KKworICAg
ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmg6CisgICAgICAgIChHbHlwaEJ1
ZmZlckFkdmFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXJBZHZhbmNlOjpHbHlw
aEJ1ZmZlckFkdmFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXJBZHZhbmNlOjpz
ZXRXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6OndpZHRoKToK
KyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyQWR2YW5jZTo6aGVpZ2h0KToKKyAgICAgICAg
KFdlYkNvcmU6OkdseXBoQnVmZmVyOjphZGQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz
L1NpbXBsZUZvbnREYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6YXBw
bHlUcmFuc2Zvcm1zKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9y
Lmg6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjpzdXBwb3J0c1R5cGVzZXR0aW5n
RmVhdHVyZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpGb250Ojppbml0Rm9ybWF0Rm9yVGV4dExheW91dCk6CisgICAgICAg
ICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6YXBwbHlUcmFuc2Zvcm1zKToKKwogMjAxMy0wMy0xOCAg
VnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5z
cGVjdG9yOiBEZWJ1Z2dlciBzY3JpcHRzIHNob3VsZCB2aXN1YWxseSBkaWZmZXIgZnJvbSBuZXR3
b3JrL2ZpbGVzeXN0ZW0gZmlsZXMgaW4gd29ya3NwYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKaW5kZXggNWZlYWZiMTQwMmM1NmQ2Mzg5MjEz
ZGJiMmE2ZGQ5N2RjZjliNzRmMS4uM2FlYzA4ZTY1ZTBiZjkxZDUyMDE2ZjU1OTBlZWEzNWIzODM3
YTJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhC
dWZmZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZl
ci5oCkBAIC01Niw2ICs1Niw4IEBAIGNsYXNzIFNpbXBsZUZvbnREYXRhOwogdHlwZWRlZiBjYWly
b19nbHlwaF90IEdseXBoQnVmZmVyR2x5cGg7CiAjZWxpZiBPUyhXSU5DRSkKIHR5cGVkZWYgd2No
YXJfdCBHbHlwaEJ1ZmZlckdseXBoOworI2VsaWYgUExBVEZPUk0oUVQpCit0eXBlZGVmIHF1aW50
MzIgR2x5cGhCdWZmZXJHbHlwaDsKICNlbHNlCiB0eXBlZGVmIEdseXBoIEdseXBoQnVmZmVyR2x5
cGg7CiAjZW5kaWYKQEAgLTg5LDYgKzkxLDE4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZmxv
YXQgYWR2YW5jZTsKIH07CisjZWxpZiBQTEFURk9STShRVCkKK3N0cnVjdCBHbHlwaEJ1ZmZlckFk
dmFuY2UgOiBwdWJsaWMgUVBvaW50RiB7CitwdWJsaWM6CisgICAgR2x5cGhCdWZmZXJBZHZhbmNl
KGNvbnN0IFFQb2ludEYmIGFkdmFuY2UpCisgICAgICAgIDogUVBvaW50RihhZHZhbmNlKQorICAg
IHsKKyAgICB9CisKKyAgICB2b2lkIHNldFdpZHRoKHFyZWFsIHdpZHRoKSB7IFFQb2ludEY6OnNl
dFgod2lkdGgpOyB9CisgICAgcXJlYWwgd2lkdGgoKSBjb25zdCB7IHJldHVybiBRUG9pbnRGOjp4
KCk7IH0KKyAgICBxcmVhbCBoZWlnaHQoKSBjb25zdCB7IHJldHVybiBRUG9pbnRGOjp5KCk7IH0K
K307CiAjZWxzZQogdHlwZWRlZiBGbG9hdFNpemUgR2x5cGhCdWZmZXJBZHZhbmNlOwogI2VuZGlm
CkBAIC0xNTYsNiArMTcwLDggQEAgcHVibGljOgogICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZChh
ZHZhbmNlKTsKICNlbGlmIE9TKFdJTkNFKQogICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZCh3aWR0
aCk7CisjZWxpZiBQTEFURk9STShRVCkKKyAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQoUVBvaW50
Rih3aWR0aCwgMCkpOwogI2Vsc2UKICAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQoRmxvYXRTaXpl
KHdpZHRoLCAwKSk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9TaW1wbGVGb250RGF0YS5oCmluZGV4IDM4MTAyNDQ3MTAxMGU3OTliNzU5N2M1MWZkYzM0
YzBiMjRhN2U3MGEuLmNlMzZiOGI5ZjVkMTE2OTZhYWYzYzdjMDJkODBmYjM5Mzg4YWY0MzQgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRh
LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEu
aApAQCAtMjAzLDE1ICsyMDMsMTggQEAgcHVibGljOgogCiAgICAgYm9vbCBhcHBseVRyYW5zZm9y
bXMoR2x5cGhCdWZmZXJHbHlwaCogZ2x5cGhzLCBHbHlwaEJ1ZmZlckFkdmFuY2UqIGFkdmFuY2Vz
LCBzaXplX3QgZ2x5cGhDb3VudCwgVHlwZXNldHRpbmdGZWF0dXJlcyB0eXBlc2V0dGluZ0ZlYXR1
cmVzKSBjb25zdAogICAgIHsKLSNpZiAhUExBVEZPUk0oTUFDKSB8fCBfX01BQ19PU19YX1ZFUlNJ
T05fTUlOX1JFUVVJUkVEIDw9IDEwODAKKyNpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hf
VkVSU0lPTl9NSU5fUkVRVUlSRUQgPiAxMDgwCisgICAgICAgIHdrQ1RGb250VHJhbnNmb3JtT3B0
aW9ucyBvcHRpb25zID0gKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBLZXJuaW5nID8gd2tDVEZvbnRU
cmFuc2Zvcm1BcHBseVBvc2l0aW9uaW5nIDogMCkgfCAodHlwZXNldHRpbmdGZWF0dXJlcyAmIExp
Z2F0dXJlcyA/IHdrQ1RGb250VHJhbnNmb3JtQXBwbHlTaGFwaW5nIDogMCk7CisgICAgICAgIHJl
dHVybiB3a0NURm9udFRyYW5zZm9ybUdseXBocyhtX3BsYXRmb3JtRGF0YS5jdEZvbnQoKSwgZ2x5
cGhzLCByZWludGVycHJldF9jYXN0PENHU2l6ZSo+KGFkdmFuY2VzKSwgZ2x5cGhDb3VudCwgb3B0
aW9ucyk7CisjZWxpZiBQTEFURk9STShRVCkgJiYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NI
RUNLKDUsIDEsIDApCisgICAgICAgIFFSYXdGb250OjpMYXlvdXRGbGFncyBmbGFncyA9ICh0eXBl
c2V0dGluZ0ZlYXR1cmVzICYgS2VybmluZykgPyBRUmF3Rm9udDo6S2VybmVkQWR2YW5jZXMgOiBR
UmF3Rm9udDo6U2VwYXJhdGVBZHZhbmNlczsKKyAgICAgICAgcmV0dXJuIG1fcGxhdGZvcm1EYXRh
LnJhd0ZvbnQoKS5hZHZhbmNlc0ZvckdseXBoSW5kZXhlcyhnbHlwaHMsIGFkdmFuY2VzLCBnbHlw
aENvdW50LCBmbGFncyk7CisjZWxzZQogICAgICAgICBVTlVTRURfUEFSQU0oZ2x5cGhzKTsKICAg
ICAgICAgVU5VU0VEX1BBUkFNKGFkdmFuY2VzKTsKICAgICAgICAgVU5VU0VEX1BBUkFNKGdseXBo
Q291bnQpOwogICAgICAgICBVTlVTRURfUEFSQU0odHlwZXNldHRpbmdGZWF0dXJlcyk7CiAgICAg
ICAgIHJldHVybiBmYWxzZTsKLSNlbHNlCi0gICAgd2tDVEZvbnRUcmFuc2Zvcm1PcHRpb25zIG9w
dGlvbnMgPSAodHlwZXNldHRpbmdGZWF0dXJlcyAmIEtlcm5pbmcgPyB3a0NURm9udFRyYW5zZm9y
bUFwcGx5UG9zaXRpb25pbmcgOiAwKSB8ICh0eXBlc2V0dGluZ0ZlYXR1cmVzICYgTGlnYXR1cmVz
ID8gd2tDVEZvbnRUcmFuc2Zvcm1BcHBseVNoYXBpbmcgOiAwKTsKLSAgICByZXR1cm4gd2tDVEZv
bnRUcmFuc2Zvcm1HbHlwaHMobV9wbGF0Zm9ybURhdGEuY3RGb250KCksIGdseXBocywgcmVpbnRl
cnByZXRfY2FzdDxDR1NpemUqPihhZHZhbmNlcyksIGdseXBoQ291bnQsIG9wdGlvbnMpOwogI2Vu
ZGlmCiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9XaWR0aEl0ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0
aEl0ZXJhdG9yLmgKaW5kZXggMTk5NmEwOTc4M2VjNDQzMTNhM2UyOWJiZjgzMmYwYmRkNWM3MmIy
YS4uMzRiMTQ2OGY3NzI2ZjAyMDAyZTVkMjA0ZjQ1ODIwMjM4ZDc4YjYyNiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaApAQCAtNjEsMTMg
KzYxLDE1IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBib29sIHN1cHBvcnRzVHlwZXNldHRpbmdG
ZWF0dXJlcyhjb25zdCBGb250JiBmb250KQogICAgIHsKLSNpZiAhUExBVEZPUk0oTUFDKSB8fCBf
X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDw9IDEwODAKLSAgICAgICAgcmV0dXJuICFm
b250LnR5cGVzZXR0aW5nRmVhdHVyZXMoKTsKLSNlbHNlCisjaWYgUExBVEZPUk0oTUFDKSAmJiBf
X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID4gMTA4MAogICAgICAgICBpZiAoIWZvbnQu
aXNQcmludGVyRm9udCgpKQogICAgICAgICAgICAgcmV0dXJuICFmb250LnR5cGVzZXR0aW5nRmVh
dHVyZXMoKTsKIAogICAgICAgICByZXR1cm4gIShmb250LnR5cGVzZXR0aW5nRmVhdHVyZXMoKSAm
IH4oS2VybmluZyB8IExpZ2F0dXJlcykpOworI2VsaWYgUExBVEZPUk0oUVQpICYmIFFUX1ZFUlNJ
T04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAxLCAwKQorICAgICAgICByZXR1cm4gIShmb250LnR5
cGVzZXR0aW5nRmVhdHVyZXMoKSAmIH5LZXJuaW5nKSAmJiAhZm9udC5pc1NtYWxsQ2FwcygpOwor
I2Vsc2UKKyAgICAgICAgcmV0dXJuICFmb250LnR5cGVzZXR0aW5nRmVhdHVyZXMoKTsKICNlbmRp
ZgogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
cXQvRm9udFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRR
dC5jcHAKaW5kZXggZTJjZGU3NjViMTk4N2RkYTA3ZDFiYmNjZDBhYjg1NjVjNzk1NGI0MC4uMTE2
YmIyNGQ1MDBhNmFkZTliYjJkMDBkMGNmYjNlYTllNGY5ZjdlMiAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwCkBAIC0yNTcsOCArMjU3LDcgQEAg
dm9pZCBGb250Ojppbml0Rm9ybWF0Rm9yVGV4dExheW91dChRVGV4dExheW91dCogbGF5b3V0KSBj
b25zdAogICAgICAgICByYW5nZS5mb3JtYXQuc2V0Rm9udFdvcmRTcGFjaW5nKG1fd29yZFNwYWNp
bmcpOwogICAgIGlmIChtX2xldHRlclNwYWNpbmcpCiAgICAgICAgIHJhbmdlLmZvcm1hdC5zZXRG
b250TGV0dGVyU3BhY2luZyhtX2xldHRlclNwYWNpbmcpOwotICAgIGlmICh0eXBlc2V0dGluZ0Zl
YXR1cmVzKCkgJiBLZXJuaW5nKQotICAgICAgICByYW5nZS5mb3JtYXQuc2V0Rm9udEtlcm5pbmco
dHJ1ZSk7CisgICAgcmFuZ2UuZm9ybWF0LnNldEZvbnRLZXJuaW5nKHR5cGVzZXR0aW5nRmVhdHVy
ZXMoKSAmIEtlcm5pbmcpOwogICAgIGlmIChpc1NtYWxsQ2FwcygpKQogICAgICAgICByYW5nZS5m
b3JtYXQuc2V0Rm9udENhcGl0YWxpemF0aW9uKFFGb250OjpTbWFsbENhcHMpOwogCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9TaW1wbGVGb250RGF0YVF0
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRh
UXQuY3BwCmluZGV4IDYzZGVmMjJiNmRlZmMxYmQ0ZWE5ZTFjNDI3ZmY1OGZhNzQ4Yzg3YmMuLjVh
ODNkYWRhYTJiZGEzMzM2ODkzOTUyZTQ0NzU0NWVmNzliMTViODcgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3Bw
CkBAIC01OCw2ICs1OCwxOSBAQCBmbG9hdCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1XaWR0aEZv
ckdseXBoKEdseXBoIGdseXBoKSBjb25zdAogICAgIHJldHVybiBhZHZhbmNlcy5hdCgwKS54KCk7
CiB9CiAKK2Jvb2wgU2ltcGxlRm9udERhdGE6OmFwcGx5VHJhbnNmb3JtcyhHbHlwaEJ1ZmZlckds
eXBoKiBnbHlwaHMsIEdseXBoQnVmZmVyQWR2YW5jZSogYWR2YW5jZXMsIHNpemVfdCBnbHlwaENv
dW50LCBUeXBlc2V0dGluZ0ZlYXR1cmVzIGZlYXR1cmVzKSBjb25zdAoreworI2lmIFFUX1ZFUlNJ
T04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAxLCAwKQorICAgIFFSYXdGb250OjpMYXlvdXRGbGFn
cyBmbGFncyA9IFFSYXdGb250OjpTZXBhcmF0ZUFkdmFuY2VzOworICAgIGlmIChmZWF0dXJlcyAm
IEtlcm5pbmcpCisgICAgICAgIGZsYWdzIHw9IFFSYXdGb250OjpLZXJuZWRBZHZhbmNlczsKKyAg
ICByZXR1cm4gbV9wbGF0Zm9ybURhdGEucmF3Rm9udCgpLmFkdmFuY2VzRm9yR2x5cGhJbmRleGVz
KGdseXBocywgYWR2YW5jZXMsIGdseXBoQ291bnQsIGZsYWdzKTsKKyNlbHNlCisgICAgVU5VU0VE
X1BBUkFNKGZlYXR1cmVzKTsKKyAgICByZXR1cm4gbV9wbGF0Zm9ybURhdGEucmF3Rm9udCgpLmFk
dmFuY2VzRm9yR2x5cGhJbmRleGVzKGdseXBocywgYWR2YW5jZXMsIGdseXBoQ291bnQpOworI2Vu
ZGlmCit9CisKIFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpwbGF0
Zm9ybUNyZWF0ZVNjYWxlZEZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2Ny
aXB0aW9uLCBmbG9hdCBzY2FsZUZhY3RvcikgY29uc3QKIHsKICAgICBjb25zdCBmbG9hdCBzY2Fs
ZWRTaXplID0gbHJvdW5kZihmb250RGVzY3JpcHRpb24uY29tcHV0ZWRTaXplKCkgKiBzY2FsZUZh
Y3Rvcik7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193772</attachid>
            <date>2013-03-19 03:06:13 -0700</date>
            <delta_ts>2013-03-19 03:28:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-106013-20130319110111.patch</filename>
            <type>text/plain</type>
            <size>7962</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVkNDk0OTZkNGVkZmUx
YjkxZjE5ZTE3MmM1YTY5YmI1ZDU0NDQ0ZS4uMjg2MzJiN2Y5MjkxNTNlM2E0N2Y1Y2E0YjU0ZWE2
YmQ0YzZlNWIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAzLTE5ICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR
dF0gU3VwcG9ydCBrZXJuaW5nIGluIGZhc3QgcGF0aCBmb250IHJlbmRlcmluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2MDEzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gc3VwcG9ydCBrZXJuaW5n
IGluIHRoZSBmYXN0IGZvbnQgcGF0aCB3ZSBuZWVkIHRvIGltcGxlbWVudCBTaW1wbGVGb250RGF0
YTo6YXBwbHlUcmFuc2Zvcm1zLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgdHlw
ZXMgdXNlZCBieSB0aGUgZmFzdCBwYXRoIEdseXBoQnVmZmVyIHRvIG1hdGNoIHRob3NlIHVzZWQg
YnkgUXQsCisgICAgICAgIGFuZCBpbXBsZW1lbnRzIFNpbXBsZUZvbnREYXRhOjphcHBseVRyYW5z
Zm9ybXMgdXNpbmcgUVJhd0ZvbnQ6OmFkdmFuY2VzRm9yR2x5cGhJbmRleGVzLgorCisgICAgICAg
ICogcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaDoKKyAgICAgICAgKEdseXBoQnVmZmVy
QWR2YW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6OkdseXBoQnVm
ZmVyQWR2YW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6OnNldFdp
ZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyQWR2YW5jZTo6d2lkdGgpOgorICAg
ICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXJBZHZhbmNlOjpoZWlnaHQpOgorICAgICAgICAoV2Vi
Q29yZTo6R2x5cGhCdWZmZXI6OmFkZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvU2lt
cGxlRm9udERhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjphcHBseVRy
YW5zZm9ybXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaDoK
KyAgICAgICAgKFdlYkNvcmU6OldpZHRoSXRlcmF0b3I6OnN1cHBvcnRzVHlwZXNldHRpbmdGZWF0
dXJlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OkZvbnQ6OmluaXRGb3JtYXRGb3JUZXh0TGF5b3V0KToKKwogMjAxMy0wMy0x
OCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIg
SW5zcGVjdG9yOiBEZWJ1Z2dlciBzY3JpcHRzIHNob3VsZCB2aXN1YWxseSBkaWZmZXIgZnJvbSBu
ZXR3b3JrL2ZpbGVzeXN0ZW0gZmlsZXMgaW4gd29ya3NwYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBk
YjQyMmYxYWZhYmQ4NzRkY2ZmYmUwNmM2MzdjMDVhMzQwMjA4MzE4Li45ZDNkMjc1N2U2NDI0MTFi
MjU2YzJjMWE4NWIzMzRlNTJmMzM3MjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0No
YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA
CisyMDEzLTAzLTE5ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEu
Y29tPgorCisgICAgICAgIFtRdF0gU3VwcG9ydCBrZXJuaW5nIGluIGZhc3QgcGF0aCBmb250IHJl
bmRlcmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MTA2MDEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
RW5hYmxlIGRlZmF1bHQga2VybmluZyB3aGVuIGZhc3Qga2VybmluZyBpcyBhdmFpbGFibGUuCisK
KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Jbml0V2ViQ29yZVF0LmNwcDoKKyAgICAgICAgKFdl
YktpdDo6aW5pdGlhbGl6ZVdlYktpdFF0KToKKwogMjAxMy0wMy0xNSAgTmF0ZSBDaGFwaW4gIDxq
YXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEhpZGUgTWFpblJlc291cmNlTG9hZGVyIGZy
b20gdGhlIG91dHNpZGUgd29ybGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL0dseXBoQnVmZmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9HbHlwaEJ1ZmZlci5oCmluZGV4IDVmZWFmYjE0MDJjNTZkNjM4OTIxM2RiYjJhNmRkOTdkY2Y5
Yjc0ZjEuLjNhZWMwOGU2NWUwYmY5MWQ1MjAxNmY1NTkwZWVhMzViMzgzN2EyZDMgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKKysrIGIv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaApAQCAtNTYsNiAr
NTYsOCBAQCBjbGFzcyBTaW1wbGVGb250RGF0YTsKIHR5cGVkZWYgY2Fpcm9fZ2x5cGhfdCBHbHlw
aEJ1ZmZlckdseXBoOwogI2VsaWYgT1MoV0lOQ0UpCiB0eXBlZGVmIHdjaGFyX3QgR2x5cGhCdWZm
ZXJHbHlwaDsKKyNlbGlmIFBMQVRGT1JNKFFUKQordHlwZWRlZiBxdWludDMyIEdseXBoQnVmZmVy
R2x5cGg7CiAjZWxzZQogdHlwZWRlZiBHbHlwaCBHbHlwaEJ1ZmZlckdseXBoOwogI2VuZGlmCkBA
IC04OSw2ICs5MSwxOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGZsb2F0IGFkdmFuY2U7CiB9
OworI2VsaWYgUExBVEZPUk0oUVQpCitzdHJ1Y3QgR2x5cGhCdWZmZXJBZHZhbmNlIDogcHVibGlj
IFFQb2ludEYgeworcHVibGljOgorICAgIEdseXBoQnVmZmVyQWR2YW5jZShjb25zdCBRUG9pbnRG
JiBhZHZhbmNlKQorICAgICAgICA6IFFQb2ludEYoYWR2YW5jZSkKKyAgICB7CisgICAgfQorCisg
ICAgdm9pZCBzZXRXaWR0aChxcmVhbCB3aWR0aCkgeyBRUG9pbnRGOjpzZXRYKHdpZHRoKTsgfQor
ICAgIHFyZWFsIHdpZHRoKCkgY29uc3QgeyByZXR1cm4gUVBvaW50Rjo6eCgpOyB9CisgICAgcXJl
YWwgaGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gUVBvaW50Rjo6eSgpOyB9Cit9OwogI2Vsc2UKIHR5
cGVkZWYgRmxvYXRTaXplIEdseXBoQnVmZmVyQWR2YW5jZTsKICNlbmRpZgpAQCAtMTU2LDYgKzE3
MCw4IEBAIHB1YmxpYzoKICAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQoYWR2YW5jZSk7CiAjZWxp
ZiBPUyhXSU5DRSkKICAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQod2lkdGgpOworI2VsaWYgUExB
VEZPUk0oUVQpCisgICAgICAgIG1fYWR2YW5jZXMuYXBwZW5kKFFQb2ludEYod2lkdGgsIDApKTsK
ICNlbHNlCiAgICAgICAgIG1fYWR2YW5jZXMuYXBwZW5kKEZsb2F0U2l6ZSh3aWR0aCwgMCkpOwog
I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1w
bGVGb250RGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9u
dERhdGEuaAppbmRleCAzODEwMjQ0NzEwMTBlNzk5Yjc1OTdjNTFmZGMzNGMwYjI0YTdlNzBhLi5j
ZTM2YjhiOWY1ZDExNjk2YWFmM2M3YzAyZDgwZmIzOTM4OGFmNDM0IDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmgKQEAgLTIwMywxNSAr
MjAzLDE4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgYXBwbHlUcmFuc2Zvcm1zKEdseXBoQnVmZmVy
R2x5cGgqIGdseXBocywgR2x5cGhCdWZmZXJBZHZhbmNlKiBhZHZhbmNlcywgc2l6ZV90IGdseXBo
Q291bnQsIFR5cGVzZXR0aW5nRmVhdHVyZXMgdHlwZXNldHRpbmdGZWF0dXJlcykgY29uc3QKICAg
ICB7Ci0jaWYgIVBMQVRGT1JNKE1BQykgfHwgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF
RCA8PSAxMDgwCisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF
UVVJUkVEID4gMTA4MAorICAgICAgICB3a0NURm9udFRyYW5zZm9ybU9wdGlvbnMgb3B0aW9ucyA9
ICh0eXBlc2V0dGluZ0ZlYXR1cmVzICYgS2VybmluZyA/IHdrQ1RGb250VHJhbnNmb3JtQXBwbHlQ
b3NpdGlvbmluZyA6IDApIHwgKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBMaWdhdHVyZXMgPyB3a0NU
Rm9udFRyYW5zZm9ybUFwcGx5U2hhcGluZyA6IDApOworICAgICAgICByZXR1cm4gd2tDVEZvbnRU
cmFuc2Zvcm1HbHlwaHMobV9wbGF0Zm9ybURhdGEuY3RGb250KCksIGdseXBocywgcmVpbnRlcnBy
ZXRfY2FzdDxDR1NpemUqPihhZHZhbmNlcyksIGdseXBoQ291bnQsIG9wdGlvbnMpOworI2VsaWYg
UExBVEZPUk0oUVQpICYmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAxLCAwKQor
ICAgICAgICBRUmF3Rm9udDo6TGF5b3V0RmxhZ3MgZmxhZ3MgPSAodHlwZXNldHRpbmdGZWF0dXJl
cyAmIEtlcm5pbmcpID8gUVJhd0ZvbnQ6Oktlcm5lZEFkdmFuY2VzIDogUVJhd0ZvbnQ6OlNlcGFy
YXRlQWR2YW5jZXM7CisgICAgICAgIHJldHVybiBtX3BsYXRmb3JtRGF0YS5yYXdGb250KCkuYWR2
YW5jZXNGb3JHbHlwaEluZGV4ZXMoZ2x5cGhzLCBhZHZhbmNlcywgZ2x5cGhDb3VudCwgZmxhZ3Mp
OworI2Vsc2UKICAgICAgICAgVU5VU0VEX1BBUkFNKGdseXBocyk7CiAgICAgICAgIFVOVVNFRF9Q
QVJBTShhZHZhbmNlcyk7CiAgICAgICAgIFVOVVNFRF9QQVJBTShnbHlwaENvdW50KTsKICAgICAg
ICAgVU5VU0VEX1BBUkFNKHR5cGVzZXR0aW5nRmVhdHVyZXMpOwogICAgICAgICByZXR1cm4gZmFs
c2U7Ci0jZWxzZQotICAgIHdrQ1RGb250VHJhbnNmb3JtT3B0aW9ucyBvcHRpb25zID0gKHR5cGVz
ZXR0aW5nRmVhdHVyZXMgJiBLZXJuaW5nID8gd2tDVEZvbnRUcmFuc2Zvcm1BcHBseVBvc2l0aW9u
aW5nIDogMCkgfCAodHlwZXNldHRpbmdGZWF0dXJlcyAmIExpZ2F0dXJlcyA/IHdrQ1RGb250VHJh
bnNmb3JtQXBwbHlTaGFwaW5nIDogMCk7Ci0gICAgcmV0dXJuIHdrQ1RGb250VHJhbnNmb3JtR2x5
cGhzKG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBnbHlwaHMsIHJlaW50ZXJwcmV0X2Nhc3Q8Q0dT
aXplKj4oYWR2YW5jZXMpLCBnbHlwaENvdW50LCBvcHRpb25zKTsKICNlbmRpZgogICAgIH0KIApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRv
ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCmlu
ZGV4IDE5OTZhMDk3ODNlYzQ0MzEzYTNlMjliYmY4MzJmMGJkZDVjNzJiMmEuLjM0YjE0NjhmNzcy
NmYwMjAwMmU1ZDIwNGY0NTgyMDIzOGQ3OGI2MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgKQEAgLTYxLDEzICs2MSwxNSBAQCBwdWJs
aWM6CiAKICAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c1R5cGVzZXR0aW5nRmVhdHVyZXMoY29uc3Qg
Rm9udCYgZm9udCkKICAgICB7Ci0jaWYgIVBMQVRGT1JNKE1BQykgfHwgX19NQUNfT1NfWF9WRVJT
SU9OX01JTl9SRVFVSVJFRCA8PSAxMDgwCi0gICAgICAgIHJldHVybiAhZm9udC50eXBlc2V0dGlu
Z0ZlYXR1cmVzKCk7Ci0jZWxzZQorI2lmIFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJT
SU9OX01JTl9SRVFVSVJFRCA+IDEwODAKICAgICAgICAgaWYgKCFmb250LmlzUHJpbnRlckZvbnQo
KSkKICAgICAgICAgICAgIHJldHVybiAhZm9udC50eXBlc2V0dGluZ0ZlYXR1cmVzKCk7CiAKICAg
ICAgICAgcmV0dXJuICEoZm9udC50eXBlc2V0dGluZ0ZlYXR1cmVzKCkgJiB+KEtlcm5pbmcgfCBM
aWdhdHVyZXMpKTsKKyNlbGlmIFBMQVRGT1JNKFFUKSAmJiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJ
T05fQ0hFQ0soNSwgMSwgMCkKKyAgICAgICAgcmV0dXJuICEoZm9udC50eXBlc2V0dGluZ0ZlYXR1
cmVzKCkgJiB+S2VybmluZykgJiYgIWZvbnQuaXNTbWFsbENhcHMoKTsKKyNlbHNlCisgICAgICAg
IHJldHVybiAhZm9udC50eXBlc2V0dGluZ0ZlYXR1cmVzKCk7CiAjZW5kaWYKICAgICB9CiAKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwCmluZGV4IGUy
Y2RlNzY1YjE5ODdkZGEwN2QxYmJjY2QwYWI4NTY1Yzc5NTRiNDAuLjExNmJiMjRkNTAwYTZhZGU5
YmIyZDAwZDBjZmIzZWE5ZTRmOWY3ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvcXQvRm9udFF0LmNwcApAQCAtMjU3LDggKzI1Nyw3IEBAIHZvaWQgRm9udDo6aW5p
dEZvcm1hdEZvclRleHRMYXlvdXQoUVRleHRMYXlvdXQqIGxheW91dCkgY29uc3QKICAgICAgICAg
cmFuZ2UuZm9ybWF0LnNldEZvbnRXb3JkU3BhY2luZyhtX3dvcmRTcGFjaW5nKTsKICAgICBpZiAo
bV9sZXR0ZXJTcGFjaW5nKQogICAgICAgICByYW5nZS5mb3JtYXQuc2V0Rm9udExldHRlclNwYWNp
bmcobV9sZXR0ZXJTcGFjaW5nKTsKLSAgICBpZiAodHlwZXNldHRpbmdGZWF0dXJlcygpICYgS2Vy
bmluZykKLSAgICAgICAgcmFuZ2UuZm9ybWF0LnNldEZvbnRLZXJuaW5nKHRydWUpOworICAgIHJh
bmdlLmZvcm1hdC5zZXRGb250S2VybmluZyh0eXBlc2V0dGluZ0ZlYXR1cmVzKCkgJiBLZXJuaW5n
KTsKICAgICBpZiAoaXNTbWFsbENhcHMoKSkKICAgICAgICAgcmFuZ2UuZm9ybWF0LnNldEZvbnRD
YXBpdGFsaXphdGlvbihRRm9udDo6U21hbGxDYXBzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9Jbml0V2ViQ29yZVF0LmNwcCBiL1NvdXJjZS9XZWJLaXQv
cXQvV2ViQ29yZVN1cHBvcnQvSW5pdFdlYkNvcmVRdC5jcHAKaW5kZXggNmEwMjJhYzQzYjRjYWZh
ZGJkMzQ0YTNhMDQxNDRlNmFkYzRmZjFiNi4uZGEzNWMxMDM3ZDFlMTk4NjUyNjRkMDg0NGUwMGE5
NWNkZWUyYWVkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9J
bml0V2ViQ29yZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0lu
aXRXZWJDb3JlUXQuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAKICNpbmNsdWRlICJDaHJvbWUuaCIK
ICNpbmNsdWRlICJDaHJvbWVDbGllbnRRdC5oIgorI2luY2x1ZGUgIkZvbnQuaCIKICNpbmNsdWRl
ICJJbWFnZS5oIgogI2luY2x1ZGUgIkluaXRpYWxpemVMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTm90
SW1wbGVtZW50ZWQuaCIKQEAgLTcyLDYgKzczLDkgQEAgUV9ERUNMX0VYUE9SVCB2b2lkIGluaXRp
YWxpemVXZWJLaXRRdCgpCiAgICAgaWYgKGluaXRDYWxsYmFjaykgewogICAgICAgICBXZWJDb3Jl
OjpSZW5kZXJUaGVtZVFTdHlsZTo6c2V0U3R5bGVGYWN0b3J5RnVuY3Rpb24oY3JlYXRlU3R5bGVG
b3JQYWdlKTsKICAgICAgICAgV2ViQ29yZTo6UmVuZGVyVGhlbWVRdDo6c2V0Q3VzdG9tVGhlbWUo
V2ViQ29yZTo6UmVuZGVyVGhlbWVRU3R5bGU6OmNyZWF0ZSwgbmV3IFdlYkNvcmU6OlNjcm9sbGJh
clRoZW1lUVN0eWxlKTsKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMSwg
MCkKKyAgICAgICAgV2ViQ29yZTo6Rm9udDo6c2V0RGVmYXVsdFR5cGVzZXR0aW5nRmVhdHVyZXMo
V2ViQ29yZTo6S2VybmluZyk7CisjZW5kaWYKICAgICB9CiB9CiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193774</attachid>
            <date>2013-03-19 03:28:50 -0700</date>
            <delta_ts>2013-03-19 07:00:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-106013-20130319112348.patch</filename>
            <type>text/plain</type>
            <size>7928</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVkNDk0OTZkNGVkZmUx
YjkxZjE5ZTE3MmM1YTY5YmI1ZDU0NDQ0ZS4uMjg2MzJiN2Y5MjkxNTNlM2E0N2Y1Y2E0YjU0ZWE2
YmQ0YzZlNWIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAzLTE5ICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR
dF0gU3VwcG9ydCBrZXJuaW5nIGluIGZhc3QgcGF0aCBmb250IHJlbmRlcmluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2MDEzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gc3VwcG9ydCBrZXJuaW5n
IGluIHRoZSBmYXN0IGZvbnQgcGF0aCB3ZSBuZWVkIHRvIGltcGxlbWVudCBTaW1wbGVGb250RGF0
YTo6YXBwbHlUcmFuc2Zvcm1zLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgdHlw
ZXMgdXNlZCBieSB0aGUgZmFzdCBwYXRoIEdseXBoQnVmZmVyIHRvIG1hdGNoIHRob3NlIHVzZWQg
YnkgUXQsCisgICAgICAgIGFuZCBpbXBsZW1lbnRzIFNpbXBsZUZvbnREYXRhOjphcHBseVRyYW5z
Zm9ybXMgdXNpbmcgUVJhd0ZvbnQ6OmFkdmFuY2VzRm9yR2x5cGhJbmRleGVzLgorCisgICAgICAg
ICogcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaDoKKyAgICAgICAgKEdseXBoQnVmZmVy
QWR2YW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6OkdseXBoQnVm
ZmVyQWR2YW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6OnNldFdp
ZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyQWR2YW5jZTo6d2lkdGgpOgorICAg
ICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXJBZHZhbmNlOjpoZWlnaHQpOgorICAgICAgICAoV2Vi
Q29yZTo6R2x5cGhCdWZmZXI6OmFkZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvU2lt
cGxlRm9udERhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjphcHBseVRy
YW5zZm9ybXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaDoK
KyAgICAgICAgKFdlYkNvcmU6OldpZHRoSXRlcmF0b3I6OnN1cHBvcnRzVHlwZXNldHRpbmdGZWF0
dXJlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OkZvbnQ6OmluaXRGb3JtYXRGb3JUZXh0TGF5b3V0KToKKwogMjAxMy0wMy0x
OCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIg
SW5zcGVjdG9yOiBEZWJ1Z2dlciBzY3JpcHRzIHNob3VsZCB2aXN1YWxseSBkaWZmZXIgZnJvbSBu
ZXR3b3JrL2ZpbGVzeXN0ZW0gZmlsZXMgaW4gd29ya3NwYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBk
YjQyMmYxYWZhYmQ4NzRkY2ZmYmUwNmM2MzdjMDVhMzQwMjA4MzE4Li45ZDNkMjc1N2U2NDI0MTFi
MjU2YzJjMWE4NWIzMzRlNTJmMzM3MjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0No
YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA
CisyMDEzLTAzLTE5ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEu
Y29tPgorCisgICAgICAgIFtRdF0gU3VwcG9ydCBrZXJuaW5nIGluIGZhc3QgcGF0aCBmb250IHJl
bmRlcmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MTA2MDEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
RW5hYmxlIGRlZmF1bHQga2VybmluZyB3aGVuIGZhc3Qga2VybmluZyBpcyBhdmFpbGFibGUuCisK
KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Jbml0V2ViQ29yZVF0LmNwcDoKKyAgICAgICAgKFdl
YktpdDo6aW5pdGlhbGl6ZVdlYktpdFF0KToKKwogMjAxMy0wMy0xNSAgTmF0ZSBDaGFwaW4gIDxq
YXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEhpZGUgTWFpblJlc291cmNlTG9hZGVyIGZy
b20gdGhlIG91dHNpZGUgd29ybGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL0dseXBoQnVmZmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9HbHlwaEJ1ZmZlci5oCmluZGV4IDVmZWFmYjE0MDJjNTZkNjM4OTIxM2RiYjJhNmRkOTdkY2Y5
Yjc0ZjEuLjNhZWMwOGU2NWUwYmY5MWQ1MjAxNmY1NTkwZWVhMzViMzgzN2EyZDMgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKKysrIGIv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaApAQCAtNTYsNiAr
NTYsOCBAQCBjbGFzcyBTaW1wbGVGb250RGF0YTsKIHR5cGVkZWYgY2Fpcm9fZ2x5cGhfdCBHbHlw
aEJ1ZmZlckdseXBoOwogI2VsaWYgT1MoV0lOQ0UpCiB0eXBlZGVmIHdjaGFyX3QgR2x5cGhCdWZm
ZXJHbHlwaDsKKyNlbGlmIFBMQVRGT1JNKFFUKQordHlwZWRlZiBxdWludDMyIEdseXBoQnVmZmVy
R2x5cGg7CiAjZWxzZQogdHlwZWRlZiBHbHlwaCBHbHlwaEJ1ZmZlckdseXBoOwogI2VuZGlmCkBA
IC04OSw2ICs5MSwxOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGZsb2F0IGFkdmFuY2U7CiB9
OworI2VsaWYgUExBVEZPUk0oUVQpCitzdHJ1Y3QgR2x5cGhCdWZmZXJBZHZhbmNlIDogcHVibGlj
IFFQb2ludEYgeworcHVibGljOgorICAgIEdseXBoQnVmZmVyQWR2YW5jZShjb25zdCBRUG9pbnRG
JiBhZHZhbmNlKQorICAgICAgICA6IFFQb2ludEYoYWR2YW5jZSkKKyAgICB7CisgICAgfQorCisg
ICAgdm9pZCBzZXRXaWR0aChxcmVhbCB3aWR0aCkgeyBRUG9pbnRGOjpzZXRYKHdpZHRoKTsgfQor
ICAgIHFyZWFsIHdpZHRoKCkgY29uc3QgeyByZXR1cm4gUVBvaW50Rjo6eCgpOyB9CisgICAgcXJl
YWwgaGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gUVBvaW50Rjo6eSgpOyB9Cit9OwogI2Vsc2UKIHR5
cGVkZWYgRmxvYXRTaXplIEdseXBoQnVmZmVyQWR2YW5jZTsKICNlbmRpZgpAQCAtMTU2LDYgKzE3
MCw4IEBAIHB1YmxpYzoKICAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQoYWR2YW5jZSk7CiAjZWxp
ZiBPUyhXSU5DRSkKICAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQod2lkdGgpOworI2VsaWYgUExB
VEZPUk0oUVQpCisgICAgICAgIG1fYWR2YW5jZXMuYXBwZW5kKFFQb2ludEYod2lkdGgsIDApKTsK
ICNlbHNlCiAgICAgICAgIG1fYWR2YW5jZXMuYXBwZW5kKEZsb2F0U2l6ZSh3aWR0aCwgMCkpOwog
I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1w
bGVGb250RGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9u
dERhdGEuaAppbmRleCAzODEwMjQ0NzEwMTBlNzk5Yjc1OTdjNTFmZGMzNGMwYjI0YTdlNzBhLi5l
OWVkNDhmNDg1ZDRhMmM2OGUyOGFhODhkMDdkMzBhZGNkOTc1YzUyIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmgKQEAgLTIwMywxNSAr
MjAzLDE4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgYXBwbHlUcmFuc2Zvcm1zKEdseXBoQnVmZmVy
R2x5cGgqIGdseXBocywgR2x5cGhCdWZmZXJBZHZhbmNlKiBhZHZhbmNlcywgc2l6ZV90IGdseXBo
Q291bnQsIFR5cGVzZXR0aW5nRmVhdHVyZXMgdHlwZXNldHRpbmdGZWF0dXJlcykgY29uc3QKICAg
ICB7Ci0jaWYgIVBMQVRGT1JNKE1BQykgfHwgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF
RCA8PSAxMDgwCisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF
UVVJUkVEID4gMTA4MAorICAgICAgICB3a0NURm9udFRyYW5zZm9ybU9wdGlvbnMgb3B0aW9ucyA9
ICh0eXBlc2V0dGluZ0ZlYXR1cmVzICYgS2VybmluZyA/IHdrQ1RGb250VHJhbnNmb3JtQXBwbHlQ
b3NpdGlvbmluZyA6IDApIHwgKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBMaWdhdHVyZXMgPyB3a0NU
Rm9udFRyYW5zZm9ybUFwcGx5U2hhcGluZyA6IDApOworICAgICAgICByZXR1cm4gd2tDVEZvbnRU
cmFuc2Zvcm1HbHlwaHMobV9wbGF0Zm9ybURhdGEuY3RGb250KCksIGdseXBocywgcmVpbnRlcnBy
ZXRfY2FzdDxDR1NpemUqPihhZHZhbmNlcyksIGdseXBoQ291bnQsIG9wdGlvbnMpOworI2VsaWYg
UExBVEZPUk0oUVQpICYmIFFUX1ZFUlNJT04gPj0gMHgwNTAxMDAKKyAgICAgICAgUVJhd0ZvbnQ6
OkxheW91dEZsYWdzIGZsYWdzID0gKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBLZXJuaW5nKSA/IFFS
YXdGb250OjpLZXJuZWRBZHZhbmNlcyA6IFFSYXdGb250OjpTZXBhcmF0ZUFkdmFuY2VzOworICAg
ICAgICByZXR1cm4gbV9wbGF0Zm9ybURhdGEucmF3Rm9udCgpLmFkdmFuY2VzRm9yR2x5cGhJbmRl
eGVzKGdseXBocywgYWR2YW5jZXMsIGdseXBoQ291bnQsIGZsYWdzKTsKKyNlbHNlCiAgICAgICAg
IFVOVVNFRF9QQVJBTShnbHlwaHMpOwogICAgICAgICBVTlVTRURfUEFSQU0oYWR2YW5jZXMpOwog
ICAgICAgICBVTlVTRURfUEFSQU0oZ2x5cGhDb3VudCk7CiAgICAgICAgIFVOVVNFRF9QQVJBTSh0
eXBlc2V0dGluZ0ZlYXR1cmVzKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwotI2Vsc2UKLSAgICB3
a0NURm9udFRyYW5zZm9ybU9wdGlvbnMgb3B0aW9ucyA9ICh0eXBlc2V0dGluZ0ZlYXR1cmVzICYg
S2VybmluZyA/IHdrQ1RGb250VHJhbnNmb3JtQXBwbHlQb3NpdGlvbmluZyA6IDApIHwgKHR5cGVz
ZXR0aW5nRmVhdHVyZXMgJiBMaWdhdHVyZXMgPyB3a0NURm9udFRyYW5zZm9ybUFwcGx5U2hhcGlu
ZyA6IDApOwotICAgIHJldHVybiB3a0NURm9udFRyYW5zZm9ybUdseXBocyhtX3BsYXRmb3JtRGF0
YS5jdEZvbnQoKSwgZ2x5cGhzLCByZWludGVycHJldF9jYXN0PENHU2l6ZSo+KGFkdmFuY2VzKSwg
Z2x5cGhDb3VudCwgb3B0aW9ucyk7CiAjZW5kaWYKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaAppbmRleCAxOTk2YTA5NzgzZWM0
NDMxM2EzZTI5YmJmODMyZjBiZGQ1YzcyYjJhLi44ZTRlMDY5OTc4ZmZjN2NlMjM1OThkNDM0ODE2
NmZmNzU2YTliMGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9XaWR0aEl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
V2lkdGhJdGVyYXRvci5oCkBAIC02MSwxMyArNjEsMTUgQEAgcHVibGljOgogCiAgICAgc3RhdGlj
IGJvb2wgc3VwcG9ydHNUeXBlc2V0dGluZ0ZlYXR1cmVzKGNvbnN0IEZvbnQmIGZvbnQpCiAgICAg
ewotI2lmICFQTEFURk9STShNQUMpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQg
PD0gMTA4MAotICAgICAgICByZXR1cm4gIWZvbnQudHlwZXNldHRpbmdGZWF0dXJlcygpOwotI2Vs
c2UKKyNpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQg
PiAxMDgwCiAgICAgICAgIGlmICghZm9udC5pc1ByaW50ZXJGb250KCkpCiAgICAgICAgICAgICBy
ZXR1cm4gIWZvbnQudHlwZXNldHRpbmdGZWF0dXJlcygpOwogCiAgICAgICAgIHJldHVybiAhKGZv
bnQudHlwZXNldHRpbmdGZWF0dXJlcygpICYgfihLZXJuaW5nIHwgTGlnYXR1cmVzKSk7CisjZWxp
ZiBQTEFURk9STShRVCkgJiYgUVRfVkVSU0lPTiA+PSAweDA1MDEwMAorICAgICAgICByZXR1cm4g
IShmb250LnR5cGVzZXR0aW5nRmVhdHVyZXMoKSAmIH5LZXJuaW5nKSAmJiAhZm9udC5pc1NtYWxs
Q2FwcygpOworI2Vsc2UKKyAgICAgICAgcmV0dXJuICFmb250LnR5cGVzZXR0aW5nRmVhdHVyZXMo
KTsKICNlbmRpZgogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvcXQvRm9udFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L3F0L0ZvbnRRdC5jcHAKaW5kZXggZTJjZGU3NjViMTk4N2RkYTA3ZDFiYmNjZDBhYjg1NjVjNzk1
NGI0MC4uMTE2YmIyNGQ1MDBhNmFkZTliYjJkMDBkMGNmYjNlYTllNGY5ZjdlMiAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwCkBAIC0yNTcsOCAr
MjU3LDcgQEAgdm9pZCBGb250Ojppbml0Rm9ybWF0Rm9yVGV4dExheW91dChRVGV4dExheW91dCog
bGF5b3V0KSBjb25zdAogICAgICAgICByYW5nZS5mb3JtYXQuc2V0Rm9udFdvcmRTcGFjaW5nKG1f
d29yZFNwYWNpbmcpOwogICAgIGlmIChtX2xldHRlclNwYWNpbmcpCiAgICAgICAgIHJhbmdlLmZv
cm1hdC5zZXRGb250TGV0dGVyU3BhY2luZyhtX2xldHRlclNwYWNpbmcpOwotICAgIGlmICh0eXBl
c2V0dGluZ0ZlYXR1cmVzKCkgJiBLZXJuaW5nKQotICAgICAgICByYW5nZS5mb3JtYXQuc2V0Rm9u
dEtlcm5pbmcodHJ1ZSk7CisgICAgcmFuZ2UuZm9ybWF0LnNldEZvbnRLZXJuaW5nKHR5cGVzZXR0
aW5nRmVhdHVyZXMoKSAmIEtlcm5pbmcpOwogICAgIGlmIChpc1NtYWxsQ2FwcygpKQogICAgICAg
ICByYW5nZS5mb3JtYXQuc2V0Rm9udENhcGl0YWxpemF0aW9uKFFGb250OjpTbWFsbENhcHMpOwog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luaXRXZWJDb3Jl
UXQuY3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9Jbml0V2ViQ29yZVF0LmNw
cAppbmRleCA2YTAyMmFjNDNiNGNhZmFkYmQzNDRhM2EwNDE0NGU2YWRjNGZmMWI2Li5kYTM1YzEw
MzdkMWUxOTg2NTI2NGQwODQ0ZTAwYTk1Y2RlZTJhZWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luaXRXZWJDb3JlUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJL
aXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5pdFdlYkNvcmVRdC5jcHAKQEAgLTMyLDYgKzMyLDcgQEAK
IAogI2luY2x1ZGUgIkNocm9tZS5oIgogI2luY2x1ZGUgIkNocm9tZUNsaWVudFF0LmgiCisjaW5j
bHVkZSAiRm9udC5oIgogI2luY2x1ZGUgIkltYWdlLmgiCiAjaW5jbHVkZSAiSW5pdGlhbGl6ZUxv
Z2dpbmcuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgpAQCAtNzIsNiArNzMsOSBAQCBR
X0RFQ0xfRVhQT1JUIHZvaWQgaW5pdGlhbGl6ZVdlYktpdFF0KCkKICAgICBpZiAoaW5pdENhbGxi
YWNrKSB7CiAgICAgICAgIFdlYkNvcmU6OlJlbmRlclRoZW1lUVN0eWxlOjpzZXRTdHlsZUZhY3Rv
cnlGdW5jdGlvbihjcmVhdGVTdHlsZUZvclBhZ2UpOwogICAgICAgICBXZWJDb3JlOjpSZW5kZXJU
aGVtZVF0OjpzZXRDdXN0b21UaGVtZShXZWJDb3JlOjpSZW5kZXJUaGVtZVFTdHlsZTo6Y3JlYXRl
LCBuZXcgV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVRU3R5bGUpOworI2lmIFFUX1ZFUlNJT04gPj0g
UVRfVkVSU0lPTl9DSEVDSyg1LCAxLCAwKQorICAgICAgICBXZWJDb3JlOjpGb250OjpzZXREZWZh
dWx0VHlwZXNldHRpbmdGZWF0dXJlcyhXZWJDb3JlOjpLZXJuaW5nKTsKKyNlbmRpZgogICAgIH0K
IH0KIAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193818</attachid>
            <date>2013-03-19 07:00:44 -0700</date>
            <delta_ts>2013-03-19 08:59:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-106013-20130319145542.patch</filename>
            <type>text/plain</type>
            <size>5380</size>
            <attacher name="Allan Sandfeld Jensen">allan.jensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2VkYTg5MDU5MGZjMzFk
YzUwNGFlZjY3MGQyZjczOWViYzc1ZmM3ZC4uMjQzNTc0M2U3NGI5N2JlMjNlY2VjNGRhYjUwZjk2
NWI3Mzc5ZjE0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTE5ICBBbGxh
biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR
dF0gU3VwcG9ydCBrZXJuaW5nIGluIGZhc3QgcGF0aCBmb250IHJlbmRlcmluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2MDEzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gc3VwcG9ydCBrZXJuaW5n
IGluIHRoZSBmYXN0IGZvbnQgcGF0aCB3ZSBuZWVkIHRvIGltcGxlbWVudCBTaW1wbGVGb250RGF0
YTo6YXBwbHlUcmFuc2Zvcm1zLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgdHlw
ZXMgdXNlZCBieSB0aGUgZmFzdCBwYXRoIEdseXBoQnVmZmVyIHRvIG1hdGNoIHRob3NlIHVzZWQg
YnkgUXQsCisgICAgICAgIGFuZCBpbXBsZW1lbnRzIFNpbXBsZUZvbnREYXRhOjphcHBseVRyYW5z
Zm9ybXMgdXNpbmcgUVJhd0ZvbnQ6OmFkdmFuY2VzRm9yR2x5cGhJbmRleGVzLgorCisgICAgICAg
ICogcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaDoKKyAgICAgICAgKEdseXBoQnVmZmVy
QWR2YW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6OkdseXBoQnVm
ZmVyQWR2YW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlckFkdmFuY2U6OnNldFdp
ZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyQWR2YW5jZTo6d2lkdGgpOgorICAg
ICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXJBZHZhbmNlOjpoZWlnaHQpOgorICAgICAgICAoV2Vi
Q29yZTo6R2x5cGhCdWZmZXI6OmFkZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvU2lt
cGxlRm9udERhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjphcHBseVRy
YW5zZm9ybXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaDoK
KyAgICAgICAgKFdlYkNvcmU6OldpZHRoSXRlcmF0b3I6OnN1cHBvcnRzVHlwZXNldHRpbmdGZWF0
dXJlcyk6CisKIDIwMTMtMDMtMTkgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtYXJpby5wcmFkYUBz
YW1zdW5nLmNvbT4KIAogICAgICAgICBbR1RLXSBXcm9uZyBndWFyZCBVU0UoR0xYKSBpbiBSZWRp
cmVjdGVkWENvbXBvc2l0ZVdpbmRvdwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL0dseXBoQnVmZmVyLmgKaW5kZXggNWZlYWZiMTQwMmM1NmQ2Mzg5MjEzZGJiMmE2ZGQ5N2Rj
ZjliNzRmMS4uM2FlYzA4ZTY1ZTBiZjkxZDUyMDE2ZjU1OTBlZWEzNWIzODM3YTJkMyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5oCkBAIC01Niw2
ICs1Niw4IEBAIGNsYXNzIFNpbXBsZUZvbnREYXRhOwogdHlwZWRlZiBjYWlyb19nbHlwaF90IEds
eXBoQnVmZmVyR2x5cGg7CiAjZWxpZiBPUyhXSU5DRSkKIHR5cGVkZWYgd2NoYXJfdCBHbHlwaEJ1
ZmZlckdseXBoOworI2VsaWYgUExBVEZPUk0oUVQpCit0eXBlZGVmIHF1aW50MzIgR2x5cGhCdWZm
ZXJHbHlwaDsKICNlbHNlCiB0eXBlZGVmIEdseXBoIEdseXBoQnVmZmVyR2x5cGg7CiAjZW5kaWYK
QEAgLTg5LDYgKzkxLDE4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZmxvYXQgYWR2YW5jZTsK
IH07CisjZWxpZiBQTEFURk9STShRVCkKK3N0cnVjdCBHbHlwaEJ1ZmZlckFkdmFuY2UgOiBwdWJs
aWMgUVBvaW50RiB7CitwdWJsaWM6CisgICAgR2x5cGhCdWZmZXJBZHZhbmNlKGNvbnN0IFFQb2lu
dEYmIGFkdmFuY2UpCisgICAgICAgIDogUVBvaW50RihhZHZhbmNlKQorICAgIHsKKyAgICB9CisK
KyAgICB2b2lkIHNldFdpZHRoKHFyZWFsIHdpZHRoKSB7IFFQb2ludEY6OnNldFgod2lkdGgpOyB9
CisgICAgcXJlYWwgd2lkdGgoKSBjb25zdCB7IHJldHVybiBRUG9pbnRGOjp4KCk7IH0KKyAgICBx
cmVhbCBoZWlnaHQoKSBjb25zdCB7IHJldHVybiBRUG9pbnRGOjp5KCk7IH0KK307CiAjZWxzZQog
dHlwZWRlZiBGbG9hdFNpemUgR2x5cGhCdWZmZXJBZHZhbmNlOwogI2VuZGlmCkBAIC0xNTYsNiAr
MTcwLDggQEAgcHVibGljOgogICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZChhZHZhbmNlKTsKICNl
bGlmIE9TKFdJTkNFKQogICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZCh3aWR0aCk7CisjZWxpZiBQ
TEFURk9STShRVCkKKyAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQoUVBvaW50Rih3aWR0aCwgMCkp
OwogI2Vsc2UKICAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQoRmxvYXRTaXplKHdpZHRoLCAwKSk7
CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1Np
bXBsZUZvbnREYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVG
b250RGF0YS5oCmluZGV4IDM4MTAyNDQ3MTAxMGU3OTliNzU5N2M1MWZkYzM0YzBiMjRhN2U3MGEu
LmU5ZWQ0OGY0ODVkNGEyYzY4ZTI4YWE4OGQwN2QzMGFkY2Q5NzVjNTIgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmgKKysrIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuaApAQCAtMjAzLDE1
ICsyMDMsMTggQEAgcHVibGljOgogCiAgICAgYm9vbCBhcHBseVRyYW5zZm9ybXMoR2x5cGhCdWZm
ZXJHbHlwaCogZ2x5cGhzLCBHbHlwaEJ1ZmZlckFkdmFuY2UqIGFkdmFuY2VzLCBzaXplX3QgZ2x5
cGhDb3VudCwgVHlwZXNldHRpbmdGZWF0dXJlcyB0eXBlc2V0dGluZ0ZlYXR1cmVzKSBjb25zdAog
ICAgIHsKLSNpZiAhUExBVEZPUk0oTUFDKSB8fCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJ
UkVEIDw9IDEwODAKKyNpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5f
UkVRVUlSRUQgPiAxMDgwCisgICAgICAgIHdrQ1RGb250VHJhbnNmb3JtT3B0aW9ucyBvcHRpb25z
ID0gKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBLZXJuaW5nID8gd2tDVEZvbnRUcmFuc2Zvcm1BcHBs
eVBvc2l0aW9uaW5nIDogMCkgfCAodHlwZXNldHRpbmdGZWF0dXJlcyAmIExpZ2F0dXJlcyA/IHdr
Q1RGb250VHJhbnNmb3JtQXBwbHlTaGFwaW5nIDogMCk7CisgICAgICAgIHJldHVybiB3a0NURm9u
dFRyYW5zZm9ybUdseXBocyhtX3BsYXRmb3JtRGF0YS5jdEZvbnQoKSwgZ2x5cGhzLCByZWludGVy
cHJldF9jYXN0PENHU2l6ZSo+KGFkdmFuY2VzKSwgZ2x5cGhDb3VudCwgb3B0aW9ucyk7CisjZWxp
ZiBQTEFURk9STShRVCkgJiYgUVRfVkVSU0lPTiA+PSAweDA1MDEwMAorICAgICAgICBRUmF3Rm9u
dDo6TGF5b3V0RmxhZ3MgZmxhZ3MgPSAodHlwZXNldHRpbmdGZWF0dXJlcyAmIEtlcm5pbmcpID8g
UVJhd0ZvbnQ6Oktlcm5lZEFkdmFuY2VzIDogUVJhd0ZvbnQ6OlNlcGFyYXRlQWR2YW5jZXM7Cisg
ICAgICAgIHJldHVybiBtX3BsYXRmb3JtRGF0YS5yYXdGb250KCkuYWR2YW5jZXNGb3JHbHlwaElu
ZGV4ZXMoZ2x5cGhzLCBhZHZhbmNlcywgZ2x5cGhDb3VudCwgZmxhZ3MpOworI2Vsc2UKICAgICAg
ICAgVU5VU0VEX1BBUkFNKGdseXBocyk7CiAgICAgICAgIFVOVVNFRF9QQVJBTShhZHZhbmNlcyk7
CiAgICAgICAgIFVOVVNFRF9QQVJBTShnbHlwaENvdW50KTsKICAgICAgICAgVU5VU0VEX1BBUkFN
KHR5cGVzZXR0aW5nRmVhdHVyZXMpOwogICAgICAgICByZXR1cm4gZmFsc2U7Ci0jZWxzZQotICAg
IHdrQ1RGb250VHJhbnNmb3JtT3B0aW9ucyBvcHRpb25zID0gKHR5cGVzZXR0aW5nRmVhdHVyZXMg
JiBLZXJuaW5nID8gd2tDVEZvbnRUcmFuc2Zvcm1BcHBseVBvc2l0aW9uaW5nIDogMCkgfCAodHlw
ZXNldHRpbmdGZWF0dXJlcyAmIExpZ2F0dXJlcyA/IHdrQ1RGb250VHJhbnNmb3JtQXBwbHlTaGFw
aW5nIDogMCk7Ci0gICAgcmV0dXJuIHdrQ1RGb250VHJhbnNmb3JtR2x5cGhzKG1fcGxhdGZvcm1E
YXRhLmN0Rm9udCgpLCBnbHlwaHMsIHJlaW50ZXJwcmV0X2Nhc3Q8Q0dTaXplKj4oYWR2YW5jZXMp
LCBnbHlwaENvdW50LCBvcHRpb25zKTsKICNlbmRpZgogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCmluZGV4IDE5OTZhMDk3ODNl
YzQ0MzEzYTNlMjliYmY4MzJmMGJkZDVjNzJiMmEuLjhlNGUwNjk5NzhmZmM3Y2UyMzU5OGQ0MzQ4
MTY2ZmY3NTZhOWIwZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL1dpZHRoSXRlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9XaWR0aEl0ZXJhdG9yLmgKQEAgLTYxLDEzICs2MSwxNSBAQCBwdWJsaWM6CiAKICAgICBzdGF0
aWMgYm9vbCBzdXBwb3J0c1R5cGVzZXR0aW5nRmVhdHVyZXMoY29uc3QgRm9udCYgZm9udCkKICAg
ICB7Ci0jaWYgIVBMQVRGT1JNKE1BQykgfHwgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF
RCA8PSAxMDgwCi0gICAgICAgIHJldHVybiAhZm9udC50eXBlc2V0dGluZ0ZlYXR1cmVzKCk7Ci0j
ZWxzZQorI2lmIFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF
RCA+IDEwODAKICAgICAgICAgaWYgKCFmb250LmlzUHJpbnRlckZvbnQoKSkKICAgICAgICAgICAg
IHJldHVybiAhZm9udC50eXBlc2V0dGluZ0ZlYXR1cmVzKCk7CiAKICAgICAgICAgcmV0dXJuICEo
Zm9udC50eXBlc2V0dGluZ0ZlYXR1cmVzKCkgJiB+KEtlcm5pbmcgfCBMaWdhdHVyZXMpKTsKKyNl
bGlmIFBMQVRGT1JNKFFUKSAmJiBRVF9WRVJTSU9OID49IDB4MDUwMTAwCisgICAgICAgIHJldHVy
biAhKGZvbnQudHlwZXNldHRpbmdGZWF0dXJlcygpICYgfktlcm5pbmcpICYmICFmb250LmlzU21h
bGxDYXBzKCk7CisjZWxzZQorICAgICAgICByZXR1cm4gIWZvbnQudHlwZXNldHRpbmdGZWF0dXJl
cygpOwogI2VuZGlmCiAgICAgfQogCg==
</data>
<flag name="review"
          id="215425"
          type_id="1"
          status="+"
          setter="jturcotte"
    />
          </attachment>
      

    </bug>

</bugzilla>