141569 2015-02-13 11:23:36 -0800 [Mac, iOS] Adjust pagination behavior for Mail.app printing use 2015-04-28 17:53:44 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 144366 1 bfulgham bfulgham andersca bfulgham commit-queue esprehn+autocc glenn hyatt kondapallykalyan webkit-bug-importer oldest_to_newest 1068979 0 bfulgham 2015-02-13 11:23:36 -0800 Certain uses of iframe elements in WebKit clients can cause undesirable printing behavior. WebKit attempts to keep all contents of an iframe together on the same page, but in some cases that does not produce good looking print output. This bug provides a new setting that allows the default printing behavior to be overridden. 1068980 1 bfulgham 2015-02-13 11:28:27 -0800 <rdar://problem/14912763> 1068983 2 246537 bfulgham 2015-02-13 11:31:43 -0800 Created attachment 246537 Patch 1069002 3 246541 bfulgham 2015-02-13 12:28:20 -0800 Created attachment 246541 Patch 1069006 4 246541 andersca 2015-02-13 12:33:29 -0800 Comment on attachment 246541 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246541&action=review > Source/WebCore/rendering/RenderBlockFlow.cpp:1617 > +static const AtomicString& messageContainerName() > +{ > + static NeverDestroyed<AtomicString> messageContainerNameString("messageContentContainer", AtomicString::ConstructFromLiteral); > + return messageContainerNameString; > +} It's bad to use AtomicString inside NeverDestroyed since they are different for different threads. I'd just use a literal in the function below instead. 1069016 5 246545 bfulgham 2015-02-13 13:26:15 -0800 Created attachment 246545 Patch 1069017 6 bfulgham 2015-02-13 13:34:43 -0800 (In reply to comment #4) > Comment on attachment 246541 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=246541&action=review > > > Source/WebCore/rendering/RenderBlockFlow.cpp:1617 > > +static const AtomicString& messageContainerName() > > +{ > > + static NeverDestroyed<AtomicString> messageContainerNameString("messageContentContainer", AtomicString::ConstructFromLiteral); > > + return messageContainerNameString; > > +} > > It's bad to use AtomicString inside NeverDestroyed since they are different > for different threads. I'd just use a literal in the function below instead. OK! 1069022 7 bfulgham 2015-02-13 13:56:06 -0800 Committed r180076: <http://trac.webkit.org/changeset/180076> 246537 2015-02-13 11:31:43 -0800 2015-02-13 12:28:15 -0800 Patch bug-141569-20150213113141.patch text/plain 8385 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MDA2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAyLTEzICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gQWRqdXN0 IHBhZ2luYXRpb24gYmVoYXZpb3IgZm9yIE1haWwuYXBwIHByaW50aW5nIHVzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNTY5CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xNDkxMjc2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaW46IEFkZCBuZXcgcGFnaW5hdGlvbiBz ZXR0aW5nIGZsYWcuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjptZXNzYWdlQ29udGFpbmVyTmFtZSk6IEFkZGVkLgorICAgICAgICAo V2ViQ29yZTo6bmVlZHNQYWdpbmF0aW9uUXVpcmspOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrRmxvdzo6YWRqdXN0TGluZVBvc2l0aW9uRm9yUGFnaW5hdGlvbik6IERvbid0 IG1vdmUgdGhlIG1lc3NhZ2UgY29udGVudAorICAgICAgICBkaXYgdG8gYSBuZXcgcGFnZSB3aGVu IHVzaW5nIHRoaXMgc3BlY2lhbCBwcmludGluZyBtb2RlLgorCiAyMDE1LTAyLTEzICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENyYXNoZXMgdW5kZXIg UmVuZGVyTGF5ZXI6OmhpdFRlc3RMYXllciB1bmRlciBkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0 ZWRQbHVnSW4oKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCShyZXZpc2lvbiAxODAwNDkp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0y MzIsMyArMjMyLDUgQEAgbG9uZ01vdXNlUHJlc3NFbmFibGVkIGluaXRpYWw9ZmFsc2UKIHNlcnZp Y2VDb250cm9sc0VuYWJsZWQgaW5pdGlhbD1mYWxzZSwgY29uZGl0aW9uYWw9U0VSVklDRV9DT05U Uk9MUwogCiBpZ25vcmVWaWV3cG9ydFNjYWxpbmdDb25zdHJhaW50cyBpbml0aWFsPWZhbHNlCisK K3BhZ2luYXRpb25RdWlya0VuYWJsZWQgaW5pdGlhbD1mYWxzZQpcIE5vIG5ld2xpbmUgYXQgZW5k IG9mIGZpbGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwCShyZXZpc2lvbiAxODAwNDkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsOSArNDUsMTEgQEAKICNpbmNs dWRlICJSZW5kZXJUYWJsZUNlbGwuaCIKICNpbmNsdWRlICJSZW5kZXJUZXh0LmgiCiAjaW5jbHVk ZSAiUmVuZGVyVmlldy5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU2ltcGxl TGluZUxheW91dEZ1bmN0aW9ucy5oIgogI2luY2x1ZGUgIlZlcnRpY2FsUG9zaXRpb25DYWNoZS5o IgogI2luY2x1ZGUgIlZpc2libGVQb3NpdGlvbi5oIgorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ry b3llZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE2MDgsNiArMTYxMCwyNCBAQCBz dGF0aWMgaW5saW5lIExheW91dFVuaXQgY2FsY3VsYXRlTWluaW11CiAgICAgcmV0dXJuIGxpbmVC b3R0b20gLSBsaW5lVG9wOwogfQogCisjaWYgUExBVEZPUk0oQ09DT0EpCitzdGF0aWMgY29uc3Qg QXRvbWljU3RyaW5nJiBtZXNzYWdlQ29udGFpbmVyTmFtZSgpCit7CisgICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPEF0b21pY1N0cmluZz4gbWVzc2FnZUNvbnRhaW5lck5hbWVTdHJpbmcoIm1lc3Nh Z2VDb250ZW50Q29udGFpbmVyIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7 CisgICAgcmV0dXJuIG1lc3NhZ2VDb250YWluZXJOYW1lU3RyaW5nOworfQorI2VuZGlmCisKK3N0 YXRpYyBpbmxpbmUgYm9vbCBuZWVkc1BhZ2luYXRpb25RdWlyayhSb290SW5saW5lQm94JiBsaW5l Qm94KQoreworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGJvb2wgcGFnaW5hdGlvblF1aXJrRW5h YmxlZCA9IGxpbmVCb3gucmVuZGVyZXIoKS5kb2N1bWVudCgpLnNldHRpbmdzKCktPnBhZ2luYXRp b25RdWlya0VuYWJsZWQoKTsKKyAgICBpZiAocGFnaW5hdGlvblF1aXJrRW5hYmxlZCAmJiBsaW5l Qm94LnJlbmRlcmVyKCkuZWxlbWVudCgpICYmIGxpbmVCb3gucmVuZGVyZXIoKS5lbGVtZW50KCkt PmlkRm9yU3R5bGVSZXNvbHV0aW9uKCkgPT0gbWVzc2FnZUNvbnRhaW5lck5hbWUoKSkKKyAgICAg ICAgcmV0dXJuIHRydWU7CisjZW5kaWYKKyAgICByZXR1cm4gZmFsc2U7Cit9CisgICAgCiB2b2lk IFJlbmRlckJsb2NrRmxvdzo6YWRqdXN0TGluZVBvc2l0aW9uRm9yUGFnaW5hdGlvbihSb290SW5s aW5lQm94KiBsaW5lQm94LCBMYXlvdXRVbml0JiBkZWx0YSwgYm9vbCYgb3ZlcmZsb3dzUmVnaW9u LCBSZW5kZXJGbG93VGhyZWFkKiBmbG93VGhyZWFkKQogewogICAgIC8vIEZJWE1FOiBGb3Igbm93 IHdlIHBhZ2luYXRlIHVzaW5nIGxpbmUgb3ZlcmZsb3cuIFRoaXMgZW5zdXJlcyB0aGF0IGxpbmVz IGRvbid0IG92ZXJsYXAgYXQgYWxsIHdoZW4gd2UKQEAgLTE2OTAsNiArMTcxMCw4IEBAIHZvaWQg UmVuZGVyQmxvY2tGbG93OjphZGp1c3RMaW5lUG9zaXRpb24KICAgICAgICAgICAgIGF1dG8gZmly c3RSb290Qm94ID0gdGhpcy0+Zmlyc3RSb290Qm94KCk7CiAgICAgICAgICAgICBhdXRvIGZpcnN0 Um9vdEJveE92ZXJmbG93UmVjdCA9IGZpcnN0Um9vdEJveC0+bG9naWNhbFZpc3VhbE92ZXJmbG93 UmVjdChmaXJzdFJvb3RCb3gtPmxpbmVUb3AoKSwgZmlyc3RSb290Qm94LT5saW5lQm90dG9tKCkp OwogICAgICAgICAgICAgYXV0byBmaXJzdExpbmVVcHBlck92ZXJoYW5nID0gc3RkOjptYXgoLWZp cnN0Um9vdEJveE92ZXJmbG93UmVjdC55KCksIExheW91dFVuaXQoKSk7CisgICAgICAgICAgICBp ZiAobmVlZHNQYWdpbmF0aW9uUXVpcmsoKmxpbmVCb3gpKQorICAgICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgICAgIHNldFBhZ2luYXRpb25TdHJ1dChyZW1haW5pbmdMb2dpY2FsSGVpZ2h0 ICsgbG9naWNhbE9mZnNldCArIGZpcnN0TGluZVVwcGVyT3ZlcmhhbmcpOwogICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgZGVsdGEgKz0gcmVtYWluaW5nTG9naWNhbEhlaWdodDsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cJKHJldmlzaW9uIDE4MDA2MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAyLTEzICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gQWRqdXN0IHBhZ2lu YXRpb24gYmVoYXZpb3IgZm9yIE1haWwuYXBwIHByaW50aW5nIHVzZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNTY5CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xNDkxMjc2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKTogQWRkIG5ldyBm bGFnLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUp OiBEaXR0by4KKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oOiBE aXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMpOiBTZXQgbmV3IHBhZ2UgY29u c3RydWN0aW9uIGZsYWcuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OnBhZ2luYXRpb25RdWlya0VuYWJsZWQpOiBBc2sgZm9yIG5ldyBwYWdp bmF0aW9uIGZsYWcKKyAgICAgICAgd2hlbiBydW5uaW5nIGFzIGEgTWFpbCBjbGllbnQuCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpXZWJQYWdlKTogU2V0IHVwIHBhZ2luYXRpb24gYmFzZWQgb24gZGVzaXJlZCBzZXR0 aW5ncy4KKwogMjAxNS0wMi0xMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4oKSBzaG91bGQg b25seSB0cmF2ZXJzZSB2aXNpYmxlIEZyYW1lcwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVk L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMTgwMDQ5 KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC04MCw2ICs4MCw3IEBAIHZvaWQgV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZW5jb2RlKEkKICAgICBlbmNvZGVyIDw8IGF2YWlsYWJsZVNjcmVlblNpemU7CiAg ICAgZW5jb2RlciA8PCB0ZXh0QXV0b3NpemluZ1dpZHRoOwogI2VuZGlmCisgICAgZW5jb2RlciA8 PCBwYWdpbmF0aW9uUXVpcmtFbmFibGVkOwogfQogCiBib29sIFdlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnM6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKQEAgLTE3NCw2ICsxNzUsOCBAQCBib29sIFdlYlBh Z2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJCiAgICAgICAgIHJldHVybiBmYWxzZTsKICNl bmRpZgogCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLnBhZ2luYXRpb25RdWly a0VuYWJsZWQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMuaAkocmV2aXNpb24gMTgwMDQ5KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBh Z2VDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMTIzLDYgKzEyMyw3IEBA IHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBXZWJDb3JlOjpGbG9hdFNp emUgYXZhaWxhYmxlU2NyZWVuU2l6ZTsKICAgICBmbG9hdCB0ZXh0QXV0b3NpemluZ1dpZHRoOwog I2VuZGlmCisgICAgYm9vbCBwYWdpbmF0aW9uUXVpcmtFbmFibGVkOwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAkocmV2aXNpb24gMTgwMDQ5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4MTYsNiArNDgxNiwxMiBAQCBXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6CiAgICAgcGFyYW1ldGVycy5taW1lVHlw ZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVycyA9IG1fcGFnZUNsaWVudC5taW1lVHlwZXNXaXRo Q3VzdG9tQ29udGVudFByb3ZpZGVycygpOwogI2VuZGlmCiAKKyNpZiBQTEFURk9STShDT0NPQSkK KyAgICBwYXJhbWV0ZXJzLnBhZ2luYXRpb25RdWlya0VuYWJsZWQgPSBwYWdpbmF0aW9uUXVpcmtF bmFibGVkKCk7CisjZWxzZQorICAgIHBhcmFtZXRlcnMucGFnaW5hdGlvblF1aXJrRW5hYmxlZCA9 IGZhbHNlOworI2VuZGlmCisKICAgICByZXR1cm4gcGFyYW1ldGVyczsKIH0KIApJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTgwMDQ5KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMjI0LDYgKzEyMjQsOCBAQCBwcml2YXRlOgogCiAgICAgLy8gRGljdGlvbmFyeS4KICAgICB2 b2lkIGRpZFBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwKGNvbnN0IERpY3Rpb25hcnlQb3B1cEluZm8m KTsKKworICAgIGJvb2wgcGFnaW5hdGlvblF1aXJrRW5hYmxlZCgpOwogI2VuZGlmCiAKICAgICAv LyBTcGVsbGluZyBhbmQgZ3JhbW1hci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViUGFnZVByb3h5TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCShyZXZpc2lvbiAxODAwNDkpCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQkod29ya2luZyBjb3B5KQpA QCAtNjYxLDYgKzY2MSwxMSBAQCBDR1JlY3QgV2ViUGFnZVByb3h5Ojpib3VuZHNPZkxheWVySW5M YXllCiAgICAgcmV0dXJuIG1fcGFnZUNsaWVudC5ib3VuZHNPZkxheWVySW5MYXllckJhY2tlZFdp bmRvd0Nvb3JkaW5hdGVzKGxheWVyKTsKIH0KIAorYm9vbCBXZWJQYWdlUHJveHk6OnBhZ2luYXRp b25RdWlya0VuYWJsZWQoKQoreworICAgIHJldHVybiBhcHBsaWNhdGlvbklzQXBwbGVNYWlsKCk7 Cit9CisgICAgCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1B QykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAJKHJldmlzaW9uIDE4MDA0OSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTA0LDYgKzUwNCw3IEBAIFdlYlBhZ2U6 OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25zdCAKICAgICBpZiAoV2ViTWVkaWFLZXlTdG9y YWdlTWFuYWdlciogbWFuYWdlciA9IHdlYlByb2Nlc3Muc3VwcGxlbWVudDxXZWJNZWRpYUtleVN0 b3JhZ2VNYW5hZ2VyPigpKQogICAgICAgICBtX3BhZ2UtPnNldHRpbmdzKCkuc2V0TWVkaWFLZXlz U3RvcmFnZURpcmVjdG9yeShtYW5hZ2VyLT5tZWRpYUtleVN0b3JhZ2VEaXJlY3RvcnkoKSk7CiAj ZW5kaWYKKyAgICBtX3BhZ2UtPnNldHRpbmdzKCkuc2V0UGFnaW5hdGlvblF1aXJrRW5hYmxlZChw YXJhbWV0ZXJzLnBhZ2luYXRpb25RdWlya0VuYWJsZWQpOwogfQogCiB2b2lkIFdlYlBhZ2U6OnJl aW5pdGlhbGl6ZVdlYlBhZ2UoY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1l dGVycykK 246541 2015-02-13 12:28:20 -0800 2015-02-13 13:26:12 -0800 Patch bug-141569-20150213122818.patch text/plain 10697 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MDA2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAyLTEzICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gQWRqdXN0 IHBhZ2luYXRpb24gYmVoYXZpb3IgZm9yIE1haWwuYXBwIHByaW50aW5nIHVzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNTY5CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xNDkxMjc2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaW46IEFkZCBuZXcgcGFnaW5hdGlvbiBz ZXR0aW5nIGZsYWcuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjptZXNzYWdlQ29udGFpbmVyTmFtZSk6IEFkZGVkLgorICAgICAgICAo V2ViQ29yZTo6bmVlZHNQYWdpbmF0aW9uUXVpcmspOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrRmxvdzo6YWRqdXN0TGluZVBvc2l0aW9uRm9yUGFnaW5hdGlvbik6IERvbid0 IG1vdmUgdGhlIG1lc3NhZ2UgY29udGVudAorICAgICAgICBkaXYgdG8gYSBuZXcgcGFnZSB3aGVu IHVzaW5nIHRoaXMgc3BlY2lhbCBwcmludGluZyBtb2RlLgorCiAyMDE1LTAyLTEzICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENyYXNoZXMgdW5kZXIg UmVuZGVyTGF5ZXI6OmhpdFRlc3RMYXllciB1bmRlciBkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0 ZWRQbHVnSW4oKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCShyZXZpc2lvbiAxODAwNDkp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0y MzIsMyArMjMyLDUgQEAgbG9uZ01vdXNlUHJlc3NFbmFibGVkIGluaXRpYWw9ZmFsc2UKIHNlcnZp Y2VDb250cm9sc0VuYWJsZWQgaW5pdGlhbD1mYWxzZSwgY29uZGl0aW9uYWw9U0VSVklDRV9DT05U Uk9MUwogCiBpZ25vcmVWaWV3cG9ydFNjYWxpbmdDb25zdHJhaW50cyBpbml0aWFsPWZhbHNlCisK K2FwcGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQgaW5pdGlhbD1mYWxzZQpcIE5vIG5ld2xp bmUgYXQgZW5kIG9mIGZpbGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwCShyZXZpc2lvbiAxODAwNDkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMiw3ICsyLDcgQEAK ICAqIENvcHlyaWdodCAoQykgMTk5OSBMYXJzIEtub2xsIChrbm9sbEBrZGUub3JnKQogICogICAg ICAgICAgIChDKSAxOTk5IEFudHRpIEtvaXZpc3RvIChrb2l2aXN0b0BrZGUub3JnKQogICogICAg ICAgICAgIChDKSAyMDA3IERhdmlkIFNtaXRoIChjYXRmaXNoLm1hbkBnbWFpbC5jb20pCi0gKiBD b3B5cmlnaHQgKEMpIDIwMDMtMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiBDb3B5cmlnaHQgKEMpIDIwMDMtMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKiBDb3B5cmlnaHQgKEMpIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkIDIwMTAuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlv dSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgpAQCAtNDUsOSArNDUsMTEgQEAKICNpbmNsdWRl ICJSZW5kZXJUYWJsZUNlbGwuaCIKICNpbmNsdWRlICJSZW5kZXJUZXh0LmgiCiAjaW5jbHVkZSAi UmVuZGVyVmlldy5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU2ltcGxlTGlu ZUxheW91dEZ1bmN0aW9ucy5oIgogI2luY2x1ZGUgIlZlcnRpY2FsUG9zaXRpb25DYWNoZS5oIgog I2luY2x1ZGUgIlZpc2libGVQb3NpdGlvbi5oIgorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3ll ZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE2MDgsNiArMTYxMCwyMSBAQCBzdGF0 aWMgaW5saW5lIExheW91dFVuaXQgY2FsY3VsYXRlTWluaW11CiAgICAgcmV0dXJuIGxpbmVCb3R0 b20gLSBsaW5lVG9wOwogfQogCitzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5nJiBtZXNzYWdlQ29u dGFpbmVyTmFtZSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEF0b21pY1N0cmluZz4g bWVzc2FnZUNvbnRhaW5lck5hbWVTdHJpbmcoIm1lc3NhZ2VDb250ZW50Q29udGFpbmVyIiwgQXRv bWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7CisgICAgcmV0dXJuIG1lc3NhZ2VDb250 YWluZXJOYW1lU3RyaW5nOworfQorCitzdGF0aWMgaW5saW5lIGJvb2wgbmVlZHNBcHBsZU1haWxQ YWdpbmF0aW9uUXVpcmsoUm9vdElubGluZUJveCYgbGluZUJveCkKK3sKKyAgICBib29sIGFwcGxl TWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQgPSBsaW5lQm94LnJlbmRlcmVyKCkuZG9jdW1lbnQo KS5zZXR0aW5ncygpLT5hcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtFbmFibGVkKCk7CisgICAgaWYg KGFwcGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQgJiYgbGluZUJveC5yZW5kZXJlcigpLmVs ZW1lbnQoKSAmJiBsaW5lQm94LnJlbmRlcmVyKCkuZWxlbWVudCgpLT5pZEZvclN0eWxlUmVzb2x1 dGlvbigpID09IG1lc3NhZ2VDb250YWluZXJOYW1lKCkpCisgICAgICAgIHJldHVybiB0cnVlOwor CisgICAgcmV0dXJuIGZhbHNlOworfQorICAgIAogdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmFkanVz dExpbmVQb3NpdGlvbkZvclBhZ2luYXRpb24oUm9vdElubGluZUJveCogbGluZUJveCwgTGF5b3V0 VW5pdCYgZGVsdGEsIGJvb2wmIG92ZXJmbG93c1JlZ2lvbiwgUmVuZGVyRmxvd1RocmVhZCogZmxv d1RocmVhZCkKIHsKICAgICAvLyBGSVhNRTogRm9yIG5vdyB3ZSBwYWdpbmF0ZSB1c2luZyBsaW5l IG92ZXJmbG93LiBUaGlzIGVuc3VyZXMgdGhhdCBsaW5lcyBkb24ndCBvdmVybGFwIGF0IGFsbCB3 aGVuIHdlCkBAIC0xNjkwLDYgKzE3MDcsOCBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6YWRqdXN0 TGluZVBvc2l0aW9uCiAgICAgICAgICAgICBhdXRvIGZpcnN0Um9vdEJveCA9IHRoaXMtPmZpcnN0 Um9vdEJveCgpOwogICAgICAgICAgICAgYXV0byBmaXJzdFJvb3RCb3hPdmVyZmxvd1JlY3QgPSBm aXJzdFJvb3RCb3gtPmxvZ2ljYWxWaXN1YWxPdmVyZmxvd1JlY3QoZmlyc3RSb290Qm94LT5saW5l VG9wKCksIGZpcnN0Um9vdEJveC0+bGluZUJvdHRvbSgpKTsKICAgICAgICAgICAgIGF1dG8gZmly c3RMaW5lVXBwZXJPdmVyaGFuZyA9IHN0ZDo6bWF4KC1maXJzdFJvb3RCb3hPdmVyZmxvd1JlY3Qu eSgpLCBMYXlvdXRVbml0KCkpOworICAgICAgICAgICAgaWYgKG5lZWRzQXBwbGVNYWlsUGFnaW5h dGlvblF1aXJrKCpsaW5lQm94KSkKKyAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICBzZXRQYWdpbmF0aW9uU3RydXQocmVtYWluaW5nTG9naWNhbEhlaWdodCArIGxvZ2ljYWxPZmZz ZXQgKyBmaXJzdExpbmVVcHBlck92ZXJoYW5nKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAg ICAgIGRlbHRhICs9IHJlbWFpbmluZ0xvZ2ljYWxIZWlnaHQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZp c2lvbiAxODAwNjMpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwyNCBAQAorMjAxNS0wMi0xMyAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFw cGxlLmNvbT4KKworICAgICAgICBbTWFjLCBpT1NdIEFkanVzdCBwYWdpbmF0aW9uIGJlaGF2aW9y IGZvciBNYWlsLmFwcCBwcmludGluZyB1c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MTU2OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTQ5MTI3 NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT aGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSk6IEFkZCBuZXcgZmxhZy4KKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKTogRGl0dG8uCisgICAg ICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaDogRGl0dG8uCisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKTogU2V0IG5ldyBwYWdlIGNvbnN0cnVjdGlvbiBmbGFn LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpwYWdpbmF0aW9uUXVpcmtFbmFibGVkKTogQXNrIGZvciBuZXcgcGFnaW5hdGlvbiBmbGFnCisg ICAgICAgIHdoZW4gcnVubmluZyBhcyBhIE1haWwgY2xpZW50LgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6V2ViUGFn ZSk6IFNldCB1cCBwYWdpbmF0aW9uIGJhc2VkIG9uIGRlc2lyZWQgc2V0dGluZ3MuCisKIDIwMTUt MDItMTIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg ZGV0ZXJtaW5lUHJpbWFyeVNuYXBzaG90dGVkUGx1Z0luKCkgc2hvdWxkIG9ubHkgdHJhdmVyc2Ug dmlzaWJsZSBGcmFtZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDE4MDA0OSkKKysrIFNvdXJjZS9X ZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExLCAy MDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtODAsNiArODAsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnM6OmVuY29kZShJCiAgICAgZW5jb2RlciA8PCBhdmFpbGFibGVTY3JlZW5TaXplOwogICAgIGVu Y29kZXIgPDwgdGV4dEF1dG9zaXppbmdXaWR0aDsKICNlbmRpZgorICAgIGVuY29kZXIgPDwgYXBw bGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZDsKIH0KIAogYm9vbCBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCkBAIC0xNzQsNiArMTc1LDggQEAgYm9vbCBX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAjZW5kaWYKIAorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5hcHBsZU1haWxQ YWdpbmF0aW9uUXVpcmtFbmFibGVkKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0 dXJuIHRydWU7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDE4MDA0OSkKKysrIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTEs NSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSwgMjAxNSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKQEAgLTEyMyw2ICsxMjMsNyBAQCBzdHJ1Y3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyB7 CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIGF2YWlsYWJsZVNjcmVlblNpemU7CiAgICAgZmxvYXQg dGV4dEF1dG9zaXppbmdXaWR0aDsKICNlbmRpZgorICAgIGJvb2wgYXBwbGVNYWlsUGFnaW5hdGlv blF1aXJrRW5hYmxlZDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE4MDA0OSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEsIDIw MTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEy IEludGVsIENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dApAQCAtNDgxNiw2ICs0ODE2LDEyIEBAIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFn ZVByb3h5OjoKICAgICBwYXJhbWV0ZXJzLm1pbWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlk ZXJzID0gbV9wYWdlQ2xpZW50Lm1pbWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzKCk7 CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIHBhcmFtZXRlcnMuYXBwbGVNYWls UGFnaW5hdGlvblF1aXJrRW5hYmxlZCA9IGFwcGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQo KTsKKyNlbHNlCisgICAgcGFyYW1ldGVycy5hcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtFbmFibGVk ID0gZmFsc2U7CisjZW5kaWYKKwogICAgIHJldHVybiBwYXJhbWV0ZXJzOwogfQogCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAxODAwNDkpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExLCAyMDE0IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAx MSwgMjAxNC0yMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTIyNCw2ICsxMjI0LDggQEAgcHJpdmF0ZToKIAogICAg IC8vIERpY3Rpb25hcnkuCiAgICAgdm9pZCBkaWRQZXJmb3JtRGljdGlvbmFyeUxvb2t1cChjb25z dCBEaWN0aW9uYXJ5UG9wdXBJbmZvJik7CisKKyAgICBib29sIGFwcGxlTWFpbFBhZ2luYXRpb25R dWlya0VuYWJsZWQoKTsKICNlbmRpZgogCiAgICAgLy8gU3BlbGxpbmcgYW5kIGdyYW1tYXIuCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5t bQkocmV2aXNpb24gMTgwMDQ5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQ YWdlUHJveHlNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29w eXJpZ2h0IChDKSAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSwgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTY2MSw2ICs2NjEsMTEg QEAgQ0dSZWN0IFdlYlBhZ2VQcm94eTo6Ym91bmRzT2ZMYXllckluTGF5ZQogICAgIHJldHVybiBt X3BhZ2VDbGllbnQuYm91bmRzT2ZMYXllckluTGF5ZXJCYWNrZWRXaW5kb3dDb29yZGluYXRlcyhs YXllcik7CiB9CiAKK2Jvb2wgV2ViUGFnZVByb3h5OjphcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtF bmFibGVkKCkKK3sKKyAgICByZXR1cm4gYXBwbGljYXRpb25Jc0FwcGxlTWFpbCgpOworfQorICAg IAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZp c2lvbiAxODAwNDkpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDEwLCAyMDExLCAyMDEyLCAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSwgMjAxMiwgMjAxMy0yMDE1IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAxMiBJbnRlbCBDb3Jwb3Jh dGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAxMCBOb2tpYSBD b3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKICAqCkBAIC01MDQsNiArNTA0 LDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IAogICAgIGlmIChX ZWJNZWRpYUtleVN0b3JhZ2VNYW5hZ2VyKiBtYW5hZ2VyID0gd2ViUHJvY2Vzcy5zdXBwbGVtZW50 PFdlYk1lZGlhS2V5U3RvcmFnZU1hbmFnZXI+KCkpCiAgICAgICAgIG1fcGFnZS0+c2V0dGluZ3Mo KS5zZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KG1hbmFnZXItPm1lZGlhS2V5U3RvcmFnZURp cmVjdG9yeSgpKTsKICNlbmRpZgorICAgIG1fcGFnZS0+c2V0dGluZ3MoKS5zZXRBcHBsZU1haWxQ YWdpbmF0aW9uUXVpcmtFbmFibGVkKHBhcmFtZXRlcnMuYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJr RW5hYmxlZCk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZShjb25zdCBX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQo= 246545 2015-02-13 13:26:15 -0800 2015-02-13 13:35:56 -0800 Patch bug-141569-20150213132613.patch text/plain 10519 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MDA2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAyLTEzICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gQWRqdXN0 IHBhZ2luYXRpb24gYmVoYXZpb3IgZm9yIE1haWwuYXBwIHByaW50aW5nIHVzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNTY5CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xNDkxMjc2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaW46IEFkZCBuZXcgcGFnaW5hdGlvbiBz ZXR0aW5nIGZsYWcuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjptZXNzYWdlQ29udGFpbmVyTmFtZSk6IEFkZGVkLgorICAgICAgICAo V2ViQ29yZTo6bmVlZHNQYWdpbmF0aW9uUXVpcmspOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrRmxvdzo6YWRqdXN0TGluZVBvc2l0aW9uRm9yUGFnaW5hdGlvbik6IERvbid0 IG1vdmUgdGhlIG1lc3NhZ2UgY29udGVudAorICAgICAgICBkaXYgdG8gYSBuZXcgcGFnZSB3aGVu IHVzaW5nIHRoaXMgc3BlY2lhbCBwcmludGluZyBtb2RlLgorCiAyMDE1LTAyLTEzICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENyYXNoZXMgdW5kZXIg UmVuZGVyTGF5ZXI6OmhpdFRlc3RMYXllciB1bmRlciBkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0 ZWRQbHVnSW4oKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCShyZXZpc2lvbiAxODAwNDkp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0y MzIsMyArMjMyLDUgQEAgbG9uZ01vdXNlUHJlc3NFbmFibGVkIGluaXRpYWw9ZmFsc2UKIHNlcnZp Y2VDb250cm9sc0VuYWJsZWQgaW5pdGlhbD1mYWxzZSwgY29uZGl0aW9uYWw9U0VSVklDRV9DT05U Uk9MUwogCiBpZ25vcmVWaWV3cG9ydFNjYWxpbmdDb25zdHJhaW50cyBpbml0aWFsPWZhbHNlCisK K2FwcGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQgaW5pdGlhbD1mYWxzZQpcIE5vIG5ld2xp bmUgYXQgZW5kIG9mIGZpbGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwCShyZXZpc2lvbiAxODAwNDkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMiw3ICsyLDcgQEAK ICAqIENvcHlyaWdodCAoQykgMTk5OSBMYXJzIEtub2xsIChrbm9sbEBrZGUub3JnKQogICogICAg ICAgICAgIChDKSAxOTk5IEFudHRpIEtvaXZpc3RvIChrb2l2aXN0b0BrZGUub3JnKQogICogICAg ICAgICAgIChDKSAyMDA3IERhdmlkIFNtaXRoIChjYXRmaXNoLm1hbkBnbWFpbC5jb20pCi0gKiBD b3B5cmlnaHQgKEMpIDIwMDMtMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiBDb3B5cmlnaHQgKEMpIDIwMDMtMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKiBDb3B5cmlnaHQgKEMpIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkIDIwMTAuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlv dSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgpAQCAtNDUsOSArNDUsMTEgQEAKICNpbmNsdWRl ICJSZW5kZXJUYWJsZUNlbGwuaCIKICNpbmNsdWRlICJSZW5kZXJUZXh0LmgiCiAjaW5jbHVkZSAi UmVuZGVyVmlldy5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU2ltcGxlTGlu ZUxheW91dEZ1bmN0aW9ucy5oIgogI2luY2x1ZGUgIlZlcnRpY2FsUG9zaXRpb25DYWNoZS5oIgog I2luY2x1ZGUgIlZpc2libGVQb3NpdGlvbi5oIgorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3ll ZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE2MDgsNiArMTYxMCwxNSBAQCBzdGF0 aWMgaW5saW5lIExheW91dFVuaXQgY2FsY3VsYXRlTWluaW11CiAgICAgcmV0dXJuIGxpbmVCb3R0 b20gLSBsaW5lVG9wOwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgbmVlZHNBcHBsZU1haWxQYWdp bmF0aW9uUXVpcmsoUm9vdElubGluZUJveCYgbGluZUJveCkKK3sKKyAgICBib29sIGFwcGxlTWFp bFBhZ2luYXRpb25RdWlya0VuYWJsZWQgPSBsaW5lQm94LnJlbmRlcmVyKCkuZG9jdW1lbnQoKS5z ZXR0aW5ncygpLT5hcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtFbmFibGVkKCk7CisgICAgaWYgKGFw cGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQgJiYgbGluZUJveC5yZW5kZXJlcigpLmVsZW1l bnQoKSAmJiBsaW5lQm94LnJlbmRlcmVyKCkuZWxlbWVudCgpLT5pZEZvclN0eWxlUmVzb2x1dGlv bigpID09IEF0b21pY1N0cmluZygibWVzc2FnZUNvbnRlbnRDb250YWluZXIiLCBBdG9taWNTdHJp bmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBy ZXR1cm4gZmFsc2U7Cit9CisgICAgCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6YWRqdXN0TGluZVBv c2l0aW9uRm9yUGFnaW5hdGlvbihSb290SW5saW5lQm94KiBsaW5lQm94LCBMYXlvdXRVbml0JiBk ZWx0YSwgYm9vbCYgb3ZlcmZsb3dzUmVnaW9uLCBSZW5kZXJGbG93VGhyZWFkKiBmbG93VGhyZWFk KQogewogICAgIC8vIEZJWE1FOiBGb3Igbm93IHdlIHBhZ2luYXRlIHVzaW5nIGxpbmUgb3ZlcmZs b3cuIFRoaXMgZW5zdXJlcyB0aGF0IGxpbmVzIGRvbid0IG92ZXJsYXAgYXQgYWxsIHdoZW4gd2UK QEAgLTE2OTAsNiArMTcwMSw4IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjphZGp1c3RMaW5lUG9z aXRpb24KICAgICAgICAgICAgIGF1dG8gZmlyc3RSb290Qm94ID0gdGhpcy0+Zmlyc3RSb290Qm94 KCk7CiAgICAgICAgICAgICBhdXRvIGZpcnN0Um9vdEJveE92ZXJmbG93UmVjdCA9IGZpcnN0Um9v dEJveC0+bG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdChmaXJzdFJvb3RCb3gtPmxpbmVUb3AoKSwg Zmlyc3RSb290Qm94LT5saW5lQm90dG9tKCkpOwogICAgICAgICAgICAgYXV0byBmaXJzdExpbmVV cHBlck92ZXJoYW5nID0gc3RkOjptYXgoLWZpcnN0Um9vdEJveE92ZXJmbG93UmVjdC55KCksIExh eW91dFVuaXQoKSk7CisgICAgICAgICAgICBpZiAobmVlZHNBcHBsZU1haWxQYWdpbmF0aW9uUXVp cmsoKmxpbmVCb3gpKQorICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHNldFBh Z2luYXRpb25TdHJ1dChyZW1haW5pbmdMb2dpY2FsSGVpZ2h0ICsgbG9naWNhbE9mZnNldCArIGZp cnN0TGluZVVwcGVyT3ZlcmhhbmcpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgZGVs dGEgKz0gcmVtYWluaW5nTG9naWNhbEhlaWdodDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4 MDA2MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE1LTAyLTEzICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtNYWMsIGlPU10gQWRqdXN0IHBhZ2luYXRpb24gYmVoYXZpb3IgZm9yIE1h aWwuYXBwIHByaW50aW5nIHVzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQxNTY5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNDkxMjc2Mz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9X ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNy ZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKTogQWRkIG5ldyBmbGFnLgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBEaXR0by4KKyAgICAgICAgKiBT aGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oOiBEaXR0by4KKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpj cmVhdGlvblBhcmFtZXRlcnMpOiBTZXQgbmV3IHBhZ2UgY29uc3RydWN0aW9uIGZsYWcuCisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMv V2ViUGFnZVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBhZ2lu YXRpb25RdWlya0VuYWJsZWQpOiBBc2sgZm9yIG5ldyBwYWdpbmF0aW9uIGZsYWcKKyAgICAgICAg d2hlbiBydW5uaW5nIGFzIGEgTWFpbCBjbGllbnQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKTogU2V0 IHVwIHBhZ2luYXRpb24gYmFzZWQgb24gZGVzaXJlZCBzZXR0aW5ncy4KKwogMjAxNS0wMi0xMiAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBkZXRlcm1p bmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4oKSBzaG91bGQgb25seSB0cmF2ZXJzZSB2aXNpYmxl IEZyYW1lcwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMTgwMDQ5KQorKysgU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEsIDIwMTUgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC04MCw2ICs4MCw3IEBAIHZvaWQgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5j b2RlKEkKICAgICBlbmNvZGVyIDw8IGF2YWlsYWJsZVNjcmVlblNpemU7CiAgICAgZW5jb2RlciA8 PCB0ZXh0QXV0b3NpemluZ1dpZHRoOwogI2VuZGlmCisgICAgZW5jb2RlciA8PCBhcHBsZU1haWxQ YWdpbmF0aW9uUXVpcmtFbmFibGVkOwogfQogCiBib29sIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnM6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycyYgcGFyYW1ldGVycykKQEAgLTE3NCw2ICsxNzUsOCBAQCBib29sIFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJCiAgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRp ZgogCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmFwcGxlTWFpbFBhZ2luYXRp b25RdWlya0VuYWJsZWQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1 ZTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuaAkocmV2aXNpb24gMTgwMDQ5KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVk L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUg QEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExLCAyMDE1IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt MTIzLDYgKzEyMyw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBX ZWJDb3JlOjpGbG9hdFNpemUgYXZhaWxhYmxlU2NyZWVuU2l6ZTsKICAgICBmbG9hdCB0ZXh0QXV0 b3NpemluZ1dpZHRoOwogI2VuZGlmCisgICAgYm9vbCBhcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtF bmFibGVkOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTgwMDQ5KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEs NSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSwgMjAxNSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTIgSW50ZWwg Q29ycG9yYXRpb24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC00 ODE2LDYgKzQ4MTYsMTIgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6 OgogICAgIHBhcmFtZXRlcnMubWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92aWRlcnMgPSBt X3BhZ2VDbGllbnQubWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92aWRlcnMoKTsKICNlbmRp ZgogCisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgcGFyYW1ldGVycy5hcHBsZU1haWxQYWdpbmF0 aW9uUXVpcmtFbmFibGVkID0gYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZCgpOworI2Vs c2UKKyAgICBwYXJhbWV0ZXJzLmFwcGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQgPSBmYWxz ZTsKKyNlbmRpZgorCiAgICAgcmV0dXJuIHBhcmFtZXRlcnM7CiB9CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE4MDA0OSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1 ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEsIDIwMTQgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExLCAyMDE0 LTIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCkBAIC0xMjI0LDYgKzEyMjQsOCBAQCBwcml2YXRlOgogCiAgICAgLy8gRGlj dGlvbmFyeS4KICAgICB2b2lkIGRpZFBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwKGNvbnN0IERpY3Rp b25hcnlQb3B1cEluZm8mKTsKKworICAgIGJvb2wgYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5h YmxlZCgpOwogI2VuZGlmCiAKICAgICAvLyBTcGVsbGluZyBhbmQgZ3JhbW1hci4KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCShyZXZp c2lvbiAxODAwNDkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94 eU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQg KEMpIDIwMTAsIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJp Z2h0IChDKSAyMDEwLCAyMDExLCAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNjYxLDYgKzY2MSwxMSBAQCBDR1Jl Y3QgV2ViUGFnZVByb3h5Ojpib3VuZHNPZkxheWVySW5MYXllCiAgICAgcmV0dXJuIG1fcGFnZUNs aWVudC5ib3VuZHNPZkxheWVySW5MYXllckJhY2tlZFdpbmRvd0Nvb3JkaW5hdGVzKGxheWVyKTsK IH0KIAorYm9vbCBXZWJQYWdlUHJveHk6OmFwcGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQo KQoreworICAgIHJldHVybiBhcHBsaWNhdGlvbklzQXBwbGVNYWlsKCk7Cit9CisgICAgCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDE4 MDA0OSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTAs IDIwMTEsIDIwMTIsIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDEwLCAyMDExLCAyMDEyLCAyMDEzLTIwMTUgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEyIEludGVsIENvcnBvcmF0aW9uLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEwIE5va2lhIENvcnBvcmF0 aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQogICoKQEAgLTUwNCw2ICs1MDQsNyBAQCBX ZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgCiAgICAgaWYgKFdlYk1lZGlh S2V5U3RvcmFnZU1hbmFnZXIqIG1hbmFnZXIgPSB3ZWJQcm9jZXNzLnN1cHBsZW1lbnQ8V2ViTWVk aWFLZXlTdG9yYWdlTWFuYWdlcj4oKSkKICAgICAgICAgbV9wYWdlLT5zZXR0aW5ncygpLnNldE1l ZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkobWFuYWdlci0+bWVkaWFLZXlTdG9yYWdlRGlyZWN0b3J5 KCkpOwogI2VuZGlmCisgICAgbV9wYWdlLT5zZXR0aW5ncygpLnNldEFwcGxlTWFpbFBhZ2luYXRp b25RdWlya0VuYWJsZWQocGFyYW1ldGVycy5hcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtFbmFibGVk KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKGNvbnN0IFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCg==