120319 2013-08-26 10:35:00 -0700 PageGroup::groupSettings() should return a reference 2013-08-26 10:56:07 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 psolanki psolanki kling psolanki oldest_to_newest 921077 0 psolanki 2013-08-26 10:35:00 -0700 PageGroup always has m_groupSettings. We should return a reference from that method. 921082 1 209664 psolanki 2013-08-26 10:37:52 -0700 Created attachment 209664 Patch 921083 2 209664 kling 2013-08-26 10:39:09 -0700 Comment on attachment 209664 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209664&action=review LGTM. > Source/WebCore/page/PageGroup.h:111 > - GroupSettings* groupSettings() const { return m_groupSettings.get(); } > + GroupSettings& groupSettings() const { return *m_groupSettings; } We should also make m_groupSettings a const OwnPtr. 921091 3 psolanki 2013-08-26 10:56:07 -0700 Committed r154618: <http://trac.webkit.org/changeset/154618> 209664 2013-08-26 10:37:52 -0700 2013-08-26 10:39:09 -0700 Patch bug-120319-20130826103753.patch text/plain 10484 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0NjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjY3NGQ1N2ZiZjBhYTEy NDhmNmVkMGIyZmExMWE4NmJjMzAxY2UzNi4uOWUwZWNmNTNlMWVmYWNjZTNiZmViMWI1YzA3ODkz OGFhZTQ2ZGIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA4LTI2ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBQYWdlR3JvdXA6Omdy b3VwU2V0dGluZ3MoKSBzaG91bGQgcmV0dXJuIGEgcmVmZXJlbmNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjAzMTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYWdlR3JvdXA6Om1fZ3JvdXBTZXR0aW5n cyBpcyBuZXZlciBOVUxMIHNvIHdlIGNhbiBqdXN0IHJldHVybiBhIHJlZmVyZW5jZSBmcm9tIGdy b3VwU2V0dGluZ3MoKS4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkZhY3Rvcnku Y3BwOgorICAgICAgICAqIHBhZ2UvUGFnZUdyb3VwLmg6CisgICAgICAgIChXZWJDb3JlOjpQYWdl R3JvdXA6Omdyb3VwU2V0dGluZ3MpOgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZU5hbWVzcGFj ZUltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZU5hbWVzcGFjZUltcGw6OmxvY2Fs U3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAgICogd29ya2Vycy9EZWZhdWx0U2hhcmVkV29ya2Vy UmVwb3NpdG9yeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFyZWRXb3JrZXJQcm94eTo6Z3Jv dXBTZXR0aW5ncyk6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJNZXNzYWdpbmdQcm94eTo6c3RhcnRXb3JrZXJHbG9i YWxTY29wZSk6CisKIDIwMTMtMDgtMjYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5j b20+CiAKICAgICAgICAgW1dpbmRvd3NdIEJ1aWxkIGZpeCBhZnRlciByMTU0NTc4LiAgUmV0dXJu IFZlY3RvcjxTdHJpbmc+KCkgaW5zdGVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5k ZXggOTA0Njk4N2Y1ODNjMmM0M2QxZTg4MTFlOTQ3NTIzYWE5MDY0MDRkMS4uYTQ0MmFkYTU3NGQ4 NjM0MGE2NmFmYjI1ZDQyZGRlYzNlMDRlMDRhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDgtMjYgIFByYXRpayBTb2xhbmtpICA8cHNvbGFu a2lAYXBwbGUuY29tPgorCisgICAgICAgIFBhZ2VHcm91cDo6Z3JvdXBTZXR0aW5ncygpIHNob3Vs ZCByZXR1cm4gYSByZWZlcmVuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyMDMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFBhZ2VHcm91cDo6bV9ncm91cFNldHRpbmdzIGlzIG5ldmVyIE5VTEwgc28g d2UgY2FuIGp1c3QgcmV0dXJuIGEgcmVmZXJlbmNlIGZyb20gZ3JvdXBTZXR0aW5ncygpLgorCisg ICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpX ZWJQYWdlUHJpdmF0ZTo6ZGlkQ2hhbmdlU2V0dGluZ3MpOgorCiAyMDEzLTA4LTI0ICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBGcmFtZTo6dHJlZSBzaG91bGQgcmV0 dXJuIGEgcmVmZXJlbmNlIGluc3RlYWQgb2YgYSBwb2ludGVyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXgg NjUzZDJmZjU4MmQ2NjM5OWU4NmY3MjMwYjQxM2JkYzhkYzNlYWYyOS4uNzEzZThiNDk5OTEwNzFh MjMwOWJmYTJhN2UzZGQwMTc0ZWVkYjUxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEzLTA4LTI2ICBQcmF0aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKwor ICAgICAgICBQYWdlR3JvdXA6Omdyb3VwU2V0dGluZ3MoKSBzaG91bGQgcmV0dXJuIGEgcmVmZXJl bmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjAz MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYWdl R3JvdXA6Om1fZ3JvdXBTZXR0aW5ncyBpcyBuZXZlciBOVUxMIHNvIHdlIGNhbiBqdXN0IHJldHVy biBhIHJlZmVyZW5jZSBmcm9tIGdyb3VwU2V0dGluZ3MoKS4KKworICAgICAgICAqIHdlYmtpdC93 ZWJraXR3ZWJkYXRhYmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRfc2V0X3dlYl9kYXRhYmFzZV9k aXJlY3RvcnlfcGF0aCk6CisKIDIwMTMtMDgtMjQgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIEZyYW1lOjp0cmVlIHNob3VsZCByZXR1cm4gYSByZWZlcmVuY2UgaW5z dGVhZCBvZiBhIHBvaW50ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjZGJmNTZhM2E4MjllZTc4ZWY3OWU4Yjg1 MGZlMzBiMjJiMGNhMjM4Li4wODVkMGYzYTYyODBmMjU4MTljMGFhZWZjYTdhZGUzZWM4MjBlOTc4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDgtMjYgIFByYXRpayBTb2xhbmtp ICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisgICAgICAgIFBhZ2VHcm91cDo6Z3JvdXBTZXR0aW5n cygpIHNob3VsZCByZXR1cm4gYSByZWZlcmVuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFBhZ2VHcm91cDo6bV9ncm91cFNldHRpbmdzIGlzIG5ldmVy IE5VTEwgc28gd2UgY2FuIGp1c3QgcmV0dXJuIGEgcmVmZXJlbmNlIGZyb20gZ3JvdXBTZXR0aW5n cygpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU5hbWVzcGFjZUltcGw6OmNyZWF0ZUxvY2Fs U3RvcmFnZU5hbWVzcGFjZSk6CisKIDIwMTMtMDgtMjQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEFkZCBXZWJLaXQyIEFQSSBmb3Ig aXNvbGF0ZWQgd29ybGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9JREJGYWN0b3J5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE QkZhY3RvcnkuY3BwCmluZGV4IDhkOThkMjI1MzM3ODRjNzY5NzRjOGQ3YzljODUwOTQ1YTc0ZjYx NmMuLmVhODIwMDdlMDRhM2E3YTYwYzg2OTgyMTFlZmE4Yzk4NWUwNzBlYmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkZhY3RvcnkuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkZhY3RvcnkuY3BwCkBAIC04Niw3ICs4 Niw3IEBAIHN0YXRpYyBTdHJpbmcgZ2V0SW5kZXhlZERCRGF0YWJhc2VQYXRoKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqIGNvbnRleHQpCiAgICAgQVNTRVJUKGlzQ29udGV4dFZhbGlkKGNvbnRleHQp KTsKICAgICBpZiAoY29udGV4dC0+aXNEb2N1bWVudCgpKSB7CiAgICAgICAgIERvY3VtZW50KiBk b2N1bWVudCA9IHRvRG9jdW1lbnQoY29udGV4dCk7Ci0gICAgICAgIHJldHVybiBkb2N1bWVudC0+ cGFnZSgpLT5ncm91cCgpLmdyb3VwU2V0dGluZ3MoKS0+aW5kZXhlZERCRGF0YWJhc2VQYXRoKCk7 CisgICAgICAgIHJldHVybiBkb2N1bWVudC0+cGFnZSgpLT5ncm91cCgpLmdyb3VwU2V0dGluZ3Mo KS5pbmRleGVkREJEYXRhYmFzZVBhdGgoKTsKICAgICB9CiAjaWYgRU5BQkxFKFdPUktFUlMpCiAg ICAgV29ya2VyR2xvYmFsU2NvcGUqIHdvcmtlckdsb2JhbFNjb3BlID0gc3RhdGljX2Nhc3Q8V29y a2VyR2xvYmFsU2NvcGUqPihjb250ZXh0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZUdyb3VwLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5oCmluZGV4IDEy Yzk0ODg4MjI5NjMwMTZkMTQ5YjkyOGJkZTdiYjY3NDlkZmRlNTUuLjZkMzFjN2M0ZTk2ZmM3ZjM5 NWEyZTAzMWI0YzM1MjIyZWY2NGE1MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZUdyb3VwLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuaApAQCAtMTA4 LDcgKzEwOCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgY29uc3QgVXNlclNjcmlw dE1hcCogdXNlclNjcmlwdHMoKSBjb25zdCB7IHJldHVybiBtX3VzZXJTY3JpcHRzLmdldCgpOyB9 CiAgICAgICAgIGNvbnN0IFVzZXJTdHlsZVNoZWV0TWFwKiB1c2VyU3R5bGVTaGVldHMoKSBjb25z dCB7IHJldHVybiBtX3VzZXJTdHlsZVNoZWV0cy5nZXQoKTsgfQogCi0gICAgICAgIEdyb3VwU2V0 dGluZ3MqIGdyb3VwU2V0dGluZ3MoKSBjb25zdCB7IHJldHVybiBtX2dyb3VwU2V0dGluZ3MuZ2V0 KCk7IH0KKyAgICAgICAgR3JvdXBTZXR0aW5ncyYgZ3JvdXBTZXR0aW5ncygpIGNvbnN0IHsgcmV0 dXJuICptX2dyb3VwU2V0dGluZ3M7IH0KIAogI2lmIEVOQUJMRShWSURFT19UUkFDSykKICAgICAg ICAgdm9pZCBjYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2VkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuY3BwCmluZGV4IDI2NTlkYmYzNGIyYjUxZGZi ZjgzNDBlNjk3YmUyOTg1YjRmMTRlOTIuLjE4N2FlNjlhYjdhNGNkNTYwMzQ0YzI4ZjE5ZmQ1Y2I3 NGM2ZjU3NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU5hbWVz cGFjZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFj ZUltcGwuY3BwCkBAIC01Nyw3ICs1Nyw3IEBAIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4g U3RvcmFnZU5hbWVzcGFjZUltcGw6OmxvY2FsU3RvcmFnZU5hbWVzcGFjZShQYWdlR3JvCiAgICAg Ly8gYXQgdGhpcyBwb2ludCB3ZSdyZSBzdHVjayB3aXRoIGl0LgogICAgIFBhZ2UqIHBhZ2UgPSAq cGFnZUdyb3VwLT5wYWdlcygpLmJlZ2luKCk7CiAgICAgY29uc3QgU3RyaW5nJiBwYXRoID0gcGFn ZS0+c2V0dGluZ3MoKS5sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoKTsKLSAgICB1bnNpZ25lZCBx dW90YSA9IHBhZ2VHcm91cC0+Z3JvdXBTZXR0aW5ncygpLT5sb2NhbFN0b3JhZ2VRdW90YUJ5dGVz KCk7CisgICAgdW5zaWduZWQgcXVvdGEgPSBwYWdlR3JvdXAtPmdyb3VwU2V0dGluZ3MoKS5sb2Nh bFN0b3JhZ2VRdW90YUJ5dGVzKCk7CiAgICAgY29uc3QgU3RyaW5nIGxvb2t1cFBhdGggPSBwYXRo LmlzTnVsbCgpID8gZW1wdHlTdHJpbmcoKSA6IHBhdGg7CiAKICAgICBMb2NhbFN0b3JhZ2VOYW1l c3BhY2VNYXA6OkFkZFJlc3VsdCByZXN1bHQgPSBsb2NhbFN0b3JhZ2VOYW1lc3BhY2VNYXAoKS5h ZGQobG9va3VwUGF0aCwgMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL0Rl ZmF1bHRTaGFyZWRXb3JrZXJSZXBvc2l0b3J5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMv RGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnkuY3BwCmluZGV4IDliZmRkMWMyNjQzNmVmMTRh MDljYjc0YWJjMTMyODQwNzAyNDJhYzQuLjk4NWFmMDA2YWVjNmE0ZDM2OTA2YmQwNDUzNDA4YWY5 MzViMThjN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJl ZFdvcmtlclJlcG9zaXRvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvRGVmYXVs dFNoYXJlZFdvcmtlclJlcG9zaXRvcnkuY3BwCkBAIC0xNzMsNyArMTczLDcgQEAgR3JvdXBTZXR0 aW5ncyogU2hhcmVkV29ya2VyUHJveHk6Omdyb3VwU2V0dGluZ3MoKSBjb25zdAogICAgIC8vIEp1 c3QgcGljayB0aGUgZmlyc3QgYWN0aXZlIGRvY3VtZW50LCBhbmQgdXNlIHRoZSBncm91cHNldHRp bmdzIG9mIHRoYXQgcGFnZS4KICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSAqKG1fd29ya2VyRG9j dW1lbnRzLmJlZ2luKCkpOwogICAgIGlmIChkb2N1bWVudC0+cGFnZSgpKQotICAgICAgICByZXR1 cm4gZG9jdW1lbnQtPnBhZ2UoKS0+Z3JvdXAoKS5ncm91cFNldHRpbmdzKCk7CisgICAgICAgIHJl dHVybiAmZG9jdW1lbnQtPnBhZ2UoKS0+Z3JvdXAoKS5ncm91cFNldHRpbmdzKCk7CiAKICAgICBy ZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyTWVz c2FnaW5nUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQ cm94eS5jcHAKaW5kZXggOWVjZTVhZTU2YTRmMzcwYzNhYjkwMTRkZWVlOGNhMmZkMGQ5YjA0OC4u Yjc0Y2U0MTRjM2E4YTljNmE2YWZlNjJiYzAyMzQzNzUwZmEwNmRlOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHAKQEAgLTMwMyw3ICszMDMs NyBAQCB2b2lkIFdvcmtlck1lc3NhZ2luZ1Byb3h5OjpzdGFydFdvcmtlckdsb2JhbFNjb3BlKGNv bnN0IEtVUkwmIHNjcmlwdFVSTCwgY29uc3QgUwogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0 YXRpY19jYXN0PERvY3VtZW50Kj4obV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LmdldCgpKTsKICAg ICBHcm91cFNldHRpbmdzKiBzZXR0aW5ncyA9IDA7CiAgICAgaWYgKGRvY3VtZW50LT5wYWdlKCkp Ci0gICAgICAgIHNldHRpbmdzID0gZG9jdW1lbnQtPnBhZ2UoKS0+Z3JvdXAoKS5ncm91cFNldHRp bmdzKCk7CisgICAgICAgIHNldHRpbmdzID0gJmRvY3VtZW50LT5wYWdlKCktPmdyb3VwKCkuZ3Jv dXBTZXR0aW5ncygpOwogICAgIFJlZlB0cjxEZWRpY2F0ZWRXb3JrZXJUaHJlYWQ+IHRocmVhZCA9 IERlZGljYXRlZFdvcmtlclRocmVhZDo6Y3JlYXRlKHNjcmlwdFVSTCwgdXNlckFnZW50LCBzZXR0 aW5ncywgc291cmNlQ29kZSwgKnRoaXMsICp0aGlzLCBzdGFydE1vZGUsIGRvY3VtZW50LT5jb250 ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGVwcmVjYXRlZEhlYWRlcigpLCBkb2N1bWVudC0+Y29udGVu dFNlY3VyaXR5UG9saWN5KCktPmRlcHJlY2F0ZWRIZWFkZXJUeXBlKCksIGRvY3VtZW50LT50b3BP cmlnaW4oKSk7CiAgICAgd29ya2VyVGhyZWFkQ3JlYXRlZCh0aHJlYWQpOwogICAgIHRocmVhZC0+ c3RhcnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFn ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IDRh ZTI5ZGExNzlmMDQyYzdjNWIwNGE3OThiMTI2YWI4NDJkMGJjM2UuLmI3MDQwOGQ3MzA4ZDA4MGNl MDI1YWI1YTMzN2YxYWMyNWM1M2U3YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlLmNwcApAQCAtNTg1MSwxNCArNTg1MSwxNCBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpk aWRDaGFuZ2VTZXR0aW5ncyhXZWJTZXR0aW5ncyogd2ViU2V0dGluZ3MpCiAgICAgY29yZVNldHRp bmdzLT5zZXRMb2NhbFN0b3JhZ2VFbmFibGVkKHdlYlNldHRpbmdzLT5pc0xvY2FsU3RvcmFnZUVu YWJsZWQoKSk7CiAgICAgY29yZVNldHRpbmdzLT5zZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNo ZUVuYWJsZWQod2ViU2V0dGluZ3MtPmlzQXBwQ2FjaGVFbmFibGVkKCkpOwogCi0gICAgbV9wYWdl LT5ncm91cCgpLmdyb3VwU2V0dGluZ3MoKS0+c2V0TG9jYWxTdG9yYWdlUXVvdGFCeXRlcyh3ZWJT ZXR0aW5ncy0+bG9jYWxTdG9yYWdlUXVvdGEoKSk7CisgICAgbV9wYWdlLT5ncm91cCgpLmdyb3Vw U2V0dGluZ3MoKS5zZXRMb2NhbFN0b3JhZ2VRdW90YUJ5dGVzKHdlYlNldHRpbmdzLT5sb2NhbFN0 b3JhZ2VRdW90YSgpKTsKICAgICBjb3JlU2V0dGluZ3MtPnNldFNlc3Npb25TdG9yYWdlUXVvdGEo d2ViU2V0dGluZ3MtPnNlc3Npb25TdG9yYWdlUXVvdGEoKSk7CiAgICAgY29yZVNldHRpbmdzLT5z ZXRVc2VzUGFnZUNhY2hlKHdlYlNldHRpbmdzLT5tYXhpbXVtUGFnZXNJbkNhY2hlKCkpOwogICAg IGNvcmVTZXR0aW5ncy0+c2V0RnJhbWVGbGF0dGVuaW5nRW5hYmxlZCh3ZWJTZXR0aW5ncy0+aXNG cmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoSU5ERVhFRF9E QVRBQkFTRSkKLSAgICBtX3BhZ2UtPmdyb3VwKCkuZ3JvdXBTZXR0aW5ncygpLT5zZXRJbmRleGVk REJEYXRhYmFzZVBhdGgod2ViU2V0dGluZ3MtPmluZGV4ZWREYXRhQmFzZVBhdGgoKSk7CisgICAg bV9wYWdlLT5ncm91cCgpLmdyb3VwU2V0dGluZ3MoKS5zZXRJbmRleGVkREJEYXRhYmFzZVBhdGgo d2ViU2V0dGluZ3MtPmluZGV4ZWREYXRhQmFzZVBhdGgoKSk7CiAjZW5kaWYKIAogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZGF0YWJhc2UuY3BwIGIvU291 cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmRhdGFiYXNlLmNwcAppbmRleCA4ZDJmMTdm MDVmY2RiOWY4NTU5YWZmMzQ1YmZmYzhiNDFjNzJhYTczLi41ODRiYTdjODJkYTJiOGMwMzNmYzcw NzIwODg1ZmU3NjczZTk5MDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0d2ViZGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJkYXRhYmFzZS5jcHAKQEAgLTQ5MSw3ICs0OTEsNyBAQCB2b2lkIHdlYmtpdF9zZXRfd2Vi X2RhdGFiYXNlX2RpcmVjdG9yeV9wYXRoKGNvbnN0IGdjaGFyKiBwYXRoKQogI2VuZGlmCiAKICNp ZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKLSAgICBXZWJDb3JlOjpQYWdlR3JvdXA6OnBhZ2VH cm91cCh3ZWJraXRQYWdlR3JvdXBOYW1lKCkpLT5ncm91cFNldHRpbmdzKCktPnNldEluZGV4ZWRE QkRhdGFiYXNlUGF0aChwYXRoU3RyaW5nKTsKKyAgICBXZWJDb3JlOjpQYWdlR3JvdXA6OnBhZ2VH cm91cCh3ZWJraXRQYWdlR3JvdXBOYW1lKCkpLT5ncm91cFNldHRpbmdzKCkuc2V0SW5kZXhlZERC RGF0YWJhc2VQYXRoKHBhdGhTdHJpbmcpOwogI2VuZGlmCiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuY3Bw CmluZGV4IGRjYTAyMDhlOWU3YmM1OWE2OGQ4MzViMzhkMmIyZDlhMGE4YTg5ZDguLjJjMjc1NTUw ZWFlNjM3ODNiNDQ2OTIwNTIxMTM2YzQzZWVhYWM2YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcApA QCAtNTYsNyArNTYsNyBAQCBQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBTdG9yYWdl TmFtZXNwYWNlSW1wbDo6Y3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYQogICAgIGlmICghcmVzdWx0 LmlzTmV3RW50cnkpCiAgICAgICAgIHJldHVybiByZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwogCi0g ICAgdW5zaWduZWQgcXVvdGEgPSBwYWdlR3JvdXAtPmdyb3VwU2V0dGluZ3MoKS0+bG9jYWxTdG9y YWdlUXVvdGFCeXRlcygpOworICAgIHVuc2lnbmVkIHF1b3RhID0gcGFnZUdyb3VwLT5ncm91cFNl dHRpbmdzKCkubG9jYWxTdG9yYWdlUXVvdGFCeXRlcygpOwogICAgIFJlZlB0cjxTdG9yYWdlTmFt ZXNwYWNlSW1wbD4gbG9jYWxTdG9yYWdlTmFtZXNwYWNlID0gYWRvcHRSZWYobmV3IFN0b3JhZ2VO YW1lc3BhY2VJbXBsKExvY2FsU3RvcmFnZSwgcGFnZUdyb3VwSUQsIHF1b3RhKSk7CiAKICAgICBy ZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gbG9jYWxTdG9yYWdlTmFtZXNwYWNlLmdldCgpOwo=