<?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>136833</bug_id>
          
          <creation_ts>2014-09-15 13:33:56 -0700</creation_ts>
          <short_desc>[GTK] Add Wayland support to WebKitWebViewBase</short_desc>
          <delta_ts>2016-08-17 00:37:13 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>DUPLICATE</resolution>
          <dup_id>115803</dup_id>
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>136849</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Zan Dobersek">zan</reporter>
          <assigned_to name="Zan Dobersek">zan</assigned_to>
          <cc>cgarcia</cc>
    
    <cc>mrobinson</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1035302</commentid>
    <comment_count>0</comment_count>
    <who name="Zan Dobersek">zan</who>
    <bug_when>2014-09-15 13:33:56 -0700</bug_when>
    <thetext>[GTK] Add Wayland support to WebKitWebViewBase</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1035304</commentid>
    <comment_count>1</comment_count>
      <attachid>238140</attachid>
    <who name="Zan Dobersek">zan</who>
    <bug_when>2014-09-15 13:47:52 -0700</bug_when>
    <thetext>Created attachment 238140
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1035424</commentid>
    <comment_count>2</comment_count>
      <attachid>238164</attachid>
    <who name="Zan Dobersek">zan</who>
    <bug_when>2014-09-16 02:37:38 -0700</bug_when>
    <thetext>Created attachment 238164
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1035565</commentid>
    <comment_count>3</comment_count>
      <attachid>238202</attachid>
    <who name="Zan Dobersek">zan</who>
    <bug_when>2014-09-16 13:40:06 -0700</bug_when>
    <thetext>Created attachment 238202
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1035710</commentid>
    <comment_count>4</comment_count>
      <attachid>238252</attachid>
    <who name="Zan Dobersek">zan</who>
    <bug_when>2014-09-17 05:50:34 -0700</bug_when>
    <thetext>Created attachment 238252
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1220818</commentid>
    <comment_count>5</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2016-08-17 00:37:13 -0700</bug_when>
    <thetext>Let&apos;s track this in bug #115803 instead.

*** This bug has been marked as a duplicate of bug 115803 ***</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>238140</attachid>
            <date>2014-09-15 13:47:52 -0700</date>
            <delta_ts>2014-09-16 02:37:31 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-136833-20140915134748.patch</filename>
            <type>text/plain</type>
            <size>8726</size>
            <attacher name="Zan Dobersek">zan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzYyOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE0LTA5LTE1ICBJYWdvIFRv
