95254 2012-08-28 15:09:47 -0700 Remove unused methods from Chromium WebKit API 2012-09-27 17:04:54 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 nasko webkit-unassigned abarth dglazkov fishd jamesr peter+ews tkent+wkapi webkit.review.bot oldest_to_newest 706778 0 nasko 2012-08-28 15:09:47 -0700 As part of https://bugs.webkit.org/show_bug.cgi?id=93127, I have introduced two new methods in the Chromium WebKit API. I'm removing the usage of the old one from the Chrome side and the old versions need to be removed from WebKit as well. 706808 1 161075 nasko 2012-08-28 15:53:02 -0700 Created attachment 161075 Patch 706812 2 webkit.review.bot 2012-08-28 15:55:16 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 706818 3 161075 abarth 2012-08-28 16:00:23 -0700 Comment on attachment 161075 Patch I assume you checked that all the implementations of willCheckAndDispatchMessageEvent now accept the extra argument. 706845 4 nasko 2012-08-28 16:24:41 -0700 (In reply to comment #3) > (From update of attachment 161075 [details]) > I assume you checked that all the implementations of willCheckAndDispatchMessageEvent now accept the extra argument. The only one I found was the RenderVIewImpl one, which I've already migrated to the new version. In addition, a full build of Chromium completed without any errors. 706852 5 161075 webkit.review.bot 2012-08-28 16:26:53 -0700 Comment on attachment 161075 Patch Attachment 161075 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13660483 706853 6 abarth 2012-08-28 16:27:48 -0700 You might need to update http://trac.webkit.org/browser/trunk/Source/WebKit/chromium/DEPS 706871 7 161075 peter+ews 2012-08-28 16:44:47 -0700 Comment on attachment 161075 Patch Attachment 161075 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/13653529 707076 8 nasko 2012-08-28 21:48:14 -0700 (In reply to comment #7) > (From update of attachment 161075 [details]) > Attachment 161075 [details] did not pass cr-android-ews (chromium-android): > Output: http://queues.webkit.org/results/13653529 This is expected for the time being. This change depends on a Chromium change currently in review: https://chromiumcodereview.appspot.com/10879105/. Once it is committed, this patch will be sent to the CQ and should succeed. 709115 9 161575 nasko 2012-08-30 15:55:21 -0700 Created attachment 161575 Patch 709144 10 161583 nasko 2012-08-30 16:36:58 -0700 Created attachment 161583 Patch 709198 11 161583 webkit.review.bot 2012-08-30 17:42:50 -0700 Comment on attachment 161583 Patch Attachment 161583 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13695902 709231 12 161583 peter+ews 2012-08-30 18:44:46 -0700 Comment on attachment 161583 Patch Attachment 161583 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/13680948 709670 13 161583 abarth 2012-08-31 08:51:42 -0700 Comment on attachment 161583 Patch Did the DEPS roll land? Let's find out. 709675 14 161583 webkit.review.bot 2012-08-31 08:59:33 -0700 Comment on attachment 161583 Patch Rejecting attachment 161583 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: target/glue/Source/WebKit/chromium/webkit/glue/webpreferences.o CXX(target) out/Release/obj.target/glue/Source/WebKit/chromium/webkit/glue/websocketstreamhandle_impl.o cc1plus: warnings being treated as errors At global scope: cc1plus: error: unrecognized command line option "-Wno-narrowing" cc1plus: error: unrecognized command line option "-Wno-narrowing" make: *** [out/Release/obj.target/glue/Source/WebKit/chromium/webkit/glue/webkit_glue.o] Error 1 make: *** Waiting for unfinished jobs.... Full output: http://queues.webkit.org/results/13725189 709682 15 nasko 2012-08-31 09:03:24 -0700 No, the DEPS didn't roll out. The bug for rolling is https://bugs.webkit.org/show_bug.cgi?id=95511. 709986 16 nasko 2012-08-31 14:27:08 -0700 And the DEPS are now rolled with http://trac.webkit.org/changeset/127305. Can you cq+ again? 710021 17 161583 webkit.review.bot 2012-08-31 15:02:01 -0700 Comment on attachment 161583 Patch Rejecting attachment 161583 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: WebFrame' has no member named 'name' Tools/DumpRenderTree/chromium/TestShell.cpp: In function 'void dumpFrameScrollPosition(WebKit::WebFrame*, bool)': Tools/DumpRenderTree/chromium/TestShell.cpp:450: error: 'class WebKit::WebFrame' has no member named 'name' CXX(target) out/Release/obj.target/DumpRenderTree/Tools/DumpRenderTree/chromium/TestShellPosix.o make: *** [out/Release/obj.target/DumpRenderTree/Tools/DumpRenderTree/chromium/TestShell.o] Error 1 make: *** Waiting for unfinished jobs.... Full output: http://queues.webkit.org/results/13714391 721212 18 164242 nasko 2012-09-14 15:51:20 -0700 Created attachment 164242 Patch 721257 19 164242 webkit.review.bot 2012-09-14 17:03:49 -0700 Comment on attachment 164242 Patch Attachment 164242 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13851692 New failing tests: platform/chromium/fast/events/intercept-postmessage.html 721266 20 abarth 2012-09-14 17:10:12 -0700 That looks like it could be a real bug... Perhaps DumpRenderTree is still using the API? 721289 21 164242 webkit.review.bot 2012-09-14 18:05:41 -0700 Comment on attachment 164242 Patch Attachment 164242 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13851709 New failing tests: platform/chromium/fast/events/intercept-postmessage.html 729983 22 166091 nasko 2012-09-27 16:26:16 -0700 Created attachment 166091 Patch 729986 23 nasko 2012-09-27 16:29:03 -0700 I had missed updating willCheckAndDispatchMessageEvent in WebViewHost for DumpRenderTree. It compiled fine, but didn't resolve to the right method call. Updated and the test passes. 730027 24 166091 webkit.review.bot 2012-09-27 17:04:48 -0700 Comment on attachment 166091 Patch Clearing flags on attachment: 166091 Committed r129821: <http://trac.webkit.org/changeset/129821> 730028 25 webkit.review.bot 2012-09-27 17:04:54 -0700 All reviewed patches have been landed. Closing bug. 161075 2012-08-28 15:53:02 -0700 2012-08-30 15:55:17 -0700 Patch bug-95254-20120828155252.patch text/plain 4432 nasko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2Nzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDM0ZTUyYThkYWRjNWVhZmEzZDFkMTM3NjlkZWRkNjI2YjBlNzNlY2EuLjQ0NmVjMjZmMGZmNmU2 MGQzNjZlYjZhNzA4ZWI4ZDMzMGQxYzA5NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMDgtMjggIE5hc2tvIE9za292ICA8bmFza29AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgbWV0aG9kcyBmcm9tIENocm9taXVtIFdlYktp dCBBUEkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTI1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92aW5nIG1ldGhvZHMsIHdoaWNoIGFyZSBubyBsb25nZXIgaW4gdXNlLgorCisgICAgICAgICog cHVibGljL1dlYkZyYW1lLmg6CisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xpZW50Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50Ojp3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3Nh Z2VFdmVudCk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lOjpmcmFtZUZvckNvbnRleHQpOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUlt cGwuaDoKKyAgICAgICAgKFdlYkZyYW1lSW1wbCk6CisKIDIwMTItMDgtMjcgIEp1c3RpbiBOb3Zv c2FkICA8anVub3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gRml4aW5nIGlu ZmluaXRlIHJlY3Vyc2lvbiBpbiBDYW52YXMyRExheWVyTWFuYWdlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkZyYW1lLmgKaW5kZXggYmM1NjA1OTMzNTZiMDFkNmUyYzMwMGNjZGMz NmViMTdmMGVhMDBhOS4uZmY4ZDI0M2UwMTM4M2Y1ZGJiN2FkMTQ4M2ZkYzA3MTFlYWEwNmRiYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCkBAIC0xMzIsMTQgKzEz Miw3IEBAIHB1YmxpYzoKIAogICAgIC8vIEJhc2ljIHByb3BlcnRpZXMgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLSAgICAvLyBUaGUgbmFtZSBv ZiB0aGlzIGZyYW1lLgotICAgIHZpcnR1YWwgV2ViU3RyaW5nIG5hbWUoKSBjb25zdCA9IDA7Ci0K ICAgICAvLyBUaGUgdW5pcXVlIG5hbWUgb2YgdGhpcyBmcmFtZS4KLSAgICAvLwotICAgIC8vIFRo aXMgaXMgdGVtcG9yYXJpbHkgaWRlbnRpY2FsIHRvIHRoZSBhYm92ZSBuYW1lKCkgZnVuY3Rpb24u IE9uY2UgdGhpcwotICAgIC8vIGNoYW5nZSBtYWtlcyBpdCBvdmVyIHRvIHRoZSBDaHJvbWl1bSB0 cmVlLCBJIHdpbGwgY2hhbmdlIGFsbCBjYWxsZXJzIHRvCi0gICAgLy8gdXNlIHRoaXMgZnVuY3Rp b24gYW5kIHdpbGwgc3Vic2VxdWVudGx5IG1vdmUgYXNzaWduZWROYW1lKCkgdG8gbmFtZSgpLgog ICAgIHZpcnR1YWwgV2ViU3RyaW5nIHVuaXF1ZU5hbWUoKSBjb25zdCA9IDA7CiAKICAgICAvLyBU aGUgbmFtZSBvZiB0aGlzIGZyYW1lLiBJZiBubyBuYW1lIGlzIGdpdmVuLCBlbXB0eSBzdHJpbmcg aXMgcmV0dXJuZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJGcmFtZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVD bGllbnQuaAppbmRleCBiNGZjY2ViYzIwNTE2ZmM2NGNmZDRkZDU1ZmQxYjM5NWExNWI2OTc1Li5m OWM3MjM4ZmU0NTA2ZWFlYmQ5OGI2NjE1MTk5YjQwNzZkNWU4MmIyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKQEAgLTQwNCwxOCArNDA0LDEw IEBAIHB1YmxpYzoKICAgICAvLyBnaXZlcyB0aGUgZW1iZWRkZXIgYSBjaGFuY2UgdG8gaGFuZGxl IGl0IGluc3RlYWQgb2YgV2ViS2l0LiBSZXR1cm5zIHRydWUKICAgICAvLyBpZiB0aGUgZW1iZWRk ZXIgaGFuZGxlZCBpdC4KICAgICB2aXJ0dWFsIGJvb2wgd2lsbENoZWNrQW5kRGlzcGF0Y2hNZXNz YWdlRXZlbnQoCi0gICAgICAgIFdlYkZyYW1lKiBzb3VyY2UsCi0gICAgICAgIFdlYlNlY3VyaXR5 T3JpZ2luIHRhcmdldCwKLSAgICAgICAgV2ViRE9NTWVzc2FnZUV2ZW50KSB7IHJldHVybiBmYWxz ZTsgfQotCi0gICAgdmlydHVhbCBib29sIHdpbGxDaGVja0FuZERpc3BhdGNoTWVzc2FnZUV2ZW50 KAogICAgICAgICBXZWJGcmFtZSogc291cmNlRnJhbWUsCiAgICAgICAgIFdlYkZyYW1lKiB0YXJn ZXRGcmFtZSwKICAgICAgICAgV2ViU2VjdXJpdHlPcmlnaW4gdGFyZ2V0LAotICAgICAgICBXZWJE T01NZXNzYWdlRXZlbnQgZXZlbnQpCi0gICAgewotICAgICAgICByZXR1cm4gd2lsbENoZWNrQW5k RGlzcGF0Y2hNZXNzYWdlRXZlbnQoc291cmNlRnJhbWUsIHRhcmdldCwgZXZlbnQpOwotICAgIH0K KyAgICAgICAgV2ViRE9NTWVzc2FnZUV2ZW50KSB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgLy8g QXNrcyB0aGUgZW1iZWRkZXIgaWYgYSBzcGVjaWZpYyB1c2VyIGFnZW50IHNob3VsZCBiZSB1c2Vk IGZvciB0aGUgZ2l2ZW4KICAgICAvLyBVUkwuIE5vbi1lbXB0eSBzdHJpbmdzIGluZGljYXRlIGFu IG92ZXJyaWRlIHNob3VsZCBiZSB1c2VkLiBPdGhlcndpc2UsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCBlYjNhZWY3NzVjYWU1N2Q0NjRiYTQzM2Fm YzBmNDc3MzRlNmM5ZmUzLi43NjQzYmE5M2I1OGQ3YmUyYWM4MzI5Zjg3ZDgyMTllYzA1ZGMyMjRm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTU4 NCw3ICs1ODQsNyBAQCBXZWJGcmFtZSogV2ViRnJhbWU6OmZyYW1lRm9yQ3VycmVudENvbnRleHQo KQogCiAjaWYgV0VCS0lUX1VTSU5HX1Y4CiBXZWJGcmFtZSogV2ViRnJhbWU6OmZyYW1lRm9yQ29u dGV4dCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KQoteyAKK3sKICAgIHJldHVybiBX ZWJGcmFtZUltcGw6OmZyb21GcmFtZSh0b0ZyYW1lSWZOb3REZXRhY2hlZChjb250ZXh0KSk7CiB9 CiAjZW5kaWYKQEAgLTU5NSwxMSArNTk1LDYgQEAgV2ViRnJhbWUqIFdlYkZyYW1lOjpmcm9tRnJh bWVPd25lckVsZW1lbnQoY29uc3QgV2ViRWxlbWVudCYgZWxlbWVudCkKICAgICAgICAgUGFzc1Jl ZlB0cjxFbGVtZW50PihlbGVtZW50KS5nZXQoKSk7CiB9CiAKLVdlYlN0cmluZyBXZWJGcmFtZUlt cGw6Om5hbWUoKSBjb25zdAotewotICAgIHJldHVybiBtX2ZyYW1lLT50cmVlKCktPnVuaXF1ZU5h bWUoKTsKLX0KLQogV2ViU3RyaW5nIFdlYkZyYW1lSW1wbDo6dW5pcXVlTmFtZSgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIG1fZnJhbWUtPnRyZWUoKS0+dW5pcXVlTmFtZSgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmggYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAppbmRleCA2OGFhNzI4OWI5Yjc3YmUxYzM4ZGRi MWQzMjFlODVlOGYzNTZjZWJkLi42MDExZTIzNThkNjU1NDI1ZDhlNWU1MzgwN2U1NWY2MzkyYjcx ZDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaApAQCAtNzIs NyArNzIsNiBAQCB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gY2xhc3MgV2ViVmVjdG9yOwogY2xhc3Mg V2ViRnJhbWVJbXBsIDogcHVibGljIFdlYkZyYW1lLCBwdWJsaWMgUmVmQ291bnRlZDxXZWJGcmFt ZUltcGw+IHsKIHB1YmxpYzoKICAgICAvLyBXZWJGcmFtZSBtZXRob2RzOgotICAgIHZpcnR1YWwg V2ViU3RyaW5nIG5hbWUoKSBjb25zdDsKICAgICB2aXJ0dWFsIFdlYlN0cmluZyB1bmlxdWVOYW1l KCkgY29uc3Q7CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgYXNzaWduZWROYW1lKCkgY29uc3Q7CiAg ICAgdmlydHVhbCB2b2lkIHNldE5hbWUoY29uc3QgV2ViU3RyaW5nJik7Cg== 161575 2012-08-30 15:55:21 -0700 2012-08-30 16:36:55 -0700 Patch bug-95254-20120830155510.patch text/plain 4828 nasko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2Nzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDM0ZTUyYThkYWRjNWVhZmEzZDFkMTM3NjlkZWRkNjI2YjBlNzNlY2EuLjQ0NmVjMjZmMGZmNmU2 MGQzNjZlYjZhNzA4ZWI4ZDMzMGQxYzA5NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMDgtMjggIE5hc2tvIE9za292ICA8bmFza29AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgbWV0aG9kcyBmcm9tIENocm9taXVtIFdlYktp dCBBUEkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTI1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92aW5nIG1ldGhvZHMsIHdoaWNoIGFyZSBubyBsb25nZXIgaW4gdXNlLgorCisgICAgICAgICog cHVibGljL1dlYkZyYW1lLmg6CisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xpZW50Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50Ojp3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3Nh Z2VFdmVudCk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lOjpmcmFtZUZvckNvbnRleHQpOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUlt cGwuaDoKKyAgICAgICAgKFdlYkZyYW1lSW1wbCk6CisKIDIwMTItMDgtMjcgIEp1c3RpbiBOb3Zv c2FkICA8anVub3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gRml4aW5nIGlu ZmluaXRlIHJlY3Vyc2lvbiBpbiBDYW52YXMyRExheWVyTWFuYWdlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCmlu ZGV4IDk0YmFiMWExOGRlMDNiZWRmNzIxZjg1NTk0NDA4NDE5ZmY2ZWVmODguLjAyMjBlZDNiODQ0 MzJhODU3NzhmMzg2MjhjNmRhOWIzZWIwZTIzZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vREVQUworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMKQEAgLTMyLDcg KzMyLDcgQEAKIAogdmFycyA9IHsKICAgJ2Nocm9taXVtX3N2bic6ICdodHRwOi8vc3JjLmNocm9t aXVtLm9yZy9zdm4vdHJ1bmsvc3JjJywKLSAgJ2Nocm9taXVtX3Jldic6ICcxNTM0NjYnCisgICdj aHJvbWl1bV9yZXYnOiAnMTU0MjQ2JwogfQogCiBkZXBzID0gewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkZyYW1lLmgKaW5kZXggYmM1NjA1OTMzNTZiMDFkNmUyYzMwMGNjZGMzNmVi MTdmMGVhMDBhOS4uZmY4ZDI0M2UwMTM4M2Y1ZGJiN2FkMTQ4M2ZkYzA3MTFlYWEwNmRiYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCkBAIC0xMzIsMTQgKzEzMiw3 IEBAIHB1YmxpYzoKIAogICAgIC8vIEJhc2ljIHByb3BlcnRpZXMgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLSAgICAvLyBUaGUgbmFtZSBvZiB0 aGlzIGZyYW1lLgotICAgIHZpcnR1YWwgV2ViU3RyaW5nIG5hbWUoKSBjb25zdCA9IDA7Ci0KICAg ICAvLyBUaGUgdW5pcXVlIG5hbWUgb2YgdGhpcyBmcmFtZS4KLSAgICAvLwotICAgIC8vIFRoaXMg aXMgdGVtcG9yYXJpbHkgaWRlbnRpY2FsIHRvIHRoZSBhYm92ZSBuYW1lKCkgZnVuY3Rpb24uIE9u Y2UgdGhpcwotICAgIC8vIGNoYW5nZSBtYWtlcyBpdCBvdmVyIHRvIHRoZSBDaHJvbWl1bSB0cmVl LCBJIHdpbGwgY2hhbmdlIGFsbCBjYWxsZXJzIHRvCi0gICAgLy8gdXNlIHRoaXMgZnVuY3Rpb24g YW5kIHdpbGwgc3Vic2VxdWVudGx5IG1vdmUgYXNzaWduZWROYW1lKCkgdG8gbmFtZSgpLgogICAg IHZpcnR1YWwgV2ViU3RyaW5nIHVuaXF1ZU5hbWUoKSBjb25zdCA9IDA7CiAKICAgICAvLyBUaGUg bmFtZSBvZiB0aGlzIGZyYW1lLiBJZiBubyBuYW1lIGlzIGdpdmVuLCBlbXB0eSBzdHJpbmcgaXMg cmV0dXJuZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJG cmFtZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGll bnQuaAppbmRleCBiNGZjY2ViYzIwNTE2ZmM2NGNmZDRkZDU1ZmQxYjM5NWExNWI2OTc1Li5mOWM3 MjM4ZmU0NTA2ZWFlYmQ5OGI2NjE1MTk5YjQwNzZkNWU4MmIyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKQEAgLTQwNCwxOCArNDA0LDEwIEBA IHB1YmxpYzoKICAgICAvLyBnaXZlcyB0aGUgZW1iZWRkZXIgYSBjaGFuY2UgdG8gaGFuZGxlIGl0 IGluc3RlYWQgb2YgV2ViS2l0LiBSZXR1cm5zIHRydWUKICAgICAvLyBpZiB0aGUgZW1iZWRkZXIg aGFuZGxlZCBpdC4KICAgICB2aXJ0dWFsIGJvb2wgd2lsbENoZWNrQW5kRGlzcGF0Y2hNZXNzYWdl RXZlbnQoCi0gICAgICAgIFdlYkZyYW1lKiBzb3VyY2UsCi0gICAgICAgIFdlYlNlY3VyaXR5T3Jp Z2luIHRhcmdldCwKLSAgICAgICAgV2ViRE9NTWVzc2FnZUV2ZW50KSB7IHJldHVybiBmYWxzZTsg fQotCi0gICAgdmlydHVhbCBib29sIHdpbGxDaGVja0FuZERpc3BhdGNoTWVzc2FnZUV2ZW50KAog ICAgICAgICBXZWJGcmFtZSogc291cmNlRnJhbWUsCiAgICAgICAgIFdlYkZyYW1lKiB0YXJnZXRG cmFtZSwKICAgICAgICAgV2ViU2VjdXJpdHlPcmlnaW4gdGFyZ2V0LAotICAgICAgICBXZWJET01N ZXNzYWdlRXZlbnQgZXZlbnQpCi0gICAgewotICAgICAgICByZXR1cm4gd2lsbENoZWNrQW5kRGlz cGF0Y2hNZXNzYWdlRXZlbnQoc291cmNlRnJhbWUsIHRhcmdldCwgZXZlbnQpOwotICAgIH0KKyAg ICAgICAgV2ViRE9NTWVzc2FnZUV2ZW50KSB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgLy8gQXNr cyB0aGUgZW1iZWRkZXIgaWYgYSBzcGVjaWZpYyB1c2VyIGFnZW50IHNob3VsZCBiZSB1c2VkIGZv ciB0aGUgZ2l2ZW4KICAgICAvLyBVUkwuIE5vbi1lbXB0eSBzdHJpbmdzIGluZGljYXRlIGFuIG92 ZXJyaWRlIHNob3VsZCBiZSB1c2VkLiBPdGhlcndpc2UsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCBlYjNhZWY3NzVjYWU1N2Q0NjRiYTQzM2FmYzBm NDc3MzRlNmM5ZmUzLi43NjQzYmE5M2I1OGQ3YmUyYWM4MzI5Zjg3ZDgyMTllYzA1ZGMyMjRmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTU4NCw3 ICs1ODQsNyBAQCBXZWJGcmFtZSogV2ViRnJhbWU6OmZyYW1lRm9yQ3VycmVudENvbnRleHQoKQog CiAjaWYgV0VCS0lUX1VTSU5HX1Y4CiBXZWJGcmFtZSogV2ViRnJhbWU6OmZyYW1lRm9yQ29udGV4 dCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KQoteyAKK3sKICAgIHJldHVybiBXZWJG cmFtZUltcGw6OmZyb21GcmFtZSh0b0ZyYW1lSWZOb3REZXRhY2hlZChjb250ZXh0KSk7CiB9CiAj ZW5kaWYKQEAgLTU5NSwxMSArNTk1LDYgQEAgV2ViRnJhbWUqIFdlYkZyYW1lOjpmcm9tRnJhbWVP d25lckVsZW1lbnQoY29uc3QgV2ViRWxlbWVudCYgZWxlbWVudCkKICAgICAgICAgUGFzc1JlZlB0 cjxFbGVtZW50PihlbGVtZW50KS5nZXQoKSk7CiB9CiAKLVdlYlN0cmluZyBXZWJGcmFtZUltcGw6 Om5hbWUoKSBjb25zdAotewotICAgIHJldHVybiBtX2ZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUo KTsKLX0KLQogV2ViU3RyaW5nIFdlYkZyYW1lSW1wbDo6dW5pcXVlTmFtZSgpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIG1fZnJhbWUtPnRyZWUoKS0+dW5pcXVlTmFtZSgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAppbmRleCA2OGFhNzI4OWI5Yjc3YmUxYzM4ZGRiMWQz MjFlODVlOGYzNTZjZWJkLi42MDExZTIzNThkNjU1NDI1ZDhlNWU1MzgwN2U1NWY2MzkyYjcxZDNi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaApAQCAtNzIsNyAr NzIsNiBAQCB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gY2xhc3MgV2ViVmVjdG9yOwogY2xhc3MgV2Vi RnJhbWVJbXBsIDogcHVibGljIFdlYkZyYW1lLCBwdWJsaWMgUmVmQ291bnRlZDxXZWJGcmFtZUlt cGw+IHsKIHB1YmxpYzoKICAgICAvLyBXZWJGcmFtZSBtZXRob2RzOgotICAgIHZpcnR1YWwgV2Vi U3RyaW5nIG5hbWUoKSBjb25zdDsKICAgICB2aXJ0dWFsIFdlYlN0cmluZyB1bmlxdWVOYW1lKCkg Y29uc3Q7CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgYXNzaWduZWROYW1lKCkgY29uc3Q7CiAgICAg dmlydHVhbCB2b2lkIHNldE5hbWUoY29uc3QgV2ViU3RyaW5nJik7Cg== 161583 2012-08-30 16:36:58 -0700 2012-09-14 15:51:16 -0700 Patch bug-95254-20120830163647.patch text/plain 4472 nasko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDlhOTQzN2U5MmY0YWU5MjQyNjNhYWE0YWRkYWZhZTk2ZjUwOTY4ZjYuLjNlOWY3ZTg0NDNiNDEw OWUwNGE4OWUwYTg2NTczMWRhZWI4OGY5ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMDgtMjkgIE5hc2tvIE9za292ICA8bmFza29AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgbWV0aG9kcyBmcm9tIENocm9taXVtIFdlYktp dCBBUEkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTI1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92aW5nIG1ldGhvZHMsIHdoaWNoIGFyZSBubyBsb25nZXIgaW4gdXNlLgorCisgICAgICAgICog cHVibGljL1dlYkZyYW1lLmg6CisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xpZW50Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50Ojp3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3Nh Z2VFdmVudCk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lOjpmcmFtZUZvckNvbnRleHQpOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUlt cGwuaDoKKyAgICAgICAgKFdlYkZyYW1lSW1wbCk6CisKIDIwMTItMDgtMjkgIFNoYXduIFNpbmdo ICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBBZGQgbW9y ZSB1bml0IHRlc3QgY292ZXJhZ2UgZm9yIHNlbWFudGljcyBvZiBkcmF3YWJsZUNvbnRlbnRSZWN0 IGFuZCB2aXNpYmxlQ29udGVudFJlY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkZyYW1lLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJG cmFtZS5oCmluZGV4IGJjNTYwNTkzMzU2YjAxZDZlMmMzMDBjY2RjMzZlYjE3ZjBlYTAwYTkuLmZm OGQyNDNlMDEzODNmNWRiYjdhZDE0ODNmZGMwNzExZWFhMDZkYmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaApAQCAtMTMyLDE0ICsxMzIsNyBAQCBwdWJsaWM6CiAK ICAgICAvLyBCYXNpYyBwcm9wZXJ0aWVzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogCi0gICAgLy8gVGhlIG5hbWUgb2YgdGhpcyBmcmFtZS4KLSAg ICB2aXJ0dWFsIFdlYlN0cmluZyBuYW1lKCkgY29uc3QgPSAwOwotCiAgICAgLy8gVGhlIHVuaXF1 ZSBuYW1lIG9mIHRoaXMgZnJhbWUuCi0gICAgLy8KLSAgICAvLyBUaGlzIGlzIHRlbXBvcmFyaWx5 IGlkZW50aWNhbCB0byB0aGUgYWJvdmUgbmFtZSgpIGZ1bmN0aW9uLiBPbmNlIHRoaXMKLSAgICAv LyBjaGFuZ2UgbWFrZXMgaXQgb3ZlciB0byB0aGUgQ2hyb21pdW0gdHJlZSwgSSB3aWxsIGNoYW5n ZSBhbGwgY2FsbGVycyB0bwotICAgIC8vIHVzZSB0aGlzIGZ1bmN0aW9uIGFuZCB3aWxsIHN1YnNl cXVlbnRseSBtb3ZlIGFzc2lnbmVkTmFtZSgpIHRvIG5hbWUoKS4KICAgICB2aXJ0dWFsIFdlYlN0 cmluZyB1bmlxdWVOYW1lKCkgY29uc3QgPSAwOwogCiAgICAgLy8gVGhlIG5hbWUgb2YgdGhpcyBm cmFtZS4gSWYgbm8gbmFtZSBpcyBnaXZlbiwgZW1wdHkgc3RyaW5nIGlzIHJldHVybmVkLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKaW5kZXggYjRm Y2NlYmMyMDUxNmZjNjRjZmQ0ZGQ1NWZkMWIzOTVhMTViNjk3NS4uZjljNzIzOGZlNDUwNmVhZWJk OThiNjYxNTE5OWI0MDc2ZDVlODJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJGcmFtZUNsaWVudC5oCkBAIC00MDQsMTggKzQwNCwxMCBAQCBwdWJsaWM6CiAgICAg Ly8gZ2l2ZXMgdGhlIGVtYmVkZGVyIGEgY2hhbmNlIHRvIGhhbmRsZSBpdCBpbnN0ZWFkIG9mIFdl YktpdC4gUmV0dXJucyB0cnVlCiAgICAgLy8gaWYgdGhlIGVtYmVkZGVyIGhhbmRsZWQgaXQuCiAg ICAgdmlydHVhbCBib29sIHdpbGxDaGVja0FuZERpc3BhdGNoTWVzc2FnZUV2ZW50KAotICAgICAg ICBXZWJGcmFtZSogc291cmNlLAotICAgICAgICBXZWJTZWN1cml0eU9yaWdpbiB0YXJnZXQsCi0g ICAgICAgIFdlYkRPTU1lc3NhZ2VFdmVudCkgeyByZXR1cm4gZmFsc2U7IH0KLQotICAgIHZpcnR1 YWwgYm9vbCB3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3NhZ2VFdmVudCgKICAgICAgICAgV2ViRnJh bWUqIHNvdXJjZUZyYW1lLAogICAgICAgICBXZWJGcmFtZSogdGFyZ2V0RnJhbWUsCiAgICAgICAg IFdlYlNlY3VyaXR5T3JpZ2luIHRhcmdldCwKLSAgICAgICAgV2ViRE9NTWVzc2FnZUV2ZW50IGV2 ZW50KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHdpbGxDaGVja0FuZERpc3BhdGNoTWVzc2FnZUV2 ZW50KHNvdXJjZUZyYW1lLCB0YXJnZXQsIGV2ZW50KTsKLSAgICB9CisgICAgICAgIFdlYkRPTU1l c3NhZ2VFdmVudCkgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIC8vIEFza3MgdGhlIGVtYmVkZGVy IGlmIGEgc3BlY2lmaWMgdXNlciBhZ2VudCBzaG91bGQgYmUgdXNlZCBmb3IgdGhlIGdpdmVuCiAg ICAgLy8gVVJMLiBOb24tZW1wdHkgc3RyaW5ncyBpbmRpY2F0ZSBhbiBvdmVycmlkZSBzaG91bGQg YmUgdXNlZC4gT3RoZXJ3aXNlLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1l SW1wbC5jcHAKaW5kZXggZWIzYWVmNzc1Y2FlNTdkNDY0YmE0MzNhZmMwZjQ3NzM0ZTZjOWZlMy4u NzY0M2JhOTNiNThkN2JlMmFjODMyOWY4N2Q4MjE5ZWMwNWRjMjI0ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC01ODQsNyArNTg0LDcgQEAgV2Vi RnJhbWUqIFdlYkZyYW1lOjpmcmFtZUZvckN1cnJlbnRDb250ZXh0KCkKIAogI2lmIFdFQktJVF9V U0lOR19WOAogV2ViRnJhbWUqIFdlYkZyYW1lOjpmcmFtZUZvckNvbnRleHQodjg6OkhhbmRsZTx2 ODo6Q29udGV4dD4gY29udGV4dCkKLXsgCit7CiAgICByZXR1cm4gV2ViRnJhbWVJbXBsOjpmcm9t RnJhbWUodG9GcmFtZUlmTm90RGV0YWNoZWQoY29udGV4dCkpOwogfQogI2VuZGlmCkBAIC01OTUs MTEgKzU5NSw2IEBAIFdlYkZyYW1lKiBXZWJGcmFtZTo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KGNv bnN0IFdlYkVsZW1lbnQmIGVsZW1lbnQpCiAgICAgICAgIFBhc3NSZWZQdHI8RWxlbWVudD4oZWxl bWVudCkuZ2V0KCkpOwogfQogCi1XZWJTdHJpbmcgV2ViRnJhbWVJbXBsOjpuYW1lKCkgY29uc3QK LXsKLSAgICByZXR1cm4gbV9mcmFtZS0+dHJlZSgpLT51bmlxdWVOYW1lKCk7Ci19Ci0KIFdlYlN0 cmluZyBXZWJGcmFtZUltcGw6OnVuaXF1ZU5hbWUoKSBjb25zdAogewogICAgIHJldHVybiBtX2Zy YW1lLT50cmVlKCktPnVuaXF1ZU5hbWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi RnJhbWVJbXBsLmgKaW5kZXggNjhhYTcyODliOWI3N2JlMWMzOGRkYjFkMzIxZTg1ZThmMzU2Y2Vi ZC4uNjAxMWUyMzU4ZDY1NTQyNWQ4ZTVlNTM4MDdlNTVmNjM5MmI3MWQzYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgKQEAgLTcyLDcgKzcyLDYgQEAgdGVtcGxh dGUgPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYlZlY3RvcjsKIGNsYXNzIFdlYkZyYW1lSW1wbCA6IHB1 YmxpYyBXZWJGcmFtZSwgcHVibGljIFJlZkNvdW50ZWQ8V2ViRnJhbWVJbXBsPiB7CiBwdWJsaWM6 CiAgICAgLy8gV2ViRnJhbWUgbWV0aG9kczoKLSAgICB2aXJ0dWFsIFdlYlN0cmluZyBuYW1lKCkg Y29uc3Q7CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgdW5pcXVlTmFtZSgpIGNvbnN0OwogICAgIHZp cnR1YWwgV2ViU3RyaW5nIGFzc2lnbmVkTmFtZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBz ZXROYW1lKGNvbnN0IFdlYlN0cmluZyYpOwo= 164242 2012-09-14 15:51:20 -0700 2012-09-27 16:26:10 -0700 Patch bug-95254-20120914155051.patch text/plain 8212 nasko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDFhZjU4NWJiMWRkMTJmYTgyNTM5MmQ3ZDVmNDBkNDVjZDY5ZGM3YTkuLjg4NzQ0OWM3NDU2ODJm ZDYxMmJhM2ZiOTg1MGQyZTYzMTQzNzk1MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMDktMTQgIE5hc2tvIE9za292ICA8bmFza29AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgbWV0aG9kcyBmcm9tIENocm9taXVtIFdlYktp dCBBUEkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTI1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92aW5nIG1ldGhvZHMsIHdoaWNoIGFyZSBubyBsb25nZXIgaW4gdXNlLgorCisgICAgICAgICog cHVibGljL1dlYkZyYW1lLmg6CisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xpZW50Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50Ojp3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3Nh Z2VFdmVudCk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lOjpmcmFtZUZvckNvbnRleHQpOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUlt cGwuaDoKKyAgICAgICAgKFdlYkZyYW1lSW1wbCk6CisKIDIwMTItMDktMTMgIFNoZXJpZmYgQm90 ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIxMjg0MDkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJGcmFtZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUu aAppbmRleCA1NmNiZTFlYTQ3ZGRhMmQ5MjkyY2U4NGI4MmVmMmRkYWMzMWM0NjI0Li4wYWFhNDJm NDBmNzYxOTM4ZDZmZjY4OGQ3MTJmZTUzZDY0ZjZlYmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkZyYW1lLmgKQEAgLTEzMiwxNCArMTMyLDcgQEAgcHVibGljOgogCiAgICAg Ly8gQmFzaWMgcHJvcGVydGllcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAotICAgIC8vIFRoZSBuYW1lIG9mIHRoaXMgZnJhbWUuCi0gICAgdmly dHVhbCBXZWJTdHJpbmcgbmFtZSgpIGNvbnN0ID0gMDsKLQogICAgIC8vIFRoZSB1bmlxdWUgbmFt ZSBvZiB0aGlzIGZyYW1lLgotICAgIC8vCi0gICAgLy8gVGhpcyBpcyB0ZW1wb3JhcmlseSBpZGVu dGljYWwgdG8gdGhlIGFib3ZlIG5hbWUoKSBmdW5jdGlvbi4gT25jZSB0aGlzCi0gICAgLy8gY2hh bmdlIG1ha2VzIGl0IG92ZXIgdG8gdGhlIENocm9taXVtIHRyZWUsIEkgd2lsbCBjaGFuZ2UgYWxs IGNhbGxlcnMgdG8KLSAgICAvLyB1c2UgdGhpcyBmdW5jdGlvbiBhbmQgd2lsbCBzdWJzZXF1ZW50 bHkgbW92ZSBhc3NpZ25lZE5hbWUoKSB0byBuYW1lKCkuCiAgICAgdmlydHVhbCBXZWJTdHJpbmcg dW5pcXVlTmFtZSgpIGNvbnN0ID0gMDsKIAogICAgIC8vIFRoZSBuYW1lIG9mIHRoaXMgZnJhbWUu IElmIG5vIG5hbWUgaXMgZ2l2ZW4sIGVtcHR5IHN0cmluZyBpcyByZXR1cm5lZC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCmluZGV4IGI0ZmNjZWJj MjA1MTZmYzY0Y2ZkNGRkNTVmZDFiMzk1YTE1YjY5NzUuLmY5YzcyMzhmZTQ1MDZlYWViZDk4YjY2 MTUxOTliNDA3NmQ1ZTgyYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYkZyYW1lQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViRnJhbWVDbGllbnQuaApAQCAtNDA0LDE4ICs0MDQsMTAgQEAgcHVibGljOgogICAgIC8vIGdp dmVzIHRoZSBlbWJlZGRlciBhIGNoYW5jZSB0byBoYW5kbGUgaXQgaW5zdGVhZCBvZiBXZWJLaXQu IFJldHVybnMgdHJ1ZQogICAgIC8vIGlmIHRoZSBlbWJlZGRlciBoYW5kbGVkIGl0LgogICAgIHZp cnR1YWwgYm9vbCB3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3NhZ2VFdmVudCgKLSAgICAgICAgV2Vi RnJhbWUqIHNvdXJjZSwKLSAgICAgICAgV2ViU2VjdXJpdHlPcmlnaW4gdGFyZ2V0LAotICAgICAg ICBXZWJET01NZXNzYWdlRXZlbnQpIHsgcmV0dXJuIGZhbHNlOyB9Ci0KLSAgICB2aXJ0dWFsIGJv b2wgd2lsbENoZWNrQW5kRGlzcGF0Y2hNZXNzYWdlRXZlbnQoCiAgICAgICAgIFdlYkZyYW1lKiBz b3VyY2VGcmFtZSwKICAgICAgICAgV2ViRnJhbWUqIHRhcmdldEZyYW1lLAogICAgICAgICBXZWJT ZWN1cml0eU9yaWdpbiB0YXJnZXQsCi0gICAgICAgIFdlYkRPTU1lc3NhZ2VFdmVudCBldmVudCkK LSAgICB7Ci0gICAgICAgIHJldHVybiB3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3NhZ2VFdmVudChz b3VyY2VGcmFtZSwgdGFyZ2V0LCBldmVudCk7Ci0gICAgfQorICAgICAgICBXZWJET01NZXNzYWdl RXZlbnQpIHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICAvLyBBc2tzIHRoZSBlbWJlZGRlciBpZiBh IHNwZWNpZmljIHVzZXIgYWdlbnQgc2hvdWxkIGJlIHVzZWQgZm9yIHRoZSBnaXZlbgogICAgIC8v IFVSTC4gTm9uLWVtcHR5IHN0cmluZ3MgaW5kaWNhdGUgYW4gb3ZlcnJpZGUgc2hvdWxkIGJlIHVz ZWQuIE90aGVyd2lzZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZyYW1lSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCmluZGV4IGViMDIzNTFkYWFjMTUzMjE1ZWYyMmI0YzcwMjVjN2ZmODNkYWE1ZWUuLjk5NjEx MDEwYWRjNDQ5NmRlZDBmOGNlODMwMjVkMjlkYWVkYTVkMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAtNTg3LDcgKzU4Nyw3IEBAIFdlYkZyYW1l KiBXZWJGcmFtZTo6ZnJhbWVGb3JDdXJyZW50Q29udGV4dCgpCiAKICNpZiBXRUJLSVRfVVNJTkdf VjgKIFdlYkZyYW1lKiBXZWJGcmFtZTo6ZnJhbWVGb3JDb250ZXh0KHY4OjpIYW5kbGU8djg6OkNv bnRleHQ+IGNvbnRleHQpCi17IAorewogICAgcmV0dXJuIFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1l KHRvRnJhbWVJZk5vdERldGFjaGVkKGNvbnRleHQpKTsKIH0KICNlbmRpZgpAQCAtNTk4LDExICs1 OTgsNiBAQCBXZWJGcmFtZSogV2ViRnJhbWU6OmZyb21GcmFtZU93bmVyRWxlbWVudChjb25zdCBX ZWJFbGVtZW50JiBlbGVtZW50KQogICAgICAgICBQYXNzUmVmUHRyPEVsZW1lbnQ+KGVsZW1lbnQp LmdldCgpKTsKIH0KIAotV2ViU3RyaW5nIFdlYkZyYW1lSW1wbDo6bmFtZSgpIGNvbnN0Ci17Ci0g ICAgcmV0dXJuIG1fZnJhbWUtPnRyZWUoKS0+dW5pcXVlTmFtZSgpOwotfQotCiBXZWJTdHJpbmcg V2ViRnJhbWVJbXBsOjp1bmlxdWVOYW1lKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9mcmFtZS0+ dHJlZSgpLT51bmlxdWVOYW1lKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1l SW1wbC5oCmluZGV4IGU1OWM5MzJjNTkyYjA0MmEwN2RkZmEzNGU3ZDNkZjkxYzk5NThlOWUuLjU2 YWY5OTQwMjg0MmZiYjBiMWFiZWZkZjA2YTM0M2FkNTc2YWNkODEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCkBAIC03Miw3ICs3Miw2IEBAIHRlbXBsYXRlIDx0 eXBlbmFtZSBUPiBjbGFzcyBXZWJWZWN0b3I7CiBjbGFzcyBXZWJGcmFtZUltcGwgOiBwdWJsaWMg V2ViRnJhbWUsIHB1YmxpYyBSZWZDb3VudGVkPFdlYkZyYW1lSW1wbD4gewogcHVibGljOgogICAg IC8vIFdlYkZyYW1lIG1ldGhvZHM6Ci0gICAgdmlydHVhbCBXZWJTdHJpbmcgbmFtZSgpIGNvbnN0 OwogICAgIHZpcnR1YWwgV2ViU3RyaW5nIHVuaXF1ZU5hbWUoKSBjb25zdDsKICAgICB2aXJ0dWFs IFdlYlN0cmluZyBhc3NpZ25lZE5hbWUoKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TmFt ZShjb25zdCBXZWJTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCBiY2RhNTQ4YTYwOGNiYTQ4NzBhZGZiNmE4NGJlMDA3NmIwNjkzZTNi Li5kNjU5MGUyYWM1NzRlNTVkYjU4NzRjNWQwY2ZhZGY4Y2JmNDZmMmNhIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIw MTItMDktMTQgIE5hc2tvIE9za292ICA8bmFza29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1v dmUgRHVtcFJlbmRlclRyZWUgdG8gdXNlIG5ld2VyIHZlcnNpb24gb2YgdGhlIG5hbWUgbWV0aG9k IG9mIFdlYkZyYW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTUyNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGUgV2ViRnJhbWUgbmFtZSgpIG1ldGhvZCBpcyByZW1vdmVkIGFuZCByZXBsYWNlZCBi eSBiZXR0ZXIgbmFtZWQgdW5pcXVlTmFtZSBtZXRob2QsIAorICAgICAgICBzbyBEUlQgbmVlZHMg dG8gYmUgdXBkYXRlZCB0byB1c2UgdGhpcyBuZXcgdmVyc2lvbi4KKworICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHA6CisgICAgICAgIChkdW1wRnJhbWVzQXNU ZXh0KToKKyAgICAgICAgKGR1bXBGcmFtZXNBc1ByaW50ZWRUZXh0KToKKyAgICAgICAgKGR1bXBG cmFtZVNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9X ZWJWaWV3SG9zdC5jcHA6CisgICAgICAgIChXZWJWaWV3SG9zdDo6dW5hYmxlVG9JbXBsZW1lbnRQ b2xpY3lXaXRoRXJyb3IpOgorICAgICAgICAoV2ViVmlld0hvc3Q6OnByaW50RnJhbWVEZXNjcmlw dGlvbik6CisKIDIwMTItMDktMTMgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9r aWEuY29tPgogCiAgICAgICAgIFtRdF0gQWRkIGNvbmZpZ3VyYXRpb24gZm9yIHByb2R1Y3Rpb24g YnVpbGRzCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hl bGwuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAppbmRl eCBlNWU5ZGVkNmFlMzBmMTllYWNiNWVmMDg0ZjhkODdjOWM0ZTQ2M2JmLi4xN2JhMDhiODhkYjQz YjY2MDQ0YjJkMzJiYjVjM2RlY2JkNTg0NmZlIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RTaGVsbC5jcHAKQEAgLTM5OSw3ICszOTksNyBAQCBzdGF0aWMgc3RyaW5nIGR1 bXBGcmFtZXNBc1RleHQoV2ViRnJhbWUqIGZyYW1lLCBib29sIHJlY3Vyc2l2ZSkKICAgICAvLyBB ZGQgaGVhZGVyIGZvciBhbGwgYnV0IHRoZSBtYWluIGZyYW1lLiBTa2lwIGVtcHR5IGZyYW1lcy4K ICAgICBpZiAoZnJhbWUtPnBhcmVudCgpICYmICFmcmFtZS0+ZG9jdW1lbnQoKS5kb2N1bWVudEVs ZW1lbnQoKS5pc051bGwoKSkgewogICAgICAgICByZXN1bHQuYXBwZW5kKCJcbi0tLS0tLS0tXG5G cmFtZTogJyIpOwotICAgICAgICByZXN1bHQuYXBwZW5kKGZyYW1lLT5uYW1lKCkudXRmOCgpLmRh dGEoKSk7CisgICAgICAgIHJlc3VsdC5hcHBlbmQoZnJhbWUtPnVuaXF1ZU5hbWUoKS51dGY4KCku ZGF0YSgpKTsKICAgICAgICAgcmVzdWx0LmFwcGVuZCgiJ1xuLS0tLS0tLS1cbiIpOwogICAgIH0K IApAQCAtNDI1LDcgKzQyNSw3IEBAIHN0YXRpYyBzdHJpbmcgZHVtcEZyYW1lc0FzUHJpbnRlZFRl eHQoV2ViRnJhbWUqIGZyYW1lLCBib29sIHJlY3Vyc2l2ZSkKICAgICAvLyBBZGQgaGVhZGVyIGZv ciBhbGwgYnV0IHRoZSBtYWluIGZyYW1lLiBTa2lwIGVtcHR5IGZyYW1lcy4KICAgICBpZiAoZnJh bWUtPnBhcmVudCgpICYmICFmcmFtZS0+ZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1lbnQoKS5pc051 bGwoKSkgewogICAgICAgICByZXN1bHQuYXBwZW5kKCJcbi0tLS0tLS0tXG5GcmFtZTogJyIpOwot ICAgICAgICByZXN1bHQuYXBwZW5kKGZyYW1lLT5uYW1lKCkudXRmOCgpLmRhdGEoKSk7CisgICAg ICAgIHJlc3VsdC5hcHBlbmQoZnJhbWUtPnVuaXF1ZU5hbWUoKS51dGY4KCkuZGF0YSgpKTsKICAg ICAgICAgcmVzdWx0LmFwcGVuZCgiJ1xuLS0tLS0tLS1cbiIpOwogICAgIH0KIApAQCAtNDQ1LDcg KzQ0NSw3IEBAIHN0YXRpYyB2b2lkIGR1bXBGcmFtZVNjcm9sbFBvc2l0aW9uKFdlYkZyYW1lKiBm cmFtZSwgYm9vbCByZWN1cnNpdmUpCiAgICAgV2ViU2l6ZSBvZmZzZXQgPSBmcmFtZS0+c2Nyb2xs T2Zmc2V0KCk7CiAgICAgaWYgKG9mZnNldC53aWR0aCA+IDAgfHwgb2Zmc2V0LmhlaWdodCA+IDAp IHsKICAgICAgICAgaWYgKGZyYW1lLT5wYXJlbnQoKSkKLSAgICAgICAgICAgIHByaW50ZigiZnJh bWUgJyVzJyAiLCBmcmFtZS0+bmFtZSgpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgcHJp bnRmKCJmcmFtZSAnJXMnICIsIGZyYW1lLT51bmlxdWVOYW1lKCkudXRmOCgpLmRhdGEoKSk7CiAg ICAgICAgIHByaW50Zigic2Nyb2xsZWQgdG8gJWQsJWRcbiIsIG9mZnNldC53aWR0aCwgb2Zmc2V0 LmhlaWdodCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9XZWJWaWV3SG9zdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJW aWV3SG9zdC5jcHAKaW5kZXggODdhOTEzZmM2MGEzNjRlMWM1MjE5ZjE0MDY3OWJmZGIyMmJhOGM0 Zi4uNGI1MmFhNjIwMTJhNDdiMmNhODg2NTY1ZWZmNTdjYTA3YzU3OTFkOCAxMDA2NDQKLS0tIGEv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCisrKyBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcApAQCAtMTA5NSw3ICsxMDk1 LDcgQEAgdm9pZCBXZWJWaWV3SG9zdDo6dW5hYmxlVG9JbXBsZW1lbnRQb2xpY3lXaXRoRXJyb3Io V2ViRnJhbWUqIGZyYW1lLCBjb25zdCBXZWJVUkwKIHsKICAgICBwcmludGYoIlBvbGljeSBkZWxl Z2F0ZTogdW5hYmxlIHRvIGltcGxlbWVudCBwb2xpY3kgd2l0aCBlcnJvciBkb21haW4gJyVzJywg IgogICAgICAgICAgICAiZXJyb3IgY29kZSAlZCwgaW4gZnJhbWUgJyVzJ1xuIiwKLSAgICAgICAg ICAgZXJyb3IuZG9tYWluLnV0ZjgoKS5kYXRhKCksIGVycm9yLnJlYXNvbiwgZnJhbWUtPm5hbWUo KS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgZXJyb3IuZG9tYWluLnV0ZjgoKS5kYXRhKCks IGVycm9yLnJlYXNvbiwgZnJhbWUtPnVuaXF1ZU5hbWUoKS51dGY4KCkuZGF0YSgpKTsKIH0KIAog dm9pZCBXZWJWaWV3SG9zdDo6d2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChXZWJGcmFtZSogZnJh bWUsIGNvbnN0IFdlYlVSTCYgZnJvbSwgY29uc3QgV2ViVVJMJiB0bywKQEAgLTE3NDQsNyArMTc0 NCw3IEBAIHZvaWQgV2ViVmlld0hvc3Q6OnVwZGF0ZVNlc3Npb25IaXN0b3J5KFdlYkZyYW1lKiBm cmFtZSkKIAogdm9pZCBXZWJWaWV3SG9zdDo6cHJpbnRGcmFtZURlc2NyaXB0aW9uKFdlYkZyYW1l KiB3ZWJmcmFtZSkKIHsKLSAgICBzdHJpbmcgbmFtZTggPSB3ZWJmcmFtZS0+bmFtZSgpLnV0Zjgo KTsKKyAgICBzdHJpbmcgbmFtZTggPSB3ZWJmcmFtZS0+dW5pcXVlTmFtZSgpLnV0ZjgoKTsKICAg ICBpZiAod2ViZnJhbWUgPT0gd2ViVmlldygpLT5tYWluRnJhbWUoKSkgewogICAgICAgICBpZiAo IW5hbWU4Lmxlbmd0aCgpKSB7CiAgICAgICAgICAgICBmcHV0cygibWFpbiBmcmFtZSIsIHN0ZG91 dCk7Cg== 166091 2012-09-27 16:26:16 -0700 2012-09-27 17:04:48 -0700 Patch bug-95254-20120927162532.patch text/plain 10235 nasko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDdmYTA0YTJlMGIyNmQzNTZmMTJlYjNhM2IxN2FjYWM0NzU4NjViNzAuLmE4MDUzYzg1MzQyYTE5 NzFlYWI3NzAxYzZlNTkwMDExYWRhMzZiYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTItMDktMjcgIE5hc2tvIE9za292ICA8bmFza29AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgbWV0aG9kcyBmcm9tIENocm9taXVtIFdlYktp dCBBUEkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTI1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92aW5nIG1ldGhvZHMsIHdoaWNoIGFyZSBubyBsb25nZXIgaW4gdXNlLgorCisgICAgICAgICog cHVibGljL1dlYkZyYW1lLmg6CisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xpZW50Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50Ojp3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3Nh Z2VFdmVudCk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgICogc3Jj L1dlYkZyYW1lSW1wbC5oOgorICAgICAgICAoV2ViRnJhbWVJbXBsKToKKwogMjAxMi0wOS0yNiAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyOTY3My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJGcmFtZS5oCmluZGV4IGYzOGM3MzkzNDk5ZTFjN2VlYTBmYjUwMGM0NTFhM2UyYzliN2Zm NzIuLmM3M2ZmYTZiOThmYWY1ODU0NjM3ZTNiNTk1YjIzNWE1ZTMwMDM3N2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaApAQCAtMTMyLDE0ICsxMzIsNyBAQCBwdWJs aWM6CiAKICAgICAvLyBCYXNpYyBwcm9wZXJ0aWVzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi0gICAgLy8gVGhlIG5hbWUgb2YgdGhpcyBmcmFt ZS4KLSAgICB2aXJ0dWFsIFdlYlN0cmluZyBuYW1lKCkgY29uc3QgPSAwOwotCiAgICAgLy8gVGhl IHVuaXF1ZSBuYW1lIG9mIHRoaXMgZnJhbWUuCi0gICAgLy8KLSAgICAvLyBUaGlzIGlzIHRlbXBv cmFyaWx5IGlkZW50aWNhbCB0byB0aGUgYWJvdmUgbmFtZSgpIGZ1bmN0aW9uLiBPbmNlIHRoaXMK LSAgICAvLyBjaGFuZ2UgbWFrZXMgaXQgb3ZlciB0byB0aGUgQ2hyb21pdW0gdHJlZSwgSSB3aWxs IGNoYW5nZSBhbGwgY2FsbGVycyB0bwotICAgIC8vIHVzZSB0aGlzIGZ1bmN0aW9uIGFuZCB3aWxs IHN1YnNlcXVlbnRseSBtb3ZlIGFzc2lnbmVkTmFtZSgpIHRvIG5hbWUoKS4KICAgICB2aXJ0dWFs IFdlYlN0cmluZyB1bmlxdWVOYW1lKCkgY29uc3QgPSAwOwogCiAgICAgLy8gVGhlIG5hbWUgb2Yg dGhpcyBmcmFtZS4gSWYgbm8gbmFtZSBpcyBnaXZlbiwgZW1wdHkgc3RyaW5nIGlzIHJldHVybmVk LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGll bnQuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKaW5k ZXggYjRmY2NlYmMyMDUxNmZjNjRjZmQ0ZGQ1NWZkMWIzOTVhMTViNjk3NS4uMTdkNjc0ODAxZGNh MmIwZTJmNjJiOTM3Y2Y2YzYyOWNkMzcyNGViYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCkBAIC00MDQsMTggKzQwNCwxMCBAQCBwdWJsaWM6 CiAgICAgLy8gZ2l2ZXMgdGhlIGVtYmVkZGVyIGEgY2hhbmNlIHRvIGhhbmRsZSBpdCBpbnN0ZWFk IG9mIFdlYktpdC4gUmV0dXJucyB0cnVlCiAgICAgLy8gaWYgdGhlIGVtYmVkZGVyIGhhbmRsZWQg aXQuCiAgICAgdmlydHVhbCBib29sIHdpbGxDaGVja0FuZERpc3BhdGNoTWVzc2FnZUV2ZW50KAot ICAgICAgICBXZWJGcmFtZSogc291cmNlLAotICAgICAgICBXZWJTZWN1cml0eU9yaWdpbiB0YXJn ZXQsCi0gICAgICAgIFdlYkRPTU1lc3NhZ2VFdmVudCkgeyByZXR1cm4gZmFsc2U7IH0KLQotICAg IHZpcnR1YWwgYm9vbCB3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3NhZ2VFdmVudCgKICAgICAgICAg V2ViRnJhbWUqIHNvdXJjZUZyYW1lLAogICAgICAgICBXZWJGcmFtZSogdGFyZ2V0RnJhbWUsCiAg ICAgICAgIFdlYlNlY3VyaXR5T3JpZ2luIHRhcmdldCwKLSAgICAgICAgV2ViRE9NTWVzc2FnZUV2 ZW50IGV2ZW50KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHdpbGxDaGVja0FuZERpc3BhdGNoTWVz c2FnZUV2ZW50KHNvdXJjZUZyYW1lLCB0YXJnZXQsIGV2ZW50KTsKLSAgICB9CisgICAgICAgIFdl YkRPTU1lc3NhZ2VFdmVudCBldmVudCkgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIC8vIEFza3Mg dGhlIGVtYmVkZGVyIGlmIGEgc3BlY2lmaWMgdXNlciBhZ2VudCBzaG91bGQgYmUgdXNlZCBmb3Ig dGhlIGdpdmVuCiAgICAgLy8gVVJMLiBOb24tZW1wdHkgc3RyaW5ncyBpbmRpY2F0ZSBhbiBvdmVy cmlkZSBzaG91bGQgYmUgdXNlZC4gT3RoZXJ3aXNlLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkZyYW1lSW1wbC5jcHAKaW5kZXggNDRmNWUxNzNkMTg0MDZjMDY4ZDc1YWEzM2UzZjBm ZjlmODVkMjE1Zi4uODlkZDFiYWM5MjU1OTQ0MjE4NzYwZDhkYWNhZmE4YWFiODMyMmE3MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC01OTgsMTEg KzU5OCw2IEBAIFdlYkZyYW1lKiBXZWJGcmFtZTo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KGNvbnN0 IFdlYkVsZW1lbnQmIGVsZW1lbnQpCiAgICAgICAgIFBhc3NSZWZQdHI8RWxlbWVudD4oZWxlbWVu dCkuZ2V0KCkpOwogfQogCi1XZWJTdHJpbmcgV2ViRnJhbWVJbXBsOjpuYW1lKCkgY29uc3QKLXsK LSAgICByZXR1cm4gbV9mcmFtZS0+dHJlZSgpLT51bmlxdWVOYW1lKCk7Ci19Ci0KIFdlYlN0cmlu ZyBXZWJGcmFtZUltcGw6OnVuaXF1ZU5hbWUoKSBjb25zdAogewogICAgIHJldHVybiBtX2ZyYW1l LT50cmVlKCktPnVuaXF1ZU5hbWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkZyYW1lSW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJh bWVJbXBsLmgKaW5kZXggYTJmZTc5N2UzYzA0ZDU5YTdmNzg4MDk0MzM4MjM4OTdmNWNlMzg2YS4u Mzg0NjZlNzcwNTFkNTNjYWEzNWI2YjFiOGQ0YTZiYzFmYmQ0NmExOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgKQEAgLTcyLDcgKzcyLDYgQEAgdGVtcGxhdGUg PHR5cGVuYW1lIFQ+IGNsYXNzIFdlYlZlY3RvcjsKIGNsYXNzIFdlYkZyYW1lSW1wbCA6IHB1Ymxp YyBXZWJGcmFtZSwgcHVibGljIFJlZkNvdW50ZWQ8V2ViRnJhbWVJbXBsPiB7CiBwdWJsaWM6CiAg ICAgLy8gV2ViRnJhbWUgbWV0aG9kczoKLSAgICB2aXJ0dWFsIFdlYlN0cmluZyBuYW1lKCkgY29u c3Q7CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgdW5pcXVlTmFtZSgpIGNvbnN0OwogICAgIHZpcnR1 YWwgV2ViU3RyaW5nIGFzc2lnbmVkTmFtZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBzZXRO YW1lKGNvbnN0IFdlYlN0cmluZyYpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IGZiNWUyMTc1NTczOTQ0NTRjNjMxY2EwYTc5ZDhkY2E5ZDU4NTRh ZTEuLmQyY2E5OWY5ZDYxMWEzNjllZGI2NTMyMWFhNzIyNWFhMGM1MTdjZjAgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAor MjAxMi0wOS0yNyAgTmFza28gT3Nrb3YgIDxuYXNrb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg TW92ZSBEdW1wUmVuZGVyVHJlZSB0byB1c2UgbmV3ZXIgdmVyc2lvbiBvZiB0aGUgbmFtZSBtZXRo b2Qgb2YKKyAgICAgICAgV2ViRnJhbWUgYW5kIHRoZSB3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3Nh Z2VFdmVudCBtZXRob2Qgb2YgV2ViRnJhbWVDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MjU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFdlYkZyYW1lIG5hbWUoKSBtZXRob2QgaXMgcmVt b3ZlZCBhbmQgcmVwbGFjZWQgYnkgYmV0dGVyIG5hbWVkCisgICAgICAgIHVuaXF1ZU5hbWUoKSBt ZXRob2QsIHNvIERSVCBuZWVkcyB0byBiZSB1cGRhdGVkIHRvIHVzZSB0aGlzIG5ldyB2ZXJzaW9u LgorICAgICAgICBBbHNvIHRoZSB3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3NhZ2VFdmVudCBpbiBX ZWJGcmFtZUNsaWVudCBnYWluZWQKKyAgICAgICAgb25lIG1vcmUgcGFyYW1ldGVyLCB3aGljaCBo YWQgdG8gYmUgYWRkZWQgaW4gRFJULgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGVzdFNoZWxsLmNwcDoKKyAgICAgICAgKGR1bXBGcmFtZXNBc1RleHQpOgorICAgICAgICAo ZHVtcEZyYW1lc0FzUHJpbnRlZFRleHQpOgorICAgICAgICAoZHVtcEZyYW1lU2Nyb2xsUG9zaXRp b24pOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcDoK KyAgICAgICAgKFdlYlZpZXdIb3N0Ojp1bmFibGVUb0ltcGxlbWVudFBvbGljeVdpdGhFcnJvcik6 CisgICAgICAgIChXZWJWaWV3SG9zdDo6d2lsbENoZWNrQW5kRGlzcGF0Y2hNZXNzYWdlRXZlbnQp OgorICAgICAgICAoV2ViVmlld0hvc3Q6OnByaW50RnJhbWVEZXNjcmlwdGlvbik6CisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaDoKKyAgICAgICAgKFdlYlZp ZXdIb3N0KToKKwogMjAxMi0wOS0yNiAgRGF2aWQgTWljaGFlbCBCYXJyICA8ZGF2aWRiYXJyQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGdyYWRlIG15c2VsZiBmcm9tIGNv bnRyaWJ1dG9yIHRvIGNvbW1pdHRlci4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9U ZXN0U2hlbGwuY3BwCmluZGV4IGU1ZTlkZWQ2YWUzMGYxOWVhY2I1ZWYwODRmOGQ4N2M5YzRlNDYz YmYuLjE3YmEwOGI4OGRiNDNiNjYwNDRiMmQzMmJiNWMzZGVjYmQ1ODQ2ZmUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAKKysrIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcApAQCAtMzk5LDcgKzM5OSw3IEBA IHN0YXRpYyBzdHJpbmcgZHVtcEZyYW1lc0FzVGV4dChXZWJGcmFtZSogZnJhbWUsIGJvb2wgcmVj dXJzaXZlKQogICAgIC8vIEFkZCBoZWFkZXIgZm9yIGFsbCBidXQgdGhlIG1haW4gZnJhbWUuIFNr aXAgZW1wdHkgZnJhbWVzLgogICAgIGlmIChmcmFtZS0+cGFyZW50KCkgJiYgIWZyYW1lLT5kb2N1 bWVudCgpLmRvY3VtZW50RWxlbWVudCgpLmlzTnVsbCgpKSB7CiAgICAgICAgIHJlc3VsdC5hcHBl bmQoIlxuLS0tLS0tLS1cbkZyYW1lOiAnIik7Ci0gICAgICAgIHJlc3VsdC5hcHBlbmQoZnJhbWUt Pm5hbWUoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgcmVzdWx0LmFwcGVuZChmcmFtZS0+dW5p cXVlTmFtZSgpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICByZXN1bHQuYXBwZW5kKCInXG4tLS0t LS0tLVxuIik7CiAgICAgfQogCkBAIC00MjUsNyArNDI1LDcgQEAgc3RhdGljIHN0cmluZyBkdW1w RnJhbWVzQXNQcmludGVkVGV4dChXZWJGcmFtZSogZnJhbWUsIGJvb2wgcmVjdXJzaXZlKQogICAg IC8vIEFkZCBoZWFkZXIgZm9yIGFsbCBidXQgdGhlIG1haW4gZnJhbWUuIFNraXAgZW1wdHkgZnJh bWVzLgogICAgIGlmIChmcmFtZS0+cGFyZW50KCkgJiYgIWZyYW1lLT5kb2N1bWVudCgpLmRvY3Vt ZW50RWxlbWVudCgpLmlzTnVsbCgpKSB7CiAgICAgICAgIHJlc3VsdC5hcHBlbmQoIlxuLS0tLS0t LS1cbkZyYW1lOiAnIik7Ci0gICAgICAgIHJlc3VsdC5hcHBlbmQoZnJhbWUtPm5hbWUoKS51dGY4 KCkuZGF0YSgpKTsKKyAgICAgICAgcmVzdWx0LmFwcGVuZChmcmFtZS0+dW5pcXVlTmFtZSgpLnV0 ZjgoKS5kYXRhKCkpOwogICAgICAgICByZXN1bHQuYXBwZW5kKCInXG4tLS0tLS0tLVxuIik7CiAg ICAgfQogCkBAIC00NDUsNyArNDQ1LDcgQEAgc3RhdGljIHZvaWQgZHVtcEZyYW1lU2Nyb2xsUG9z aXRpb24oV2ViRnJhbWUqIGZyYW1lLCBib29sIHJlY3Vyc2l2ZSkKICAgICBXZWJTaXplIG9mZnNl dCA9IGZyYW1lLT5zY3JvbGxPZmZzZXQoKTsKICAgICBpZiAob2Zmc2V0LndpZHRoID4gMCB8fCBv ZmZzZXQuaGVpZ2h0ID4gMCkgewogICAgICAgICBpZiAoZnJhbWUtPnBhcmVudCgpKQotICAgICAg ICAgICAgcHJpbnRmKCJmcmFtZSAnJXMnICIsIGZyYW1lLT5uYW1lKCkudXRmOCgpLmRhdGEoKSk7 CisgICAgICAgICAgICBwcmludGYoImZyYW1lICclcycgIiwgZnJhbWUtPnVuaXF1ZU5hbWUoKS51 dGY4KCkuZGF0YSgpKTsKICAgICAgICAgcHJpbnRmKCJzY3JvbGxlZCB0byAlZCwlZFxuIiwgb2Zm c2V0LndpZHRoLCBvZmZzZXQuaGVpZ2h0KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcAppbmRleCBmOGQ4MDRlOTY0ODQ0NzAyYjcxMzE5 ZjM0N2IxOWRmYmIzYzI4MGZhLi5lMGIwZDE0OTcxOWYwNmZlMzI5Njg4Y2ViYzc2YzE1M2UxMWJl NzllIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9z dC5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3Bw CkBAIC0xMDk2LDcgKzEwOTYsNyBAQCB2b2lkIFdlYlZpZXdIb3N0Ojp1bmFibGVUb0ltcGxlbWVu dFBvbGljeVdpdGhFcnJvcihXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFdlYlVSTAogewogICAgIHBy aW50ZigiUG9saWN5IGRlbGVnYXRlOiB1bmFibGUgdG8gaW1wbGVtZW50IHBvbGljeSB3aXRoIGVy cm9yIGRvbWFpbiAnJXMnLCAiCiAgICAgICAgICAgICJlcnJvciBjb2RlICVkLCBpbiBmcmFtZSAn JXMnXG4iLAotICAgICAgICAgICBlcnJvci5kb21haW4udXRmOCgpLmRhdGEoKSwgZXJyb3IucmVh c29uLCBmcmFtZS0+bmFtZSgpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgZXJyb3IuZG9t YWluLnV0ZjgoKS5kYXRhKCksIGVycm9yLnJlYXNvbiwgZnJhbWUtPnVuaXF1ZU5hbWUoKS51dGY4 KCkuZGF0YSgpKTsKIH0KIAogdm9pZCBXZWJWaWV3SG9zdDo6d2lsbFBlcmZvcm1DbGllbnRSZWRp cmVjdChXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFdlYlVSTCYgZnJvbSwgY29uc3QgV2ViVVJMJiB0 bywKQEAgLTEzOTksNyArMTM5OSw3IEBAIHZvaWQgV2ViVmlld0hvc3Q6OmRlbGV0ZUZpbGVTeXN0 ZW0oV2ViS2l0OjpXZWJGcmFtZSogZnJhbWUsIFdlYktpdDo6V2ViRmlsZVN5c3RlCiAgICAgd2Vi a2l0X3N1cHBvcnQ6OkRlbGV0ZUZpbGVTeXN0ZW0oZnJhbWUsIHR5cGUsIGNhbGxiYWNrcyk7CiB9 CiAKLWJvb2wgV2ViVmlld0hvc3Q6OndpbGxDaGVja0FuZERpc3BhdGNoTWVzc2FnZUV2ZW50KFdl YkZyYW1lKiBzb3VyY2UsIFdlYlNlY3VyaXR5T3JpZ2luIHRhcmdldCwgV2ViRE9NTWVzc2FnZUV2 ZW50IGV2ZW50KQorYm9vbCBXZWJWaWV3SG9zdDo6d2lsbENoZWNrQW5kRGlzcGF0Y2hNZXNzYWdl RXZlbnQoV2ViRnJhbWUqIHNvdXJjZUZyYW1lLCBXZWJGcmFtZSogdGFyZ2V0RnJhbWUsIFdlYlNl Y3VyaXR5T3JpZ2luIHRhcmdldCwgV2ViRE9NTWVzc2FnZUV2ZW50IGV2ZW50KQogewogICAgIGlm IChtX3NoZWxsLT50ZXN0UnVubmVyKCktPnNob3VsZEludGVyY2VwdFBvc3RNZXNzYWdlKCkpIHsK ICAgICAgICAgZnB1dHMoImludGVyY2VwdGVkIHBvc3RNZXNzYWdlXG4iLCBzdGRvdXQpOwpAQCAt MTc0NSw3ICsxNzQ1LDcgQEAgdm9pZCBXZWJWaWV3SG9zdDo6dXBkYXRlU2Vzc2lvbkhpc3Rvcnko V2ViRnJhbWUqIGZyYW1lKQogCiB2b2lkIFdlYlZpZXdIb3N0OjpwcmludEZyYW1lRGVzY3JpcHRp b24oV2ViRnJhbWUqIHdlYmZyYW1lKQogewotICAgIHN0cmluZyBuYW1lOCA9IHdlYmZyYW1lLT5u YW1lKCkudXRmOCgpOworICAgIHN0cmluZyBuYW1lOCA9IHdlYmZyYW1lLT51bmlxdWVOYW1lKCku dXRmOCgpOwogICAgIGlmICh3ZWJmcmFtZSA9PSB3ZWJWaWV3KCktPm1haW5GcmFtZSgpKSB7CiAg ICAgICAgIGlmICghbmFtZTgubGVuZ3RoKCkpIHsKICAgICAgICAgICAgIGZwdXRzKCJtYWluIGZy YW1lIiwgc3Rkb3V0KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L1dlYlZpZXdIb3N0LmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9z dC5oCmluZGV4IDRhMzYyN2Y5MGU5M2Y0MmE2Njc3MTc2NzQyNzczNTQwYjg0NmQyZmUuLmMyY2I2 ODg3ODVjYWY4ZTE2MjRmZjk4Njk1MjhiZDNkY2ZmZjVlYTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKKysrIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaApAQCAtMjY4LDcgKzI2OCw5IEBAIGNsYXNzIFdl YlZpZXdIb3N0IDogcHVibGljIFdlYktpdDo6V2ViVmlld0NsaWVudCwgcHVibGljIFdlYktpdDo6 V2ViRnJhbWVDbGllbnQsCiAgICAgdmlydHVhbCB2b2lkIGRpZERldGVjdFhTUyhXZWJLaXQ6Oldl YkZyYW1lKiwgY29uc3QgV2ViS2l0OjpXZWJVUkwmLCBib29sIGRpZEJsb2NrRW50aXJlUGFnZSk7 CiAgICAgdmlydHVhbCB2b2lkIG9wZW5GaWxlU3lzdGVtKFdlYktpdDo6V2ViRnJhbWUqLCBXZWJL aXQ6OldlYkZpbGVTeXN0ZW06OlR5cGUsIGxvbmcgbG9uZyBzaXplLCBib29sIGNyZWF0ZSwgV2Vi S2l0OjpXZWJGaWxlU3lzdGVtQ2FsbGJhY2tzKik7CiAgICAgdmlydHVhbCB2b2lkIGRlbGV0ZUZp bGVTeXN0ZW0oV2ViS2l0OjpXZWJGcmFtZSosIFdlYktpdDo6V2ViRmlsZVN5c3RlbTo6VHlwZSwg V2ViS2l0OjpXZWJGaWxlU3lzdGVtQ2FsbGJhY2tzKik7Ci0gICAgdmlydHVhbCBib29sIHdpbGxD aGVja0FuZERpc3BhdGNoTWVzc2FnZUV2ZW50KFdlYktpdDo6V2ViRnJhbWUqIHNvdXJjZSwgV2Vi S2l0OjpXZWJTZWN1cml0eU9yaWdpbiB0YXJnZXQsIFdlYktpdDo6V2ViRE9NTWVzc2FnZUV2ZW50 KTsKKyAgICB2aXJ0dWFsIGJvb2wgd2lsbENoZWNrQW5kRGlzcGF0Y2hNZXNzYWdlRXZlbnQoCisg ICAgICAgIFdlYktpdDo6V2ViRnJhbWUqIHNvdXJjZUZyYW1lLCBXZWJLaXQ6OldlYkZyYW1lKiB0 YXJnZXRGcmFtZSwgCisgICAgICAgIFdlYktpdDo6V2ViU2VjdXJpdHlPcmlnaW4gdGFyZ2V0LCBX ZWJLaXQ6OldlYkRPTU1lc3NhZ2VFdmVudCk7CiAgICAgdmlydHVhbCB2b2lkIHJlZ2lzdGVySW50 ZW50U2VydmljZShXZWJLaXQ6OldlYkZyYW1lKiwgY29uc3QgV2ViS2l0OjpXZWJJbnRlbnRTZXJ2 aWNlSW5mbyYpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaEludGVudChXZWJLaXQ6OldlYkZy YW1lKiwgY29uc3QgV2ViS2l0OjpXZWJJbnRlbnRSZXF1ZXN0Jik7CiAgICAgdmlydHVhbCB2b2lk IGRlbGl2ZXJlZEludGVudFJlc3VsdChXZWJLaXQ6OldlYkZyYW1lKiwgaW50LCBjb25zdCBXZWJL aXQ6OldlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYpOwo=