55738 2011-03-03 18:44:35 -0800 Get rid of Page::globalHistoryItem 2011-03-03 20:10:06 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 362193 0 andersca 2011-03-03 18:44:35 -0800 Get rid of Page::globalHistoryItem 362195 1 84678 andersca 2011-03-03 18:48:41 -0800 Created attachment 84678 Patch 362196 2 webkit.review.bot 2011-03-03 18:51:20 -0800 Attachment 84678 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/mac/WebView/WebViewData.h:38: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 17 files If any of these errors are false positives, please file a bug against check-webkit-style. 362205 3 andersca 2011-03-03 19:21:14 -0800 Committed r80310: <http://trac.webkit.org/changeset/80310> 362218 4 webkit.review.bot 2011-03-03 20:10:06 -0800 http://trac.webkit.org/changeset/80310 might have broken SnowLeopard Intel Release (Tests) The following tests are not passing: accessibility/plugin.html compositing/geometry/empty-embed-rects.html fast/loader/loadInProgress.html 84678 2011-03-03 18:48:41 -0800 2011-03-03 18:53:48 -0800 Patch bug-55738-20110303184840.patch text/plain 18380 andersca SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwMzA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDMtMDMgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBHZXQgcmlkIG9mIFBhZ2U6Omdsb2JhbEhpc3RvcnlJdGVt CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTczOAor CisgICAgICAgIFRoZSBtX2dsb2JhbEhpc3RvcnlJdGVtIGlzIG9ubHkgdXNlZCBieSBNYWMgYW5k IFdpbmRvd3MgV2ViS2l0MS4KKyAgICAgICAgSW5zdGVhZCBvZiBoYXZpbmcgV2ViQ29yZSB1cGRh dGluZyB0aGlzIG1lbWJlciB2YXJpYWJsZSwganVzdCBjYWxsIG91dAorICAgICAgICB0byBhIEZy YW1lTG9hZGVyQ2xpZW50IG1lbWJlciBmdW5jdGlvbiBhbmQgbGV0IFdlYktpdCBrZWVwIGl0IHVw IHRvIGRhdGUuCisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlDbGllbnRzLmg6CisgICAgICAgIChX ZWJDb3JlOjpFbXB0eUZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlbW92ZUJhY2tGb3J3 YXJkSXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpFbXB0eUZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRh dGVHbG9iYWxIaXN0b3J5SXRlbUZvclBhZ2UpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2hlY2tMb2FkQ29tcGxldGVG b3JUaGlzRnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbnRpbnVlTG9h ZEFmdGVyTmF2aWdhdGlvblBvbGljeSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xp ZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6dXBkYXRlR2xvYmFs SGlzdG9yeUl0ZW1Gb3JQYWdlKToKKyAgICAgICAgKiBsb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OmdvVG9JdGVtKToKKyAg ICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVGb3JTdGFuZGFyZExvYWQp OgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclJlZGlyZWN0 V2l0aExvY2tlZEJhY2tGb3J3YXJkTGlzdCk6CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAg ICAgICAgKiBwYWdlL1BhZ2UuaDoKKwogMjAxMS0wMy0wMiAgSmVyZW15IE9ybG93ICA8am9ybG93 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTdGV2ZSBCbG9jay4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgJKHJldmlzaW9uIDgwMjgyKQorKysgU291 cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNTIs OCArMzUyLDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRHb1RvSGlzdG9yeUl0 ZW0oSGlzdG9yeUl0ZW0qKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9v bCBzaG91bGRTdG9wTG9hZGluZ0Zvckhpc3RvcnlJdGVtKEhpc3RvcnlJdGVtKikgY29uc3QgeyBy ZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRBZGRCYWNrRm9yd2Fy ZEl0ZW0oSGlzdG9yeUl0ZW0qKSBjb25zdCB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hE aWRSZW1vdmVCYWNrRm9yd2FyZEl0ZW0oSGlzdG9yeUl0ZW0qKSBjb25zdCB7IH07CisgICAgdmly dHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVtb3ZlQmFja0ZvcndhcmRJdGVtKEhpc3RvcnlJdGVtKikg Y29uc3QgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2hhbmdlQmFja0ZvcndhcmRJ bmRleCgpIGNvbnN0IHsgfQorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVHbG9iYWxIaXN0b3J5SXRl bUZvclBhZ2UoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2F2ZVZpZXdTdGF0ZVRvSXRlbShIaXN0 b3J5SXRlbSopIHsgfQogICAgIHZpcnR1YWwgYm9vbCBjYW5DYWNoZVBhZ2UoKSBjb25zdCB7IHJl dHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50 KCkgeyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9u IDgwMjgyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjM5Miw4ICsyMzkyLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2hlY2tMb2Fk Q29tcGxldGVGb3JUaAogICAgICAgICAgICAgaWYgKHNob3VsZFJlc2V0ICYmIGl0ZW0pCiAgICAg ICAgICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpIHsKICAgICAgICAg ICAgICAgICAgICAgcGFnZS0+YmFja0ZvcndhcmQoKS0+c2V0Q3VycmVudEl0ZW0oaXRlbS5nZXQo KSk7Ci0gICAgICAgICAgICAgICAgICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fZnJhbWUtPnNl dHRpbmdzKCk7Ci0gICAgICAgICAgICAgICAgICAgIHBhZ2UtPnNldEdsb2JhbEhpc3RvcnlJdGVt KCghc2V0dGluZ3MgfHwgc2V0dGluZ3MtPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSkgPyAwIDog aXRlbS5nZXQoKSk7CisgICAgICAgICAgICAgICAgICAgIG1fZnJhbWUtPmxvYWRlcigpLT5jbGll bnQoKS0+dXBkYXRlR2xvYmFsSGlzdG9yeUl0ZW1Gb3JQYWdlKCk7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0yOTYzLDE1ICsyOTYyLDE1IEBA IHZvaWQgRnJhbWVMb2FkZXI6OmNvbnRpbnVlTG9hZEFmdGVyTmF2aWcKICAgICAgICAgLy8gSWYg dGhlIG5hdmlnYXRpb24gcmVxdWVzdCBjYW1lIGZyb20gdGhlIGJhY2svZm9yd2FyZCBtZW51LCBh bmQgd2UgcHVudCBvbiBpdCwgd2UgaGF2ZSB0aGUgCiAgICAgICAgIC8vIHByb2JsZW0gdGhhdCB3 ZSBoYXZlIG9wdGltaXN0aWNhbGx5IG1vdmVkIHRoZSBiL2YgY3Vyc29yIGFscmVhZHksIHNvIG1v dmUgaXQgYmFjay4gIEZvciBzYW5pdHksIAogICAgICAgICAvLyB3ZSBvbmx5IGRvIHRoaXMgd2hl biBwdW50aW5nIGEgbmF2aWdhdGlvbiBmb3IgdGhlIHRhcmdldCBmcmFtZSBvciB0b3AtbGV2ZWwg ZnJhbWUuICAKLSAgICAgICAgaWYgKChpc1RhcmdldEl0ZW0gfHwgaXNMb2FkaW5nTWFpbkZyYW1l KCkpICYmIGlzQmFja0ZvcndhcmRMb2FkVHlwZShwb2xpY3lDaGVja2VyKCktPmxvYWRUeXBlKCkp KQorICAgICAgICBpZiAoKGlzVGFyZ2V0SXRlbSB8fCBpc0xvYWRpbmdNYWluRnJhbWUoKSkgJiYg aXNCYWNrRm9yd2FyZExvYWRUeXBlKHBvbGljeUNoZWNrZXIoKS0+bG9hZFR5cGUoKSkpIHsKICAg ICAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpKSB7CiAgICAgICAgICAg ICAgICAgRnJhbWUqIG1haW5GcmFtZSA9IHBhZ2UtPm1haW5GcmFtZSgpOwogICAgICAgICAgICAg ICAgIGlmIChIaXN0b3J5SXRlbSogcmVzZXRJdGVtID0gbWFpbkZyYW1lLT5sb2FkZXIoKS0+aGlz dG9yeSgpLT5jdXJyZW50SXRlbSgpKSB7CiAgICAgICAgICAgICAgICAgICAgIHBhZ2UtPmJhY2tG b3J3YXJkKCktPnNldEN1cnJlbnRJdGVtKHJlc2V0SXRlbSk7Ci0gICAgICAgICAgICAgICAgICAg IFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fZnJhbWUtPnNldHRpbmdzKCk7Ci0gICAgICAgICAgICAg ICAgICAgIHBhZ2UtPnNldEdsb2JhbEhpc3RvcnlJdGVtKCghc2V0dGluZ3MgfHwgc2V0dGluZ3Mt PnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSkgPyAwIDogcmVzZXRJdGVtKTsKKyAgICAgICAgICAg ICAgICAgICAgbV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT51cGRhdGVHbG9iYWxIaXN0b3J5 SXRlbUZvclBhZ2UoKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CisgICAgICAg IH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDgwMjgyKQorKysgU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE5MSw2ICsxOTEs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERp ZEFkZEJhY2tGb3J3YXJkSXRlbShIaXN0b3J5SXRlbSopIGNvbnN0ID0gMDsKICAgICAgICAgdmly dHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVtb3ZlQmFja0ZvcndhcmRJdGVtKEhpc3RvcnlJdGVtKikg Y29uc3QgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDaGFuZ2VCYWNrRm9y d2FyZEluZGV4KCkgY29uc3QgPSAwOworICAgICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlR2xvYmFs SGlzdG9yeUl0ZW1Gb3JQYWdlKCkgeyB9CiAKICAgICAgICAgLy8gVGhpcyBmcmFtZSBoYXMgZGlz cGxheWVkIGluYWN0aXZlIGNvbnRlbnQgKHN1Y2ggYXMgYW4gaW1hZ2UpIGZyb20gYW4KICAgICAg ICAgLy8gaW5zZWN1cmUgc291cmNlLiAgSW5hY3RpdmUgY29udGVudCBjYW5ub3Qgc3ByZWFkIHRv IG90aGVyIGZyYW1lcy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJv bGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250 cm9sbGVyLmNwcAkocmV2aXNpb24gODAyODIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlz dG9yeUNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTAsOCArMjUwLDcgQEAgdm9p ZCBIaXN0b3J5Q29udHJvbGxlcjo6Z29Ub0l0ZW0oSGlzdG9yeQogICAgIC8vIGFzIG9wcG9zZWQg dG8gaGFwcGVuaW5nIGZvciBzb21lL29uZSBvZiB0aGUgcGFnZSBjb21taXRzIHRoYXQgbWlnaHQg aGFwcGVuIHNvb24KICAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IGN1cnJlbnRJdGVtID0gcGFnZS0+ YmFja0ZvcndhcmQoKS0+Y3VycmVudEl0ZW0oKTsKICAgICBwYWdlLT5iYWNrRm9yd2FyZCgpLT5z ZXRDdXJyZW50SXRlbSh0YXJnZXRJdGVtKTsKLSAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBtX2Zy YW1lLT5zZXR0aW5ncygpOwotICAgIHBhZ2UtPnNldEdsb2JhbEhpc3RvcnlJdGVtKCghc2V0dGlu Z3MgfHwgc2V0dGluZ3MtPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSkgPyAwIDogdGFyZ2V0SXRl bSk7CisgICAgbV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT51cGRhdGVHbG9iYWxIaXN0b3J5 SXRlbUZvclBhZ2UoKTsKIAogICAgIC8vIEZpcnN0IHNldCB0aGUgcHJvdmlzaW9uYWwgaXRlbSBv ZiBhbnkgZnJhbWVzIHRoYXQgYXJlIG5vdCBhY3R1YWxseSBuYXZpZ2F0aW5nLgogICAgIC8vIFRo aXMgbXVzdCBiZSBkb25lIGJlZm9yZSB0cnlpbmcgdG8gbmF2aWdhdGUgdGhlIGRlc2lyZWQgZnJh bWUsIGJlY2F1c2Ugc29tZQpAQCAtMzIzLDggKzMyMiw4IEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xs ZXI6OnVwZGF0ZUZvclN0YW5kYXIKICAgICAgICAgICAgICAgICBpZiAoZnJhbWVMb2FkZXItPmRv Y3VtZW50TG9hZGVyKCktPnVucmVhY2hhYmxlVVJMKCkuaXNFbXB0eSgpKQogICAgICAgICAgICAg ICAgICAgICBmcmFtZUxvYWRlci0+Y2xpZW50KCktPnVwZGF0ZUdsb2JhbEhpc3RvcnlSZWRpcmVj dExpbmtzKCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoUGFnZSogcGFnZSA9IG1f ZnJhbWUtPnBhZ2UoKSkKLSAgICAgICAgICAgICAgICBwYWdlLT5zZXRHbG9iYWxIaXN0b3J5SXRl bShuZWVkUHJpdmFjeSA/IDAgOiBwYWdlLT5iYWNrRm9yd2FyZCgpLT5jdXJyZW50SXRlbSgpKTsK KworICAgICAgICAgICAgbV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT51cGRhdGVHbG9iYWxI aXN0b3J5SXRlbUZvclBhZ2UoKTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIC8v IFRoZSBjbGllbnQgcmVkaXJlY3QgcmVwbGFjZXMgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtLgpA QCAtMzYxLDggKzM2MCw4IEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclJlZGly ZWMKICAgICAgICAgICAgICAgICAgICAgaWYgKG1fZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExv YWRlcigpLT51bnJlYWNoYWJsZVVSTCgpLmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICAgICAg ICAgIG1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+dXBkYXRlR2xvYmFsSGlzdG9yeVJlZGly ZWN0TGlua3MoKTsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgaWYgKFBhZ2Uq IHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpCi0gICAgICAgICAgICAgICAgICAgIHBhZ2UtPnNldEds b2JhbEhpc3RvcnlJdGVtKG5lZWRQcml2YWN5ID8gMCA6IHBhZ2UtPmJhY2tGb3J3YXJkKCktPmN1 cnJlbnRJdGVtKCkpOworCisgICAgICAgICAgICAgICAgbV9mcmFtZS0+bG9hZGVyKCktPmNsaWVu dCgpLT51cGRhdGVHbG9iYWxIaXN0b3J5SXRlbUZvclBhZ2UoKTsKICAgICAgICAgICAgIH0KICAg ICAgICAgfQogICAgICAgICAvLyBUaGUgY2xpZW50IHJlZGlyZWN0IHJlcGxhY2VzIHRoZSBjdXJy ZW50IGhpc3RvcnkgaXRlbS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gODAyODIp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNDMs MTEgKzM0Myw2IEBAIGludCBQYWdlOjpnZXRIaXN0b3J5TGVuZ3RoKCkKICAgICByZXR1cm4gYmFj a0ZvcndhcmQoKS0+YmFja0NvdW50KCkgKyAxICsgYmFja0ZvcndhcmQoKS0+Zm9yd2FyZENvdW50 KCk7CiB9CiAKLXZvaWQgUGFnZTo6c2V0R2xvYmFsSGlzdG9yeUl0ZW0oSGlzdG9yeUl0ZW0qIGl0 ZW0pCi17Ci0gICAgbV9nbG9iYWxIaXN0b3J5SXRlbSA9IGl0ZW07Ci19Ci0KIHZvaWQgUGFnZTo6 c2V0R3JvdXBOYW1lKGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKICAgICBpZiAobV9ncm91cCAmJiAh bV9ncm91cC0+bmFtZSgpLmlzRW1wdHkoKSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHJldmlzaW9u IDgwMjgyKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAg LTE0Nyw5ICsxNDcsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgdm9pZCBnb1Rv SXRlbShIaXN0b3J5SXRlbSosIEZyYW1lTG9hZFR5cGUpOwogCi0gICAgICAgIEhpc3RvcnlJdGVt KiBnbG9iYWxIaXN0b3J5SXRlbSgpIGNvbnN0IHsgcmV0dXJuIG1fZ2xvYmFsSGlzdG9yeUl0ZW0u Z2V0KCk7IH0KLSAgICAgICAgdm9pZCBzZXRHbG9iYWxIaXN0b3J5SXRlbShIaXN0b3J5SXRlbSop OwotCiAgICAgICAgIHZvaWQgc2V0R3JvdXBOYW1lKGNvbnN0IFN0cmluZyYpOwogICAgICAgICBj b25zdCBTdHJpbmcmIGdyb3VwTmFtZSgpIGNvbnN0OwogCkBAIC0zMzUsOCArMzMyLDYgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBPd25QdHI8QmFja0ZvcndhcmRDb250cm9sbGVyPiBt X2JhY2tGb3J3YXJkQ29udHJvbGxlcjsKICAgICAgICAgUmVmUHRyPEZyYW1lPiBtX21haW5GcmFt ZTsKIAotICAgICAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IG1fZ2xvYmFsSGlzdG9yeUl0ZW07Ci0K ICAgICAgICAgbXV0YWJsZSBSZWZQdHI8UGx1Z2luRGF0YT4gbV9wbHVnaW5EYXRhOwogCiAgICAg ICAgIFJlZlB0cjxSZW5kZXJUaGVtZT4gbV90aGVtZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDgwMzA4KQorKysgU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDMtMDMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBHZXQgcmlkIG9mIFBhZ2U6Omdsb2JhbEhpc3RvcnlJdGVtCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTczOAorCisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xp ZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5SXRlbUZvclBhZ2UpOgorICAgICAgICBHZXQgdGhlIGN1 cnJlbnQgaGlzdG9yeSBpdGVtIGFuZCB1cGRhdGUgaXQgdXNpbmcgLVtXZWJWaWV3IF9zZXRHbG9i YWxIaXN0b3J5SXRlbTpdLgorICAgIAorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV2ViVmlldyBfZ2xvYmFsSGlzdG9yeUl0ZW1dKToKKyAgICAgICAgKC1bV2ViVmll dyBfc2V0R2xvYmFsSGlzdG9yeUl0ZW06XSk6CisgICAgICAgIFNldCBfZ2xvYmFsSGlzdG9yeUl0 ZW0gaXZhci4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlld0RhdGEuaDoKKyAgICAgICAgKiBX ZWJWaWV3L1dlYlZpZXdEYXRhLm1tOgorICAgICAgICBBZGQgX2dsb2JhbEhpc3RvcnlJdGVtIGl2 YXIuCisKIDIwMTEtMDMtMDMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCShyZXZp c2lvbiA4MDI4MikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE1NSw2ICsxNTUsNyBAQCBwcml2YXRl OgogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEFkZEJhY2tGb3J3YXJkSXRlbShXZWJDb3Jl OjpIaXN0b3J5SXRlbSopIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFJlbW92 ZUJhY2tGb3J3YXJkSXRlbShXZWJDb3JlOjpIaXN0b3J5SXRlbSopIGNvbnN0OwogICAgIHZpcnR1 YWwgdm9pZCBkaXNwYXRjaERpZENoYW5nZUJhY2tGb3J3YXJkSW5kZXgoKSBjb25zdDsKKyAgICB2 aXJ0dWFsIHZvaWQgdXBkYXRlR2xvYmFsSGlzdG9yeUl0ZW1Gb3JQYWdlKCk7CiAKICAgICB2aXJ0 dWFsIHZvaWQgZGlkRGlzcGxheUluc2VjdXJlQ29udGVudCgpOwogICAgIHZpcnR1YWwgdm9pZCBk aWRSdW5JbnNlY3VyZUNvbnRlbnQoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qLCBjb25zdCBXZWJD b3JlOjpLVVJMJik7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQkocmV2aXNpb24gODAyODIpCisrKyBT b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQko d29ya2luZyBjb3B5KQpAQCAtNzUsNiArNzUsNyBAQAogI2ltcG9ydCAiV2ViVUlEZWxlZ2F0ZVBy aXZhdGUuaCIKICNpbXBvcnQgIldlYlZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCA8V2ViQ29yZS9B dXRoZW50aWNhdGlvbk1hYy5oPgorI2ltcG9ydCA8V2ViQ29yZS9CYWNrRm9yd2FyZENvbnRyb2xs ZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvQmxvY2tFeGNlcHRpb25zLmg+CiAjaW1wb3J0IDxXZWJD b3JlL0NhY2hlZEZyYW1lLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0Nocm9tZS5oPgpAQCAtOTY2LDYg Kzk2NywxOSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENoCiB7CiB9 CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZUdsb2JhbEhpc3RvcnlJdGVtRm9y UGFnZSgpCit7CisgICAgSGlzdG9yeUl0ZW0qIGhpc3RvcnlJdGVtID0gMDsKKworICAgIGlmIChQ YWdlKiBwYWdlID0gY29yZShtX3dlYkZyYW1lLmdldCgpKS0+cGFnZSgpKSB7CisgICAgICAgIGlm ICghcGFnZS0+c2V0dGluZ3MoKS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQorICAgICAgICAg ICAgaGlzdG9yeUl0ZW0gPSBwYWdlLT5iYWNrRm9yd2FyZCgpLT5jdXJyZW50SXRlbSgpOworICAg IH0KKworICAgIFdlYlZpZXcgKndlYlZpZXcgPSBnZXRXZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkp OworICAgIFt3ZWJWaWV3IF9zZXRHbG9iYWxIaXN0b3J5SXRlbTpoaXN0b3J5SXRlbV07Cit9CisK IHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnQoKQog ewogICAgIFdlYlZpZXcgKndlYlZpZXcgPSBnZXRXZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkpOyAg IApJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gODAyODIp CisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkK QEAgLTIyNTIsOSArMjI1MiwxNSBAQCAtICh2b2lkKXNldFVzZXNQYWdlQ2FjaGU6KEJPT0wpdXNl c1BhZ2VDCiAKIC0gKFdlYkhpc3RvcnlJdGVtICopX2dsb2JhbEhpc3RvcnlJdGVtCiB7Ci0gICAg aWYgKCFfcHJpdmF0ZS0+cGFnZSkKKyAgICBpZiAoIV9wcml2YXRlKQogICAgICAgICByZXR1cm4g bmlsOwotICAgIHJldHVybiBraXQoX3ByaXZhdGUtPnBhZ2UtPmdsb2JhbEhpc3RvcnlJdGVtKCkp OworCisgICAgcmV0dXJuIGtpdChfcHJpdmF0ZS0+X2dsb2JhbEhpc3RvcnlJdGVtLmdldCgpKTsK K30KKworLSAodm9pZClfc2V0R2xvYmFsSGlzdG9yeUl0ZW06KEhpc3RvcnlJdGVtKiloaXN0b3J5 SXRlbQoreworICAgIF9wcml2YXRlLT5fZ2xvYmFsSGlzdG9yeUl0ZW0gPSBoaXN0b3J5SXRlbTsK IH0KIAogLSAoV2ViVGV4dEl0ZXJhdG9yICopdGV4dEl0ZXJhdG9yRm9yUmVjdDooTlNSZWN0KXJl Y3QKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0RhdGEuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdEYXRhLmgJKHJldmlzaW9u IDgwMjgyKQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3RGF0YS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNSw2ICszNSw3IEBACiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKKyAgICBjbGFzcyBIaXN0b3J5SXRlbTsKICAgICBjbGFzcyBQ YWdlOwogfQogCkBAIC0xODMsNSArMTg0LDcgQEAgQGludGVyZmFjZSBXZWJWaWV3UHJpdmF0ZSA6 IE5TT2JqZWN0IHsKICNlbmRpZgogICAgIGlkPFdlYkdlb2xvY2F0aW9uUHJvdmlkZXI+IF9nZW9s b2NhdGlvblByb3ZpZGVyOwogICAgIGlkPFdlYkRldmljZU9yaWVudGF0aW9uUHJvdmlkZXI+IG1f ZGV2aWNlT3JpZW50YXRpb25Qcm92aWRlcjsKKworICAgIFJlZlB0cjxXZWJDb3JlOjpIaXN0b3J5 SXRlbT4gX2dsb2JhbEhpc3RvcnlJdGVtOwogfQogQGVuZApJbmRleDogU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3RGF0YS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZXdEYXRhLm1tCShyZXZpc2lvbiA4MDI4MikKKysrIFNvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlld0RhdGEubW0JKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMy LDcgQEAKICNpbXBvcnQgIldlYktpdExvZ2dpbmcuaCIKICNpbXBvcnQgIldlYlByZWZlcmVuY2VL ZXlzUHJpdmF0ZS5oIgogI2ltcG9ydCA8V2ViQ29yZS9XZWJDb3JlT2JqQ0V4dHJhcy5oPgorI2lt cG9ydCA8V2ViQ29yZS9IaXN0b3J5SXRlbS5oPgogI2ltcG9ydCA8b2JqYy9vYmpjLWF1dG8uaD4K ICNpbXBvcnQgPHJ1bnRpbWUvSW5pdGlhbGl6ZVRocmVhZGluZy5oPgogI2ltcG9ydCA8d3RmL1Ro cmVhZGluZy5oPgpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3SW50ZXJu YWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRl cm5hbC5oCShyZXZpc2lvbiA4MDI4MikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlld0ludGVybmFsLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICBjbGFzcyBFbGVtZW50OwogICAgIGNsYXNzIEZyYW1lOworICAgIGNs YXNzIEhpc3RvcnlJdGVtOwogICAgIGNsYXNzIEtVUkw7CiAgICAgY2xhc3MgS2V5Ym9hcmRFdmVu dDsKICAgICBjbGFzcyBQYWdlOwpAQCAtMTE0LDYgKzExNSw3IEBAIEBpbnRlcmZhY2UgV2ViVmll dyAoV2ViVmlld090aGVySW50ZXJuYWwKIAogI2lmZGVmIF9fY3BsdXNwbHVzCiAtIChXZWJDb3Jl OjpQYWdlKilwYWdlOworLSAodm9pZClfc2V0R2xvYmFsSGlzdG9yeUl0ZW06KFdlYkNvcmU6Okhp c3RvcnlJdGVtKiloaXN0b3J5SXRlbTsKICNlbmRpZgogCiAtIChOU01lbnUgKilfbWVudUZvckVs ZW1lbnQ6KE5TRGljdGlvbmFyeSAqKWVsZW1lbnQgZGVmYXVsdEl0ZW1zOihOU0FycmF5ICopaXRl bXM7CkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiA4MDMwOCkKKysrIFNvdXJjZS9XZWJL aXQvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTAz LTAzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2V0IHJpZCBvZiBQYWdlOjpnbG9i YWxIaXN0b3J5SXRlbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTU3MzgKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcDoKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0 b3J5SXRlbUZvclBhZ2UpOgorICAgICAgICBHZXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtIGFu ZCB1cGRhdGUgaXQgdXNpbmcgV2ViVmlldzo6c2V0R2xvYmFsSGlzdG9yeUl0ZW0uCisgICAgICAg IAorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAg ICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpnbG9iYWxIaXN0b3J5SXRlbSk6 CisgICAgICAgIChXZWJWaWV3OjpzZXRHbG9iYWxIaXN0b3J5SXRlbSk6CisgICAgICAgICogV2Vi Vmlldy5oOgorCiAyMDExLTAzLTAzICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGNvcnJlY3Rpb24uCkluZGV4OiBTb3VyY2Uv V2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9X ZWJWaWV3LmNwcAkocmV2aXNpb24gODAyODIpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTg5MiwxMiArNTg5MiwxMiBAQCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIFdlYlZpZXc6Omdsb2JhCiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJl dHVybiBFX0ZBSUw7CiAKLSAgICBpZiAoIW1fcGFnZS0+Z2xvYmFsSGlzdG9yeUl0ZW0oKSkgewor ICAgIGlmICghbV9nbG9iYWxIaXN0b3J5SXRlbSkgewogICAgICAgICAqaXRlbSA9IDA7CiAgICAg ICAgIHJldHVybiBTX09LOwogICAgIH0KIAotICAgICppdGVtID0gV2ViSGlzdG9yeUl0ZW06OmNy ZWF0ZUluc3RhbmNlKG1fcGFnZS0+Z2xvYmFsSGlzdG9yeUl0ZW0oKSk7CisgICAgKml0ZW0gPSBX ZWJIaXN0b3J5SXRlbTo6Y3JlYXRlSW5zdGFuY2UobV9nbG9iYWxIaXN0b3J5SXRlbSk7CiAgICAg cmV0dXJuIFNfT0s7CiB9CiAKQEAgLTY2MzMsMyArNjYzMyw4IEBAIEhSRVNVTFQgV2ViVmlldzo6 c2V0TWluaW11bVRpbWVySW50ZXJ2YWwKICAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldE1pbkRP TVRpbWVySW50ZXJ2YWwoaW50ZXJ2YWwpOwogICAgIHJldHVybiBTX09LOwogfQorCit2b2lkIFdl YlZpZXc6OnNldEdsb2JhbEhpc3RvcnlJdGVtKEhpc3RvcnlJdGVtKiBoaXN0b3J5SXRlbSkKK3sK KyAgICBtX2dsb2JhbEhpc3RvcnlJdGVtID0gaGlzdG9yeUl0ZW07Cit9CkluZGV4OiBTb3VyY2Uv V2ViS2l0L3dpbi9XZWJWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2Vi Vmlldy5oCShyZXZpc2lvbiA4MDI4MikKKysrIFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogfQog I2VuZGlmCiAKK25hbWVzcGFjZSBXZWJDb3JlIHsKKyAgICBjbGFzcyBIaXN0b3J5SXRlbTsKK30K KwogY2xhc3MgRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlcjsKIGNsYXNzIFdlYkJhY2tGb3J3YXJk TGlzdDsKIGNsYXNzIFdlYkZyYW1lOwpAQCAtOTI0LDYgKzkyOCw4IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgc2V0TGFzdEN1cnNvcihIQ1VSU09SIGN1cnNvcikgeyBtX2xhc3RTZXRDdXJzb3IgPSBj dXJzb3I7IH0KIAorICAgIHZvaWQgc2V0R2xvYmFsSGlzdG9yeUl0ZW0oV2ViQ29yZTo6SGlzdG9y eUl0ZW0qKTsKKwogcHJpdmF0ZToKICAgICB2b2lkIHNldFpvb21NdWx0aXBsaWVyKGZsb2F0IG11 bHRpcGxpZXIsIGJvb2wgaXNUZXh0T25seSk7CiAgICAgZmxvYXQgem9vbU11bHRpcGxpZXIoYm9v bCBpc1RleHRPbmx5KTsKQEAgLTEwNzMsNiArMTA3OSw4IEBAIHByb3RlY3RlZDoKICAgICBib29s IG1fbmV4dERpc3BsYXlJc1N5bmNocm9ub3VzOwogCiAgICAgSENVUlNPUiBtX2xhc3RTZXRDdXJz b3I7CisKKyAgICBSZWZQdHI8V2ViQ29yZTo6SGlzdG9yeUl0ZW0+IG1fZ2xvYmFsSGlzdG9yeUl0 ZW07CiB9OwogCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dp bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDgwMjgy KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCw2ICs1MCw3IEBACiAjaW5jbHVkZSAiV2ViVVJM UmVzcG9uc2UuaCIKICNpbmNsdWRlICJXZWJWaWV3LmgiCiAjcHJhZ21hIHdhcm5pbmcocHVzaCwg MCkKKyNpbmNsdWRlIDxXZWJDb3JlL0JhY2tGb3J3YXJkQ29udHJvbGxlci5oPgogI2luY2x1ZGUg PFdlYkNvcmUvQ2FjaGVkRnJhbWUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0RvY3VtZW50TG9hZGVy Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZUxvYWRlci5oPgpAQCAtNjcsNiArNjgsNyBAQAog I2luY2x1ZGUgPFdlYkNvcmUvUGx1Z2luVmlldy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVuZGVy UGFydC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VIYW5kbGUuaD4KKyNpbmNsdWRlIDxX ZWJDb3JlL1NldHRpbmdzLmg+CiAjcHJhZ21hIHdhcm5pbmcocG9wKQogCiB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKQEAgLTYxOSw2ICs2MjEsMTkgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRDaAogewogfQogCit2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRh dGVHbG9iYWxIaXN0b3J5SXRlbUZvclBhZ2UoKQoreworICAgIEhpc3RvcnlJdGVtKiBoaXN0b3J5 SXRlbSA9IDA7CisgICAgV2ViVmlldyogd2ViVmlldyA9IG1fd2ViRnJhbWUtPndlYlZpZXcoKTsK KworICAgIGlmIChQYWdlKiBwYWdlID0gd2ViVmlldy0+cGFnZSgpKSB7CisgICAgICAgIGlmICgh cGFnZS0+c2V0dGluZ3MoKS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQorICAgICAgICAgICAg aGlzdG9yeUl0ZW0gPSBwYWdlLT5iYWNrRm9yd2FyZCgpLT5jdXJyZW50SXRlbSgpOworICAgIH0K KworICAgIHdlYlZpZXctPnNldEdsb2JhbEhpc3RvcnlJdGVtKGhpc3RvcnlJdGVtKTsKK30KKwog dm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkRGlzcGxheUluc2VjdXJlQ29udGVudCgpCiB7 CiAgICAgV2ViVmlldyogd2ViVmlldyA9IG1fd2ViRnJhbWUtPndlYlZpZXcoKTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuaAkocmV2aXNpb24gODAyODIpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC05OCw2ICs5 OCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRBZGRCYWNrRm9yd2Fy ZEl0ZW0oV2ViQ29yZTo6SGlzdG9yeUl0ZW0qKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgZGlz cGF0Y2hEaWRSZW1vdmVCYWNrRm9yd2FyZEl0ZW0oV2ViQ29yZTo6SGlzdG9yeUl0ZW0qKSBjb25z dDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDaGFuZ2VCYWNrRm9yd2FyZEluZGV4KCkg Y29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUdsb2JhbEhpc3RvcnlJdGVtRm9yUGFnZSgp OwogCiAgICAgdmlydHVhbCB2b2lkIGRpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnQoKTsKICAgICB2 aXJ0dWFsIHZvaWQgZGlkUnVuSW5zZWN1cmVDb250ZW50KFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu KiwgY29uc3QgV2ViQ29yZTo6S1VSTCYpOwo=