<?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>159933</bug_id>
          
          <creation_ts>2016-07-19 11:49:46 -0700</creation_ts>
          <short_desc>[iOS] REGRESSION(203378): PDFDocumentImage::updateCachedImageIfNeeded() uses the unscaled size when deciding whether to cache the PDF image</short_desc>
          <delta_ts>2016-07-22 11:46:45 -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>Images</component>
          <version>WebKit 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>InRadar, Regression</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Said Abou-Hallawa">sabouhallawa</reporter>
          <assigned_to name="Said Abou-Hallawa">sabouhallawa</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>dino</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1212447</commentid>
    <comment_count>0</comment_count>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2016-07-19 11:49:46 -0700</bug_when>
    <thetext>The r203378 did not actually fix the https://bugs.webkit.org/show_bug.cgi?id=158715 because although we have the right steps to decide whether to cache the PDF image or not, we are using the unscaled size which is wrong. The image has to be created scaled with the context.scaleFactor(). This may lead to allowing caching a PDF image which will cause the WebKit to jetsam on iOS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1212449</commentid>
    <comment_count>1</comment_count>
      <attachid>284026</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2016-07-19 11:52:00 -0700</bug_when>
    <thetext>Created attachment 284026
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1212470</commentid>
    <comment_count>2</comment_count>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2016-07-19 12:50:00 -0700</bug_when>
    <thetext>&lt;rdar://problem/27430450&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1213617</commentid>
    <comment_count>3</comment_count>
      <attachid>284026</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2016-07-22 10:37:26 -0700</bug_when>
    <thetext>Comment on attachment 284026
Patch

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

&gt; Source/WebCore/ChangeLog:8
&gt; +        We need to use the scaled size when deciding whether to cache the PDF image or not.

Why?

&gt; Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp:225
&gt;  #if PLATFORM(IOS)
&gt;      m_cachedImageRect = cachedImageRect(context, dstRect);
&gt; +#else
&gt; +    m_cachedImageRect = dstRect;
&gt; +#endif

It would be good to turn these #if PLATFORM(IOS) into something more descriptive, that explains why iOS needs special behavior.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1213634</commentid>
    <comment_count>4</comment_count>
      <attachid>284347</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2016-07-22 11:00:51 -0700</bug_when>
    <thetext>Created attachment 284347
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1213637</commentid>
    <comment_count>5</comment_count>
      <attachid>284348</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2016-07-22 11:11:16 -0700</bug_when>
    <thetext>Created attachment 284348
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1213665</commentid>
    <comment_count>6</comment_count>
      <attachid>284348</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-07-22 11:46:40 -0700</bug_when>
    <thetext>Comment on attachment 284348
Patch

Clearing flags on attachment: 284348

Committed r203606: &lt;http://trac.webkit.org/changeset/203606&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1213666</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-07-22 11:46:45 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>284026</attachid>
            <date>2016-07-19 11:52:00 -0700</date>
            <delta_ts>2016-07-22 11:00:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-159933-20160719115104.patch</filename>
            <type>text/plain</type>
            <size>2296</size>
            <attacher name="Said Abou-Hallawa">sabouhallawa</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzQxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA3LTE5ICBTYWlkIEFi
b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUkVH
UkVTU0lPTigyMDMzNzgpOiBQREZEb2N1bWVudEltYWdlOjp1cGRhdGVDYWNoZWRJbWFnZUlmTmVl
ZGVkKCkgdXNlcyB0aGUgdW5zY2FsZWQgc2l6ZSB3aGVuIGRlY2lkaW5nIHdoZXRoZXIgdG8gY2Fj
aGUgdGhlIFBERiBpbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MTU5OTMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgV2UgbmVlZCB0byB1c2UgdGhlIHNjYWxlZCBzaXplIHdoZW4gZGVjaWRpbmcgd2hl
dGhlciB0byBjYWNoZSB0aGUgUERGIGltYWdlIG9yIG5vdC4KKworICAgICAgICAqIHBsYXRmb3Jt
L2dyYXBoaWNzL2NnL1BERkRvY3VtZW50SW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UERG
RG9jdW1lbnRJbWFnZTo6dXBkYXRlQ2FjaGVkSW1hZ2VJZk5lZWRlZCk6CisKIDIwMTYtMDctMTkg
IE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogSW5jb3JyZWN0IGJl
aGF2aW9yIGZvciB3b3JkIHJlbGF0ZWQgdGV4dCBtYXJrZXIgZnVuY3Rpb25zIHdoZW4gdGhlcmUn
cyBjb2xsYXBzZWQgd2hpdGVzcGFjZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY2cvUERGRG9jdW1lbnRJbWFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvUERGRG9jdW1lbnRJbWFnZS5jcHAJKHJldmlzaW9uIDIw
MzM5MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL1BERkRvY3VtZW50
SW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjAsMTcgKzIyMCwyMyBAQCB2b2lkIFBERkRv
Y3VtZW50SW1hZ2U6OnVwZGF0ZUNhY2hlZEltYWdlCiAKICNpZiBQTEFURk9STShJT1MpCiAgICAg
bV9jYWNoZWRJbWFnZVJlY3QgPSBjYWNoZWRJbWFnZVJlY3QoY29udGV4dCwgZHN0UmVjdCk7Cisj
ZWxzZQorICAgIG1fY2FjaGVkSW1hZ2VSZWN0ID0gZHN0UmVjdDsKKyNlbmRpZgorCisgICAgRmxv
YXRTaXplIGNhY2hlZEltYWdlU2l6ZSA9IEZsb2F0UmVjdChlbmNsb3NpbmdJbnRSZWN0KG1fY2Fj
aGVkSW1hZ2VSZWN0KSkuc2l6ZSgpOworCisjaWYgUExBVEZPUk0oSU9TKQorICAgIEludFNpemUg
c2NhbGVkU2l6ZSA9IEltYWdlQnVmZmVyOjpjb21wYXRpYmxlQnVmZmVyU2l6ZShjYWNoZWRJbWFn
ZVNpemUsIGNvbnRleHQpOwogCiAgICAgLy8gQ2FjaGUgdGhlIFBERiBpbWFnZSBvbmx5IGlmIHRo
ZSBzaXplIG9mIHRoZSBuZXcgaW1hZ2Ugd29uJ3QgZXhjZWVkIHRoZSBsaW1pdC4KLSAgICBpZiAo
c19hbGxEZWNvZGVkRGF0YVNpemUgKyBtX2NhY2hlZEltYWdlUmVjdC5zaXplKCkuYXJlYSgpICog
NCAtIG1fY2FjaGVkQnl0ZXMgPiBzX21heERlY29kZWREYXRhU2l6ZSkgeworICAgIGlmIChzX2Fs
bERlY29kZWREYXRhU2l6ZSArIHNhZmVDYXN0PHNpemVfdD4oc2NhbGVkU2l6ZS53aWR0aCgpKSAq
IHNjYWxlZFNpemUuaGVpZ2h0KCkgKiA0IC0gbV9jYWNoZWRCeXRlcyA+IHNfbWF4RGVjb2RlZERh
dGFTaXplKSB7CiAgICAgICAgIGRlc3Ryb3lEZWNvZGVkRGF0YSgpOwogICAgICAgICByZXR1cm47
CiAgICAgfQotI2Vsc2UKLSAgICBtX2NhY2hlZEltYWdlUmVjdCA9IGRzdFJlY3Q7CiAjZW5kaWYK
IAotICAgIG1fY2FjaGVkSW1hZ2VCdWZmZXIgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlQ29tcGF0aWJs
ZUJ1ZmZlcihGbG9hdFJlY3QoZW5jbG9zaW5nSW50UmVjdChtX2NhY2hlZEltYWdlUmVjdCkpLnNp
emUoKSwgY29udGV4dCk7CisgICAgbV9jYWNoZWRJbWFnZUJ1ZmZlciA9IEltYWdlQnVmZmVyOjpj
cmVhdGVDb21wYXRpYmxlQnVmZmVyKGNhY2hlZEltYWdlU2l6ZSwgY29udGV4dCk7CiAgICAgaWYg
KCFtX2NhY2hlZEltYWdlQnVmZmVyKSB7CiAgICAgICAgIGRlc3Ryb3lEZWNvZGVkRGF0YSgpOwog
ICAgICAgICByZXR1cm47Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>284347</attachid>
            <date>2016-07-22 11:00:51 -0700</date>
            <delta_ts>2016-07-22 11:11:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-159933-20160722105950.patch</filename>
            <type>text/plain</type>
            <size>4645</size>
            <attacher name="Said Abou-Hallawa">sabouhallawa</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzYwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA3LTIyICBTYWlkIEFi