cmFsICA8aXRvcmFsQGlnYWxpYS5jb20+IGFuZCBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh
bGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgV2F5bGFuZCBzdXBwb3J0IHRvIFdlYktpdFdl
YlZpZXdCYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xMzY4MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBBIGhlbHBlciBjbGFzcywgR0tERGlzcGxheVR5cGUsIHByb3ZpZGVzIGFuIGVudW0gb2YgdGhl
IHN1cHBvcnRlZCBkaXNwbGF5IHR5cGVzCisgICAgICAgIGFuZCB0aGUgc3RhdGljIGdldCgpIG1l
dGhvZCB3aGljaCByZXR1cm5zIHRoZSB0eXBlIG9mIHRoZSBkaXNwbGF5IHVuZGVyIHdoaWNoCisg
ICAgICAgIHdlIGFyZSBydW5uaW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi
S2l0V2ViVmlld0Jhc2UuY3BwOgorICAgICAgICAoR0RLRGlzcGxheVR5cGU6OmdldCk6CisgICAg
ICAgICh3ZWJraXRXZWJWaWV3QmFzZUNvbnN0cnVjdGVkKTogVW5kZXIgV2F5bGFuZCwgdGhlIHdh
eWxhbmRDb21wb3NpdG9yIG1lbWJlcgorICAgICAgICB2YXJpYWJsZSBpcyBpbml0aWFsaXplZCB0
byBwb2ludCB0byB0aGUgV2F5bGFuZENvbXBvc2l0b3IgaW5zdGFuY2UuCisgICAgICAgICh3ZWJr
aXRXZWJWaWV3UmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jlc3VsdHMpOiBVbmRlciB0aGUg
WDExIGRpc3BsYXksIHRoZQorICAgICAgICBjdXJyZW50IGJlaGF2aW9yIGlzIHByZXNlcnZlci4g
VW5kZXIgV2F5bGFuZCwgd2UgY3JlYXRlIHRoZSBzaW1wbGUKKyAgICAgICAgUmVuZGVyaW5nQ29u
dGV4dCBvYmplY3QgYW5kIHBhc3MgaXQgYXMgYW4gYXJndW1lbnQgdG8gdGhlCisgICAgICAgIFdh
eWxhbmRDb21wb3NpdG9yOjpyZW5kZXIoKSBtZXRob2QuCisgICAgICAgICh3ZWJraXRXZWJWaWV3
QmFzZURlc3Ryb3kpOiBSZW1vdmUgdGhlIHVuZGVybHlpbmcgR3RrV2lkZ2V0IGZyb20gdGhlCisg
ICAgICAgIFdheWxhbmRDb21wb3NpdG9yJ3Mgd2lkZ2V0LXRvLXN1cmZhY2UgbWFwcGluZyB3aGVu
IGRlc3Ryb3lpbmcgdGhlCisgICAgICAgIFdlYktpdFdlYlZpZXdCYXNlLgorICAgICAgICAod2Vi
a2l0V2ViVmlld0Jhc2VVcGRhdGVQcmVmZXJlbmNlcyk6IEFsc28gcmV0dXJuIGVhcmx5LCBrZWVw
aW5nIEFDIGVuYWJsZWQsIGlmCisgICAgICAgIHRoZSBXYXlsYW5kQ29tcG9zaXRvciBtZW1iZXIg
dmFyaWFibGUgb24gdGhlIHByaXZhdGUgc3RydWN0IGhhcyBiZWVuIHByb3Blcmx5CisgICAgICAg
IGluaXRpYWxpemVkLgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKTog
VW5kZXIgV2F5bGFuZCwgdGhlIHVuZGVybHlpbmcgR3RrV2lkZ2V0IG9mIHRoZQorICAgICAgICBX
ZWJLaXRXZWJWaWVXQmFzZSBpcyBhZGRlZCB0byB0aGUgV2F5bGFuZENvbXBvc2l0b3IgaW5zdGFu
Y2UncyB3aWRnZXQtdG8tc3VyZmFjZQorICAgICAgICBtYXBwaW5nIGFsb25nIHdpdGggc2V0dGlu
ZyB0aGUgQUMgd2luZG93IElEICh3aGljaCB0ZWNobmljYWxseSBlcXVhbHMgdG8gdGhlCisgICAg
ICAgIHBhZ2UgSUQpLgorCiAyMDE0LTA5LTEzICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcmFjbG91
Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFNob3VsZCBjYWxsIFtCS1NQcm9jZXNzQXNzZXJ0aW9u
IGludmFsaWRhdGVdCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL
aXRXZWJWaWV3QmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz
L0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCShyZXZpc2lvbiAxNzM2MjcpCisrKyBTb3Vy
Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAJKHdvcmtp
bmcgY29weSkKQEAgLTY0LDkgKzY0LDEyIEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZWdpb24uaD4K
ICNpbmNsdWRlIDxnZGsvZ2RrLmg+CiAjaW5jbHVkZSA8Z2RrL2dka2tleXN5bXMuaD4KLSNpZiBk
ZWZpbmVkKEdES19XSU5ET1dJTkdfWDExKQorI2lmIFBMQVRGT1JNKFgxMSkKICNpbmNsdWRlIDxn
ZGsvZ2RreC5oPgogI2VuZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkKKyNpbmNsdWRlIDxnZGsv
Z2Rrd2F5bGFuZC5oPgorI2VuZGlmCiAjaW5jbHVkZSA8bWVtb3J5PgogI2luY2x1ZGUgPHd0Zi9I
YXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5oPgpAQCAtNzYsOSArNzks
MTUgQEAKICNpbmNsdWRlICJXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5LmgiCiAjZW5kaWYKIAot
I2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZPUk0oWDExKQorI2lmIFVTRShURVhU
VVJFX01BUFBFUl9HTCkKKyNpZiBQTEFURk9STShYMTEpCiAjaW5jbHVkZSA8V2ViQ29yZS9SZWRp
cmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5oPgogI2VuZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkK
KyNpbmNsdWRlIDxXZWJDb3JlL1dheWxhbmRDb21wb3NpdG9yLmg+CisjaW5jbHVkZSA8V2ViQ29y
ZS9XYXlsYW5kQ29tcG9zaXRvckVHTC5oPgorI2VuZGlmCisjZW5kaWYKIAogLy8gZ3RrX3dpZGdl
dF9nZXRfc2NhbGVfZmFjdG9yKCkgYXBwZWFyZWQgaW4gR1RLIDMuMTAsIGJ1dCB3ZSBhbHNvIG5l
ZWQKIC8vIHRvIG1ha2Ugc3VyZSB3ZSBoYXZlIGNhaXJvIG5ldyBlbm91Z2ggdG8gc3VwcG9ydCBj
YWlyb19zdXJmYWNlX3NldF9kZXZpY2Vfc2NhbGUKQEAgLTEzOCwxMyArMTQ3LDQ1IEBAIHN0cnVj
dCBfV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlIHsKICAgICBXZWJGdWxsU2NyZWVuQ2xpZW50R3Rr
IGZ1bGxTY3JlZW5DbGllbnQ7CiAjZW5kaWYKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkg
JiYgUExBVEZPUk0oWDExKQorI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNpZiBQTEFURk9S
TShYMTEpCiAgICAgT3duUHRyPFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93PiByZWRpcmVjdGVk
V2luZG93OwogI2VuZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkKKyAgICBXYXlsYW5kQ29tcG9z
aXRvciogd2F5bGFuZENvbXBvc2l0b3I7CisjZW5kaWYKKyNlbmRpZgogfTsKIAogV0VCS0lUX0RF
RklORV9UWVBFKFdlYktpdFdlYlZpZXdCYXNlLCB3ZWJraXRfd2ViX3ZpZXdfYmFzZSwgR1RLX1RZ
UEVfQ09OVEFJTkVSKQogCitjbGFzcyBHREtEaXNwbGF5VHlwZSB7CitwdWJsaWM6CisgICAgZW51
bSBUeXBlIHsKKyAgICAgICAgTm9uZSwKKyAgICAgICAgWDExLAorICAgICAgICBXYXlsYW5kCisg
ICAgfTsKKworICAgIHN0YXRpYyBUeXBlIGdldCgpCisgICAgeworICAgICAgICBzdGF0aWMgVHlw
ZSB0eXBlID0gTm9uZTsKKyAgICAgICAgaWYgKHR5cGUgPT0gTm9uZSkgeworICAgICAgICAgICAg
R2RrRGlzcGxheSogZGlzcGxheSA9IGdka19kaXNwbGF5X21hbmFnZXJfZ2V0X2RlZmF1bHRfZGlz
cGxheShnZGtfZGlzcGxheV9tYW5hZ2VyX2dldCgpKTsKKyNpZiBQTEFURk9STShYMTEpCisgICAg
ICAgICAgICBpZiAoR0RLX0lTX1gxMV9ESVNQTEFZKGRpc3BsYXkpKQorICAgICAgICAgICAgICAg
IHR5cGUgPSBYMTE7CisjZW5kaWYKKyNpZiBQTEFURk9STShXQVlMQU5EKQorICAgICAgICAgICAg
aWYgKEdES19JU19XQVlMQU5EX0RJU1BMQVkoZGlzcGxheSkpCisgICAgICAgICAgICAgICAgdHlw
ZSA9IFdheWxhbmQ7CisjZW5kaWYKKyAgICAgICAgICAgIEFTU0VSVCh0eXBlICE9IE5vbmUpOwor
ICAgICAgICB9CisgICAgICAgIHJldHVybiB0eXBlOworICAgIH0KK307CisKICNpZiAhR1RLX0NI
RUNLX1ZFUlNJT04oMywgMTMsIDQpCiBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZU5vdGlm
eVJlc2l6ZXJTaXplKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSkKIHsKQEAgLTQyNCwx
NSArNDY1LDE5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ29uc3RydWN0ZWQKICAg
ICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRShv
YmplY3QpLT5wcml2OwogICAgIHByaXYtPnBhZ2VDbGllbnQgPSBQYWdlQ2xpZW50SW1wbDo6Y3Jl
YXRlKHZpZXdXaWRnZXQpOwogICAgIHByaXYtPmRyYWdBbmREcm9wSGVscGVyLnNldFdpZGdldCh2
aWV3V2lkZ2V0KTsKLQotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZPUk0oWDEx
KQotICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBnZGtfZGlzcGxheV9tYW5hZ2VyX2dldF9kZWZh
dWx0X2Rpc3BsYXkoZ2RrX2Rpc3BsYXlfbWFuYWdlcl9nZXQoKSk7Ci0gICAgaWYgKEdES19JU19Y
MTFfRElTUExBWShkaXNwbGF5KSkgeworI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNpZiBQ
TEFURk9STShYMTEpCisgICAgaWYgKEdES0Rpc3BsYXlUeXBlOjpnZXQoKSA9PSBHREtEaXNwbGF5
VHlwZTo6WDExKSB7CiAgICAgICAgIHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cgPSBSZWRpcmVjdGVk
WENvbXBvc2l0ZVdpbmRvdzo6Y3JlYXRlKEludFNpemUoMSwgMSksIFJlZGlyZWN0ZWRYQ29tcG9z
aXRlV2luZG93OjpEb05vdENyZWF0ZUdMQ29udGV4dCk7CiAgICAgICAgIGlmIChwcml2LT5yZWRp
cmVjdGVkV2luZG93KQogICAgICAgICAgICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+c2V0RGFt
YWdlTm90aWZ5Q2FsbGJhY2socmVkaXJlY3RlZFdpbmRvd0RhbWFnZWRDYWxsYmFjaywgb2JqZWN0
KTsKICAgICB9CiAjZW5kaWYKKyNpZiBQTEFURk9STShXQVlMQU5EKQorICAgIGlmIChHREtEaXNw
bGF5VHlwZTo6Z2V0KCkgPT0gR0RLRGlzcGxheVR5cGU6OldheWxhbmQpCisgICAgICAgIHByaXYt
PndheWxhbmRDb21wb3NpdG9yID0gV2F5bGFuZENvbXBvc2l0b3I6Omluc3RhbmNlKCk7CisjZW5k
aWYKKyNlbmRpZgogCiAgICAgcHJpdi0+YXV0aGVudGljYXRpb25EaWFsb2cgPSAwOwogfQpAQCAt
NDQzLDIxICs0ODgsMzcgQEAgc3RhdGljIGJvb2wgd2Via2l0V2ViVmlld1JlbmRlckFjY2VsZXJh
dAogICAgIGlmICghZHJhd2luZ0FyZWEtPmlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgp
KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSNpZiBQTEFURk9STShYMTEpCiAgICAgLy8gVG8g
YXZvaWQgZmxhc2hlcyB3aGVuIGluaXRpYWxpemluZyBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBm
b3IgdGhlIGZpcnN0CiAgICAgLy8gdGltZSwgd2Ugd2FpdCB1bnRpbCB3ZSBrbm93IHRoZXJlJ3Mg
YSBmcmFtZSByZWFkeSBiZWZvcmUgcmVuZGVyaW5nLgogICAgIFdlYktpdFdlYlZpZXdCYXNlUHJp
dmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNlLT5wcml2OwotICAgIGlmICghcHJpdi0+cmVkaXJlY3Rl
ZFdpbmRvdykKLSAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgY2Fpcm9fcmVjdGFuZ2xlKGNy
LCBjbGlwUmVjdC0+eCwgY2xpcFJlY3QtPnksIGNsaXBSZWN0LT53aWR0aCwgY2xpcFJlY3QtPmhl
aWdodCk7Ci0gICAgY2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlID0gcHJpdi0+cmVkaXJlY3RlZFdp
bmRvdy0+Y2Fpcm9TdXJmYWNlRm9yV2lkZ2V0KEdUS19XSURHRVQod2ViVmlld0Jhc2UpKTsKLSAg
ICBjYWlyb19zZXRfc291cmNlX3N1cmZhY2UoY3IsIHN1cmZhY2UsIDAsIDApOwotICAgIGNhaXJv
X2ZpbGwoY3IpOwotICAgIHJldHVybiB0cnVlOwotI2Vsc2UKLSAgICByZXR1cm4gZmFsc2U7Cisj
aWYgUExBVEZPUk0oWDExKQorICAgIGlmIChHREtEaXNwYXlUeXBlOjpnZXQoKSA9PSBHREtEaXNw
bGF5VHlwZTo6WDExKSB7CisgICAgICAgIGlmICghcHJpdi0+cmVkaXJlY3RlZFdpbmRvdykKKyAg
ICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBjYWlyb19zdXJmYWNlX3QqIHN1cmZh
Y2UgPSBwcml2LT5yZWRpcmVjdGVkV2luZG93LT5jYWlyb1N1cmZhY2VGb3JXaWRnZXQoR1RLX1dJ
REdFVCh3ZWJWaWV3QmFzZSkpOworICAgICAgICBpZiAoc3VyZmFjZSkgeworICAgICAgICAgICAg
Y2Fpcm9fcmVjdGFuZ2xlKGNyLCBjbGlwUmVjdC0+eCwgY2xpcFJlY3QtPnksIGNsaXBSZWN0LT53
aWR0aCwgY2xpcFJlY3QtPmhlaWdodCk7CisgICAgICAgICAgICBjYWlyb19zZXRfc291cmNlX3N1
cmZhY2UoY3IsIHN1cmZhY2UsIDAsIDApOworICAgICAgICAgICAgY2Fpcm9fZmlsbChjcik7Cisg
ICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQogI2VuZGlmCisKKyNpZiBQTEFU
Rk9STShXQVlMQU5EKQorICAgIGlmIChHREtEaXNwbGF5VHlwZTo6Z2V0KCkgPT0gR0RLRGlzcGxh
eVR5cGU6OldheWxhbmQpIHsKKyAgICAgICAgaWYgKCFwcml2LT53YXlsYW5kQ29tcG9zaXRvcikK
KyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBXYXlsYW5kQ29tcG9zaXRvckVH
TDo6UmVuZGVyaW5nQ29udGV4dCByZW5kZXJpbmdDb250ZXh0KEdUS19XSURHRVQod2ViVmlld0Jh
c2UpLCBjciwgY2xpcFJlY3QpOworICAgICAgICBwcml2LT53YXlsYW5kQ29tcG9zaXRvci0+cmVu
ZGVyKHJlbmRlcmluZ0NvbnRleHQpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisjZW5k
aWYKKworICAgIHJldHVybiBmYWxzZTsKIH0KICNlbmRpZgogCkBAIC05MTQsNiArOTc1LDExIEBA
IHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlRGVzdHJveShHdGsKICAgICBpZiAocHJpdi0+
YXV0aGVudGljYXRpb25EaWFsb2cpCiAgICAgICAgIGd0a193aWRnZXRfZGVzdHJveShwcml2LT5h
dXRoZW50aWNhdGlvbkRpYWxvZyk7CiAKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBM
QVRGT1JNKFdBWUxBTkQpCisgICAgaWYgKHByaXYtPndheWxhbmRDb21wb3NpdG9yKQorICAgICAg
ICBwcml2LT53YXlsYW5kQ29tcG9zaXRvci0+cmVtb3ZlV2lkZ2V0KHdpZGdldCk7CisjZW5kaWYK
KwogICAgIEdUS19XSURHRVRfQ0xBU1Mod2Via2l0X3dlYl92aWV3X2Jhc2VfcGFyZW50X2NsYXNz
KS0+ZGVzdHJveSh3aWRnZXQpOwogfQogCkBAIC05NzksMTAgKzEwNDUsMTYgQEAgdm9pZCB3ZWJr
aXRXZWJWaWV3QmFzZVVwZGF0ZVByZWZlcmVuY2VzKAogewogICAgIFdlYktpdFdlYlZpZXdCYXNl
UHJpdmF0ZSogcHJpdiA9IHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2OwogCi0jaWYgVVNFKFRFWFRV
UkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpCisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dM
KQorI2lmIFBMQVRGT1JNKFgxMSkKICAgICBpZiAocHJpdi0+cmVkaXJlY3RlZFdpbmRvdykKICAg
ICAgICAgcmV0dXJuOwogI2VuZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkKKyAgICBpZiAocHJp
di0+d2F5bGFuZENvbXBvc2l0b3IpCisgICAgICAgIHJldHVybjsKKyNlbmRpZgorI2VuZGlmCiAK
ICAgICBwcml2LT5wYWdlUHJveHktPnByZWZlcmVuY2VzKCkuc2V0QWNjZWxlcmF0ZWRDb21wb3Np
dGluZ0VuYWJsZWQoZmFsc2UpOwogfQpAQCAtMTAwNiwxMCArMTA3OCwxOCBAQCB2b2lkIHdlYmtp
dFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZShXZWJLCiAgICAgcHJpdi0+cGFnZVByb3h5ID0gY29u
dGV4dC0+Y3JlYXRlV2ViUGFnZSgqcHJpdi0+cGFnZUNsaWVudCwgV1RGOjptb3ZlKHdlYlBhZ2VD
b25maWd1cmF0aW9uKSk7CiAgICAgcHJpdi0+cGFnZVByb3h5LT5pbml0aWFsaXplV2ViUGFnZSgp
OwogCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpCi0gICAgaWYg
KHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpCisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2lm
IFBMQVRGT1JNKFgxMSkKKyAgICBpZiAoR0RLRGlzcGxheVR5cGU6OmdldCgpID09IEdES0Rpc3Bs
YXlUeXBlOjpYMTEgJiYgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdykKICAgICAgICAgcHJpdi0+cGFn
ZVByb3h5LT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nV2luZG93SWQocHJpdi0+cmVkaXJlY3Rl
ZFdpbmRvdy0+d2luZG93SWQoKSk7CiAjZW5kaWYKKyNpZiBQTEFURk9STShXQVlMQU5EKQorICAg
IGlmIChHREtEaXNwbGF5VHlwZTo6Z2V0KCkgPT0gR0RLRGlzcGxheVR5cGU6OldheWxhbmQgJiYg
cHJpdi0+d2F5bGFuZENvbXBvc2l0b3IpIHsKKyAgICAgICAgcHJpdi0+d2F5bGFuZENvbXBvc2l0
b3ItPmFkZFdpZGdldChHVEtfV0lER0VUKHdlYmtpdFdlYlZpZXdCYXNlKSwgcHJpdi0+cGFnZVBy
b3h5LT5wYWdlSUQoKSk7CisgICAgICAgIHByaXYtPnBhZ2VQcm94eS0+c2V0QWNjZWxlcmF0ZWRD
b21wb3NpdGluZ1dpbmRvd0lkKFdheWxhbmRDb21wb3NpdG9yOjp3aWRnZXRJRChHVEtfV0lER0VU
KHdlYmtpdFdlYlZpZXdCYXNlKSkpOworICAgIH0KKyNlbmRpZgorI2VuZGlmCiAKICNpZiBIQVZF
KEdUS19TQ0FMRV9GQUNUT1IpCiAgICAgLy8gV2UgYXR0YWNoIHRoaXMgaGVyZSwgYmVjYXVzZSBj
aGFuZ2VzIGluIHNjYWxlIGZhY3RvciBhcmUgcGFzc2VkIGRpcmVjdGx5IHRvIHRoZSBwYWdlIHBy
b3h5Lgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>238164</attachid>
            <date>2014-09-16 02:37:38 -0700</date>
            <delta_ts>2014-09-16 13:40:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-136833-20140916023734.patch</filename>
            <type>text/plain</type>
            <size>7961</size>
            <attacher name="Zan Dobersek">zan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY1NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTA5LTE2ICBJYWdvIFRv
