68938 2011-09-27 14:35:46 -0700 REGRESSION(r95573): Crash when loading SVG documents in a flattened frame or any SVG document in Chromium/Mac. 2011-09-28 13:54:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68480 1 dglazkov dglazkov hyatt thorton oldest_to_newest 474244 0 dglazkov 2011-09-27 14:35:46 -0700 [Chromium/Mac] REGRESSION(r95573): All SVG documents crash on loading. 474248 1 108901 dglazkov 2011-09-27 14:39:55 -0700 Created attachment 108901 Patch 474312 2 108901 dglazkov 2011-09-27 15:55:54 -0700 Comment on attachment 108901 Patch needs more testing. 474769 3 109028 dglazkov 2011-09-28 09:30:41 -0700 Created attachment 109028 Patch 474773 4 109028 hyatt 2011-09-28 09:34:43 -0700 Comment on attachment 109028 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109028&action=review Really does seem odd that Chromium is calling this on the RenderView... how do you even get the answer you want? I'm not convinced this is even doing what you think it's doing. > Source/WebCore/rendering/RenderBlock.cpp:4897 > - LayoutUnit cw = containingBlock()->contentLogicalWidth(); > + LayoutUnit cw = containingBlockOrSelf(this)->contentLogicalWidth(); I wouldn't do it this way, since it doesn't really make any sense. This value really shouldn't even be used by anything since the RenderView can't have percentage heights/widths specified on it, so null checking should be better. RenderBlock* cb = containingBlock(); LayoutUnit cw = cb ? cb->contentLogicalWidth() : 0; I'd prefer that. 474959 5 109062 dglazkov 2011-09-28 13:27:02 -0700 Created attachment 109062 Patch 474964 6 dglazkov 2011-09-28 13:29:46 -0700 (In reply to comment #4) > (From update of attachment 109028 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=109028&action=review > > Really does seem odd that Chromium is calling this on the RenderView... how do you even get the answer you want? I'm not convinced this is even doing what you think it's doing. Added test for flattened frames which also causes the same crash. > > > Source/WebCore/rendering/RenderBlock.cpp:4897 > > - LayoutUnit cw = containingBlock()->contentLogicalWidth(); > > + LayoutUnit cw = containingBlockOrSelf(this)->contentLogicalWidth(); > > I wouldn't do it this way, since it doesn't really make any sense. This value really shouldn't even be used by anything since the RenderView can't have percentage heights/widths specified on it, so null checking should be better. > > RenderBlock* cb = containingBlock(); > LayoutUnit cw = cb ? cb->contentLogicalWidth() : 0; > > I'd prefer that. Done! 474968 7 109062 hyatt 2011-09-28 13:31:39 -0700 Comment on attachment 109062 Patch r=me 474991 8 dglazkov 2011-09-28 13:54:52 -0700 Committed r96258: <http://trac.webkit.org/changeset/96258> 108901 2011-09-27 14:39:55 -0700 2011-09-27 15:55:54 -0700 Patch bug-68938-20110927143954.patch text/plain 5112 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTYxNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MjM4YWRmNjVmMDBhMDdl NzJlOTdkOWJjNjJmYTllOTg5NTFmZjMyLi4xZTQyZTQwOWJhN2NjYzAzOTJhNmY3YTQwNTZlZWNh NWFhZmQ4NTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDktMjcgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW0v TWFjXSBSRUdSRVNTSU9OKHI5NTU3Myk6IEFsbCBTVkcgZG9jdW1lbnRzIGNyYXNoIG9uIGxvYWRp bmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODkz OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6 IGFsbCBzdmcgdGVzdHMgaW4gTGF5b3V0VGVzdHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVCbG9j a1ByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOiBBZGRlZCBhIG51bGwtY2hlY2sgZm9yIGNvbnRhaW5p bmdCbG9jay4KKwogMjAxMS0wOS0yNyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAK ICAgICAgICAgQWRkICdmaWx0ZXInIHZhbHVlIHRvIFJlbmRlclN0eWxlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCAwMGYzZjNkODA0OGU1MDJlOTJiZGY2MTYy MGE0MmViY2NlNTBmM2E3Li45NmUyZmY2MTk1MzQyZjk1ZDIzYWQ4ODk1NDVkNjBiMWQ2NGFjZmQw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTUyMDAsNyAr NTIwMCwxMCBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQmxvY2tQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKCkKICAgICAgICAgICAgICAgICAvLyBEZXRlcm1pbmUgYSBsZWZ0IGFuZCByaWdodCBt YXggdmFsdWUgYmFzZWQgb2ZmIHdoZXRoZXIgb3Igbm90IHRoZSBmbG9hdHMgY2FuIGZpdCBpbiB0 aGUKICAgICAgICAgICAgICAgICAvLyBtYXJnaW5zIG9mIHRoZSBvYmplY3QuICBGb3IgbmVnYXRp dmUgbWFyZ2lucywgd2Ugd2lsbCBhdHRlbXB0IHRvIG92ZXJsYXAgdGhlIGZsb2F0IGlmIHRoZSBu ZWdhdGl2ZSBtYXJnaW4KICAgICAgICAgICAgICAgICAvLyBpcyBzbWFsbGVyIHRoYW4gdGhlIGZs b2F0IHdpZHRoLgotICAgICAgICAgICAgICAgIGJvb2wgbHRyID0gY29udGFpbmluZ0Jsb2NrKCkt PnN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKKyAgICAgICAgICAgICAgICBSZW5k ZXJCbG9jayogY29udGFpbmluZ0Jsb2NrID0gdGhpcy0+Y29udGFpbmluZ0Jsb2NrKCk7CisgICAg ICAgICAgICAgICAgaWYgKCFjb250YWluaW5nQmxvY2spCisgICAgICAgICAgICAgICAgICAgIGNv bnRhaW5pbmdCbG9jayA9IHRoaXM7CisgICAgICAgICAgICAgICAgYm9vbCBsdHIgPSBjb250YWlu aW5nQmxvY2stPnN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKICAgICAgICAgICAg ICAgICBMYXlvdXRVbml0IG1hcmdpbkxvZ2ljYWxMZWZ0ID0gbHRyID8gbWFyZ2luU3RhcnQgOiBt YXJnaW5FbmQ7CiAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW5Mb2dpY2FsUmlnaHQg PSBsdHIgPyBtYXJnaW5FbmQgOiBtYXJnaW5TdGFydDsKICAgICAgICAgICAgICAgICBMYXlvdXRV bml0IG1heExlZnQgPSBtYXJnaW5Mb2dpY2FsTGVmdCA+IDAgPyBtYXgoZmxvYXRMZWZ0V2lkdGgs IG1hcmdpbkxvZ2ljYWxMZWZ0KSA6IGZsb2F0TGVmdFdpZHRoICsgbWFyZ2luTG9naWNhbExlZnQ7 CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjk3 NTgzZGIwZGNmNzNjYjVlYzBmNGZmOTMzMTQzYjY3NGEzMzE4Zi4uNGVjNjBjMzYyODRiOWYwMmQy ZWQzODk4M2E3OGU1MDE2NGMwMWE1MSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTA5LTI3ICBEaW1pdHJpIEds YXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtL01hY10g UkVHUkVTU0lPTihyOTU1NzMpOiBBbGwgU1ZHIGRvY3VtZW50cyBjcmFzaCBvbiBsb2FkaW5nLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njg5MzgKKwor ICAgICAgICBNYWRlIENocm9taXVtL01hYyBEUlQgYmV0dGVyIG1hdGNoIGhvdyBDaHJvbWl1bS9N YWMgcXVlcmllcyBXZWJLaXQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHA6Cisg ICAgICAgIChXZWJWaWV3SG9zdDo6ZGlkVXBkYXRlTGF5b3V0KTogQWRkZWQgd2lkdGgvaGVpZ2h0 IHF1ZXJpZXMuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3Qu aDogVXBkYXRlZCBkZWZzLgorCiAyMDExLTA5LTI3ICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9t aXVtLm9yZz4KIAogICAgICAgICB3YXRjaGxpc3Q6IEFkZCB0aGUgZmlsZW5hbWUgcGF0dGVybiBm b3IgZGVmaW5pdGlvbnMuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9XZWJWaWV3SG9zdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3 SG9zdC5jcHAKaW5kZXggYzJlZmQzMzMwYzYzYTNiNTU4OTk1NjI4MDBjNjU0MGIzYTJlMDM3ZS4u YTU4YTkxNzQ1NzE2NjMyYzEyYTUzNDY3Y2ZkZjk5ZmU0MGE4OTliNSAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCisrKyBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcApAQCAtNzk0LDYgKzc5NCwxOCBA QCBXZWJBcHBsaWNhdGlvbkNhY2hlSG9zdCogV2ViVmlld0hvc3Q6OmNyZWF0ZUFwcGxpY2F0aW9u Q2FjaGVIb3N0KFdlYkZyYW1lKiBmcmFtZQogICAgIHJldHVybiB3ZWJraXRfc3VwcG9ydDo6Q3Jl YXRlQXBwbGljYXRpb25DYWNoZUhvc3QoZnJhbWUsIGNsaWVudCk7CiB9CiAKK3ZvaWQgV2ViVmll d0hvc3Q6OmRpZFVwZGF0ZUxheW91dChXZWJGcmFtZSopCit7CisjaWYgT1MoTUFDX09TX1gpCisg ICAgLy8gUXVlcnkgcHJlZmVycmVkIHdpZHRoIHRvIGVtdWxhdGUgdGhlIHNhbWUgZnVuY3Rpb25h bGl0eSBpbiBDaHJvbWl1bToKKyAgICAvLyBzZWUgUmVuZGVyVmlldzo6Q2hlY2tQcmVmZXJyZWRT aXplIChzcmMvY29udGVudC9yZW5kZXJlci9yZW5kZXJfdmlldy5jYykKKyAgICAvLyBhbmQgVGFi Q29udGVudHNWaWV3TWFjOjpSZW5kZXJWaWV3Q3JlYXRlZCAoc3JjL2Nocm9tZS9icm93c2VyL3Rh Yl9jb250ZW50cy90YWJfY29udGVudHNfdmlld19tYWMubW0pCisgICAgd2ViVmlldygpLT5tYWlu RnJhbWUoKS0+Y29udGVudHNQcmVmZXJyZWRXaWR0aCgpOworICAgIHdlYlZpZXcoKS0+bWFpbkZy YW1lKCktPmRvY3VtZW50RWxlbWVudFNjcm9sbEhlaWdodCgpOworI2VuZGlmCit9CisKKwogdm9p ZCBXZWJWaWV3SG9zdDo6bG9hZFVSTEV4dGVybmFsbHkoV2ViRnJhbWUqIGZyYW1lLCBjb25zdCBX ZWJVUkxSZXF1ZXN0JiByZXF1ZXN0LCBXZWJOYXZpZ2F0aW9uUG9saWN5IHBvbGljeSkKIHsKICAg ICBsb2FkVVJMRXh0ZXJuYWxseShmcmFtZSwgcmVxdWVzdCwgcG9saWN5LCBXZWJTdHJpbmcoKSk7 CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5o IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAppbmRleCBmNTEz MmVhYjUzNTg1ZmY5NWVhMWRmM2NlNWRlZWFjMDNjNjg3Y2RlLi42ZjFmYThiZjBmNWFjZTE4N2Rj ZWVjMzIwYjJlZmRhMGM4YWVkYjgyIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9XZWJWaWV3SG9zdC5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L1dlYlZpZXdIb3N0LmgKQEAgLTE3MSw2ICsxNzEsNyBAQCBjbGFzcyBXZWJWaWV3SG9zdCA6IHB1 YmxpYyBXZWJLaXQ6OldlYlNwZWxsQ2hlY2tDbGllbnQsIHB1YmxpYyBXZWJLaXQ6OldlYlZpZXdD bAogICAgIHZpcnR1YWwgV2ViS2l0OjpXZWJXb3JrZXIqIGNyZWF0ZVdvcmtlcihXZWJLaXQ6Oldl YkZyYW1lKiwgV2ViS2l0OjpXZWJXb3JrZXJDbGllbnQqKTsKICAgICB2aXJ0dWFsIFdlYktpdDo6 V2ViTWVkaWFQbGF5ZXIqIGNyZWF0ZU1lZGlhUGxheWVyKFdlYktpdDo6V2ViRnJhbWUqLCBXZWJL aXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50Kik7CiAgICAgdmlydHVhbCBXZWJLaXQ6OldlYkFwcGxp Y2F0aW9uQ2FjaGVIb3N0KiBjcmVhdGVBcHBsaWNhdGlvbkNhY2hlSG9zdChXZWJLaXQ6OldlYkZy YW1lKiwgV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hlSG9zdENsaWVudCopOworICAgIHZpcnR1 YWwgdm9pZCBkaWRVcGRhdGVMYXlvdXQoV2ViS2l0OjpXZWJGcmFtZSopOwogICAgIHZpcnR1YWwg dm9pZCBsb2FkVVJMRXh0ZXJuYWxseShXZWJLaXQ6OldlYkZyYW1lKiwgY29uc3QgV2ViS2l0OjpX ZWJVUkxSZXF1ZXN0JiwgV2ViS2l0OjpXZWJOYXZpZ2F0aW9uUG9saWN5KTsKICAgICB2aXJ0dWFs IHZvaWQgbG9hZFVSTEV4dGVybmFsbHkoV2ViS2l0OjpXZWJGcmFtZSosIGNvbnN0IFdlYktpdDo6 V2ViVVJMUmVxdWVzdCYsIFdlYktpdDo6V2ViTmF2aWdhdGlvblBvbGljeSwgY29uc3QgV2ViS2l0 OjpXZWJTdHJpbmcmIGRvd25sb2FkTmFtZSk7CiAgICAgdmlydHVhbCBXZWJLaXQ6OldlYk5hdmln YXRpb25Qb2xpY3kgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbigK 109028 2011-09-28 09:30:41 -0700 2011-09-28 13:26:59 -0700 Patch bug-68938-20110928093040.patch text/plain 6524 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTYxNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MjM4YWRmNjVmMDBhMDdl NzJlOTdkOWJjNjJmYTllOTg5NTFmZjMyLi4xZTQyZTQwOWJhN2NjYzAzOTJhNmY3YTQwNTZlZWNh NWFhZmQ4NTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDktMjcgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW0v TWFjXSBSRUdSRVNTSU9OKHI5NTU3Myk6IEFsbCBTVkcgZG9jdW1lbnRzIGNyYXNoIG9uIGxvYWRp bmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODkz OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6 IGFsbCBzdmcgdGVzdHMgaW4gTGF5b3V0VGVzdHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVCbG9j a1ByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOiBBZGRlZCBhIG51bGwtY2hlY2sgZm9yIGNvbnRhaW5p bmdCbG9jay4KKwogMjAxMS0wOS0yNyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAK ICAgICAgICAgQWRkICdmaWx0ZXInIHZhbHVlIHRvIFJlbmRlclN0eWxlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCAwMGYzZjNkODA0OGU1MDJlOTJiZGY2MTYy MGE0MmViY2NlNTBmM2E3Li5hM2M2MTFkOTY5NGM5NzAwYjlhNWI5ZGQ4YjhjNzFiMGRiZmRlMjkx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTQ4ODIsMTIg KzQ4ODIsMTkgQEAgc3RhdGljIGlubGluZSB2b2lkIHVwZGF0ZVByZWZlcnJlZFdpZHRoKExheW91 dFVuaXQmIHByZWZlcnJlZFdpZHRoLCBmbG9hdCYgcmVzdWwKICAgICBwcmVmZXJyZWRXaWR0aCA9 IG1heChzbmFwcGVkUmVzdWx0LCBwcmVmZXJyZWRXaWR0aCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUg UmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9ja09yU2VsZihSZW5kZXJCbG9jayogc2VsZikKK3sK KyAgICBpZiAoUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jayA9IHNlbGYtPmNvbnRhaW5pbmdC bG9jaygpKQorICAgICAgICByZXR1cm4gY29udGFpbmluZ0Jsb2NrOworICAgIHJldHVybiBzZWxm OworfQorCiB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdp ZHRocygpCiB7CiAgICAgZmxvYXQgaW5saW5lTWF4ID0gMDsKICAgICBmbG9hdCBpbmxpbmVNaW4g PSAwOwogCi0gICAgTGF5b3V0VW5pdCBjdyA9IGNvbnRhaW5pbmdCbG9jaygpLT5jb250ZW50TG9n aWNhbFdpZHRoKCk7CisgICAgTGF5b3V0VW5pdCBjdyA9IGNvbnRhaW5pbmdCbG9ja09yU2VsZih0 aGlzKS0+Y29udGVudExvZ2ljYWxXaWR0aCgpOwogCiAgICAgLy8gSWYgd2UgYXJlIGF0IHRoZSBz dGFydCBvZiBhIGxpbmUsIHdlIHdhbnQgdG8gaWdub3JlIGFsbCB3aGl0ZS1zcGFjZS4KICAgICAv LyBBbHNvIHN0cmlwIHNwYWNlcyBpZiB3ZSBwcmV2aW91c2x5IGhhZCB0ZXh0IHRoYXQgZW5kZWQg aW4gYSB0cmFpbGluZyBzcGFjZS4KQEAgLTUyMDAsNyArNTIwNyw3IEBAIHZvaWQgUmVuZGVyQmxv Y2s6OmNvbXB1dGVCbG9ja1ByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICAgICAgICAg IC8vIERldGVybWluZSBhIGxlZnQgYW5kIHJpZ2h0IG1heCB2YWx1ZSBiYXNlZCBvZmYgd2hldGhl ciBvciBub3QgdGhlIGZsb2F0cyBjYW4gZml0IGluIHRoZQogICAgICAgICAgICAgICAgIC8vIG1h cmdpbnMgb2YgdGhlIG9iamVjdC4gIEZvciBuZWdhdGl2ZSBtYXJnaW5zLCB3ZSB3aWxsIGF0dGVt cHQgdG8gb3ZlcmxhcCB0aGUgZmxvYXQgaWYgdGhlIG5lZ2F0aXZlIG1hcmdpbgogICAgICAgICAg ICAgICAgIC8vIGlzIHNtYWxsZXIgdGhhbiB0aGUgZmxvYXQgd2lkdGguCi0gICAgICAgICAgICAg ICAgYm9vbCBsdHIgPSBjb250YWluaW5nQmxvY2soKS0+c3R5bGUoKS0+aXNMZWZ0VG9SaWdodERp cmVjdGlvbigpOworICAgICAgICAgICAgICAgIGJvb2wgbHRyID0gY29udGFpbmluZ0Jsb2NrT3JT ZWxmKHRoaXMpLT5zdHlsZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7CiAgICAgICAgICAg ICAgICAgTGF5b3V0VW5pdCBtYXJnaW5Mb2dpY2FsTGVmdCA9IGx0ciA/IG1hcmdpblN0YXJ0IDog bWFyZ2luRW5kOwogICAgICAgICAgICAgICAgIExheW91dFVuaXQgbWFyZ2luTG9naWNhbFJpZ2h0 ID0gbHRyID8gbWFyZ2luRW5kIDogbWFyZ2luU3RhcnQ7CiAgICAgICAgICAgICAgICAgTGF5b3V0 VW5pdCBtYXhMZWZ0ID0gbWFyZ2luTG9naWNhbExlZnQgPiAwID8gbWF4KGZsb2F0TGVmdFdpZHRo LCBtYXJnaW5Mb2dpY2FsTGVmdCkgOiBmbG9hdExlZnRXaWR0aCArIG1hcmdpbkxvZ2ljYWxMZWZ0 OwpAQCAtNTIzNiw3ICs1MjQzLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZUJsb2NrUHJl ZmVycmVkTG9naWNhbFdpZHRocygpCiAgICAgICAgIC8vIHdpdGggcGVyY2VudGFnZSB3aWR0aHMg YmUgaW5maW5pdGUgKGFzIGxvbmcgYXMgdGhleSBhcmUgbm90IGluc2lkZSBhIHRhYmxlIGNlbGwp LgogICAgICAgICBpZiAoZG9jdW1lbnQoKS0+aW5RdWlya3NNb2RlKCkgJiYgY2hpbGQtPnN0eWxl KCktPmxvZ2ljYWxXaWR0aCgpLmlzUGVyY2VudCgpICYmCiAgICAgICAgICAgICAhaXNUYWJsZUNl bGwoKSAmJiBjaGlsZC0+aXNUYWJsZSgpICYmIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoIDwg QkxPQ0tfTUFYX1dJRFRIKSB7Ci0gICAgICAgICAgICBSZW5kZXJCbG9jayogY2IgPSBjb250YWlu aW5nQmxvY2soKTsKKyAgICAgICAgICAgIFJlbmRlckJsb2NrKiBjYiA9IGNvbnRhaW5pbmdCbG9j a09yU2VsZih0aGlzKTsKICAgICAgICAgICAgIHdoaWxlICghY2ItPmlzUmVuZGVyVmlldygpICYm ICFjYi0+aXNUYWJsZUNlbGwoKSkKICAgICAgICAgICAgICAgICBjYiA9IGNiLT5jb250YWluaW5n QmxvY2soKTsKICAgICAgICAgICAgIGlmICghY2ItPmlzVGFibGVDZWxsKCkpCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjk3NTgzZGIwZGNmNzNj YjVlYzBmNGZmOTMzMTQzYjY3NGEzMzE4Zi4uNGVjNjBjMzYyODRiOWYwMmQyZWQzODk4M2E3OGU1 MDE2NGMwMWE1MSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTA5LTI3ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xh emtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtL01hY10gUkVHUkVTU0lPTihy OTU1NzMpOiBBbGwgU1ZHIGRvY3VtZW50cyBjcmFzaCBvbiBsb2FkaW5nLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njg5MzgKKworICAgICAgICBNYWRl IENocm9taXVtL01hYyBEUlQgYmV0dGVyIG1hdGNoIGhvdyBDaHJvbWl1bS9NYWMgcXVlcmllcyBX ZWJLaXQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHA6CisgICAgICAgIChXZWJW aWV3SG9zdDo6ZGlkVXBkYXRlTGF5b3V0KTogQWRkZWQgd2lkdGgvaGVpZ2h0IHF1ZXJpZXMuCisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaDogVXBkYXRlZCBk ZWZzLgorCiAyMDExLTA5LTI3ICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9taXVtLm9yZz4KIAog ICAgICAgICB3YXRjaGxpc3Q6IEFkZCB0aGUgZmlsZW5hbWUgcGF0dGVybiBmb3IgZGVmaW5pdGlv bnMuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9z dC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKaW5k ZXggYzJlZmQzMzMwYzYzYTNiNTU4OTk1NjI4MDBjNjU0MGIzYTJlMDM3ZS4uYjc2MTc2MjMwODg4 NmM1NDA0OTJlZWFhOWM1NWU0M2MzMmFmNGZiNyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcApAQCAtNzk0LDYgKzc5NCwyNCBAQCBXZWJBcHBsaWNh dGlvbkNhY2hlSG9zdCogV2ViVmlld0hvc3Q6OmNyZWF0ZUFwcGxpY2F0aW9uQ2FjaGVIb3N0KFdl YkZyYW1lKiBmcmFtZQogICAgIHJldHVybiB3ZWJraXRfc3VwcG9ydDo6Q3JlYXRlQXBwbGljYXRp b25DYWNoZUhvc3QoZnJhbWUsIGNsaWVudCk7CiB9CiAKK3ZvaWQgV2ViVmlld0hvc3Q6OmRpZFVw ZGF0ZUxheW91dChXZWJGcmFtZSopCit7CisjaWYgT1MoTUFDX09TX1gpCisgICAgc3RhdGljIGJv b2wgcXVlcnlpbmdQcmVmZXJyZWRTaXplID0gZmFsc2U7CisgICAgaWYgKHF1ZXJ5aW5nUHJlZmVy cmVkU2l6ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgcXVlcnlpbmdQcmVmZXJyZWRTaXplID0g dHJ1ZTsKKyAgICAvLyBRdWVyeSBwcmVmZXJyZWQgd2lkdGggdG8gZW11bGF0ZSB0aGUgc2FtZSBm dW5jdGlvbmFsaXR5IGluIENocm9taXVtOgorICAgIC8vIHNlZSBSZW5kZXJWaWV3OjpDaGVja1By ZWZlcnJlZFNpemUgKHNyYy9jb250ZW50L3JlbmRlcmVyL3JlbmRlcl92aWV3LmNjKQorICAgIC8v IGFuZCBUYWJDb250ZW50c1ZpZXdNYWM6OlJlbmRlclZpZXdDcmVhdGVkIChzcmMvY2hyb21lL2Jy b3dzZXIvdGFiX2NvbnRlbnRzL3RhYl9jb250ZW50c192aWV3X21hYy5tbSkKKyAgICB3ZWJWaWV3 KCktPm1haW5GcmFtZSgpLT5jb250ZW50c1ByZWZlcnJlZFdpZHRoKCk7CisgICAgd2ViVmlldygp LT5tYWluRnJhbWUoKS0+ZG9jdW1lbnRFbGVtZW50U2Nyb2xsSGVpZ2h0KCk7CisgICAgcXVlcnlp bmdQcmVmZXJyZWRTaXplID0gZmFsc2U7CisjZW5kaWYKK30KKworCiB2b2lkIFdlYlZpZXdIb3N0 Ojpsb2FkVVJMRXh0ZXJuYWxseShXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFdlYlVSTFJlcXVlc3Qm IHJlcXVlc3QsIFdlYk5hdmlnYXRpb25Qb2xpY3kgcG9saWN5KQogewogICAgIGxvYWRVUkxFeHRl cm5hbGx5KGZyYW1lLCByZXF1ZXN0LCBwb2xpY3ksIFdlYlN0cmluZygpKTsKZGlmZiAtLWdpdCBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmggYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCmluZGV4IGY1MTMyZWFiNTM1ODVmZjk1 ZWExZGYzY2U1ZGVlYWMwM2M2ODdjZGUuLjZmMWZhOGJmMGY1YWNlMTg3ZGNlZWMzMjBiMmVmZGEw YzhhZWRiODIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZp ZXdIb3N0LmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3Qu aApAQCAtMTcxLDYgKzE3MSw3IEBAIGNsYXNzIFdlYlZpZXdIb3N0IDogcHVibGljIFdlYktpdDo6 V2ViU3BlbGxDaGVja0NsaWVudCwgcHVibGljIFdlYktpdDo6V2ViVmlld0NsCiAgICAgdmlydHVh bCBXZWJLaXQ6OldlYldvcmtlciogY3JlYXRlV29ya2VyKFdlYktpdDo6V2ViRnJhbWUqLCBXZWJL aXQ6OldlYldvcmtlckNsaWVudCopOwogICAgIHZpcnR1YWwgV2ViS2l0OjpXZWJNZWRpYVBsYXll ciogY3JlYXRlTWVkaWFQbGF5ZXIoV2ViS2l0OjpXZWJGcmFtZSosIFdlYktpdDo6V2ViTWVkaWFQ bGF5ZXJDbGllbnQqKTsKICAgICB2aXJ0dWFsIFdlYktpdDo6V2ViQXBwbGljYXRpb25DYWNoZUhv c3QqIGNyZWF0ZUFwcGxpY2F0aW9uQ2FjaGVIb3N0KFdlYktpdDo6V2ViRnJhbWUqLCBXZWJLaXQ6 OldlYkFwcGxpY2F0aW9uQ2FjaGVIb3N0Q2xpZW50Kik7CisgICAgdmlydHVhbCB2b2lkIGRpZFVw ZGF0ZUxheW91dChXZWJLaXQ6OldlYkZyYW1lKik7CiAgICAgdmlydHVhbCB2b2lkIGxvYWRVUkxF eHRlcm5hbGx5KFdlYktpdDo6V2ViRnJhbWUqLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlcXVlc3Qm LCBXZWJLaXQ6OldlYk5hdmlnYXRpb25Qb2xpY3kpOwogICAgIHZpcnR1YWwgdm9pZCBsb2FkVVJM RXh0ZXJuYWxseShXZWJLaXQ6OldlYkZyYW1lKiwgY29uc3QgV2ViS2l0OjpXZWJVUkxSZXF1ZXN0 JiwgV2ViS2l0OjpXZWJOYXZpZ2F0aW9uUG9saWN5LCBjb25zdCBXZWJLaXQ6OldlYlN0cmluZyYg ZG93bmxvYWROYW1lKTsKICAgICB2aXJ0dWFsIFdlYktpdDo6V2ViTmF2aWdhdGlvblBvbGljeSBk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uKAo= 109062 2011-09-28 13:27:02 -0700 2011-09-28 13:31:38 -0700 Patch bug-68938-20110928132701.patch text/plain 8807 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTYyMzUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwYTViMjY2OGIwNmRiNjU1MzVjYTNh OTVkMzRkMWNkOTU1YTFkMWZjLi45MDIxYjg1ZWI5ZjgyOGM2YTQ3OWQ0NzIwNGJmYWI2MTY5YzIz OGI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDktMjggIERpbWl0cmkgR2xhemtvdiAg PGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OKHI5NTU3Myk6IENy YXNoIHdoZW4gbG9hZGluZyBhbiBTVkcgZG9jdW1lbnQgaW4gYSBmbGF0dGVuZWQgaWZyYW1lLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njg5MzgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZnJh bWVzL2ZsYXR0ZW5pbmcvY3Jhc2gtc3ZnLWRvY3VtZW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9jcmFzaC1zdmctZG9jdW1lbnQuaHRtbDog QWRkZWQuCisKIDIwMTEtMDktMjggIEthdXN0dWJoIEF0cmF3YWxrYXIgIDxrYXVzdHViaEBtb3Rv cm9sYS5jb20+CiAKICAgICAgICAgW0d0a10gSW1wbGVtZW50IHRleHRJbnB1dENvbnRyb2xsZXIu ZG9Db21tYW5kCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9mbGF0dGVuaW5n L2NyYXNoLXN2Zy1kb2N1bWVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1l cy9mbGF0dGVuaW5nL2NyYXNoLXN2Zy1kb2N1bWVudC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u M2IzMzAyZDA1MzE0ZGIzZjY1NDQyNWEyNTc1YzZlZDA0ZTA0ODM5OAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvY3Jhc2gtc3ZnLWRvY3VtZW50 LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitTaG91bGQgbm90IGNyYXNoLgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9jcmFzaC1zdmctZG9jdW1lbnQu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvY3Jhc2gtc3ZnLWRvY3Vt ZW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uZmU3YWM0MjU1YjQyZWJmZTE3NTYzYTEwMzI0YmRlOGY5MThl OWM0MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5p bmcvY3Jhc2gtc3ZnLWRvY3VtZW50Lmh0bWwKQEAgLTAsMCArMSwxMiBAQAorPGJvZHk+Cis8c2Ny aXB0PgorCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5b3V0VGVz dENvbnRyb2xsZXIuc2V0RnJhbWVGbGF0dGVuaW5nRW5hYmxlZCh0cnVlKTsKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Cit9CisKKzwvc2NyaXB0PgorPGlmcmFtZSBzcmM9 ImRhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2 Zyc+PC9zdmc+Ij48L2lmcmFtZT4KK1Nob3VsZCBub3QgY3Jhc2guCis8L2JvZHk+ClwgTm8gbmV3 bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDRkZTNiMTkyN2VlMTA2YTUwYWFkNGEx NGYwZmU3MTAzNTc1ZWI3NWUuLmU4NDNmOTJhNjM3YTIyMDllYzM0OWI4ZDVlMTQyZTc4NDRiYmU2 ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wOS0yNyAgRGltaXRyaSBHbGF6 a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bS9NYWNdIFJF R1JFU1NJT04ocjk1NTczKTogQWxsIFNWRyBkb2N1bWVudHMgY3Jhc2ggb24gbG9hZGluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4OTM4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogYWxsIHN2 ZyB0ZXN0cyBpbiBMYXlvdXRUZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6Y29tcHV0ZUJsb2NrUHJlZmVy cmVkTG9naWNhbFdpZHRocyk6IEFkZGVkIGEgbnVsbC1jaGVjayBmb3IgY29udGFpbmluZ0Jsb2Nr LgorCiAyMDExLTA5LTI4ICBGYWR5IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtDaHJvbWl1bV0gU2VwZXJhdGUgR1RLIHNwZWNpZmljIEd5cCBydWxlcyBmcm9tIFgx MSBHeXAgcnVsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4 IDAwZjNmM2Q4MDQ4ZTUwMmU5MmJkZjYxNjIwYTQyZWJjY2U1MGYzYTcuLjYzMGRiNTdhNGQ0ODEy YWFiN2EyYmEyZWE5YzE2NWUzMmExOWNjYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcApAQCAtNDg4Nyw3ICs0ODg3LDggQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29t cHV0ZUlubGluZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIGZsb2F0IGlubGluZU1heCA9 IDA7CiAgICAgZmxvYXQgaW5saW5lTWluID0gMDsKIAotICAgIExheW91dFVuaXQgY3cgPSBjb250 YWluaW5nQmxvY2soKS0+Y29udGVudExvZ2ljYWxXaWR0aCgpOworICAgIFJlbmRlckJsb2NrKiBj b250YWluaW5nQmxvY2sgPSB0aGlzLT5jb250YWluaW5nQmxvY2soKTsKKyAgICBMYXlvdXRVbml0 IGN3ID0gY29udGFpbmluZ0Jsb2NrID8gY29udGFpbmluZ0Jsb2NrLT5jb250ZW50TG9naWNhbFdp ZHRoKCkgOiAwOwogCiAgICAgLy8gSWYgd2UgYXJlIGF0IHRoZSBzdGFydCBvZiBhIGxpbmUsIHdl IHdhbnQgdG8gaWdub3JlIGFsbCB3aGl0ZS1zcGFjZS4KICAgICAvLyBBbHNvIHN0cmlwIHNwYWNl cyBpZiB3ZSBwcmV2aW91c2x5IGhhZCB0ZXh0IHRoYXQgZW5kZWQgaW4gYSB0cmFpbGluZyBzcGFj ZS4KQEAgLTUxNTIsNiArNTE1Myw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVCbG9ja1By ZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIGJvb2wgbm93cmFwID0gc3R5bGUoKS0+d2hpdGVT cGFjZSgpID09IE5PV1JBUDsKIAogICAgIFJlbmRlck9iamVjdCAqY2hpbGQgPSBmaXJzdENoaWxk KCk7CisgICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jayA9IHRoaXMtPmNvbnRhaW5pbmdC bG9jaygpOwogICAgIExheW91dFVuaXQgZmxvYXRMZWZ0V2lkdGggPSAwLCBmbG9hdFJpZ2h0V2lk dGggPSAwOwogICAgIHdoaWxlIChjaGlsZCkgewogICAgICAgICAvLyBQb3NpdGlvbmVkIGNoaWxk cmVuIGRvbid0IGFmZmVjdCB0aGUgbWluL21heCB3aWR0aApAQCAtNTIwMCw3ICs1MjAyLDcgQEAg dm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZUJsb2NrUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAg ICAgICAgICAgICAgICAgLy8gRGV0ZXJtaW5lIGEgbGVmdCBhbmQgcmlnaHQgbWF4IHZhbHVlIGJh c2VkIG9mZiB3aGV0aGVyIG9yIG5vdCB0aGUgZmxvYXRzIGNhbiBmaXQgaW4gdGhlCiAgICAgICAg ICAgICAgICAgLy8gbWFyZ2lucyBvZiB0aGUgb2JqZWN0LiAgRm9yIG5lZ2F0aXZlIG1hcmdpbnMs IHdlIHdpbGwgYXR0ZW1wdCB0byBvdmVybGFwIHRoZSBmbG9hdCBpZiB0aGUgbmVnYXRpdmUgbWFy Z2luCiAgICAgICAgICAgICAgICAgLy8gaXMgc21hbGxlciB0aGFuIHRoZSBmbG9hdCB3aWR0aC4K LSAgICAgICAgICAgICAgICBib29sIGx0ciA9IGNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLT5p c0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7CisgICAgICAgICAgICAgICAgYm9vbCBsdHIgPSBjb250 YWluaW5nQmxvY2sgPyBjb250YWluaW5nQmxvY2stPnN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJl Y3Rpb24oKSA6IHN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKICAgICAgICAgICAg ICAgICBMYXlvdXRVbml0IG1hcmdpbkxvZ2ljYWxMZWZ0ID0gbHRyID8gbWFyZ2luU3RhcnQgOiBt YXJnaW5FbmQ7CiAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW5Mb2dpY2FsUmlnaHQg PSBsdHIgPyBtYXJnaW5FbmQgOiBtYXJnaW5TdGFydDsKICAgICAgICAgICAgICAgICBMYXlvdXRV bml0IG1heExlZnQgPSBtYXJnaW5Mb2dpY2FsTGVmdCA+IDAgPyBtYXgoZmxvYXRMZWZ0V2lkdGgs IG1hcmdpbkxvZ2ljYWxMZWZ0KSA6IGZsb2F0TGVmdFdpZHRoICsgbWFyZ2luTG9naWNhbExlZnQ7 CkBAIC01MjM0LDkgKzUyMzYsOSBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQmxvY2tQcmVm ZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICAgICAgLy8gb2YgMTAwcHggYmVjYXVzZSBvZiB0aGUg dGFibGUuCiAgICAgICAgIC8vIFdlIGNhbiBhY2hpZXZlIHRoaXMgZWZmZWN0IGJ5IG1ha2luZyB0 aGUgbWF4d2lkdGggb2YgYmxvY2tzIHRoYXQgY29udGFpbiB0YWJsZXMKICAgICAgICAgLy8gd2l0 aCBwZXJjZW50YWdlIHdpZHRocyBiZSBpbmZpbml0ZSAoYXMgbG9uZyBhcyB0aGV5IGFyZSBub3Qg aW5zaWRlIGEgdGFibGUgY2VsbCkuCi0gICAgICAgIGlmIChkb2N1bWVudCgpLT5pblF1aXJrc01v ZGUoKSAmJiBjaGlsZC0+c3R5bGUoKS0+bG9naWNhbFdpZHRoKCkuaXNQZXJjZW50KCkgJiYKLSAg ICAgICAgICAgICFpc1RhYmxlQ2VsbCgpICYmIGNoaWxkLT5pc1RhYmxlKCkgJiYgbV9tYXhQcmVm ZXJyZWRMb2dpY2FsV2lkdGggPCBCTE9DS19NQVhfV0lEVEgpIHsKLSAgICAgICAgICAgIFJlbmRl ckJsb2NrKiBjYiA9IGNvbnRhaW5pbmdCbG9jaygpOworICAgICAgICBpZiAoY29udGFpbmluZ0Js b2NrICYmIGRvY3VtZW50KCktPmluUXVpcmtzTW9kZSgpICYmIGNoaWxkLT5zdHlsZSgpLT5sb2dp Y2FsV2lkdGgoKS5pc1BlcmNlbnQoKQorICAgICAgICAgICAgJiYgIWlzVGFibGVDZWxsKCkgJiYg Y2hpbGQtPmlzVGFibGUoKSAmJiBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA8IEJMT0NLX01B WF9XSURUSCkgeworICAgICAgICAgICAgUmVuZGVyQmxvY2sqIGNiID0gY29udGFpbmluZ0Jsb2Nr OwogICAgICAgICAgICAgd2hpbGUgKCFjYi0+aXNSZW5kZXJWaWV3KCkgJiYgIWNiLT5pc1RhYmxl Q2VsbCgpKQogICAgICAgICAgICAgICAgIGNiID0gY2ItPmNvbnRhaW5pbmdCbG9jaygpOwogICAg ICAgICAgICAgaWYgKCFjYi0+aXNUYWJsZUNlbGwoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwMDEyYTg3ODZiMWNhMjU0YmQ0ZGJkMDEwYzk4 ZGFkZGU1MDJlYjI0Li5hZmQwNzE4Y2VkZWFhMjVkNjQxZWNiNjg4NjJlMTFiN2FhNTM2YjVlIDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTEtMDktMjcgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVt Lm9yZz4KKworICAgICAgICBbQ2hyb21pdW0vTWFjXSBSRUdSRVNTSU9OKHI5NTU3Myk6IEFsbCBT VkcgZG9jdW1lbnRzIGNyYXNoIG9uIGxvYWRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODkzOAorCisgICAgICAgIE1hZGUgQ2hyb21pdW0vTWFj IERSVCBiZXR0ZXIgbWF0Y2ggaG93IENocm9taXVtL01hYyBxdWVyaWVzIFdlYktpdC4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcDoKKyAgICAgICAgKFdlYlZpZXdIb3N0OjpkaWRV cGRhdGVMYXlvdXQpOiBBZGRlZCB3aWR0aC9oZWlnaHQgcXVlcmllcy4KKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oOiBVcGRhdGVkIGRlZnMuCisKIDIwMTEt MDktMjggIFhpYW56aHUgV2FuZyAgPHdhbmd4aWFuemh1QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBMZXQgVGVzdFdlYktpdEFQSSBhbmQgd2Via2l0X3VuaXRfdGVzdHMgd29yayBmb3IgY2hyb21p dW0td2luCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3 SG9zdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAK aW5kZXggYzJlZmQzMzMwYzYzYTNiNTU4OTk1NjI4MDBjNjU0MGIzYTJlMDM3ZS4uYjc2MTc2MjMw ODg4NmM1NDA0OTJlZWFhOWM1NWU0M2MzMmFmNGZiNyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcApAQCAtNzk0LDYgKzc5NCwyNCBAQCBXZWJBcHBs aWNhdGlvbkNhY2hlSG9zdCogV2ViVmlld0hvc3Q6OmNyZWF0ZUFwcGxpY2F0aW9uQ2FjaGVIb3N0 KFdlYkZyYW1lKiBmcmFtZQogICAgIHJldHVybiB3ZWJraXRfc3VwcG9ydDo6Q3JlYXRlQXBwbGlj YXRpb25DYWNoZUhvc3QoZnJhbWUsIGNsaWVudCk7CiB9CiAKK3ZvaWQgV2ViVmlld0hvc3Q6OmRp ZFVwZGF0ZUxheW91dChXZWJGcmFtZSopCit7CisjaWYgT1MoTUFDX09TX1gpCisgICAgc3RhdGlj IGJvb2wgcXVlcnlpbmdQcmVmZXJyZWRTaXplID0gZmFsc2U7CisgICAgaWYgKHF1ZXJ5aW5nUHJl ZmVycmVkU2l6ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgcXVlcnlpbmdQcmVmZXJyZWRTaXpl ID0gdHJ1ZTsKKyAgICAvLyBRdWVyeSBwcmVmZXJyZWQgd2lkdGggdG8gZW11bGF0ZSB0aGUgc2Ft ZSBmdW5jdGlvbmFsaXR5IGluIENocm9taXVtOgorICAgIC8vIHNlZSBSZW5kZXJWaWV3OjpDaGVj a1ByZWZlcnJlZFNpemUgKHNyYy9jb250ZW50L3JlbmRlcmVyL3JlbmRlcl92aWV3LmNjKQorICAg IC8vIGFuZCBUYWJDb250ZW50c1ZpZXdNYWM6OlJlbmRlclZpZXdDcmVhdGVkIChzcmMvY2hyb21l L2Jyb3dzZXIvdGFiX2NvbnRlbnRzL3RhYl9jb250ZW50c192aWV3X21hYy5tbSkKKyAgICB3ZWJW aWV3KCktPm1haW5GcmFtZSgpLT5jb250ZW50c1ByZWZlcnJlZFdpZHRoKCk7CisgICAgd2ViVmll dygpLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnRFbGVtZW50U2Nyb2xsSGVpZ2h0KCk7CisgICAgcXVl cnlpbmdQcmVmZXJyZWRTaXplID0gZmFsc2U7CisjZW5kaWYKK30KKworCiB2b2lkIFdlYlZpZXdI b3N0Ojpsb2FkVVJMRXh0ZXJuYWxseShXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFdlYlVSTFJlcXVl c3QmIHJlcXVlc3QsIFdlYk5hdmlnYXRpb25Qb2xpY3kgcG9saWN5KQogewogICAgIGxvYWRVUkxF eHRlcm5hbGx5KGZyYW1lLCByZXF1ZXN0LCBwb2xpY3ksIFdlYlN0cmluZygpKTsKZGlmZiAtLWdp dCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmggYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCmluZGV4IGY1MTMyZWFiNTM1ODVm Zjk1ZWExZGYzY2U1ZGVlYWMwM2M2ODdjZGUuLjZmMWZhOGJmMGY1YWNlMTg3ZGNlZWMzMjBiMmVm ZGEwYzhhZWRiODIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dl YlZpZXdIb3N0LmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hv c3QuaApAQCAtMTcxLDYgKzE3MSw3IEBAIGNsYXNzIFdlYlZpZXdIb3N0IDogcHVibGljIFdlYktp dDo6V2ViU3BlbGxDaGVja0NsaWVudCwgcHVibGljIFdlYktpdDo6V2ViVmlld0NsCiAgICAgdmly dHVhbCBXZWJLaXQ6OldlYldvcmtlciogY3JlYXRlV29ya2VyKFdlYktpdDo6V2ViRnJhbWUqLCBX ZWJLaXQ6OldlYldvcmtlckNsaWVudCopOwogICAgIHZpcnR1YWwgV2ViS2l0OjpXZWJNZWRpYVBs YXllciogY3JlYXRlTWVkaWFQbGF5ZXIoV2ViS2l0OjpXZWJGcmFtZSosIFdlYktpdDo6V2ViTWVk aWFQbGF5ZXJDbGllbnQqKTsKICAgICB2aXJ0dWFsIFdlYktpdDo6V2ViQXBwbGljYXRpb25DYWNo ZUhvc3QqIGNyZWF0ZUFwcGxpY2F0aW9uQ2FjaGVIb3N0KFdlYktpdDo6V2ViRnJhbWUqLCBXZWJL aXQ6OldlYkFwcGxpY2F0aW9uQ2FjaGVIb3N0Q2xpZW50Kik7CisgICAgdmlydHVhbCB2b2lkIGRp ZFVwZGF0ZUxheW91dChXZWJLaXQ6OldlYkZyYW1lKik7CiAgICAgdmlydHVhbCB2b2lkIGxvYWRV UkxFeHRlcm5hbGx5KFdlYktpdDo6V2ViRnJhbWUqLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlcXVl c3QmLCBXZWJLaXQ6OldlYk5hdmlnYXRpb25Qb2xpY3kpOwogICAgIHZpcnR1YWwgdm9pZCBsb2Fk VVJMRXh0ZXJuYWxseShXZWJLaXQ6OldlYkZyYW1lKiwgY29uc3QgV2ViS2l0OjpXZWJVUkxSZXF1 ZXN0JiwgV2ViS2l0OjpXZWJOYXZpZ2F0aW9uUG9saWN5LCBjb25zdCBXZWJLaXQ6OldlYlN0cmlu ZyYgZG93bmxvYWROYW1lKTsKICAgICB2aXJ0dWFsIFdlYktpdDo6V2ViTmF2aWdhdGlvblBvbGlj eSBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uKAo=