126173 2013-12-23 12:03:22 -0800 [GTK][WK2] Simplify ProcessExecutablePathGtk 2014-01-09 23:36:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan betravis cgarcia commit-queue esprehn+autocc glenn gyuyoung.kim macpherson menard mrobinson oldest_to_newest 962538 0 zan 2013-12-23 12:03:22 -0800 [GTK][WK2] Simplify ProcessExecutablePathGtk 962539 1 219923 zan 2013-12-23 12:13:00 -0800 Created attachment 219923 Patch 962543 2 219923 mrobinson 2013-12-23 12:29:27 -0800 Comment on attachment 219923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219923&action=review > Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp:51 > + static CString executablePath = getCurrentExecutablePath(); > if (!executablePath.isNull()) { > - String processPath = pathByAppendingComponent(executablePath, processName); > + String processPath = pathByAppendingComponent(directoryName(filenameToString(executablePath.data())), processName); > if (fileExists(processPath)) > return processPath; This is a little slower, because directoryName and filenameToString runs for each path, but not much. 962556 3 219923 zan 2013-12-23 13:06:03 -0800 Comment on attachment 219923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219923&action=review >> Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp:51 >> return processPath; > > This is a little slower, because directoryName and filenameToString runs for each path, but not much. I can further store return values of findWebKitProcess in static variables in executablePathOf*Process. This would limit the number of times that findWebKitProcess is called to 3. If that sounds OK I can upload a new patch. 962561 4 mrobinson 2013-12-23 13:10:36 -0800 (In reply to comment #3) > (From update of attachment 219923 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=219923&action=review > > >> Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp:51 > >> return processPath; > > > > This is a little slower, because directoryName and filenameToString runs for each path, but not much. > > I can further store return values of findWebKitProcess in static variables in executablePathOf*Process. This would limit the number of times that findWebKitProcess is called to 3. > > If that sounds OK I can upload a new patch. It seems simpler to cache the return value of directoryName(filenameToString(...)), but if this function is called only a few times, I don't think it's a big deal. 962563 5 219923 zan 2013-12-23 13:21:51 -0800 Comment on attachment 219923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219923&action=review >>>> Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp:51 >>>> return processPath; >>> >>> This is a little slower, because directoryName and filenameToString runs for each path, but not much. >> >> I can further store return values of findWebKitProcess in static variables in executablePathOf*Process. This would limit the number of times that findWebKitProcess is called to 3. >> >> If that sounds OK I can upload a new patch. > > It seems simpler to cache the return value of directoryName(filenameToString(...)), but if this function is called only a few times, I don't think it's a big deal. This will now be called whenever a new process is being created. It's unnecessary work, really. I can offload all of this (getCurrentExecutablePath, filenameToString and directoryName calls) into a small helper static function. Its return value would then be stored in the static variable, so it would only get called once. 962567 6 219929 zan 2013-12-23 13:33:30 -0800 Created attachment 219929 Patch 962582 7 219929 zan 2013-12-23 14:04:11 -0800 Comment on attachment 219929 Patch Clearing flags on attachment: 219929 Committed r161020: <http://trac.webkit.org/changeset/161020> 962583 8 zan 2013-12-23 14:04:18 -0800 All reviewed patches have been landed. Closing bug. 966028 9 betravis 2014-01-09 12:55:44 -0800 Reopening to attach new patch. 966029 10 220760 betravis 2014-01-09 12:55:45 -0800 Created attachment 220760 Initial patch 966037 11 mrobinson 2014-01-09 13:14:15 -0800 (In reply to comment #10) > Created an attachment (id=220760) [details] > Initial patch Wrong bug? 966252 12 betravis 2014-01-09 23:28:28 -0800 Yes, apologies. Was wondering where webkit-patch sent this one. 219923 2013-12-23 12:13:00 -0800 2013-12-23 13:33:25 -0800 Patch bug-126173-20131223121259.patch text/plain 3948 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwOTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzY1MjkwY2E3YzljMzEz NGRiODMxNjg1M2U3MzA2ZjYwMDM0MWJjNC4uNDFhODhlMzk2NTFmMmM4MjQzYTZkOWY1MmI5NDlj YWU1ZGNjYWI3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTEyLTIzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXSzJdIFNp bXBsaWZ5IFByb2Nlc3NFeGVjdXRhYmxlUGF0aEd0aworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MTczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc3RvcmUgcHJvY2VzcyBuYW1lIHN0cmluZ3Mg aW4gZ2xvYmFsIHZhcmlhYmxlcyAtLSBlYWNoIG9mIHRoZSBuYW1lcyBpcyBvbmx5IHVzZWQgaW4g dGhlIHJlbGV2YW50CisgICAgICAgIGZ1bmN0aW9uLCBzbyB0aGUgc3RyaW5nIGNhbiBiZSBkaXJl Y3RseSBwYXNzZWQgaW50byB0aGUgZmluZFdlYktpdFByb2Nlc3MgZnVuY3Rpb24gY2FsbC4KKwor ICAgICAgICBTaW1wbGlmeSB0aGUgZmluZFdlYktpdFByb2Nlc3MgZnVuY3Rpb24uIE1ha2UgdGhl IGV4ZWNEaXJlY3RvcnkgdmFyaWFibGUgc3RhdGljIHNvIHRoYXQgZ19nZXRlbnYgaXMgb25seQor ICAgICAgICBjYWxsZWQgb25jZSwgYXMgaXQncyBub3QgZXhwZWN0ZWQgZm9yIHRoZSBXRUJLSVRf RVhFQ19QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlIHRvIGNoYW5nZSBkdXJpbmcgdGhlIHJ1bnRp bWUuCisgICAgICAgIFN0b3JlIHRoZSByZXR1cm4gdmFsdWUgb2YgZ2V0Q3VycmVudEV4ZWN1dGFi bGVQYXRoIGluIGEgc3RhdGljIHZhcmlhYmxlLiBUaGUgZnVuY3Rpb24gd2lsbCBvbmx5IGJlIGNh bGxlZCBvbmNlLAorICAgICAgICBhcyBpdCB1c2VkIHRvIGJlLCBhbmQgdGhlIHJldHVybmVkIENT dHJpbmcgY2FuIHRoZW4gYmUgdXNlZCB0byBjb25zdHJ1Y3QgYSBwcm9jZXNzIHBhdGggYXMgbG9u ZyBhcyBpdCBpcyBub3QgbnVsbC4KKyAgICAgICAgVGhpcyByZW1vdmVzIHRoZSBuZWVkIGZvciBh biBleHRyYSBzdGF0aWMgYm9vbGVhbiB2YXJpYWJsZSBhbmQgcmVkdWNlcyB0aGUgc2l6ZSBvZiB0 aGUgY29kZSBhIGJpdC4KKworICAgICAgICAqIFNoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQ YXRoR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZmluZFdlYktpdFByb2Nlc3MpOgorICAgICAg ICAoV2ViS2l0OjpleGVjdXRhYmxlUGF0aE9mV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6 OmV4ZWN1dGFibGVQYXRoT2ZQbHVnaW5Qcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6ZXhlY3V0 YWJsZVBhdGhPZk5ldHdvcmtQcm9jZXNzKToKKwogMjAxMy0xMi0yMyAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQnVpbGQgd2l0aCBu ZXR3b3JrIHByb2Nlc3MgdW5jb25kaXRpb25hbGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAKaW5kZXggOWYyZTYyOTVk OGMxZDQwZTI2MmRlZjE0NTM5NWU4ODA3MDk1NGVkZS4uNGUyNjRlNTIzZWRlYmVkM2ExMjBiMzQx NmRkMjFlMjUzNzk2NjJiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Q cm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9n dGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcApAQCAtMzUsMzEgKzM1LDE4IEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotY29uc3QgY2hhciog Z1dlYktpdFdlYlByb2Nlc3NOYW1lID0gIldlYktpdFdlYlByb2Nlc3MiOwotY29uc3QgY2hhciog Z1dlYktpdFBsdWdpblByb2Nlc3NOYW1lID0gIldlYktpdFBsdWdpblByb2Nlc3MiOwotY29uc3Qg Y2hhciogZ1dlYktpdE5ldHdvcmtQcm9jZXNzTmFtZSA9ICJXZWJLaXROZXR3b3JrUHJvY2VzcyI7 Ci0KIHN0YXRpYyBTdHJpbmcgZmluZFdlYktpdFByb2Nlc3MoY29uc3QgY2hhciogcHJvY2Vzc05h bWUpCiB7Ci0gICAgY29uc3QgY2hhciogZXhlY0RpcmVjdG9yeSA9IGdfZ2V0ZW52KCJXRUJLSVRf RVhFQ19QQVRIIik7CisgICAgc3RhdGljIGNvbnN0IGNoYXIqIGV4ZWNEaXJlY3RvcnkgPSBnX2dl dGVudigiV0VCS0lUX0VYRUNfUEFUSCIpOwogICAgIGlmIChleGVjRGlyZWN0b3J5KSB7CiAgICAg ICAgIFN0cmluZyBwcm9jZXNzUGF0aCA9IHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChmaWxlbmFt ZVRvU3RyaW5nKGV4ZWNEaXJlY3RvcnkpLCBwcm9jZXNzTmFtZSk7CiAgICAgICAgIGlmIChmaWxl RXhpc3RzKHByb2Nlc3NQYXRoKSkKICAgICAgICAgICAgIHJldHVybiBwcm9jZXNzUGF0aDsKICAg ICB9CiAKLSAgICBzdGF0aWMgYm9vbCBnb3RFeGVjdXRhYmxlUGF0aCA9IGZhbHNlOwotICAgIHN0 YXRpYyBTdHJpbmcgZXhlY3V0YWJsZVBhdGg7Ci0gICAgaWYgKCFnb3RFeGVjdXRhYmxlUGF0aCkg ewotICAgICAgICBnb3RFeGVjdXRhYmxlUGF0aCA9IHRydWU7Ci0KLSAgICAgICAgQ1N0cmluZyBl eGVjdXRhYmxlRmlsZSA9IGdldEN1cnJlbnRFeGVjdXRhYmxlUGF0aCgpOwotICAgICAgICBpZiAo IWV4ZWN1dGFibGVGaWxlLmlzTnVsbCgpKQotICAgICAgICAgICAgZXhlY3V0YWJsZVBhdGggPSBk aXJlY3RvcnlOYW1lKGZpbGVuYW1lVG9TdHJpbmcoZXhlY3V0YWJsZUZpbGUuZGF0YSgpKSk7Ci0g ICAgfQotCisgICAgc3RhdGljIENTdHJpbmcgZXhlY3V0YWJsZVBhdGggPSBnZXRDdXJyZW50RXhl Y3V0YWJsZVBhdGgoKTsKICAgICBpZiAoIWV4ZWN1dGFibGVQYXRoLmlzTnVsbCgpKSB7Ci0gICAg ICAgIFN0cmluZyBwcm9jZXNzUGF0aCA9IHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChleGVjdXRh YmxlUGF0aCwgcHJvY2Vzc05hbWUpOworICAgICAgICBTdHJpbmcgcHJvY2Vzc1BhdGggPSBwYXRo QnlBcHBlbmRpbmdDb21wb25lbnQoZGlyZWN0b3J5TmFtZShmaWxlbmFtZVRvU3RyaW5nKGV4ZWN1 dGFibGVQYXRoLmRhdGEoKSkpLCBwcm9jZXNzTmFtZSk7CiAgICAgICAgIGlmIChmaWxlRXhpc3Rz KHByb2Nlc3NQYXRoKSkKICAgICAgICAgICAgIHJldHVybiBwcm9jZXNzUGF0aDsKICAgICB9CkBA IC02OSwxOCArNTYsMTggQEAgc3RhdGljIFN0cmluZyBmaW5kV2ViS2l0UHJvY2Vzcyhjb25zdCBj aGFyKiBwcm9jZXNzTmFtZSkKIAogU3RyaW5nIGV4ZWN1dGFibGVQYXRoT2ZXZWJQcm9jZXNzKCkK IHsKLSAgICByZXR1cm4gZmluZFdlYktpdFByb2Nlc3MoZ1dlYktpdFdlYlByb2Nlc3NOYW1lKTsK KyAgICByZXR1cm4gZmluZFdlYktpdFByb2Nlc3MoIldlYktpdFdlYlByb2Nlc3MiKTsKIH0KIAog U3RyaW5nIGV4ZWN1dGFibGVQYXRoT2ZQbHVnaW5Qcm9jZXNzKCkKIHsKLSAgICByZXR1cm4gZmlu ZFdlYktpdFByb2Nlc3MoZ1dlYktpdFBsdWdpblByb2Nlc3NOYW1lKTsKKyAgICByZXR1cm4gZmlu ZFdlYktpdFByb2Nlc3MoIldlYktpdFBsdWdpblByb2Nlc3MiKTsKIH0KIAogI2lmIEVOQUJMRShO RVRXT1JLX1BST0NFU1MpCiBTdHJpbmcgZXhlY3V0YWJsZVBhdGhPZk5ldHdvcmtQcm9jZXNzKCkK IHsKLSAgICByZXR1cm4gZmluZFdlYktpdFByb2Nlc3MoZ1dlYktpdE5ldHdvcmtQcm9jZXNzTmFt ZSk7CisgICAgcmV0dXJuIGZpbmRXZWJLaXRQcm9jZXNzKCJXZWJLaXROZXR3b3JrUHJvY2VzcyIp OwogfQogI2VuZGlmCiAK 219929 2013-12-23 13:33:30 -0800 2014-01-09 12:55:41 -0800 Patch bug-126173-20131223133330.patch text/plain 4170 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwOTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzY1MjkwY2E3YzljMzEz NGRiODMxNjg1M2U3MzA2ZjYwMDM0MWJjNC4uMTZjMjY3Mjk2MTE1NDkxNDVkNTNmNTU0ZDNlNDg3 N2NlN2U3ODZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTEyLTIzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXSzJdIFNp bXBsaWZ5IFByb2Nlc3NFeGVjdXRhYmxlUGF0aEd0aworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MTczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc3RvcmUgcHJvY2VzcyBuYW1lIHN0cmluZ3Mg aW4gZ2xvYmFsIHZhcmlhYmxlcyAtLSBlYWNoIG9mIHRoZSBuYW1lcyBpcyBvbmx5IHVzZWQgaW4g dGhlIHJlbGV2YW50CisgICAgICAgIGZ1bmN0aW9uLCBzbyB0aGUgc3RyaW5nIGNhbiBiZSBkaXJl Y3RseSBwYXNzZWQgaW50byB0aGUgZmluZFdlYktpdFByb2Nlc3MgZnVuY3Rpb24gY2FsbC4KKwor ICAgICAgICBTaW1wbGlmeSB0aGUgZmluZFdlYktpdFByb2Nlc3MgZnVuY3Rpb24uIE1ha2UgdGhl IGV4ZWNEaXJlY3RvcnkgdmFyaWFibGUgc3RhdGljIHNvIHRoYXQgZ19nZXRlbnYgaXMgb25seQor ICAgICAgICBjYWxsZWQgb25jZSwgYXMgaXQncyBub3QgZXhwZWN0ZWQgZm9yIHRoZSBXRUJLSVRf RVhFQ19QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlIHRvIGNoYW5nZSBkdXJpbmcgdGhlIHJ1bnRp bWUuCisKKyAgICAgICAgSW50cm9kdWNlIHRoZSBnZXRFeGVjdXRhYmxlUGF0aCBoZWxwZXIgZnVu Y3Rpb24gdGhhdCBnZXRzIHRoZSBjdXJyZW50IGV4ZWN1dGFibGUgcGF0aCBhbmQsIGlmIG5vbi1u dWxsLCByZXR1cm5zCisgICAgICAgIHRoZSBkaXJlY3RvcnkgcGF0aCBvZiB0aGF0IGV4ZWN1dGFi bGUuIFRoZSBoZWxwZXIgZnVuY3Rpb24gcHJlc2VydmVzIHRoZSBzbWFsbCBwZXJmb3JtYW5jZSBp bXByb3ZlbWVudCBvZiBxdWVyeWluZworICAgICAgICBhbmQgcHJvY2Vzc2luZyB0aGUgZXhlY3V0 YWJsZSBwYXRoIG9ubHkgb25jZS4KKyAgICAgICAgVGhlIHJldHVybiB2YWx1ZSBvZiBnZXRFeGVj dXRhYmxlUGF0aCBpcyBzdG9yZWQgaW4gYSBzdGF0aWMgdmFyaWFibGUgYW5kIGlzIHVzZWQgdG8g Y29uc3RydWN0IHRoZSBwcm9jZXNzIHBhdGgKKyAgICAgICAgaWYgdGhlIGV4ZWN1dGFibGUgcGF0 aCB3YXMgc3VjY2Vzc2Z1bGx5IHJldHJpZXZlZC4KKworICAgICAgICAqIFNoYXJlZC9ndGsvUHJv Y2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2V0RXhlY3V0YWJs ZVBhdGgpOgorICAgICAgICAoV2ViS2l0OjpmaW5kV2ViS2l0UHJvY2Vzcyk6CisgICAgICAgIChX ZWJLaXQ6OmV4ZWN1dGFibGVQYXRoT2ZXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6ZXhl Y3V0YWJsZVBhdGhPZlBsdWdpblByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpleGVjdXRhYmxl UGF0aE9mTmV0d29ya1Byb2Nlc3MpOgorCiAyMDEzLTEyLTIzICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBCdWlsZCB3aXRoIG5ldHdv cmsgcHJvY2VzcyB1bmNvbmRpdGlvbmFsbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcAppbmRleCA5ZjJlNjI5NWQ4YzFk NDBlMjYyZGVmMTQ1Mzk1ZTg4MDcwOTU0ZWRlLi5lNzU3Y2MyZWFjOTAyZWYzZDhjOGRlMDNiNTQ4 OTM2MzQzYWQyYmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nl c3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Q cm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCkBAIC0zNSwyOSArMzUsMjQgQEAgdXNpbmcgbmFt ZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1jb25zdCBjaGFyKiBnV2Vi S2l0V2ViUHJvY2Vzc05hbWUgPSAiV2ViS2l0V2ViUHJvY2VzcyI7Ci1jb25zdCBjaGFyKiBnV2Vi S2l0UGx1Z2luUHJvY2Vzc05hbWUgPSAiV2ViS2l0UGx1Z2luUHJvY2VzcyI7Ci1jb25zdCBjaGFy KiBnV2ViS2l0TmV0d29ya1Byb2Nlc3NOYW1lID0gIldlYktpdE5ldHdvcmtQcm9jZXNzIjsKK3N0 YXRpYyBTdHJpbmcgZ2V0RXhlY3V0YWJsZVBhdGgoKQoreworICAgIENTdHJpbmcgZXhlY3V0YWJs ZVBhdGggPSBnZXRDdXJyZW50RXhlY3V0YWJsZVBhdGgoKTsKKyAgICBpZiAoIWV4ZWN1dGFibGVQ YXRoLmlzTnVsbCgpKQorICAgICAgICByZXR1cm4gZGlyZWN0b3J5TmFtZShmaWxlbmFtZVRvU3Ry aW5nKGV4ZWN1dGFibGVQYXRoLmRhdGEoKSkpOworICAgIHJldHVybiBTdHJpbmcoKTsKK30KIAog c3RhdGljIFN0cmluZyBmaW5kV2ViS2l0UHJvY2Vzcyhjb25zdCBjaGFyKiBwcm9jZXNzTmFtZSkK IHsKLSAgICBjb25zdCBjaGFyKiBleGVjRGlyZWN0b3J5ID0gZ19nZXRlbnYoIldFQktJVF9FWEVD X1BBVEgiKTsKKyAgICBzdGF0aWMgY29uc3QgY2hhciogZXhlY0RpcmVjdG9yeSA9IGdfZ2V0ZW52 KCJXRUJLSVRfRVhFQ19QQVRIIik7CiAgICAgaWYgKGV4ZWNEaXJlY3RvcnkpIHsKICAgICAgICAg U3RyaW5nIHByb2Nlc3NQYXRoID0gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGZpbGVuYW1lVG9T dHJpbmcoZXhlY0RpcmVjdG9yeSksIHByb2Nlc3NOYW1lKTsKICAgICAgICAgaWYgKGZpbGVFeGlz dHMocHJvY2Vzc1BhdGgpKQogICAgICAgICAgICAgcmV0dXJuIHByb2Nlc3NQYXRoOwogICAgIH0K IAotICAgIHN0YXRpYyBib29sIGdvdEV4ZWN1dGFibGVQYXRoID0gZmFsc2U7Ci0gICAgc3RhdGlj IFN0cmluZyBleGVjdXRhYmxlUGF0aDsKLSAgICBpZiAoIWdvdEV4ZWN1dGFibGVQYXRoKSB7Ci0g ICAgICAgIGdvdEV4ZWN1dGFibGVQYXRoID0gdHJ1ZTsKLQotICAgICAgICBDU3RyaW5nIGV4ZWN1 dGFibGVGaWxlID0gZ2V0Q3VycmVudEV4ZWN1dGFibGVQYXRoKCk7Ci0gICAgICAgIGlmICghZXhl Y3V0YWJsZUZpbGUuaXNOdWxsKCkpCi0gICAgICAgICAgICBleGVjdXRhYmxlUGF0aCA9IGRpcmVj dG9yeU5hbWUoZmlsZW5hbWVUb1N0cmluZyhleGVjdXRhYmxlRmlsZS5kYXRhKCkpKTsKLSAgICB9 Ci0KKyAgICBzdGF0aWMgU3RyaW5nIGV4ZWN1dGFibGVQYXRoID0gZ2V0RXhlY3V0YWJsZVBhdGgo KTsKICAgICBpZiAoIWV4ZWN1dGFibGVQYXRoLmlzTnVsbCgpKSB7CiAgICAgICAgIFN0cmluZyBw cm9jZXNzUGF0aCA9IHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChleGVjdXRhYmxlUGF0aCwgcHJv Y2Vzc05hbWUpOwogICAgICAgICBpZiAoZmlsZUV4aXN0cyhwcm9jZXNzUGF0aCkpCkBAIC02OSwx OCArNjQsMTggQEAgc3RhdGljIFN0cmluZyBmaW5kV2ViS2l0UHJvY2Vzcyhjb25zdCBjaGFyKiBw cm9jZXNzTmFtZSkKIAogU3RyaW5nIGV4ZWN1dGFibGVQYXRoT2ZXZWJQcm9jZXNzKCkKIHsKLSAg ICByZXR1cm4gZmluZFdlYktpdFByb2Nlc3MoZ1dlYktpdFdlYlByb2Nlc3NOYW1lKTsKKyAgICBy ZXR1cm4gZmluZFdlYktpdFByb2Nlc3MoIldlYktpdFdlYlByb2Nlc3MiKTsKIH0KIAogU3RyaW5n IGV4ZWN1dGFibGVQYXRoT2ZQbHVnaW5Qcm9jZXNzKCkKIHsKLSAgICByZXR1cm4gZmluZFdlYktp dFByb2Nlc3MoZ1dlYktpdFBsdWdpblByb2Nlc3NOYW1lKTsKKyAgICByZXR1cm4gZmluZFdlYktp dFByb2Nlc3MoIldlYktpdFBsdWdpblByb2Nlc3MiKTsKIH0KIAogI2lmIEVOQUJMRShORVRXT1JL X1BST0NFU1MpCiBTdHJpbmcgZXhlY3V0YWJsZVBhdGhPZk5ldHdvcmtQcm9jZXNzKCkKIHsKLSAg ICByZXR1cm4gZmluZFdlYktpdFByb2Nlc3MoZ1dlYktpdE5ldHdvcmtQcm9jZXNzTmFtZSk7Cisg ICAgcmV0dXJuIGZpbmRXZWJLaXRQcm9jZXNzKCJXZWJLaXROZXR3b3JrUHJvY2VzcyIpOwogfQog I2VuZGlmCiAK 220760 2014-01-09 12:55:45 -0800 2014-01-09 23:36:16 -0800 Initial patch bug-126173-20140109125538.patch text/plain 4322 betravis U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc2MzZiODA3OThjZTk4 YmJlYTA2OWZlOTcwNzE5ZTllOWI0NTRlNi4uNjFhZmRhNDZlOTVlNmQwMDAzYmYzNWExMDRmZTA5 ODljZWNlOTZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAxLTA5ICBCZWFy IFRyYXZpcyAgPGJldHJhdmlzQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIFNoYXBlc10gQ2hh bmdlIHBhcnNlQmFzaWNTaGFwZSB0byByZXR1cm4gYSBDU1NQcmltaXRpdmVWYWx1ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2NzEzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgdGhlIGR1cGxp Y2F0ZWQgY29kZSB3cmFwcGluZyB0aGUgQ1NTQmFzaWNTaGFwZSBpbiBhIENTU1ByaW1pdGl2ZVZh bHVlCisgICAgICAgIGJ5IGhhdmluZyBwYXJzZUJhc2ljU2hhcGUgcmV0dXJuIGEgQ1NTUHJpbWl0 aXZlVmFsdWUgcmVmZXJlbmNlLgorCisgICAgICAgIFJlZmFjdG9yaW5nLCBubyBuZXcgdGVzdHMu CisKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Bh cnNlcjo6cGFyc2VTaGFwZVByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6 cGFyc2VDbGlwUGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlQmFzaWNT aGFwZSk6CisgICAgICAgICogY3NzL0NTU1BhcnNlci5oOgorCiAyMDE0LTAxLTA5ICBNeWxlcyBD LiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgTmFycm93IHVuZGVy bGluZXMgYXJlIHRvbyB0YWxsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFy c2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCmluZGV4IDY4MDIxMDE4 NmE3N2EzNjI4NjQ4YjVhMjQzZTdkMzcyMjg5YmU0MzYuLjY5MTAxNmFiYjMxZWMzZjMxOGIzMWI3 MjRkMGY1MTM4Zjk4ZWExNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJz ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC01ODY2LDcg KzU4NjYsNyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NQYXJzZXI6OnBhcnNlU2hhcGVQcm9w ZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BJZCkKICAgICBDU1NQYXJzZXJWYWx1ZSogdmFsdWUgPSBt X3ZhbHVlTGlzdC0+Y3VycmVudCgpOwogICAgIENTU1ZhbHVlSUQgdmFsdWVJZCA9IHZhbHVlLT5p ZDsKICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGtleXdvcmRWYWx1ZTsKLSAgICBSZWZQ dHI8Q1NTQmFzaWNTaGFwZT4gc2hhcGVWYWx1ZTsKKyAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFs dWU+IHNoYXBlVmFsdWU7CiAKICAgICBpZiAodmFsdWVJZCA9PSBDU1NWYWx1ZU5vbmUKICAgICAg ICAgfHwgKHZhbHVlSWQgPT0gQ1NTVmFsdWVPdXRzaWRlU2hhcGUgJiYgcHJvcElkID09IENTU1By b3BlcnR5V2Via2l0U2hhcGVJbnNpZGUpKSB7CkBAIC01OTAyLDEwICs1OTAyLDEyIEBAIFBhc3NS ZWZQdHI8Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFyc2VTaGFwZVByb3BlcnR5KENTU1Byb3BlcnR5 SUQgcHJvcElkKQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCisgICAgQVNT RVJUKCFzaGFwZVZhbHVlIHx8IHNoYXBlVmFsdWUtPmlzU2hhcGUoKSk7CisKICAgICBpZiAoc2hh cGVWYWx1ZSAmJiBrZXl3b3JkVmFsdWUpCi0gICAgICAgIHNoYXBlVmFsdWUtPnNldExheW91dEJv eChrZXl3b3JkVmFsdWUucmVsZWFzZSgpKTsKKyAgICAgICAgc2hhcGVWYWx1ZS0+Z2V0U2hhcGVW YWx1ZSgpLT5zZXRMYXlvdXRCb3goa2V5d29yZFZhbHVlLnJlbGVhc2UoKSk7CiAKLSAgICByZXR1 cm4gc2hhcGVWYWx1ZSA/IGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHNoYXBlVmFsdWUucmVs ZWFzZSgpKSA6IGtleXdvcmRWYWx1ZS5yZWxlYXNlKCk7CisgICAgcmV0dXJuIHNoYXBlVmFsdWUg PyBzaGFwZVZhbHVlLnJlbGVhc2UoKSA6IGtleXdvcmRWYWx1ZS5yZWxlYXNlKCk7CiB9CiAjZW5k aWYKIApAQCAtNTkzNCwxMCArNTkzNiwxMCBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NQYXJz ZXI6OnBhcnNlQ2xpcFBhdGgoKQogICAgICAgICB2YWx1ZUlkID0gdmFsdWUtPmlkOwogICAgICAg ICBpZiAodmFsdWUtPnVuaXQgPT0gQ1NTUGFyc2VyVmFsdWU6OkZ1bmN0aW9uICYmICFzaGFwZUZv dW5kKSB7CiAgICAgICAgICAgICAvLyBwYXJzZUJhc2ljU2hhcGUgYWxyZWFkeSBhc2tzIGZvciB0 aGUgbmV4dCB2YWx1ZSBsaXN0IGl0ZW0uCi0gICAgICAgICAgICBSZWZQdHI8Q1NTQmFzaWNTaGFw ZT4gc2hhcGVWYWx1ZSA9IHBhcnNlQmFzaWNTaGFwZSgpOworICAgICAgICAgICAgUmVmUHRyPENT U1ByaW1pdGl2ZVZhbHVlPiBzaGFwZVZhbHVlID0gcGFyc2VCYXNpY1NoYXBlKCk7CiAgICAgICAg ICAgICBpZiAoIXNoYXBlVmFsdWUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0g ICAgICAgICAgICBsaXN0LT5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc2hhcGVW YWx1ZS5yZWxlYXNlKCkpKTsKKyAgICAgICAgICAgIGxpc3QtPmFwcGVuZChzaGFwZVZhbHVlLnJl bGVhc2UoKSk7CiAgICAgICAgICAgICBzaGFwZUZvdW5kID0gdHJ1ZTsKICAgICAgICAgfSBlbHNl IGlmICgoaXNCb3hWYWx1ZSh2YWx1ZUlkKSB8fCB2YWx1ZUlkID09IENTU1ZhbHVlQm91bmRpbmdC b3gpICYmICFib3hGb3VuZCkgewogICAgICAgICAgICAgbGlzdC0+YXBwZW5kKHBhcnNlVmFsaWRQ cmltaXRpdmUodmFsdWVJZCwgdmFsdWUpKTsKQEAgLTU5NjYsNyArNTk2OCw3IEBAIHN0YXRpYyBi b29sIGlzRGVwcmVjYXRlZEJhc2ljU2hhcGUoQ1NTUGFyc2VyVmFsdWVMaXN0KiBhcmdzKQogICAg IHJldHVybiBmYWxzZTsKIH0KIAotUGFzc1JlZlB0cjxDU1NCYXNpY1NoYXBlPiBDU1NQYXJzZXI6 OnBhcnNlQmFzaWNTaGFwZSgpCitQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBDU1NQYXJz ZXI6OnBhcnNlQmFzaWNTaGFwZSgpCiB7CiAgICAgQ1NTUGFyc2VyVmFsdWUqIHZhbHVlID0gbV92 YWx1ZUxpc3QtPmN1cnJlbnQoKTsKICAgICBBU1NFUlQodmFsdWUtPnVuaXQgPT0gQ1NTUGFyc2Vy VmFsdWU6OkZ1bmN0aW9uKTsKQEAgLTU5OTksNyArNjAwMSw3IEBAIFBhc3NSZWZQdHI8Q1NTQmFz aWNTaGFwZT4gQ1NTUGFyc2VyOjpwYXJzZUJhc2ljU2hhcGUoKQogICAgICAgICByZXR1cm4gbnVs bHB0cjsKIAogICAgIG1fdmFsdWVMaXN0LT5uZXh0KCk7Ci0gICAgcmV0dXJuIHNoYXBlLnJlbGVh c2UoKTsKKyAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc2hhcGUucmVsZWFz ZSgpKTsKIH0KIAogLy8gWyAnZm9udC1zdHlsZScgfHwgJ2ZvbnQtdmFyaWFudCcgfHwgJ2ZvbnQt d2VpZ2h0JyBdPyAnZm9udC1zaXplJyBbIC8gJ2xpbmUtaGVpZ2h0JyBdPyAnZm9udC1mYW1pbHkn CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmggYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUGFyc2VyLmgKaW5kZXggMTliMjY5NmYzZmNiZGQzMTY5ZDE5NDI0NzkwNzFi ZTk1NzUxZjY5NC4uNzYyYzI2MWU3N2U2ZDU0YTA3NzM3YTYzZWYzMzNiOTNhMDcxY2QwMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQYXJzZXIuaApAQCAtMTc5LDcgKzE3OSw3IEBAIHB1YmxpYzoKICAgICBQYXNz UmVmUHRyPENTU1ZhbHVlPiBwYXJzZVNoYXBlUHJvcGVydHkoQ1NTUHJvcGVydHlJRCk7CiAjZW5k aWYKIAotICAgIFBhc3NSZWZQdHI8Q1NTQmFzaWNTaGFwZT4gcGFyc2VCYXNpY1NoYXBlKCk7Cisg ICAgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gcGFyc2VCYXNpY1NoYXBlKCk7CiAgICAg UGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gcGFyc2VTaGFwZVJhZGl1cyhDU1NQYXJzZXJW YWx1ZSopOwogICAgIFBhc3NSZWZQdHI8Q1NTQmFzaWNTaGFwZT4gcGFyc2VCYXNpY1NoYXBlUmVj dGFuZ2xlKENTU1BhcnNlclZhbHVlTGlzdCopOwogICAgIFBhc3NSZWZQdHI8Q1NTQmFzaWNTaGFw ZT4gcGFyc2VCYXNpY1NoYXBlQ2lyY2xlKENTU1BhcnNlclZhbHVlTGlzdCopOwo=