cmFsICA8aXRvcmFsQGlnYWxpYS5jb20+IGFuZCBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh
bGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgV2F5bGFuZCBzdXBwb3J0IHRvIFdlYktpdFdl
YlZpZXdCYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xMzY4MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdl
YmtpdFdlYlZpZXdCYXNlQ29uc3RydWN0ZWQpOiBVbmRlciBXYXlsYW5kLCB0aGUgd2F5bGFuZENv
bXBvc2l0b3IgbWVtYmVyCisgICAgICAgIHZhcmlhYmxlIGlzIGluaXRpYWxpemVkIHRvIHBvaW50
IHRvIHRoZSBXYXlsYW5kQ29tcG9zaXRvciBpbnN0YW5jZS4KKyAgICAgICAgKHdlYmtpdFdlYlZp
ZXdSZW5kZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nUmVzdWx0cyk6IFVuZGVyIHRoZSBYMTEgZGlz
cGxheSwgdGhlCisgICAgICAgIGN1cnJlbnQgYmVoYXZpb3IgaXMgcHJlc2VydmVyLiBVbmRlciBX
YXlsYW5kLCB3ZSBjcmVhdGUgdGhlIHNpbXBsZQorICAgICAgICBSZW5kZXJpbmdDb250ZXh0IG9i
amVjdCBhbmQgcGFzcyBpdCBhcyBhbiBhcmd1bWVudCB0byB0aGUKKyAgICAgICAgV2F5bGFuZENv
bXBvc2l0b3I6OnJlbmRlcigpIG1ldGhvZC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRGVz
dHJveSk6IFJlbW92ZSB0aGUgdW5kZXJseWluZyBHdGtXaWRnZXQgZnJvbSB0aGUKKyAgICAgICAg
V2F5bGFuZENvbXBvc2l0b3IncyB3aWRnZXQtdG8tc3VyZmFjZSBtYXBwaW5nIHdoZW4gZGVzdHJv
eWluZyB0aGUKKyAgICAgICAgV2ViS2l0V2ViVmlld0Jhc2UuCisgICAgICAgICh3ZWJraXRXZWJW
aWV3QmFzZVVwZGF0ZVByZWZlcmVuY2VzKTogQWxzbyByZXR1cm4gZWFybHksIGtlZXBpbmcgQUMg
ZW5hYmxlZCwgaWYKKyAgICAgICAgdGhlIFdheWxhbmRDb21wb3NpdG9yIG1lbWJlciB2YXJpYWJs
ZSBvbiB0aGUgcHJpdmF0ZSBzdHJ1Y3QgaGFzIGJlZW4gcHJvcGVybHkKKyAgICAgICAgaW5pdGlh
bGl6ZWQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UpOiBVbmRlciBX
YXlsYW5kLCB0aGUgdW5kZXJseWluZyBHdGtXaWRnZXQgb2YgdGhlCisgICAgICAgIFdlYktpdFdl
YlZpZVdCYXNlIGlzIGFkZGVkIHRvIHRoZSBXYXlsYW5kQ29tcG9zaXRvciBpbnN0YW5jZSdzIHdp
ZGdldC10by1zdXJmYWNlCisgICAgICAgIG1hcHBpbmcgYWxvbmcgd2l0aCBzZXR0aW5nIHRoZSBB
QyB3aW5kb3cgSUQgKHdoaWNoIHRlY2huaWNhbGx5IGVxdWFscyB0byB0aGUKKyAgICAgICAgcGFn
ZSBJRCkuCisKIDIwMTQtMDktMTMgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFyYWNsb3VnaEBhcHBs
ZS5jb20+CiAKICAgICAgICAgU2hvdWxkIGNhbGwgW0JLU1Byb2Nlc3NBc3NlcnRpb24gaW52YWxp
ZGF0ZV0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp
ZXdCYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0
ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAJKHJldmlzaW9uIDE3MzY1NykKKysrIFNvdXJjZS9XZWJL
aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAkod29ya2luZyBjb3B5
KQpAQCAtNTAsNiArNTAsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ2Fpcm9VdGlsaXRpZXMuaD4K
ICNpbmNsdWRlIDxXZWJDb3JlL0NsaXBib2FyZFV0aWxpdGllc0d0ay5oPgogI2luY2x1ZGUgPFdl
YkNvcmUvRGF0YU9iamVjdEd0ay5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRGlzcGxheVN5c3RlbVR5
cGUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0RyYWdEYXRhLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9E
cmFnSWNvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR1VuaXF1ZVB0ckd0ay5oPgpAQCAtNjQsNyAr
NjUsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUmVnaW9uLmg+CiAjaW5jbHVkZSA8Z2RrL2dkay5o
PgogI2luY2x1ZGUgPGdkay9nZGtrZXlzeW1zLmg+Ci0jaWYgZGVmaW5lZChHREtfV0lORE9XSU5H
X1gxMSkKKyNpZiBQTEFURk9STShYMTEpCiAjaW5jbHVkZSA8Z2RrL2dka3guaD4KICNlbmRpZgog
I2luY2x1ZGUgPG1lbW9yeT4KQEAgLTc2LDkgKzc3LDE1IEBACiAjaW5jbHVkZSAiV2ViRnVsbFNj
cmVlbk1hbmFnZXJQcm94eS5oIgogI2VuZGlmCiAKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wp
ICYmIFBMQVRGT1JNKFgxMSkKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCisjaWYgUExBVEZP
Uk0oWDExKQogI2luY2x1ZGUgPFdlYkNvcmUvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuaD4K
ICNlbmRpZgorI2lmIFBMQVRGT1JNKFdBWUxBTkQpCisjaW5jbHVkZSA8V2ViQ29yZS9XYXlsYW5k
Q29tcG9zaXRvci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvV2F5bGFuZENvbXBvc2l0b3JFR0wuaD4K
KyNlbmRpZgorI2VuZGlmCiAKIC8vIGd0a193aWRnZXRfZ2V0X3NjYWxlX2ZhY3RvcigpIGFwcGVh
cmVkIGluIEdUSyAzLjEwLCBidXQgd2UgYWxzbyBuZWVkCiAvLyB0byBtYWtlIHN1cmUgd2UgaGF2
ZSBjYWlybyBuZXcgZW5vdWdoIHRvIHN1cHBvcnQgY2Fpcm9fc3VyZmFjZV9zZXRfZGV2aWNlX3Nj
YWxlCkBAIC0xMzgsOSArMTQ1LDE0IEBAIHN0cnVjdCBfV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRl
IHsKICAgICBXZWJGdWxsU2NyZWVuQ2xpZW50R3RrIGZ1bGxTY3JlZW5DbGllbnQ7CiAjZW5kaWYK
IAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZPUk0oWDExKQorI2lmIFVTRShU
RVhUVVJFX01BUFBFUl9HTCkKKyNpZiBQTEFURk9STShYMTEpCiAgICAgT3duUHRyPFJlZGlyZWN0
ZWRYQ29tcG9zaXRlV2luZG93PiByZWRpcmVjdGVkV2luZG93OwogI2VuZGlmCisjaWYgUExBVEZP
Uk0oV0FZTEFORCkKKyAgICBXYXlsYW5kQ29tcG9zaXRvciogd2F5bGFuZENvbXBvc2l0b3I7Cisj
ZW5kaWYKKyNlbmRpZgogfTsKIAogV0VCS0lUX0RFRklORV9UWVBFKFdlYktpdFdlYlZpZXdCYXNl
LCB3ZWJraXRfd2ViX3ZpZXdfYmFzZSwgR1RLX1RZUEVfQ09OVEFJTkVSKQpAQCAtNDI0LDE1ICs0
MzYsMTkgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDb25zdHJ1Y3RlZAogICAgIFdl
YktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklFV19CQVNFKG9iamVj
dCktPnByaXY7CiAgICAgcHJpdi0+cGFnZUNsaWVudCA9IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGUo
dmlld1dpZGdldCk7CiAgICAgcHJpdi0+ZHJhZ0FuZERyb3BIZWxwZXIuc2V0V2lkZ2V0KHZpZXdX
aWRnZXQpOwotCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpCi0g
ICAgR2RrRGlzcGxheSogZGlzcGxheSA9IGdka19kaXNwbGF5X21hbmFnZXJfZ2V0X2RlZmF1bHRf
ZGlzcGxheShnZGtfZGlzcGxheV9tYW5hZ2VyX2dldCgpKTsKLSAgICBpZiAoR0RLX0lTX1gxMV9E
SVNQTEFZKGRpc3BsYXkpKSB7CisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2lmIFBMQVRG
T1JNKFgxMSkKKyAgICBpZiAoRGlzcGxheVN5c3RlbVR5cGU6OmdldCgpID09IERpc3BsYXlTeXN0
ZW1UeXBlOjpYMTEpIHsKICAgICAgICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdyA9IFJlZGlyZWN0
ZWRYQ29tcG9zaXRlV2luZG93OjpjcmVhdGUoSW50U2l6ZSgxLCAxKSwgUmVkaXJlY3RlZFhDb21w
b3NpdGVXaW5kb3c6OkRvTm90Q3JlYXRlR0xDb250ZXh0KTsKICAgICAgICAgaWYgKHByaXYtPnJl
ZGlyZWN0ZWRXaW5kb3cpCiAgICAgICAgICAgICBwcml2LT5yZWRpcmVjdGVkV2luZG93LT5zZXRE
YW1hZ2VOb3RpZnlDYWxsYmFjayhyZWRpcmVjdGVkV2luZG93RGFtYWdlZENhbGxiYWNrLCBvYmpl
Y3QpOwogICAgIH0KICNlbmRpZgorI2lmIFBMQVRGT1JNKFdBWUxBTkQpCisgICAgaWYgKERpc3Bs
YXlTeXN0ZW1UeXBlOjpnZXQoKSA9PSBEaXNwbGF5U3lzdGVtVHlwZTo6V2F5bGFuZCkKKyAgICAg
ICAgcHJpdi0+d2F5bGFuZENvbXBvc2l0b3IgPSBXYXlsYW5kQ29tcG9zaXRvcjo6aW5zdGFuY2Uo
KTsKKyNlbmRpZgorI2VuZGlmCiAKICAgICBwcml2LT5hdXRoZW50aWNhdGlvbkRpYWxvZyA9IDA7
CiB9CkBAIC00NDMsMjEgKzQ1OSwzNyBAQCBzdGF0aWMgYm9vbCB3ZWJraXRXZWJWaWV3UmVuZGVy
QWNjZWxlcmF0CiAgICAgaWYgKCFkcmF3aW5nQXJlYS0+aXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRp
bmdNb2RlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotI2lmIFBMQVRGT1JNKFgxMSkKICAg
ICAvLyBUbyBhdm9pZCBmbGFzaGVzIHdoZW4gaW5pdGlhbGl6aW5nIGFjY2VsZXJhdGVkIGNvbXBv
c2l0aW5nIGZvciB0aGUgZmlyc3QKICAgICAvLyB0aW1lLCB3ZSB3YWl0IHVudGlsIHdlIGtub3cg
dGhlcmUncyBhIGZyYW1lIHJlYWR5IGJlZm9yZSByZW5kZXJpbmcuCiAgICAgV2ViS2l0V2ViVmll
d0Jhc2VQcml2YXRlKiBwcml2ID0gd2ViVmlld0Jhc2UtPnByaXY7Ci0gICAgaWYgKCFwcml2LT5y
ZWRpcmVjdGVkV2luZG93KQotICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBjYWlyb19yZWN0
YW5nbGUoY3IsIGNsaXBSZWN0LT54LCBjbGlwUmVjdC0+eSwgY2xpcFJlY3QtPndpZHRoLCBjbGlw
UmVjdC0+aGVpZ2h0KTsKLSAgICBjYWlyb19zdXJmYWNlX3QqIHN1cmZhY2UgPSBwcml2LT5yZWRp
cmVjdGVkV2luZG93LT5jYWlyb1N1cmZhY2VGb3JXaWRnZXQoR1RLX1dJREdFVCh3ZWJWaWV3QmFz
ZSkpOwotICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjciwgc3VyZmFjZSwgMCwgMCk7Ci0g
ICAgY2Fpcm9fZmlsbChjcik7Ci0gICAgcmV0dXJuIHRydWU7Ci0jZWxzZQotICAgIHJldHVybiBm
YWxzZTsKKyNpZiBQTEFURk9STShYMTEpCisgICAgaWYgKERpc3BsYXlTeXN0ZW1UeXBlOjpnZXQo
KSA9PSBEaXNwbGF5U3lzdGVtVHlwZTo6WDExKSB7CisgICAgICAgIGlmICghcHJpdi0+cmVkaXJl
Y3RlZFdpbmRvdykKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBjYWlyb19z
dXJmYWNlX3QqIHN1cmZhY2UgPSBwcml2LT5yZWRpcmVjdGVkV2luZG93LT5jYWlyb1N1cmZhY2VG
b3JXaWRnZXQoR1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkpOworICAgICAgICBpZiAoc3VyZmFjZSkg
eworICAgICAgICAgICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCBjbGlwUmVjdC0+eCwgY2xpcFJlY3Qt
PnksIGNsaXBSZWN0LT53aWR0aCwgY2xpcFJlY3QtPmhlaWdodCk7CisgICAgICAgICAgICBjYWly
b19zZXRfc291cmNlX3N1cmZhY2UoY3IsIHN1cmZhY2UsIDAsIDApOworICAgICAgICAgICAgY2Fp
cm9fZmlsbChjcik7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorI2Vu
ZGlmCisKKyNpZiBQTEFURk9STShXQVlMQU5EKQorICAgIGlmIChEaXNwbGF5U3lzdGVtVHlwZTo6
Z2V0KCkgPT0gRGlzcGxheVN5c3RlbVR5cGU6OldheWxhbmQpIHsKKyAgICAgICAgaWYgKCFwcml2
LT53YXlsYW5kQ29tcG9zaXRvcikKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAg
ICBXYXlsYW5kQ29tcG9zaXRvckVHTDo6UmVuZGVyaW5nQ29udGV4dCByZW5kZXJpbmdDb250ZXh0
KEdUS19XSURHRVQod2ViVmlld0Jhc2UpLCBjciwgY2xpcFJlY3QpOworICAgICAgICBwcml2LT53
YXlsYW5kQ29tcG9zaXRvci0+cmVuZGVyKHJlbmRlcmluZ0NvbnRleHQpOworICAgICAgICByZXR1
cm4gdHJ1ZTsKKyAgICB9CiAjZW5kaWYKKworICAgIHJldHVybiBmYWxzZTsKIH0KICNlbmRpZgog
CkBAIC05MTQsNiArOTQ2LDExIEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlRGVzdHJv
eShHdGsKICAgICBpZiAocHJpdi0+YXV0aGVudGljYXRpb25EaWFsb2cpCiAgICAgICAgIGd0a193
aWRnZXRfZGVzdHJveShwcml2LT5hdXRoZW50aWNhdGlvbkRpYWxvZyk7CiAKKyNpZiBVU0UoVEVY
VFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFdBWUxBTkQpCisgICAgaWYgKHByaXYtPndheWxh
bmRDb21wb3NpdG9yKQorICAgICAgICBwcml2LT53YXlsYW5kQ29tcG9zaXRvci0+cmVtb3ZlV2lk
Z2V0KHdpZGdldCk7CisjZW5kaWYKKwogICAgIEdUS19XSURHRVRfQ0xBU1Mod2Via2l0X3dlYl92
aWV3X2Jhc2VfcGFyZW50X2NsYXNzKS0+ZGVzdHJveSh3aWRnZXQpOwogfQogCkBAIC05NzksMTAg
KzEwMTYsMTYgQEAgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVVwZGF0ZVByZWZlcmVuY2VzKAogewog
ICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYmtpdFdlYlZpZXdCYXNlLT5w
cml2OwogCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpCisjaWYg
VVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2lmIFBMQVRGT1JNKFgxMSkKICAgICBpZiAocHJpdi0+
cmVkaXJlY3RlZFdpbmRvdykKICAgICAgICAgcmV0dXJuOwogI2VuZGlmCisjaWYgUExBVEZPUk0o
V0FZTEFORCkKKyAgICBpZiAocHJpdi0+d2F5bGFuZENvbXBvc2l0b3IpCisgICAgICAgIHJldHVy
bjsKKyNlbmRpZgorI2VuZGlmCiAKICAgICBwcml2LT5wYWdlUHJveHktPnByZWZlcmVuY2VzKCku
c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoZmFsc2UpOwogfQpAQCAtMTAwNiwxMCAr
MTA0OSwxOCBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZShXZWJLCiAgICAg
cHJpdi0+cGFnZVByb3h5ID0gY29udGV4dC0+Y3JlYXRlV2ViUGFnZSgqcHJpdi0+cGFnZUNsaWVu
dCwgV1RGOjptb3ZlKHdlYlBhZ2VDb25maWd1cmF0aW9uKSk7CiAgICAgcHJpdi0+cGFnZVByb3h5
LT5pbml0aWFsaXplV2ViUGFnZSgpOwogCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQ
TEFURk9STShYMTEpCi0gICAgaWYgKHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpCisjaWYgVVNFKFRF
WFRVUkVfTUFQUEVSX0dMKQorI2lmIFBMQVRGT1JNKFgxMSkKKyAgICBpZiAoRGlzcGxheVN5c3Rl
bVR5cGU6OmdldCgpID09IERpc3BsYXlTeXN0ZW1UeXBlOjpYMTEgJiYgcHJpdi0+cmVkaXJlY3Rl
ZFdpbmRvdykKICAgICAgICAgcHJpdi0+cGFnZVByb3h5LT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0
aW5nV2luZG93SWQocHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+d2luZG93SWQoKSk7CiAjZW5kaWYK
KyNpZiBQTEFURk9STShXQVlMQU5EKQorICAgIGlmIChEaXNwbGF5U3lzdGVtVHlwZTo6Z2V0KCkg
PT0gRGlzcGxheVN5c3RlbVR5cGU6OldheWxhbmQgJiYgcHJpdi0+d2F5bGFuZENvbXBvc2l0b3Ip
IHsKKyAgICAgICAgcHJpdi0+d2F5bGFuZENvbXBvc2l0b3ItPmFkZFdpZGdldChHVEtfV0lER0VU
KHdlYmtpdFdlYlZpZXdCYXNlKSwgcHJpdi0+cGFnZVByb3h5LT5wYWdlSUQoKSk7CisgICAgICAg
IHByaXYtPnBhZ2VQcm94eS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1dpbmRvd0lkKFdheWxh
bmRDb21wb3NpdG9yOjp3aWRnZXRJRChHVEtfV0lER0VUKHdlYmtpdFdlYlZpZXdCYXNlKSkpOwor
ICAgIH0KKyNlbmRpZgorI2VuZGlmCiAKICNpZiBIQVZFKEdUS19TQ0FMRV9GQUNUT1IpCiAgICAg
Ly8gV2UgYXR0YWNoIHRoaXMgaGVyZSwgYmVjYXVzZSBjaGFuZ2VzIGluIHNjYWxlIGZhY3RvciBh
cmUgcGFzc2VkIGRpcmVjdGx5IHRvIHRoZSBwYWdlIHByb3h5Lgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>238202</attachid>
            <date>2014-09-16 13:40:06 -0700</date>
            <delta_ts>2014-09-17 05:50:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-136833-20140916134002.patch</filename>
            <type>text/plain</type>
            <size>7684</size>
            <attacher name="Zan Dobersek">zan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY2OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTA5LTE2ICBJYWdvIFRv