b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUkVH
UkVTU0lPTigyMDMzNzgpOiBQREZEb2N1bWVudEltYWdlOjp1cGRhdGVDYWNoZWRJbWFnZUlmTmVl
ZGVkKCkgdXNlcyB0aGUgdW5zY2FsZWQgc2l6ZSB3aGVuIGRlY2lkaW5nIHdoZXRoZXIgdG8gY2Fj
aGUgdGhlIFBERiBpbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MTU5OTMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisg
ICAgICAgIFdlIG5lZWQgdG8gdXNlIHRoZSBzY2FsZWQgc2l6ZSB3aGVuIGRlY2lkaW5nIHdoZXRo
ZXIgdG8gY2FjaGUgdGhlIFBERiBpbWFnZQorICAgICAgICBvciBub3QuIFRoaXMgaXMgYmVjYXVz
ZSBJbWFnZUJ1ZmZlciB0YWtlcyB0aGUgZGlzcGxheSByZXNvbHV0aW9uIGludG8gYWNjb3VudAor
ICAgICAgICB3aGljaCBnaXZlcyBoaWdoZXIgcmVzb2x1dGlvbiBmb3IgdGhlIGltYWdlIHdoZW4g
em9vbWluZy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ltYWdlQnVmZmVyLmg6Cisg
ICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6Y3JlYXRlKToKKyAgICAgICAgKiBwbGF0Zm9y
bS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl
QnVmZmVyOjpjcmVhdGVDb21wYXRpYmxlQnVmZmVyKToKKyAgICAgICAgVW5yZWxhdGVkIGNoYW5n
ZS4gVXNlIG1ha2VfdW5pcXVlPEltYWdlQnVmZmVyPiBpbnN0ZWFkIG9mIGNhbGxpbmcgbmV3IElt
YWdlQnVmZmVyLgorICAgICAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9QREZE
b2N1bWVudEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBERkRvY3VtZW50SW1hZ2U6OnVw
ZGF0ZUNhY2hlZEltYWdlSWZOZWVkZWQpOgorCiAyMDE2LTA3LTIyICBDaHJpcyBEdW1leiAgPGNk
dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUGFyYW1ldGVyIHRvIE5vZGUuY29tcGFyZURvY3Vt
ZW50UG9zaXRpb24oKSBzaG91bGQgYmUgbWFuZGF0b3J5IGFuZCBub24tbnVsbGFibGUKSW5kZXg6
IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlQnVmZmVyLmgKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VCdWZmZXIuaAkocmV2
aXNpb24gMjAzNTQ1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VC
dWZmZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNzMsNyArNzMsNyBAQCBwdWJsaWM6CiAgICAgc3Rh
dGljIHN0ZDo6dW5pcXVlX3B0cjxJbWFnZUJ1ZmZlcj4gY3JlYXRlKGNvbnN0IEZsb2F0U2l6ZSYg
c2l6ZSwgUmVuZGVyaW5nTW9kZSByZW5kZXJpbmdNb2RlLCBmbG9hdCByZXNvbHV0aW9uU2NhbGUg
PSAxLCBDb2xvclNwYWNlIGNvbG9yU3BhY2UgPSBDb2xvclNwYWNlU1JHQikKICAgICB7CiAgICAg
ICAgIGJvb2wgc3VjY2VzcyA9IGZhbHNlOwotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW1hZ2VC
dWZmZXI+IGJ1ZmZlcihuZXcgSW1hZ2VCdWZmZXIoc2l6ZSwgcmVzb2x1dGlvblNjYWxlLCBjb2xv
clNwYWNlLCByZW5kZXJpbmdNb2RlLCBzdWNjZXNzKSk7CisgICAgICAgIHN0ZDo6dW5pcXVlX3B0
cjxJbWFnZUJ1ZmZlcj4gYnVmZmVyID0gc3RkOjptYWtlX3VuaXF1ZTxJbWFnZUJ1ZmZlcj4oc2l6
ZSwgcmVzb2x1dGlvblNjYWxlLCBjb2xvclNwYWNlLCByZW5kZXJpbmdNb2RlLCBzdWNjZXNzKTsK
ICAgICAgICAgaWYgKCFzdWNjZXNzKQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg
ICAgIHJldHVybiBidWZmZXI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9jZy9JbWFnZUJ1ZmZlckNHLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcAkocmV2aXNpb24gMjAzNTQ1KQorKysg
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAJKHdv
cmtpbmcgY29weSkKQEAgLTk5LDcgKzk5LDcgQEAgc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVy
PiBJbWFnZUJ1ZmZlcgogICAgIFJlbmRlcmluZ01vZGUgcmVuZGVyaW5nTW9kZSA9IGNvbnRleHQu
cmVuZGVyaW5nTW9kZSgpOwogICAgIEludFNpemUgc2NhbGVkU2l6ZSA9IEltYWdlQnVmZmVyOjpj
b21wYXRpYmxlQnVmZmVyU2l6ZShzaXplLCBjb250ZXh0KTsKICAgICBib29sIHN1Y2Nlc3MgPSBm
YWxzZTsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8SW1hZ2VCdWZmZXI+IGJ1ZmZlcihuZXcgSW1hZ2VC
dWZmZXIoc2NhbGVkU2l6ZSwgMSwgY29sb3JTcGFjZS5nZXQoKSwgcmVuZGVyaW5nTW9kZSwgc3Vj
Y2VzcykpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxJbWFnZUJ1ZmZlcj4gYnVmZmVyID0gc3RkOjpt
YWtlX3VuaXF1ZTxJbWFnZUJ1ZmZlcj4oc2NhbGVkU2l6ZSwgMSwgY29sb3JTcGFjZS5nZXQoKSwg
cmVuZGVyaW5nTW9kZSwgc3VjY2Vzcyk7CiAKICAgICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAgIHJl
dHVybiBudWxscHRyOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cv
UERGRG9jdW1lbnRJbWFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vZ3JhcGhpY3MvY2cvUERGRG9jdW1lbnRJbWFnZS5jcHAJKHJldmlzaW9uIDIwMzU0NSkKKysr
IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL1BERkRvY3VtZW50SW1hZ2UuY3Bw
CSh3b3JraW5nIGNvcHkpCkBAIC0yMTksMTggKzIxOSwyNiBAQCB2b2lkIFBERkRvY3VtZW50SW1h
Z2U6OnVwZGF0ZUNhY2hlZEltYWdlCiAgICAgICAgIHJldHVybjsKIAogI2lmIFBMQVRGT1JNKElP
UykKKyAgICAvLyBLZWVwIHRoZSBtZW1vcnkgdXNlZCBieSB0aGUgY2FjaGVkIGltYWdlIGJlbG93
IHNvbWUgdGhyZXNob2xkLCBvdGhlcndpc2UgV2ViS2l0IHByb2Nlc3MKKyAgICAvLyB3aWxsIGpl
dHNhbSBpZiBpdCBleGNlZWRzIGl0cyBtZW1vcnkgbGltaXQuIE9ubHkgYSByZWN0YW5nbGUgZnJv
bSB0aGUgUERGIG1heSBiZSBjYWNoZWQuCiAgICAgbV9jYWNoZWRJbWFnZVJlY3QgPSBjYWNoZWRJ
bWFnZVJlY3QoY29udGV4dCwgZHN0UmVjdCk7CisjZWxzZQorICAgIG1fY2FjaGVkSW1hZ2VSZWN0
ID0gZHN0UmVjdDsKKyNlbmRpZgorCisgICAgRmxvYXRTaXplIGNhY2hlZEltYWdlU2l6ZSA9IEZs
b2F0UmVjdChlbmNsb3NpbmdJbnRSZWN0KG1fY2FjaGVkSW1hZ2VSZWN0KSkuc2l6ZSgpOwogCi0g
ICAgLy8gQ2FjaGUgdGhlIFBERiBpbWFnZSBvbmx5IGlmIHRoZSBzaXplIG9mIHRoZSBuZXcgaW1h
Z2Ugd29uJ3QgZXhjZWVkIHRoZSBsaW1pdC4KLSAgICBpZiAoc19hbGxEZWNvZGVkRGF0YVNpemUg
KyBtX2NhY2hlZEltYWdlUmVjdC5zaXplKCkuYXJlYSgpICogNCAtIG1fY2FjaGVkQnl0ZXMgPiBz
X21heERlY29kZWREYXRhU2l6ZSkgeworI2lmIFBMQVRGT1JNKElPUykKKyAgICBJbnRTaXplIHNj
YWxlZFNpemUgPSBJbWFnZUJ1ZmZlcjo6Y29tcGF0aWJsZUJ1ZmZlclNpemUoY2FjaGVkSW1hZ2VT
aXplLCBjb250ZXh0KTsKKworICAgIC8vIENhY2hlIHRoZSBQREYgaW1hZ2Ugb25seSBpZiB0aGUg
c2l6ZSBvZiB0aGUgbmV3IGltYWdlIHdvbid0IGV4Y2VlZCB0aGUgY2FjaGUgdGhyZXNob2xkLgor
ICAgIGlmIChzX2FsbERlY29kZWREYXRhU2l6ZSArIHNhZmVDYXN0PHNpemVfdD4oc2NhbGVkU2l6
ZS53aWR0aCgpKSAqIHNjYWxlZFNpemUuaGVpZ2h0KCkgKiA0IC0gbV9jYWNoZWRCeXRlcyA+IHNf
bWF4RGVjb2RlZERhdGFTaXplKSB7CiAgICAgICAgIGRlc3Ryb3lEZWNvZGVkRGF0YSgpOwogICAg
ICAgICByZXR1cm47CiAgICAgfQotI2Vsc2UKLSAgICBtX2NhY2hlZEltYWdlUmVjdCA9IGRzdFJl
Y3Q7CiAjZW5kaWYKIAotICAgIG1fY2FjaGVkSW1hZ2VCdWZmZXIgPSBJbWFnZUJ1ZmZlcjo6Y3Jl
YXRlQ29tcGF0aWJsZUJ1ZmZlcihGbG9hdFJlY3QoZW5jbG9zaW5nSW50UmVjdChtX2NhY2hlZElt
YWdlUmVjdCkpLnNpemUoKSwgY29udGV4dCk7CisgICAgbV9jYWNoZWRJbWFnZUJ1ZmZlciA9IElt
YWdlQnVmZmVyOjpjcmVhdGVDb21wYXRpYmxlQnVmZmVyKGNhY2hlZEltYWdlU2l6ZSwgY29udGV4
dCk7CiAgICAgaWYgKCFtX2NhY2hlZEltYWdlQnVmZmVyKSB7CiAgICAgICAgIGRlc3Ryb3lEZWNv
ZGVkRGF0YSgpOwogICAgICAgICByZXR1cm47Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>284348</attachid>
            <date>2016-07-22 11:11:16 -0700</date>
            <delta_ts>2016-07-22 11:46:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-159933-20160722111014.patch</filename>
            <type>text/plain</type>
            <size>2734</size>
            <attacher name="Said Abou-Hallawa">sabouhallawa</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzYwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA3LTIyICBTYWlkIEFi
b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUkVH
UkVTU0lPTigyMDMzNzgpOiBQREZEb2N1bWVudEltYWdlOjp1cGRhdGVDYWNoZWRJbWFnZUlmTmVl
ZGVkKCkgdXNlcyB0aGUgdW5zY2FsZWQgc2l6ZSB3aGVuIGRlY2lkaW5nIHdoZXRoZXIgdG8gY2Fj
aGUgdGhlIFBERiBpbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MTU5OTMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisg
ICAgICAgIFdlIG5lZWQgdG8gdXNlIHRoZSBzY2FsZWQgc2l6ZSB3aGVuIGRlY2lkaW5nIHdoZXRo
ZXIgdG8gY2FjaGUgdGhlIFBERiBpbWFnZQorICAgICAgICBvciBub3QuIFRoaXMgaXMgYmVjYXVz
ZSBJbWFnZUJ1ZmZlciB0YWtlcyB0aGUgZGlzcGxheSByZXNvbHV0aW9uIGludG8gYWNjb3VudAor
ICAgICAgICB3aGljaCBnaXZlcyBoaWdoZXIgcmVzb2x1dGlvbiBmb3IgdGhlIGltYWdlIHdoZW4g
em9vbWluZy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL1BERkRvY3VtZW50SW1h
Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UERGRG9jdW1lbnRJbWFnZTo6dXBkYXRlQ2FjaGVk
SW1hZ2VJZk5lZWRlZCk6CisKIDIwMTYtMDctMjIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl
LmNvbT4KIAogICAgICAgICBQYXJhbWV0ZXIgdG8gTm9kZS5jb21wYXJlRG9jdW1lbnRQb3NpdGlv
bigpIHNob3VsZCBiZSBtYW5kYXRvcnkgYW5kIG5vbi1udWxsYWJsZQpJbmRleDogU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvUERGRG9jdW1lbnRJbWFnZS5jcHAKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvUERGRG9jdW1lbnRJbWFn
ZS5jcHAJKHJldmlzaW9uIDIwMzU0NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL2NnL1BERkRvY3VtZW50SW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTksMTggKzIx
OSwyNiBAQCB2b2lkIFBERkRvY3VtZW50SW1hZ2U6OnVwZGF0ZUNhY2hlZEltYWdlCiAgICAgICAg
IHJldHVybjsKIAogI2lmIFBMQVRGT1JNKElPUykKKyAgICAvLyBLZWVwIHRoZSBtZW1vcnkgdXNl
ZCBieSB0aGUgY2FjaGVkIGltYWdlIGJlbG93IHNvbWUgdGhyZXNob2xkLCBvdGhlcndpc2UgV2Vi
S2l0IHByb2Nlc3MKKyAgICAvLyB3aWxsIGpldHNhbSBpZiBpdCBleGNlZWRzIGl0cyBtZW1vcnkg
bGltaXQuIE9ubHkgYSByZWN0YW5nbGUgZnJvbSB0aGUgUERGIG1heSBiZSBjYWNoZWQuCiAgICAg
bV9jYWNoZWRJbWFnZVJlY3QgPSBjYWNoZWRJbWFnZVJlY3QoY29udGV4dCwgZHN0UmVjdCk7Cisj
ZWxzZQorICAgIG1fY2FjaGVkSW1hZ2VSZWN0ID0gZHN0UmVjdDsKKyNlbmRpZgorCisgICAgRmxv
YXRTaXplIGNhY2hlZEltYWdlU2l6ZSA9IEZsb2F0UmVjdChlbmNsb3NpbmdJbnRSZWN0KG1fY2Fj
aGVkSW1hZ2VSZWN0KSkuc2l6ZSgpOwogCi0gICAgLy8gQ2FjaGUgdGhlIFBERiBpbWFnZSBvbmx5
IGlmIHRoZSBzaXplIG9mIHRoZSBuZXcgaW1hZ2Ugd29uJ3QgZXhjZWVkIHRoZSBsaW1pdC4KLSAg
ICBpZiAoc19hbGxEZWNvZGVkRGF0YVNpemUgKyBtX2NhY2hlZEltYWdlUmVjdC5zaXplKCkuYXJl
YSgpICogNCAtIG1fY2FjaGVkQnl0ZXMgPiBzX21heERlY29kZWREYXRhU2l6ZSkgeworI2lmIFBM
QVRGT1JNKElPUykKKyAgICBJbnRTaXplIHNjYWxlZFNpemUgPSBJbWFnZUJ1ZmZlcjo6Y29tcGF0
aWJsZUJ1ZmZlclNpemUoY2FjaGVkSW1hZ2VTaXplLCBjb250ZXh0KTsKKworICAgIC8vIENhY2hl
IHRoZSBQREYgaW1hZ2Ugb25seSBpZiB0aGUgc2l6ZSBvZiB0aGUgbmV3IGltYWdlIHdvbid0IGV4
Y2VlZCB0aGUgY2FjaGUgdGhyZXNob2xkLgorICAgIGlmIChzX2FsbERlY29kZWREYXRhU2l6ZSAr
IHNhZmVDYXN0PHNpemVfdD4oc2NhbGVkU2l6ZS53aWR0aCgpKSAqIHNjYWxlZFNpemUuaGVpZ2h0
KCkgKiA0IC0gbV9jYWNoZWRCeXRlcyA+IHNfbWF4RGVjb2RlZERhdGFTaXplKSB7CiAgICAgICAg
IGRlc3Ryb3lEZWNvZGVkRGF0YSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQotI2Vsc2UKLSAg
ICBtX2NhY2hlZEltYWdlUmVjdCA9IGRzdFJlY3Q7CiAjZW5kaWYKIAotICAgIG1fY2FjaGVkSW1h
Z2VCdWZmZXIgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlQ29tcGF0aWJsZUJ1ZmZlcihGbG9hdFJlY3Qo
ZW5jbG9zaW5nSW50UmVjdChtX2NhY2hlZEltYWdlUmVjdCkpLnNpemUoKSwgY29udGV4dCk7Cisg
ICAgbV9jYWNoZWRJbWFnZUJ1ZmZlciA9IEltYWdlQnVmZmVyOjpjcmVhdGVDb21wYXRpYmxlQnVm
ZmVyKGNhY2hlZEltYWdlU2l6ZSwgY29udGV4dCk7CiAgICAgaWYgKCFtX2NhY2hlZEltYWdlQnVm
ZmVyKSB7CiAgICAgICAgIGRlc3Ryb3lEZWNvZGVkRGF0YSgpOwogICAgICAgICByZXR1cm47Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>