cmFsICA8aXRvcmFsQGlnYWxpYS5jb20+IGFuZCBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh
bGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgV2F5bGFuZCBzdXBwb3J0IHRvIFdlYktpdFdl
YlZpZXdCYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xMzY4MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdl
YmtpdFdlYlZpZXdCYXNlQ29uc3RydWN0ZWQpOiBVbmRlciBXYXlsYW5kLCB0aGUgd2F5bGFuZENv
bXBvc2l0b3IgbWVtYmVyCisgICAgICAgIHZhcmlhYmxlIGlzIGluaXRpYWxpemVkIHRvIHBvaW50
IHRvIHRoZSBXYXlsYW5kQ29tcG9zaXRvciBpbnN0YW5jZS4KKyAgICAgICAgKHdlYmtpdFdlYlZp
ZXdSZW5kZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nUmVzdWx0cyk6IFVuZGVyIHRoZSBYMTEgZGlz
cGxheSwgdGhlCisgICAgICAgIGN1cnJlbnQgYmVoYXZpb3IgaXMgcHJlc2VydmVyLiBVbmRlciBX
YXlsYW5kLCB3ZSBjcmVhdGUgdGhlIHNpbXBsZQorICAgICAgICBSZW5kZXJpbmdDb250ZXh0IG9i
amVjdCBhbmQgcGFzcyBpdCBhcyBhbiBhcmd1bWVudCB0byB0aGUKKyAgICAgICAgV2F5bGFuZENv
bXBvc2l0b3I6OnJlbmRlcigpIG1ldGhvZC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRGVz
dHJveSk6IFJlbW92ZSB0aGUgdW5kZXJseWluZyBHdGtXaWRnZXQgZnJvbSB0aGUKKyAgICAgICAg
V2F5bGFuZENvbXBvc2l0b3IncyB3aWRnZXQtdG8tc3VyZmFjZSBtYXBwaW5nIHdoZW4gZGVzdHJv
eWluZyB0aGUKKyAgICAgICAgV2ViS2l0V2ViVmlld0Jhc2UuCisgICAgICAgICh3ZWJraXRXZWJW
aWV3QmFzZVVwZGF0ZVByZWZlcmVuY2VzKTogQWxzbyByZXR1cm4gZWFybHksIGtlZXBpbmcgQUMg
ZW5hYmxlZCwgaWYKKyAgICAgICAgdGhlIFdheWxhbmRDb21wb3NpdG9yIG1lbWJlciB2YXJpYWJs
ZSBvbiB0aGUgcHJpdmF0ZSBzdHJ1Y3QgaGFzIGJlZW4gcHJvcGVybHkKKyAgICAgICAgaW5pdGlh
bGl6ZWQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UpOiBVbmRlciBX
YXlsYW5kLCB0aGUgdW5kZXJseWluZyBHdGtXaWRnZXQgb2YgdGhlCisgICAgICAgIFdlYktpdFdl
YlZpZVdCYXNlIGlzIGFkZGVkIHRvIHRoZSBXYXlsYW5kQ29tcG9zaXRvciBpbnN0YW5jZSdzIHdp
ZGdldC10by1zdXJmYWNlCisgICAgICAgIG1hcHBpbmcgYWxvbmcgd2l0aCBzZXR0aW5nIHRoZSBB
QyB3aW5kb3cgSUQgKHdoaWNoIHRlY2huaWNhbGx5IGVxdWFscyB0byB0aGUKKyAgICAgICAgcGFn
ZSBJRCkuCisKIDIwMTQtMDktMTYgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAog
ICAgICAgICBTdGFuZGFyZGl6ZWQgdGhlIHJldHVybiB0eXBlIG9mIGEgZGVsZWdhdGUgbWV0aG9k
LgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jh
c2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl
YktpdFdlYlZpZXdCYXNlLmNwcAkocmV2aXNpb24gMTczNjY4KQorKysgU291cmNlL1dlYktpdDIv
VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA
IC02NCw3ICs2NCw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZWdpb24uaD4KICNpbmNsdWRlIDxn
ZGsvZ2RrLmg+CiAjaW5jbHVkZSA8Z2RrL2dka2tleXN5bXMuaD4KLSNpZiBkZWZpbmVkKEdES19X
SU5ET1dJTkdfWDExKQorI2lmIFBMQVRGT1JNKFgxMSkKICNpbmNsdWRlIDxnZGsvZ2RreC5oPgog
I2VuZGlmCiAjaW5jbHVkZSA8bWVtb3J5PgpAQCAtNzYsOSArNzYsMTUgQEAKICNpbmNsdWRlICJX
ZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5LmgiCiAjZW5kaWYKIAotI2lmIFVTRShURVhUVVJFX01B
UFBFUl9HTCkgJiYgUExBVEZPUk0oWDExKQorI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNp
ZiBQTEFURk9STShYMTEpCiAjaW5jbHVkZSA8V2ViQ29yZS9SZWRpcmVjdGVkWENvbXBvc2l0ZVdp
bmRvdy5oPgogI2VuZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkKKyNpbmNsdWRlIDxXZWJDb3Jl
L1dheWxhbmRDb21wb3NpdG9yLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9XYXlsYW5kQ29tcG9zaXRv
ckVHTC5oPgorI2VuZGlmCisjZW5kaWYKIAogLy8gZ3RrX3dpZGdldF9nZXRfc2NhbGVfZmFjdG9y
KCkgYXBwZWFyZWQgaW4gR1RLIDMuMTAsIGJ1dCB3ZSBhbHNvIG5lZWQKIC8vIHRvIG1ha2Ugc3Vy
ZSB3ZSBoYXZlIGNhaXJvIG5ldyBlbm91Z2ggdG8gc3VwcG9ydCBjYWlyb19zdXJmYWNlX3NldF9k
ZXZpY2Vfc2NhbGUKQEAgLTEzOCw5ICsxNDQsMTQgQEAgc3RydWN0IF9XZWJLaXRXZWJWaWV3QmFz
ZVByaXZhdGUgewogICAgIFdlYkZ1bGxTY3JlZW5DbGllbnRHdGsgZnVsbFNjcmVlbkNsaWVudDsK
ICNlbmRpZgogCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpCisj
aWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2lmIFBMQVRGT1JNKFgxMSkKICAgICBPd25QdHI8
UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c+IHJlZGlyZWN0ZWRXaW5kb3c7CiAjZW5kaWYKKyNp
ZiBQTEFURk9STShXQVlMQU5EKQorICAgIFdheWxhbmRDb21wb3NpdG9yKiB3YXlsYW5kQ29tcG9z
aXRvcjsKKyNlbmRpZgorI2VuZGlmCiB9OwogCiBXRUJLSVRfREVGSU5FX1RZUEUoV2ViS2l0V2Vi
Vmlld0Jhc2UsIHdlYmtpdF93ZWJfdmlld19iYXNlLCBHVEtfVFlQRV9DT05UQUlORVIpCkBAIC00
MjQsMTUgKzQzNSwxOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUNvbnN0cnVjdGVk
CiAgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9WSUVXX0JB
U0Uob2JqZWN0KS0+cHJpdjsKICAgICBwcml2LT5wYWdlQ2xpZW50ID0gUGFnZUNsaWVudEltcGw6
OmNyZWF0ZSh2aWV3V2lkZ2V0KTsKICAgICBwcml2LT5kcmFnQW5kRHJvcEhlbHBlci5zZXRXaWRn
ZXQodmlld1dpZGdldCk7Ci0KLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JN
KFgxMSkKLSAgICBHZGtEaXNwbGF5KiBkaXNwbGF5ID0gZ2RrX2Rpc3BsYXlfbWFuYWdlcl9nZXRf
ZGVmYXVsdF9kaXNwbGF5KGdka19kaXNwbGF5X21hbmFnZXJfZ2V0KCkpOwotICAgIGlmIChHREtf
SVNfWDExX0RJU1BMQVkoZGlzcGxheSkpIHsKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCisj
aWYgUExBVEZPUk0oWDExKQorICAgIGlmIChEaXNwbGF5U3lzdGVtVHlwZTo6Z2V0KCkgPT0gRGlz
cGxheVN5c3RlbVR5cGU6OlgxMSkgewogICAgICAgICBwcml2LT5yZWRpcmVjdGVkV2luZG93ID0g
UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c6OmNyZWF0ZShJbnRTaXplKDEsIDEpLCBSZWRpcmVj
dGVkWENvbXBvc2l0ZVdpbmRvdzo6RG9Ob3RDcmVhdGVHTENvbnRleHQpOwogICAgICAgICBpZiAo
cHJpdi0+cmVkaXJlY3RlZFdpbmRvdykKICAgICAgICAgICAgIHByaXYtPnJlZGlyZWN0ZWRXaW5k
b3ctPnNldERhbWFnZU5vdGlmeUNhbGxiYWNrKHJlZGlyZWN0ZWRXaW5kb3dEYW1hZ2VkQ2FsbGJh
Y2ssIG9iamVjdCk7CiAgICAgfQogI2VuZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkKKyAgICBp
ZiAoRGlzcGxheVN5c3RlbVR5cGU6OmdldCgpID09IERpc3BsYXlTeXN0ZW1UeXBlOjpXYXlsYW5k
KQorICAgICAgICBwcml2LT53YXlsYW5kQ29tcG9zaXRvciA9IFdheWxhbmRDb21wb3NpdG9yOjpp
bnN0YW5jZSgpOworI2VuZGlmCisjZW5kaWYKIAogICAgIHByaXYtPmF1dGhlbnRpY2F0aW9uRGlh
bG9nID0gMDsKIH0KQEAgLTQ0MywyMSArNDU4LDM3IEBAIHN0YXRpYyBib29sIHdlYmtpdFdlYlZp
ZXdSZW5kZXJBY2NlbGVyYXQKICAgICBpZiAoIWRyYXdpbmdBcmVhLT5pc0luQWNjZWxlcmF0ZWRD
b21wb3NpdGluZ01vZGUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0jaWYgUExBVEZPUk0o
WDExKQogICAgIC8vIFRvIGF2b2lkIGZsYXNoZXMgd2hlbiBpbml0aWFsaXppbmcgYWNjZWxlcmF0
ZWQgY29tcG9zaXRpbmcgZm9yIHRoZSBmaXJzdAogICAgIC8vIHRpbWUsIHdlIHdhaXQgdW50aWwg
d2Uga25vdyB0aGVyZSdzIGEgZnJhbWUgcmVhZHkgYmVmb3JlIHJlbmRlcmluZy4KICAgICBXZWJL
aXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJWaWV3QmFzZS0+cHJpdjsKLSAgICBpZiAo
IXByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpCi0gICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGNh
aXJvX3JlY3RhbmdsZShjciwgY2xpcFJlY3QtPngsIGNsaXBSZWN0LT55LCBjbGlwUmVjdC0+d2lk
dGgsIGNsaXBSZWN0LT5oZWlnaHQpOwotICAgIGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSA9IHBy
aXYtPnJlZGlyZWN0ZWRXaW5kb3ctPmNhaXJvU3VyZmFjZUZvcldpZGdldChHVEtfV0lER0VUKHdl
YlZpZXdCYXNlKSk7Ci0gICAgY2Fpcm9fc2V0X3NvdXJjZV9zdXJmYWNlKGNyLCBzdXJmYWNlLCAw
LCAwKTsKLSAgICBjYWlyb19maWxsKGNyKTsKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbHNlCi0gICAg
cmV0dXJuIGZhbHNlOworI2lmIFBMQVRGT1JNKFgxMSkKKyAgICBpZiAoRGlzcGxheVN5c3RlbVR5
cGU6OmdldCgpID09IERpc3BsYXlTeXN0ZW1UeXBlOjpYMTEpIHsKKyAgICAgICAgaWYgKCFwcml2
LT5yZWRpcmVjdGVkV2luZG93KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAg
IGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSA9IHByaXYtPnJlZGlyZWN0ZWRXaW5kb3ctPmNhaXJv
U3VyZmFjZUZvcldpZGdldChHVEtfV0lER0VUKHdlYlZpZXdCYXNlKSk7CisgICAgICAgIGlmIChz
dXJmYWNlKSB7CisgICAgICAgICAgICBjYWlyb19yZWN0YW5nbGUoY3IsIGNsaXBSZWN0LT54LCBj
bGlwUmVjdC0+eSwgY2xpcFJlY3QtPndpZHRoLCBjbGlwUmVjdC0+aGVpZ2h0KTsKKyAgICAgICAg
ICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjciwgc3VyZmFjZSwgMCwgMCk7CisgICAgICAg
ICAgICBjYWlyb19maWxsKGNyKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg
ICB9CisjZW5kaWYKKworI2lmIFBMQVRGT1JNKFdBWUxBTkQpCisgICAgaWYgKERpc3BsYXlTeXN0
ZW1UeXBlOjpnZXQoKSA9PSBEaXNwbGF5U3lzdGVtVHlwZTo6V2F5bGFuZCkgeworICAgICAgICBp
ZiAoIXByaXYtPndheWxhbmRDb21wb3NpdG9yKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor
CisgICAgICAgIFdheWxhbmRDb21wb3NpdG9yRUdMOjpSZW5kZXJpbmdDb250ZXh0IHJlbmRlcmlu
Z0NvbnRleHQoR1RLX1dJREdFVCh3ZWJWaWV3QmFzZSksIGNyLCBjbGlwUmVjdCk7CisgICAgICAg
IHByaXYtPndheWxhbmRDb21wb3NpdG9yLT5yZW5kZXIocmVuZGVyaW5nQ29udGV4dCk7CisgICAg
ICAgIHJldHVybiB0cnVlOworICAgIH0KICNlbmRpZgorCisgICAgcmV0dXJuIGZhbHNlOwogfQog
I2VuZGlmCiAKQEAgLTkxNCw2ICs5NDUsMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jh
c2VEZXN0cm95KEd0awogICAgIGlmIChwcml2LT5hdXRoZW50aWNhdGlvbkRpYWxvZykKICAgICAg
ICAgZ3RrX3dpZGdldF9kZXN0cm95KHByaXYtPmF1dGhlbnRpY2F0aW9uRGlhbG9nKTsKIAorI2lm
IFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZPUk0oV0FZTEFORCkKKyAgICBpZiAocHJp
di0+d2F5bGFuZENvbXBvc2l0b3IpCisgICAgICAgIHByaXYtPndheWxhbmRDb21wb3NpdG9yLT5y
ZW1vdmVXaWRnZXQod2lkZ2V0KTsKKyNlbmRpZgorCiAgICAgR1RLX1dJREdFVF9DTEFTUyh3ZWJr
aXRfd2ViX3ZpZXdfYmFzZV9wYXJlbnRfY2xhc3MpLT5kZXN0cm95KHdpZGdldCk7CiB9CiAKQEAg
LTk3OSwxMCArMTAxNSwxNiBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlVXBkYXRlUHJlZmVyZW5j
ZXMoCiB7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2Via2l0V2ViVmll
d0Jhc2UtPnByaXY7CiAKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFgx
MSkKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCisjaWYgUExBVEZPUk0oWDExKQogICAgIGlm
IChwcml2LT5yZWRpcmVjdGVkV2luZG93KQogICAgICAgICByZXR1cm47CiAjZW5kaWYKKyNpZiBQ
TEFURk9STShXQVlMQU5EKQorICAgIGlmIChwcml2LT53YXlsYW5kQ29tcG9zaXRvcikKKyAgICAg
ICAgcmV0dXJuOworI2VuZGlmCisjZW5kaWYKIAogICAgIHByaXYtPnBhZ2VQcm94eS0+cHJlZmVy
ZW5jZXMoKS5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZChmYWxzZSk7CiB9CkBAIC0x
MDA2LDEwICsxMDQ4LDE4IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKFdl
YksKICAgICBwcml2LT5wYWdlUHJveHkgPSBjb250ZXh0LT5jcmVhdGVXZWJQYWdlKCpwcml2LT5w
YWdlQ2xpZW50LCBXVEY6Om1vdmUod2ViUGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICBwcml2LT5w
YWdlUHJveHktPmluaXRpYWxpemVXZWJQYWdlKCk7CiAKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJf
R0wpICYmIFBMQVRGT1JNKFgxMSkKLSAgICBpZiAocHJpdi0+cmVkaXJlY3RlZFdpbmRvdykKKyNp
ZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCisjaWYgUExBVEZPUk0oWDExKQorICAgIGlmIChEaXNw
bGF5U3lzdGVtVHlwZTo6Z2V0KCkgPT0gRGlzcGxheVN5c3RlbVR5cGU6OlgxMSAmJiBwcml2LT5y
ZWRpcmVjdGVkV2luZG93KQogICAgICAgICBwcml2LT5wYWdlUHJveHktPnNldEFjY2VsZXJhdGVk
Q29tcG9zaXRpbmdXaW5kb3dJZChwcml2LT5yZWRpcmVjdGVkV2luZG93LT53aW5kb3dJZCgpKTsK
ICNlbmRpZgorI2lmIFBMQVRGT1JNKFdBWUxBTkQpCisgICAgaWYgKERpc3BsYXlTeXN0ZW1UeXBl
OjpnZXQoKSA9PSBEaXNwbGF5U3lzdGVtVHlwZTo6V2F5bGFuZCAmJiBwcml2LT53YXlsYW5kQ29t
cG9zaXRvcikgeworICAgICAgICBwcml2LT53YXlsYW5kQ29tcG9zaXRvci0+YWRkV2lkZ2V0KEdU
S19XSURHRVQod2Via2l0V2ViVmlld0Jhc2UpLCBwcml2LT5wYWdlUHJveHktPnBhZ2VJRCgpKTsK
KyAgICAgICAgcHJpdi0+cGFnZVByb3h5LT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nV2luZG93
SWQoV2F5bGFuZENvbXBvc2l0b3I6OndpZGdldElEKEdUS19XSURHRVQod2Via2l0V2ViVmlld0Jh
c2UpKSk7CisgICAgfQorI2VuZGlmCisjZW5kaWYKIAogI2lmIEhBVkUoR1RLX1NDQUxFX0ZBQ1RP
UikKICAgICAvLyBXZSBhdHRhY2ggdGhpcyBoZXJlLCBiZWNhdXNlIGNoYW5nZXMgaW4gc2NhbGUg
ZmFjdG9yIGFyZSBwYXNzZWQgZGlyZWN0bHkgdG8gdGhlIHBhZ2UgcHJveHkuCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>238252</attachid>
            <date>2014-09-17 05:50:34 -0700</date>
            <delta_ts>2016-01-14 14:08:28 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-136833-20140917055031.patch</filename>
            <type>text/plain</type>
            <size>7679</size>
            <attacher name="Zan Dobersek">zan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY5MCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTA5LTE3ICBJYWdvIFRv
cmFsICA8aXRvcmFsQGlnYWxpYS5jb20+IGFuZCBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh
bGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgV2F5bGFuZCBzdXBwb3J0IHRvIFdlYktpdFdl
YlZpZXdCYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xMzY4MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdl
YmtpdFdlYlZpZXdCYXNlQ29uc3RydWN0ZWQpOiBVbmRlciBXYXlsYW5kLCB0aGUgd2F5bGFuZENv
bXBvc2l0b3IgbWVtYmVyCisgICAgICAgIHZhcmlhYmxlIGlzIGluaXRpYWxpemVkIHRvIHBvaW50
IHRvIHRoZSBXYXlsYW5kQ29tcG9zaXRvciBpbnN0YW5jZS4KKyAgICAgICAgKHdlYmtpdFdlYlZp
ZXdSZW5kZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nUmVzdWx0cyk6IFVuZGVyIHRoZSBYMTEgZGlz
cGxheSwgdGhlCisgICAgICAgIGN1cnJlbnQgYmVoYXZpb3IgaXMgcHJlc2VydmVyLiBVbmRlciBX
YXlsYW5kLCB3ZSBjcmVhdGUgdGhlIHNpbXBsZQorICAgICAgICBSZW5kZXJpbmdDb250ZXh0IG9i
amVjdCBhbmQgcGFzcyBpdCBhcyBhbiBhcmd1bWVudCB0byB0aGUKKyAgICAgICAgV2F5bGFuZENv
bXBvc2l0b3I6OnJlbmRlcigpIG1ldGhvZC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRGVz
dHJveSk6IFJlbW92ZSB0aGUgdW5kZXJseWluZyBHdGtXaWRnZXQgZnJvbSB0aGUKKyAgICAgICAg
V2F5bGFuZENvbXBvc2l0b3IncyB3aWRnZXQtdG8tc3VyZmFjZSBtYXBwaW5nIHdoZW4gZGVzdHJv
eWluZyB0aGUKKyAgICAgICAgV2ViS2l0V2ViVmlld0Jhc2UuCisgICAgICAgICh3ZWJraXRXZWJW
aWV3QmFzZVVwZGF0ZVByZWZlcmVuY2VzKTogQWxzbyByZXR1cm4gZWFybHksIGtlZXBpbmcgQUMg
ZW5hYmxlZCwgaWYKKyAgICAgICAgdGhlIFdheWxhbmRDb21wb3NpdG9yIG1lbWJlciB2YXJpYWJs
ZSBvbiB0aGUgcHJpdmF0ZSBzdHJ1Y3QgaGFzIGJlZW4gcHJvcGVybHkKKyAgICAgICAgaW5pdGlh
bGl6ZWQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UpOiBVbmRlciBX
YXlsYW5kLCB0aGUgdW5kZXJseWluZyBHdGtXaWRnZXQgb2YgdGhlCisgICAgICAgIFdlYktpdFdl
YlZpZVdCYXNlIGlzIGFkZGVkIHRvIHRoZSBXYXlsYW5kQ29tcG9zaXRvciBpbnN0YW5jZSdzIHdp
ZGdldC10by1zdXJmYWNlCisgICAgICAgIG1hcHBpbmcgYWxvbmcgd2l0aCBzZXR0aW5nIHRoZSBB
QyB3aW5kb3cgSUQgKHdoaWNoIHRlY2huaWNhbGx5IGVxdWFscyB0byB0aGUKKyAgICAgICAgcGFn
ZSBJRCkuCisKIDIwMTQtMDktMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs
aWEuY29tPgogCiAgICAgICAgIFtHVEtdIEZpeCBsYXllcmluZyB2aW9sYXRpb25zIGluIFBhc3Rl
Ym9hcmRHdGsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl
YlZpZXdCYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ
L2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAJKHJldmlzaW9uIDE3MzY5MCkKKysrIFNvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAkod29ya2luZyBj
b3B5KQpAQCAtNjQsNyArNjQsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUmVnaW9uLmg+CiAjaW5j
bHVkZSA8Z2RrL2dkay5oPgogI2luY2x1ZGUgPGdkay9nZGtrZXlzeW1zLmg+Ci0jaWYgZGVmaW5l
ZChHREtfV0lORE9XSU5HX1gxMSkKKyNpZiBQTEFURk9STShYMTEpCiAjaW5jbHVkZSA8Z2RrL2dk
a3guaD4KICNlbmRpZgogI2luY2x1ZGUgPG1lbW9yeT4KQEAgLTc2LDkgKzc2LDE1IEBACiAjaW5j
bHVkZSAiV2ViRnVsbFNjcmVlbk1hbmFnZXJQcm94eS5oIgogI2VuZGlmCiAKLSNpZiBVU0UoVEVY
VFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFgxMSkKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJf
R0wpCisjaWYgUExBVEZPUk0oWDExKQogI2luY2x1ZGUgPFdlYkNvcmUvUmVkaXJlY3RlZFhDb21w
b3NpdGVXaW5kb3cuaD4KICNlbmRpZgorI2lmIFBMQVRGT1JNKFdBWUxBTkQpCisjaW5jbHVkZSA8
V2ViQ29yZS9XYXlsYW5kQ29tcG9zaXRvci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvV2F5bGFuZENv
bXBvc2l0b3JFR0wuaD4KKyNlbmRpZgorI2VuZGlmCiAKIC8vIGd0a193aWRnZXRfZ2V0X3NjYWxl
X2ZhY3RvcigpIGFwcGVhcmVkIGluIEdUSyAzLjEwLCBidXQgd2UgYWxzbyBuZWVkCiAvLyB0byBt
YWtlIHN1cmUgd2UgaGF2ZSBjYWlybyBuZXcgZW5vdWdoIHRvIHN1cHBvcnQgY2Fpcm9fc3VyZmFj
ZV9zZXRfZGV2aWNlX3NjYWxlCkBAIC0xMzgsOSArMTQ0LDE0IEBAIHN0cnVjdCBfV2ViS2l0V2Vi
Vmlld0Jhc2VQcml2YXRlIHsKICAgICBXZWJGdWxsU2NyZWVuQ2xpZW50R3RrIGZ1bGxTY3JlZW5D
bGllbnQ7CiAjZW5kaWYKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZPUk0o
WDExKQorI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNpZiBQTEFURk9STShYMTEpCiAgICAg
T3duUHRyPFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93PiByZWRpcmVjdGVkV2luZG93OwogI2Vu
ZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkKKyAgICBXYXlsYW5kQ29tcG9zaXRvciogd2F5bGFu
ZENvbXBvc2l0b3I7CisjZW5kaWYKKyNlbmRpZgogfTsKIAogV0VCS0lUX0RFRklORV9UWVBFKFdl
YktpdFdlYlZpZXdCYXNlLCB3ZWJraXRfd2ViX3ZpZXdfYmFzZSwgR1RLX1RZUEVfQ09OVEFJTkVS
KQpAQCAtNDI0LDE1ICs0MzUsMTkgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDb25z
dHJ1Y3RlZAogICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJf
VklFV19CQVNFKG9iamVjdCktPnByaXY7CiAgICAgcHJpdi0+cGFnZUNsaWVudCA9IFBhZ2VDbGll
bnRJbXBsOjpjcmVhdGUodmlld1dpZGdldCk7CiAgICAgcHJpdi0+ZHJhZ0FuZERyb3BIZWxwZXIu
c2V0V2lkZ2V0KHZpZXdXaWRnZXQpOwotCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQ
TEFURk9STShYMTEpCi0gICAgR2RrRGlzcGxheSogZGlzcGxheSA9IGdka19kaXNwbGF5X21hbmFn
ZXJfZ2V0X2RlZmF1bHRfZGlzcGxheShnZGtfZGlzcGxheV9tYW5hZ2VyX2dldCgpKTsKLSAgICBp
ZiAoR0RLX0lTX1gxMV9ESVNQTEFZKGRpc3BsYXkpKSB7CisjaWYgVVNFKFRFWFRVUkVfTUFQUEVS
X0dMKQorI2lmIFBMQVRGT1JNKFgxMSkKKyAgICBpZiAoZ2V0RGlzcGxheVN5c3RlbVR5cGUoKSA9
PSBEaXNwbGF5U3lzdGVtVHlwZTo6WDExKSB7CiAgICAgICAgIHByaXYtPnJlZGlyZWN0ZWRXaW5k
b3cgPSBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6Y3JlYXRlKEludFNpemUoMSwgMSksIFJl
ZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93OjpEb05vdENyZWF0ZUdMQ29udGV4dCk7CiAgICAgICAg
IGlmIChwcml2LT5yZWRpcmVjdGVkV2luZG93KQogICAgICAgICAgICAgcHJpdi0+cmVkaXJlY3Rl
ZFdpbmRvdy0+c2V0RGFtYWdlTm90aWZ5Q2FsbGJhY2socmVkaXJlY3RlZFdpbmRvd0RhbWFnZWRD
YWxsYmFjaywgb2JqZWN0KTsKICAgICB9CiAjZW5kaWYKKyNpZiBQTEFURk9STShXQVlMQU5EKQor
ICAgIGlmIChnZXREaXNwbGF5U3lzdGVtVHlwZSgpID09IERpc3BsYXlTeXN0ZW1UeXBlOjpXYXls
YW5kKQorICAgICAgICBwcml2LT53YXlsYW5kQ29tcG9zaXRvciA9IFdheWxhbmRDb21wb3NpdG9y
OjppbnN0YW5jZSgpOworI2VuZGlmCisjZW5kaWYKIAogICAgIHByaXYtPmF1dGhlbnRpY2F0aW9u
RGlhbG9nID0gMDsKIH0KQEAgLTQ0MywyMSArNDU4LDM3IEBAIHN0YXRpYyBib29sIHdlYmtpdFdl
YlZpZXdSZW5kZXJBY2NlbGVyYXQKICAgICBpZiAoIWRyYXdpbmdBcmVhLT5pc0luQWNjZWxlcmF0
ZWRDb21wb3NpdGluZ01vZGUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0jaWYgUExBVEZP
Uk0oWDExKQogICAgIC8vIFRvIGF2b2lkIGZsYXNoZXMgd2hlbiBpbml0aWFsaXppbmcgYWNjZWxl
cmF0ZWQgY29tcG9zaXRpbmcgZm9yIHRoZSBmaXJzdAogICAgIC8vIHRpbWUsIHdlIHdhaXQgdW50
aWwgd2Uga25vdyB0aGVyZSdzIGEgZnJhbWUgcmVhZHkgYmVmb3JlIHJlbmRlcmluZy4KICAgICBX
ZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJWaWV3QmFzZS0+cHJpdjsKLSAgICBp
ZiAoIXByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpCi0gICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg
IGNhaXJvX3JlY3RhbmdsZShjciwgY2xpcFJlY3QtPngsIGNsaXBSZWN0LT55LCBjbGlwUmVjdC0+
d2lkdGgsIGNsaXBSZWN0LT5oZWlnaHQpOwotICAgIGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSA9
IHByaXYtPnJlZGlyZWN0ZWRXaW5kb3ctPmNhaXJvU3VyZmFjZUZvcldpZGdldChHVEtfV0lER0VU
KHdlYlZpZXdCYXNlKSk7Ci0gICAgY2Fpcm9fc2V0X3NvdXJjZV9zdXJmYWNlKGNyLCBzdXJmYWNl
LCAwLCAwKTsKLSAgICBjYWlyb19maWxsKGNyKTsKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbHNlCi0g
ICAgcmV0dXJuIGZhbHNlOworI2lmIFBMQVRGT1JNKFgxMSkKKyAgICBpZiAoZ2V0RGlzcGxheVN5
c3RlbVR5cGUoKSA9PSBEaXNwbGF5U3lzdGVtVHlwZTo6WDExKSB7CisgICAgICAgIGlmICghcHJp
di0+cmVkaXJlY3RlZFdpbmRvdykKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAg
ICBjYWlyb19zdXJmYWNlX3QqIHN1cmZhY2UgPSBwcml2LT5yZWRpcmVjdGVkV2luZG93LT5jYWly
b1N1cmZhY2VGb3JXaWRnZXQoR1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkpOworICAgICAgICBpZiAo
c3VyZmFjZSkgeworICAgICAgICAgICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCBjbGlwUmVjdC0+eCwg
Y2xpcFJlY3QtPnksIGNsaXBSZWN0LT53aWR0aCwgY2xpcFJlY3QtPmhlaWdodCk7CisgICAgICAg
ICAgICBjYWlyb19zZXRfc291cmNlX3N1cmZhY2UoY3IsIHN1cmZhY2UsIDAsIDApOworICAgICAg
ICAgICAgY2Fpcm9fZmlsbChjcik7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRydWU7Cisg
ICAgfQorI2VuZGlmCisKKyNpZiBQTEFURk9STShXQVlMQU5EKQorICAgIGlmIChnZXREaXNwbGF5
U3lzdGVtVHlwZSgpID09IERpc3BsYXlTeXN0ZW1UeXBlOjpXYXlsYW5kKSB7CisgICAgICAgIGlm
ICghcHJpdi0+d2F5bGFuZENvbXBvc2l0b3IpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisK
KyAgICAgICAgV2F5bGFuZENvbXBvc2l0b3JFR0w6OlJlbmRlcmluZ0NvbnRleHQgcmVuZGVyaW5n
Q29udGV4dChHVEtfV0lER0VUKHdlYlZpZXdCYXNlKSwgY3IsIGNsaXBSZWN0KTsKKyAgICAgICAg
cHJpdi0+d2F5bGFuZENvbXBvc2l0b3ItPnJlbmRlcihyZW5kZXJpbmdDb250ZXh0KTsKKyAgICAg
ICAgcmV0dXJuIHRydWU7CisgICAgfQogI2VuZGlmCisKKyAgICByZXR1cm4gZmFsc2U7CiB9CiAj
ZW5kaWYKIApAQCAtOTE0LDYgKzk0NSwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFz
ZURlc3Ryb3koR3RrCiAgICAgaWYgKHByaXYtPmF1dGhlbnRpY2F0aW9uRGlhbG9nKQogICAgICAg
ICBndGtfd2lkZ2V0X2Rlc3Ryb3kocHJpdi0+YXV0aGVudGljYXRpb25EaWFsb2cpOwogCisjaWYg
VVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShXQVlMQU5EKQorICAgIGlmIChwcml2
LT53YXlsYW5kQ29tcG9zaXRvcikKKyAgICAgICAgcHJpdi0+d2F5bGFuZENvbXBvc2l0b3ItPnJl
bW92ZVdpZGdldCh3aWRnZXQpOworI2VuZGlmCisKICAgICBHVEtfV0lER0VUX0NMQVNTKHdlYmtp
dF93ZWJfdmlld19iYXNlX3BhcmVudF9jbGFzcyktPmRlc3Ryb3kod2lkZ2V0KTsKIH0KIApAQCAt
OTc5LDEwICsxMDE1LDE2IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VVcGRhdGVQcmVmZXJlbmNl
cygKIHsKICAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJraXRXZWJWaWV3
QmFzZS0+cHJpdjsKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZPUk0oWDEx
KQorI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNpZiBQTEFURk9STShYMTEpCiAgICAgaWYg
KHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpCiAgICAgICAgIHJldHVybjsKICNlbmRpZgorI2lmIFBM
QVRGT1JNKFdBWUxBTkQpCisgICAgaWYgKHByaXYtPndheWxhbmRDb21wb3NpdG9yKQorICAgICAg
ICByZXR1cm47CisjZW5kaWYKKyNlbmRpZgogCiAgICAgcHJpdi0+cGFnZVByb3h5LT5wcmVmZXJl
bmNlcygpLnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKGZhbHNlKTsKIH0KQEAgLTEw
MDYsMTAgKzEwNDgsMTggQEAgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UoV2Vi
SwogICAgIHByaXYtPnBhZ2VQcm94eSA9IGNvbnRleHQtPmNyZWF0ZVdlYlBhZ2UoKnByaXYtPnBh
Z2VDbGllbnQsIFdURjo6bW92ZSh3ZWJQYWdlQ29uZmlndXJhdGlvbikpOwogICAgIHByaXYtPnBh
Z2VQcm94eS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9H
TCkgJiYgUExBVEZPUk0oWDExKQotICAgIGlmIChwcml2LT5yZWRpcmVjdGVkV2luZG93KQorI2lm
IFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNpZiBQTEFURk9STShYMTEpCisgICAgaWYgKGdldERp
c3BsYXlTeXN0ZW1UeXBlKCkgPT0gRGlzcGxheVN5c3RlbVR5cGU6OlgxMSAmJiBwcml2LT5yZWRp
cmVjdGVkV2luZG93KQogICAgICAgICBwcml2LT5wYWdlUHJveHktPnNldEFjY2VsZXJhdGVkQ29t
cG9zaXRpbmdXaW5kb3dJZChwcml2LT5yZWRpcmVjdGVkV2luZG93LT53aW5kb3dJZCgpKTsKICNl
bmRpZgorI2lmIFBMQVRGT1JNKFdBWUxBTkQpCisgICAgaWYgKGdldERpc3BsYXlTeXN0ZW1UeXBl
KCkgPT0gRGlzcGxheVN5c3RlbVR5cGU6OldheWxhbmQgJiYgcHJpdi0+d2F5bGFuZENvbXBvc2l0
b3IpIHsKKyAgICAgICAgcHJpdi0+d2F5bGFuZENvbXBvc2l0b3ItPmFkZFdpZGdldChHVEtfV0lE
R0VUKHdlYmtpdFdlYlZpZXdCYXNlKSwgcHJpdi0+cGFnZVByb3h5LT5wYWdlSUQoKSk7CisgICAg
ICAgIHByaXYtPnBhZ2VQcm94eS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1dpbmRvd0lkKFdh
eWxhbmRDb21wb3NpdG9yOjp3aWRnZXRJRChHVEtfV0lER0VUKHdlYmtpdFdlYlZpZXdCYXNlKSkp
OworICAgIH0KKyNlbmRpZgorI2VuZGlmCiAKICNpZiBIQVZFKEdUS19TQ0FMRV9GQUNUT1IpCiAg
ICAgLy8gV2UgYXR0YWNoIHRoaXMgaGVyZSwgYmVjYXVzZSBjaGFuZ2VzIGluIHNjYWxlIGZhY3Rv
ciBhcmUgcGFzc2VkIGRpcmVjdGx5IHRvIHRoZSBwYWdlIHByb3h5Lgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>