110393 2013-02-20 15:12:43 -0800 Positioned, replaced elements with intrinsic width keywords compute the wrong width 2013-02-20 17:09:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan eae eric esprehn+autocc esprehn hyatt leviw ojan.autocc tony webkit-ews webkit.review.bot oldest_to_newest 837817 0 ojan 2013-02-20 15:12:43 -0800 Positioned, replaced elements with intrinsic width keywords compute the wrong width 837824 1 189392 ojan 2013-02-20 15:18:17 -0800 Created attachment 189392 Patch 837836 2 189392 eae 2013-02-20 15:33:25 -0800 Comment on attachment 189392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189392&action=review > Source/WebCore/rendering/RenderBox.cpp:2594 > + LayoutUnit containerLogicalWidth = 0; This temporary variable isn't needed. If you feel it is needed for readability reason then at last match the name of the argument (availableLogicalWidth). > LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html:19 > + <iframe class="child" style="width: -webkit-max-content;" data-expected-width="310"></iframe> Where did you get the number 310 from? 837841 3 189392 ojan 2013-02-20 15:38:04 -0800 Comment on attachment 189392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189392&action=review >> Source/WebCore/rendering/RenderBox.cpp:2594 >> + LayoutUnit containerLogicalWidth = 0; > > This temporary variable isn't needed. If you feel it is needed for readability reason then at last match the name of the argument (availableLogicalWidth). I think it's needed for readablity. I'll rename it. >> LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html:19 >> + <iframe class="child" style="width: -webkit-max-content;" data-expected-width="310"></iframe> > > Where did you get the number 310 from? The intrinsic width of an iframe is 300px and it has a 10px border. 837845 4 189392 tony 2013-02-20 15:41:12 -0800 Comment on attachment 189392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189392&action=review > Source/WebCore/rendering/RenderBox.cpp:2617 > } Nit: It would be nice to remove the default: case and enumerate the remaining types (Auto, Relative, and Undefined, I think). 837848 5 eae 2013-02-20 15:41:53 -0800 (In reply to comment #3) > (From update of attachment 189392 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189392&action=review > > >> Source/WebCore/rendering/RenderBox.cpp:2594 > >> + LayoutUnit containerLogicalWidth = 0; > > > > This temporary variable isn't needed. If you feel it is needed for readability reason then at last match the name of the argument (availableLogicalWidth). > > I think it's needed for readablity. I'll rename it. Fair enough. > > >> LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html:19 > >> + <iframe class="child" style="width: -webkit-max-content;" data-expected-width="310"></iframe> > > > > Where did you get the number 310 from? > > The intrinsic width of an iframe is 300px and it has a 10px border. Could you add a variable for that? I.e. defaultIframeWidth = 300 and then use that to compute the expected width? Would make the test a lot easier to understand. 837850 6 189392 esprehn 2013-02-20 15:43:13 -0800 Comment on attachment 189392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189392&action=review >>>> LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html:19 >>>> + <iframe class="child" style="width: -webkit-max-content;" data-expected-width="310"></iframe> >>> >>> Where did you get the number 310 from? >> >> The intrinsic width of an iframe is 300px and it has a 10px border. > > Could you add a variable for that? I.e. defaultIframeWidth = 300 and then use that to compute the expected width? Would make the test a lot easier to understand. The whole point of these new style data-expected tests is there's no need for script running. Lets just use a comment to explain that instead. 837851 7 189392 ojan 2013-02-20 15:43:55 -0800 Comment on attachment 189392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189392&action=review >>>> LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html:19 >>>> + <iframe class="child" style="width: -webkit-max-content;" data-expected-width="310"></iframe> >>> >>> Where did you get the number 310 from? >> >> The intrinsic width of an iframe is 300px and it has a 10px border. > > Could you add a variable for that? I.e. defaultIframeWidth = 300 and then use that to compute the expected width? Would make the test a lot easier to understand. It would make this test considerably more complicated. Now I need script to set an attribute, but some of these widths are different. I mean...I can do it, but it doesn't seem worth it. I could add a comment though and get the same benefit I think. 837860 8 eae 2013-02-20 15:48:05 -0800 (In reply to comment #6) > > Could you add a variable for that? I.e. defaultIframeWidth = 300 and then use that to compute the expected width? Would make the test a lot easier to understand. > > The whole point of these new style data-expected tests is there's no need for script running. Lets just use a comment to explain that instead. It still runs a script. It just happens that you declare the expectations in html instead of js. While it might make sense in many cases it doesn't here as it provides values without any explanation and makes the test harder to understand. Perhaps we should change resources/check-layout.js to allow named constants and simple arithmetic. (In reply to comment #7) A comment would do nicely. Thanks. 837889 9 189403 ojan 2013-02-20 16:17:40 -0800 Created attachment 189403 Patch 837895 10 189403 eflews.bot 2013-02-20 16:24:01 -0800 Comment on attachment 189403 Patch Attachment 189403 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/16651617 837896 11 189403 webkit-ews 2013-02-20 16:24:41 -0800 Comment on attachment 189403 Patch Attachment 189403 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/16660585 837897 12 189403 webkit-ews 2013-02-20 16:26:26 -0800 Comment on attachment 189403 Patch Attachment 189403 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/16656605 837905 13 189403 eae 2013-02-20 16:31:36 -0800 Comment on attachment 189403 Patch Thanks! 837962 14 ojan 2013-02-20 17:09:39 -0800 Committed r143539: <http://trac.webkit.org/changeset/143539> 189392 2013-02-20 15:18:17 -0800 2013-02-20 16:17:38 -0800 Patch bug-110393-20130220151438.patch text/plain 10442 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgzNTExNjkxYTMyMjJk Y2RiODQ3NDdkNDRhYTZkNjNmMTgwZjI3ZS4uMTQ4MzI5ZjFjM2ZhMDFiZWYyMTU5NjkzN2UzNmE4 MjdhZmUxYzI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTAyLTIwICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUG9zaXRpb25lZCwgcmVwbGFj ZWQgZWxlbWVudHMgd2l0aCBpbnRyaW5zaWMgd2lkdGgga2V5d29yZHMgY29tcHV0ZSB0aGUgd3Jv bmcgd2lkdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExMDM5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6IGZhc3QvY3NzLWludHJpbnNpYy1kaW1lbnNpb25zL2ludHJpbnNpYy1zaXplZC1yZXBs YWNlZC1hYnNvbHV0ZXMuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0 aFVzaW5nKToKKyAgICAgICAgQWRkIHRoZSBpbnRyaW5zaWMgc2l6ZSBrZXl3b3JkcyB0byB0aGUg c3dpdGNoLiBDb25mdXNpbmdseSwgd2UgaGF2ZSB0bworICAgICAgICBzdWJ0cmFjdCB0aGUgYm9y ZGVyIGFuZCBwYWRkaW5nIHNpbmNlIHRoZSBjYWxsZXJzIGV4cGVjdCB0aGUgY29udGVudCB3aWR0 aC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKToKKyAg ICAgICAgRG9uJ3QgZG8gdGhlIGludHJpbnNpYyByYXRpbyBjYWxjdWxhdGlvbiBpZiB0aGUgd2lk dGggaXMgYW4KKyAgICAgICAgaW50cmluc2ljIHdpZHRoIGtleXdvcmQsIGFzIHBlciwgaHR0cDov L2Rldi53My5vcmcvY3Nzd2cvY3NzMy1zaXppbmcvI3JlcGxhY2VkLWludHJpbnNpYy4KKworICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lk dGhzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxhY2VkOjpjb21wdXRlUHJlZmVycmVk TG9naWNhbFdpZHRocyk6CisgICAgICAgIFRoZSBvbGQgY29kZSB3YXMgdHJ5aW5nIHRvIGFwcGx5 IHRoZSBpbnRyaW5zaWMgcmF0aW8gY2FsY3VsYXRpb24gdG8KKyAgICAgICAgdGhlIGludHJpbnNp YyB3aWR0aCwgd2hpY2ggaXMgd3JvbmcgcGVyIHNwZWMuCisKKzIwMTMtMDItMjAgIE9qYW4gVmFm YWkgIDxvamFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZW1vdmUgc3RyZXRjaGVzVG9NaW5J bnRyaW5zaWNMb2dpY2FsV2lkdGgKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExMDI2NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CmluZGV4IGQyMTI2N2ZkY2ExY2ZlZmY3MTlkY2I3MTE1MTE5NWE1ZDdjNzkzZmYuLjhmNDFkNjMy YjVjZjViM2M1N2NjZmQzNDVhYzJmN2QyYzY5NWNjMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCkBAIC0yNTg4LDExICsyNTg4LDE5IEBAIExheW91dFVuaXQgUmVuZGVy Qm94Ojpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhVc2luZyhTaXplVHlwZSBzaXplVHlwZSwg TGVuZ3RoCiAgICAgc3dpdGNoIChsb2dpY2FsV2lkdGgudHlwZSgpKSB7CiAgICAgICAgIGNhc2Ug Rml4ZWQ6CiAgICAgICAgICAgICByZXR1cm4gYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZv ckJveFNpemluZyhsb2dpY2FsV2lkdGgudmFsdWUoKSk7CisgICAgICAgIGNhc2UgTWluQ29udGVu dDoKKyAgICAgICAgY2FzZSBNYXhDb250ZW50OiB7CisgICAgICAgICAgICAvLyBNaW5Db250ZW50 L01heENvbnRlbnQgZG9uJ3QgbmVlZCB0aGUgY29udGFpbmVyTG9naWNhbFdpZHRoIGFyZ3VtZW50 LgorICAgICAgICAgICAgTGF5b3V0VW5pdCBjb250YWluZXJMb2dpY2FsV2lkdGggPSAwOworICAg ICAgICAgICAgcmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhsb2dpY2Fs V2lkdGgsIGNvbnRhaW5lckxvZ2ljYWxXaWR0aCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdp ZHRoKCk7CisgICAgICAgIH0KICAgICAgICAgY2FzZSBWaWV3cG9ydFBlcmNlbnRhZ2VXaWR0aDoK ICAgICAgICAgY2FzZSBWaWV3cG9ydFBlcmNlbnRhZ2VIZWlnaHQ6CiAgICAgICAgIGNhc2UgVmll d3BvcnRQZXJjZW50YWdlTWluOgogICAgICAgICBjYXNlIFZpZXdwb3J0UGVyY2VudGFnZU1heDoK ICAgICAgICAgICAgIHJldHVybiBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6 aW5nKHZhbHVlRm9yTGVuZ3RoKGxvZ2ljYWxXaWR0aCwgMCwgdmlldygpKSk7CisgICAgICAgIGNh c2UgRml0Q29udGVudDoKKyAgICAgICAgY2FzZSBGaWxsQXZhaWxhYmxlOgogICAgICAgICBjYXNl IFBlcmNlbnQ6IAogICAgICAgICBjYXNlIENhbGN1bGF0ZWQ6IHsKICAgICAgICAgICAgIC8vIEZJ WE1FOiBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KCkgaXMgd3JvbmcgaWYg dGhlIHJlcGxhY2VkIGVsZW1lbnQncyBibG9jay1mbG93IGlzIHBlcnBlbmRpY3VsYXIgdG8gdGhl CkBAIC0yNjAyLDYgKzI2MTAsOCBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZVJlcGxh Y2VkTG9naWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUgc2l6ZVR5cGUsIExlbmd0aAogICAgICAgICAg ICAgTGVuZ3RoIGNvbnRhaW5lckxvZ2ljYWxXaWR0aCA9IGNvbnRhaW5pbmdCbG9jaygpLT5zdHls ZSgpLT5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgY2FzZXMg d2hlbiBjb250YWluaW5nIGJsb2NrIHdpZHRoIGlzIGNhbGN1bGF0ZWQgb3Igdmlld3BvcnQgcGVy Y2VudC4KICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MTA3MQorICAgICAgICAgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpKQor ICAgICAgICAgICAgICAgIHJldHVybiBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmco bG9naWNhbFdpZHRoLCBjdykgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CiAgICAg ICAgICAgICBpZiAoY3cgPiAwIHx8ICghY3cgJiYgKGNvbnRhaW5lckxvZ2ljYWxXaWR0aC5pc0Zp eGVkKCkgfHwgY29udGFpbmVyTG9naWNhbFdpZHRoLmlzUGVyY2VudCgpKSkpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcobWlu aW11bVZhbHVlRm9yTGVuZ3RoKGxvZ2ljYWxXaWR0aCwgY3cpKTsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKaW5kZXggMmZmYTAwNjAwMWQ4 MTg5YjU1NDE4MzZjZGI4ODc0OGU1NzVhMjkyMi4uM2JlOTFiYmY3OTk5MzMxZWIxM2E1YjNkNWJk NWQyMDhmZWNiMWM3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFj ZWQuY3BwCkBAIC0zMTksNyArMzE5LDcgQEAgdm9pZCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZUlu dHJpbnNpY1JhdGlvSW5mb3JtYXRpb24oRmxvYXRTaXplJiBpbnRyaW5zaWNTaXplLAogCiBMYXlv dXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxk Q29tcHV0ZVByZWZlcnJlZCBzaG91bGRDb21wdXRlUHJlZmVycmVkKSBjb25zdAogewotICAgIGlm IChzdHlsZSgpLT5sb2dpY2FsV2lkdGgoKS5pc1NwZWNpZmllZCgpKQorICAgIGlmIChzdHlsZSgp LT5sb2dpY2FsV2lkdGgoKS5pc1NwZWNpZmllZCgpIHx8IHN0eWxlKCktPmxvZ2ljYWxXaWR0aCgp LmlzSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lk dGhSZXNwZWN0aW5nTWluTWF4V2lkdGgoY29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoVXNpbmco TWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbFdpZHRoKCkpLCBzaG91bGRDb21w dXRlUHJlZmVycmVkKTsKIAogICAgIFJlbmRlckJveCogY29udGVudFJlbmRlcmVyID0gZW1iZWRk ZWRDb250ZW50Qm94KCk7CkBAIC00MjEsMTYgKzQyMSwxOSBAQCBMYXlvdXRVbml0IFJlbmRlclJl cGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KCkgY29uc3QKIAogdm9pZCBSZW5k ZXJSZXBsYWNlZDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWlu TG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0CiB7Ci0gICAg Ly8gV2UgY2Fubm90IHJlc29sdmUgYW55IHBlcmNlbnQgbG9naWNhbCB3aWR0aCBoZXJlIGFzIHRo ZSBhdmFpbGFibGUgbG9naWNhbAotICAgIC8vIHdpZHRoIG1heSBub3QgYmUgc2V0IG9uIG91ciBj b250YWluaW5nIGJsb2NrLgotICAgIG1pbkxvZ2ljYWxXaWR0aCA9IG1heExvZ2ljYWxXaWR0aCA9 IHN0eWxlKCktPmxvZ2ljYWxXaWR0aCgpLmlzUGVyY2VudCgpID8gaW50cmluc2ljTG9naWNhbFdp ZHRoKCkgOiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoQ29tcHV0ZVByZWZlcnJlZCk7Cisg ICAgbWluTG9naWNhbFdpZHRoID0gbWF4TG9naWNhbFdpZHRoID0gaW50cmluc2ljTG9naWNhbFdp ZHRoKCk7CiB9CiAKIHZvaWQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKCkKIHsKICAgICBBU1NFUlQocHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KCkpOwog Ci0gICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobV9taW5QcmVmZXJyZWRMb2dpY2Fs V2lkdGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKKyAgICAvLyBXZSBjYW5ub3QgcmVz b2x2ZSBhbnkgcGVyY2VudCBsb2dpY2FsIHdpZHRoIGhlcmUgYXMgdGhlIGF2YWlsYWJsZSBsb2dp Y2FsCisgICAgLy8gd2lkdGggbWF5IG5vdCBiZSBzZXQgb24gb3VyIGNvbnRhaW5pbmcgYmxvY2su CisgICAgaWYgKHN0eWxlKCktPmxvZ2ljYWxXaWR0aCgpLmlzUGVyY2VudCgpKQorICAgICAgICBj b21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwg bV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOworICAgIGVsc2UKKyAgICAgICAgbV9taW5QcmVm ZXJyZWRMb2dpY2FsV2lkdGggPSBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVS ZXBsYWNlZExvZ2ljYWxXaWR0aChDb21wdXRlUHJlZmVycmVkKTsKIAogICAgIFJlbmRlclN0eWxl KiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKICAgICBpZiAoc3R5bGVUb1VzZS0+bG9naWNhbFdpZHRo KCkuaXNQZXJjZW50KCkgfHwgc3R5bGVUb1VzZS0+bG9naWNhbE1heFdpZHRoKCkuaXNQZXJjZW50 KCkgfHwgaGFzUmVsYXRpdmVJbnRyaW5zaWNMb2dpY2FsV2lkdGgoKSkKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlNDdmNDM3 YmYyNDA3YTEzMDFmODAwMDNlNTgxMDQ5YjhlNGM0NDhjLi5jMDE0ZjY0MTljYzA4MWMyOWQyNzJi N2E4MDk5NjJmMjVjOWUyNmEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTMtMDItMjAgIE9q YW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBQb3NpdGlvbmVkLCByZXBs YWNlZCBlbGVtZW50cyB3aXRoIGludHJpbnNpYyB3aWR0aCBrZXl3b3JkcyBjb21wdXRlIHRoZSB3 cm9uZyB3aWR0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTEwMzkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBmYXN0L2Nzcy1pbnRyaW5zaWMtZGltZW5zaW9ucy9pbnRyaW5zaWMtc2l6ZWQtcmVwbGFj ZWQtYWJzb2x1dGVzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MtaW50 cmluc2ljLWRpbWVuc2lvbnMvaW50cmluc2ljLXNpemVkLXJlcGxhY2VkLWFic29sdXRlcy5odG1s OiBBZGRlZC4KKworMjAxMy0wMi0yMCAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgor CiAgICAgICAgIE1ha2UgaW50cmluc2ljIHdpZHRoIHZhbHVlcyB3b3JrIGZvciBwb3NpdGlvbmVk IGVsZW1lbnRzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTAyNjQKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtaW50cmluc2ljLWRp bWVuc2lvbnMvaW50cmluc2ljLXNpemVkLXJlcGxhY2VkLWFic29sdXRlcy1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1pbnRyaW5zaWMtZGltZW5zaW9ucy9pbnRyaW5zaWMtc2l6 ZWQtcmVwbGFjZWQtYWJzb2x1dGVzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hZjJmNjY4YTIw MzJmMzZjZDdhZTRlNTE2ZWI0OWQ3ZDdkZGYwMTJjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9jc3MtaW50cmluc2ljLWRpbWVuc2lvbnMvaW50cmluc2ljLXNpemVkLXJlcGxh Y2VkLWFic29sdXRlcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzMSBAQAorVGVzdHMgdGhhdCBp bnRyaW5zaWMgd2lkdGggdmFsdWVzIG9uIGFic29sdXRlbHkgcG9zaXRpb25lZCBlbGVtZW50IHdv cmsuCisKK1BBU1MKKworUEFTUworCitQQVNTCisKK1BBU1MKKworUEFTUworCitQQVNTCisKK1BB U1MKKworUEFTUworCitQQVNTCisKK1BBU1MKKworUEFTUworCitQQVNTCisKK1BBU1MKKworUEFT UworCitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1pbnRyaW5zaWMtZGlt ZW5zaW9ucy9pbnRyaW5zaWMtc2l6ZWQtcmVwbGFjZWQtYWJzb2x1dGVzLmh0bWwgYi9MYXlvdXRU ZXN0cy9mYXN0L2Nzcy1pbnRyaW5zaWMtZGltZW5zaW9ucy9pbnRyaW5zaWMtc2l6ZWQtcmVwbGFj ZWQtYWJzb2x1dGVzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDlkMDA2MDZlYzNmNzEwMjhhNjY0YmIxZDc0 ZGY1ODkxYmNkNjhlYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWlu dHJpbnNpYy1kaW1lbnNpb25zL2ludHJpbnNpYy1zaXplZC1yZXBsYWNlZC1hYnNvbHV0ZXMuaHRt bApAQCAtMCwwICsxLDgzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KKy5jb250YWluZXIg eworICAgIHBvc2l0aW9uOnJlbGF0aXZlOworICAgIGJvcmRlcjogNXB4IHNvbGlkIGJsdWU7Cisg ICAgd2lkdGg6IDM1MHB4OworICAgIGhlaWdodDogMzUwcHg7Cit9CisuY2hpbGQgeworICAgIHBv c2l0aW9uOmFic29sdXRlOworICAgIGJvcmRlcjogNXB4IHNvbGlkIHBpbms7Cit9Cis8L3N0eWxl PgorCitUZXN0cyB0aGF0IGludHJpbnNpYyB3aWR0aCB2YWx1ZXMgb24gYWJzb2x1dGVseSBwb3Np dGlvbmVkIGVsZW1lbnQgd29yay4KKworPCEtLSB3aWR0aCB0ZXN0cyAtLT4KKzxkaXYgY2xhc3M9 ImNvbnRhaW5lciI+CisgICAgPGlmcmFtZSBjbGFzcz0iY2hpbGQiIHN0eWxlPSJ3aWR0aDogLXdl YmtpdC1tYXgtY29udGVudDsiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+PC9pZnJhbWU+Cis8 L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8aWZyYW1lIGNsYXNzPSJjaGls ZCIgc3R5bGU9IndpZHRoOiAtd2Via2l0LW1pbi1jb250ZW50OyIgZGF0YS1leHBlY3RlZC13aWR0 aD0iMzEwIj48L2lmcmFtZT4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAg IDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBzdHlsZT0id2lkdGg6IC13ZWJraXQtZml0LWNvbnRlbnQ7 IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIzMTAiPjwvaWZyYW1lPgorPC9kaXY+CisKKzxkaXYgY2xh c3M9ImNvbnRhaW5lciIgc3R5bGU9IndpZHRoOiA1MHB4Ij4KKyAgICA8aWZyYW1lIGNsYXNzPSJj aGlsZCIgc3R5bGU9IndpZHRoOiAtd2Via2l0LWZpdC1jb250ZW50OyIgZGF0YS1leHBlY3RlZC13 aWR0aD0iMzEwIj48L2lmcmFtZT4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgor ICAgIDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBzdHlsZT0id2lkdGg6IC13ZWJraXQtZmlsbC1hdmFp bGFibGU7IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIzNTAiPjwvaWZyYW1lPgorPC9kaXY+CisKKzwh LS0gbWluLXdpZHRoIHRlc3RzIC0tPgorPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8aWZy YW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9Im1pbi13aWR0aDogLXdlYmtpdC1tYXgtY29udGVudDsg d2lkdGg6IDEwcHg7IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIzMTAiPjwvaWZyYW1lPgorPC9kaXY+ CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGlmcmFtZSBjbGFzcz0iY2hpbGQiIHN0 eWxlPSJtaW4td2lkdGg6IC13ZWJraXQtbWluLWNvbnRlbnQ7IHdpZHRoOiAxMHB4OyIgZGF0YS1l eHBlY3RlZC13aWR0aD0iMzEwIj48L2lmcmFtZT4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250 YWluZXIiPgorICAgIDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBzdHlsZT0ibWluLXdpZHRoOiAtd2Vi a2l0LWZpdC1jb250ZW50OyB3aWR0aDogMTBweDsiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+ PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIiBzdHlsZT0id2lkdGg6 IDUwcHgiPgorICAgIDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBzdHlsZT0ibWluLXdpZHRoOiAtd2Vi a2l0LWZpdC1jb250ZW50OyB3aWR0aDogMTBweDsiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+ PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8aWZyYW1l IGNsYXNzPSJjaGlsZCIgc3R5bGU9Im1pbi13aWR0aDogLXdlYmtpdC1maWxsLWF2YWlsYWJsZTsg d2lkdGg6IDEwcHg7IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIzNTAiPjwvaWZyYW1lPgorPC9kaXY+ CisKKzwhLS0gbWF4LXdpZHRoIHRlc3RzIC0tPgorPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAg ICA8aWZyYW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9Im1heC13aWR0aDogLXdlYmtpdC1tYXgtY29u dGVudDsgd2lkdGg6IDEwMDBweDsiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+PC9pZnJhbWU+ Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8aWZyYW1lIGNsYXNzPSJj aGlsZCIgc3R5bGU9Im1heC13aWR0aDogLXdlYmtpdC1taW4tY29udGVudDsgd2lkdGg6IDEwMDBw eDsiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBj bGFzcz0iY29udGFpbmVyIj4KKyAgICA8aWZyYW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9Im1heC13 aWR0aDogLXdlYmtpdC1maXQtY29udGVudDsgd2lkdGg6IDEwMDBweDsiIGRhdGEtZXhwZWN0ZWQt d2lkdGg9IjMxMCI+PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIiBz dHlsZT0id2lkdGg6IDUwcHgiPgorICAgIDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBzdHlsZT0ibWF4 LXdpZHRoOiAtd2Via2l0LWZpdC1jb250ZW50OyB3aWR0aDogMTAwMHB4OyIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMzEwIj48L2lmcmFtZT4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIi PgorICAgIDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBzdHlsZT0ibWF4LXdpZHRoOiAtd2Via2l0LWZp bGwtYXZhaWxhYmxlOyB3aWR0aDogMTAwMHB4OyIgZGF0YS1leHBlY3RlZC13aWR0aD0iMzUwIj48 L2lmcmFtZT4KKzwvZGl2PgorCis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2NoZWNrLWxh eW91dC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorY2hlY2tMYXlvdXQoIi5jb250YWluZXIiKTsK Kzwvc2NyaXB0Pgo= 189403 2013-02-20 16:17:40 -0800 2013-02-20 16:31:36 -0800 Patch bug-110393-20130220161402.patch text/plain 10868 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgzNTExNjkxYTMyMjJk Y2RiODQ3NDdkNDRhYTZkNjNmMTgwZjI3ZS4uMTQ4MzI5ZjFjM2ZhMDFiZWYyMTU5NjkzN2UzNmE4 MjdhZmUxYzI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTAyLTIwICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUG9zaXRpb25lZCwgcmVwbGFj ZWQgZWxlbWVudHMgd2l0aCBpbnRyaW5zaWMgd2lkdGgga2V5d29yZHMgY29tcHV0ZSB0aGUgd3Jv bmcgd2lkdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExMDM5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6IGZhc3QvY3NzLWludHJpbnNpYy1kaW1lbnNpb25zL2ludHJpbnNpYy1zaXplZC1yZXBs YWNlZC1hYnNvbHV0ZXMuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0 aFVzaW5nKToKKyAgICAgICAgQWRkIHRoZSBpbnRyaW5zaWMgc2l6ZSBrZXl3b3JkcyB0byB0aGUg c3dpdGNoLiBDb25mdXNpbmdseSwgd2UgaGF2ZSB0bworICAgICAgICBzdWJ0cmFjdCB0aGUgYm9y ZGVyIGFuZCBwYWRkaW5nIHNpbmNlIHRoZSBjYWxsZXJzIGV4cGVjdCB0aGUgY29udGVudCB3aWR0 aC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKToKKyAg ICAgICAgRG9uJ3QgZG8gdGhlIGludHJpbnNpYyByYXRpbyBjYWxjdWxhdGlvbiBpZiB0aGUgd2lk dGggaXMgYW4KKyAgICAgICAgaW50cmluc2ljIHdpZHRoIGtleXdvcmQsIGFzIHBlciwgaHR0cDov L2Rldi53My5vcmcvY3Nzd2cvY3NzMy1zaXppbmcvI3JlcGxhY2VkLWludHJpbnNpYy4KKworICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lk dGhzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxhY2VkOjpjb21wdXRlUHJlZmVycmVk TG9naWNhbFdpZHRocyk6CisgICAgICAgIFRoZSBvbGQgY29kZSB3YXMgdHJ5aW5nIHRvIGFwcGx5 IHRoZSBpbnRyaW5zaWMgcmF0aW8gY2FsY3VsYXRpb24gdG8KKyAgICAgICAgdGhlIGludHJpbnNp YyB3aWR0aCwgd2hpY2ggaXMgd3JvbmcgcGVyIHNwZWMuCisKKzIwMTMtMDItMjAgIE9qYW4gVmFm YWkgIDxvamFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZW1vdmUgc3RyZXRjaGVzVG9NaW5J bnRyaW5zaWNMb2dpY2FsV2lkdGgKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExMDI2NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CmluZGV4IGQyMTI2N2ZkY2ExY2ZlZmY3MTlkY2I3MTE1MTE5NWE1ZDdjNzkzZmYuLjczNTg3YWE0 MDNmZWU5NmEzOGQ1NTM2NzhhZWUzODBlYzVkM2ZkNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCkBAIC0yNTg4LDExICsyNTg4LDE5IEBAIExheW91dFVuaXQgUmVuZGVy Qm94Ojpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhVc2luZyhTaXplVHlwZSBzaXplVHlwZSwg TGVuZ3RoCiAgICAgc3dpdGNoIChsb2dpY2FsV2lkdGgudHlwZSgpKSB7CiAgICAgICAgIGNhc2Ug Rml4ZWQ6CiAgICAgICAgICAgICByZXR1cm4gYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZv ckJveFNpemluZyhsb2dpY2FsV2lkdGgudmFsdWUoKSk7CisgICAgICAgIGNhc2UgTWluQ29udGVu dDoKKyAgICAgICAgY2FzZSBNYXhDb250ZW50OiB7CisgICAgICAgICAgICAvLyBNaW5Db250ZW50 L01heENvbnRlbnQgZG9uJ3QgbmVlZCB0aGUgYXZhaWxhYmxlTG9naWNhbFdpZHRoIGFyZ3VtZW50 LgorICAgICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGggPSAwOworICAg ICAgICAgICAgcmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhsb2dpY2Fs V2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdp ZHRoKCk7CisgICAgICAgIH0KICAgICAgICAgY2FzZSBWaWV3cG9ydFBlcmNlbnRhZ2VXaWR0aDoK ICAgICAgICAgY2FzZSBWaWV3cG9ydFBlcmNlbnRhZ2VIZWlnaHQ6CiAgICAgICAgIGNhc2UgVmll d3BvcnRQZXJjZW50YWdlTWluOgogICAgICAgICBjYXNlIFZpZXdwb3J0UGVyY2VudGFnZU1heDoK ICAgICAgICAgICAgIHJldHVybiBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6 aW5nKHZhbHVlRm9yTGVuZ3RoKGxvZ2ljYWxXaWR0aCwgMCwgdmlldygpKSk7CisgICAgICAgIGNh c2UgRml0Q29udGVudDoKKyAgICAgICAgY2FzZSBGaWxsQXZhaWxhYmxlOgogICAgICAgICBjYXNl IFBlcmNlbnQ6IAogICAgICAgICBjYXNlIENhbGN1bGF0ZWQ6IHsKICAgICAgICAgICAgIC8vIEZJ WE1FOiBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KCkgaXMgd3JvbmcgaWYg dGhlIHJlcGxhY2VkIGVsZW1lbnQncyBibG9jay1mbG93IGlzIHBlcnBlbmRpY3VsYXIgdG8gdGhl CkBAIC0yNjAyLDExICsyNjEwLDE3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlUmVw bGFjZWRMb2dpY2FsV2lkdGhVc2luZyhTaXplVHlwZSBzaXplVHlwZSwgTGVuZ3RoCiAgICAgICAg ICAgICBMZW5ndGggY29udGFpbmVyTG9naWNhbFdpZHRoID0gY29udGFpbmluZ0Jsb2NrKCktPnN0 eWxlKCktPmxvZ2ljYWxXaWR0aCgpOwogICAgICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBjYXNl cyB3aGVuIGNvbnRhaW5pbmcgYmxvY2sgd2lkdGggaXMgY2FsY3VsYXRlZCBvciB2aWV3cG9ydCBw ZXJjZW50LgogICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTkxMDcxCisgICAgICAgICAgICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkp CisgICAgICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2lu Zyhsb2dpY2FsV2lkdGgsIGN3KSAtIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKICAg ICAgICAgICAgIGlmIChjdyA+IDAgfHwgKCFjdyAmJiAoY29udGFpbmVyTG9naWNhbFdpZHRoLmlz Rml4ZWQoKSB8fCBjb250YWluZXJMb2dpY2FsV2lkdGguaXNQZXJjZW50KCkpKSkKICAgICAgICAg ICAgICAgICByZXR1cm4gYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyht aW5pbXVtVmFsdWVGb3JMZW5ndGgobG9naWNhbFdpZHRoLCBjdykpOwogICAgICAgICB9CiAgICAg ICAgIC8vIGZhbGwgdGhyb3VnaAotICAgICAgICBkZWZhdWx0OgorICAgICAgICBjYXNlIEludHJp bnNpYzoKKyAgICAgICAgY2FzZSBNaW5JbnRyaW5zaWM6CisgICAgICAgIGNhc2UgQXV0bzoKKyAg ICAgICAgY2FzZSBSZWxhdGl2ZToKKyAgICAgICAgY2FzZSBVbmRlZmluZWQ6CiAgICAgICAgICAg ICByZXR1cm4gaW50cmluc2ljTG9naWNhbFdpZHRoKCk7CiAgICAgIH0KIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDJmZmEwMDYwMDFkODE4OWI1 NTQxODM2Y2RiODg3NDhlNTc1YTI5MjIuLjNiZTkxYmJmNzk5OTMzMWViMTNhNWIzZDViZDVkMjA4 ZmVjYjFjNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBs YWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNw cApAQCAtMzE5LDcgKzMxOSw3IEBAIHZvaWQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVJbnRyaW5z aWNSYXRpb0luZm9ybWF0aW9uKEZsb2F0U2l6ZSYgaW50cmluc2ljU2l6ZSwKIAogTGF5b3V0VW5p dCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1 dGVQcmVmZXJyZWQgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCkgY29uc3QKIHsKLSAgICBpZiAoc3R5 bGUoKS0+bG9naWNhbFdpZHRoKCkuaXNTcGVjaWZpZWQoKSkKKyAgICBpZiAoc3R5bGUoKS0+bG9n aWNhbFdpZHRoKCkuaXNTcGVjaWZpZWQoKSB8fCBzdHlsZSgpLT5sb2dpY2FsV2lkdGgoKS5pc0lu dHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoUmVz cGVjdGluZ01pbk1heFdpZHRoKGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFVzaW5nKE1haW5P clByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxvZ2ljYWxXaWR0aCgpKSwgc2hvdWxkQ29tcHV0ZVBy ZWZlcnJlZCk7CiAKICAgICBSZW5kZXJCb3gqIGNvbnRlbnRSZW5kZXJlciA9IGVtYmVkZGVkQ29u dGVudEJveCgpOwpAQCAtNDIxLDE2ICs0MjEsMTkgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNl ZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodCgpIGNvbnN0CiAKIHZvaWQgUmVuZGVyUmVw bGFjZWQ6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2lj YWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdAogewotICAgIC8vIFdl IGNhbm5vdCByZXNvbHZlIGFueSBwZXJjZW50IGxvZ2ljYWwgd2lkdGggaGVyZSBhcyB0aGUgYXZh aWxhYmxlIGxvZ2ljYWwKLSAgICAvLyB3aWR0aCBtYXkgbm90IGJlIHNldCBvbiBvdXIgY29udGFp bmluZyBibG9jay4KLSAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBzdHls ZSgpLT5sb2dpY2FsV2lkdGgoKS5pc1BlcmNlbnQoKSA/IGludHJpbnNpY0xvZ2ljYWxXaWR0aCgp IDogY29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKENvbXB1dGVQcmVmZXJyZWQpOworICAgIG1p bkxvZ2ljYWxXaWR0aCA9IG1heExvZ2ljYWxXaWR0aCA9IGludHJpbnNpY0xvZ2ljYWxXaWR0aCgp OwogfQogCiB2b2lkIFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRo cygpCiB7CiAgICAgQVNTRVJUKHByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKTsKIAotICAg IGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRo LCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7CisgICAgLy8gV2UgY2Fubm90IHJlc29sdmUg YW55IHBlcmNlbnQgbG9naWNhbCB3aWR0aCBoZXJlIGFzIHRoZSBhdmFpbGFibGUgbG9naWNhbAor ICAgIC8vIHdpZHRoIG1heSBub3QgYmUgc2V0IG9uIG91ciBjb250YWluaW5nIGJsb2NrLgorICAg IGlmIChzdHlsZSgpLT5sb2dpY2FsV2lkdGgoKS5pc1BlcmNlbnQoKSkKKyAgICAgICAgY29tcHV0 ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1fbWF4 UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKKyAgICBlbHNlCisgICAgICAgIG1fbWluUHJlZmVycmVk TG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBjb21wdXRlUmVwbGFj ZWRMb2dpY2FsV2lkdGgoQ29tcHV0ZVByZWZlcnJlZCk7CiAKICAgICBSZW5kZXJTdHlsZSogc3R5 bGVUb1VzZSA9IHN0eWxlKCk7CiAgICAgaWYgKHN0eWxlVG9Vc2UtPmxvZ2ljYWxXaWR0aCgpLmlz UGVyY2VudCgpIHx8IHN0eWxlVG9Vc2UtPmxvZ2ljYWxNYXhXaWR0aCgpLmlzUGVyY2VudCgpIHx8 IGhhc1JlbGF0aXZlSW50cmluc2ljTG9naWNhbFdpZHRoKCkpCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZTQ3ZjQzN2JmMjQw N2ExMzAxZjgwMDAzZTU4MTA0OWI4ZTRjNDQ4Yy4uYzAxNGY2NDE5Y2MwODFjMjlkMjcyYjdhODA5 OTYyZjI1YzllMjZhMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEzLTAyLTIwICBPamFuIFZh ZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUG9zaXRpb25lZCwgcmVwbGFjZWQg ZWxlbWVudHMgd2l0aCBpbnRyaW5zaWMgd2lkdGgga2V5d29yZHMgY29tcHV0ZSB0aGUgd3Jvbmcg d2lkdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx MDM5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog ZmFzdC9jc3MtaW50cmluc2ljLWRpbWVuc2lvbnMvaW50cmluc2ljLXNpemVkLXJlcGxhY2VkLWFi c29sdXRlcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3NzLWludHJpbnNp Yy1kaW1lbnNpb25zL2ludHJpbnNpYy1zaXplZC1yZXBsYWNlZC1hYnNvbHV0ZXMuaHRtbDogQWRk ZWQuCisKKzIwMTMtMDItMjAgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKwogICAg ICAgICBNYWtlIGludHJpbnNpYyB3aWR0aCB2YWx1ZXMgd29yayBmb3IgcG9zaXRpb25lZCBlbGVt ZW50cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEw MjY0CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWludHJpbnNpYy1kaW1lbnNp b25zL2ludHJpbnNpYy1zaXplZC1yZXBsYWNlZC1hYnNvbHV0ZXMtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZmFzdC9jc3MtaW50cmluc2ljLWRpbWVuc2lvbnMvaW50cmluc2ljLXNpemVkLXJl cGxhY2VkLWFic29sdXRlcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWYyZjY2OGEyMDMyZjM2 Y2Q3YWU0ZTUxNmViNDlkN2Q3ZGRmMDEyYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvY3NzLWludHJpbnNpYy1kaW1lbnNpb25zL2ludHJpbnNpYy1zaXplZC1yZXBsYWNlZC1h YnNvbHV0ZXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMzEgQEAKK1Rlc3RzIHRoYXQgaW50cmlu c2ljIHdpZHRoIHZhbHVlcyBvbiBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgZWxlbWVudCB3b3JrLgor CitQQVNTCisKK1BBU1MKKworUEFTUworCitQQVNTCisKK1BBU1MKKworUEFTUworCitQQVNTCisK K1BBU1MKKworUEFTUworCitQQVNTCisKK1BBU1MKKworUEFTUworCitQQVNTCisKK1BBU1MKKwor UEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtaW50cmluc2ljLWRpbWVuc2lv bnMvaW50cmluc2ljLXNpemVkLXJlcGxhY2VkLWFic29sdXRlcy5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MtaW50cmluc2ljLWRpbWVuc2lvbnMvaW50cmluc2ljLXNpemVkLXJlcGxhY2VkLWFi c29sdXRlcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjg0ZmMwZDU1MzU0ZTViY2Y2NzVlMzhkZjc0YTNmYzk4 MzAxZjkzNTkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1pbnRyaW5z aWMtZGltZW5zaW9ucy9pbnRyaW5zaWMtc2l6ZWQtcmVwbGFjZWQtYWJzb2x1dGVzLmh0bWwKQEAg LTAsMCArMSw4NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+CisuY29udGFpbmVyIHsKKyAg ICBwb3NpdGlvbjpyZWxhdGl2ZTsKKyAgICBib3JkZXI6IDVweCBzb2xpZCBibHVlOworICAgIHdp ZHRoOiAzNTBweDsKKyAgICBoZWlnaHQ6IDM1MHB4OworfQorLmNoaWxkIHsKKyAgICBwb3NpdGlv bjphYnNvbHV0ZTsKKyAgICBib3JkZXI6IDVweCBzb2xpZCBwaW5rOworfQorPC9zdHlsZT4KKwor VGVzdHMgdGhhdCBpbnRyaW5zaWMgd2lkdGggdmFsdWVzIG9uIGFic29sdXRlbHkgcG9zaXRpb25l ZCBlbGVtZW50IHdvcmsuCisKKzwhLS0gVGhlIDMxMHB4IGV4cGVjdGVkIHZhbHVlcyBhcmUgdGhl IDMwMHB4IGludHJpbnNpYyB3aWR0aCBvZiBhbiBpZnJhbWUgcGx1cyAxMHB4IG9mIGJvcmRlci4K KyAgICBUaGUgMzUwcHggZXhwZWN0ZWQgdmFsdWVzIGFyZSB0aGUgaWZyYW1lIGZpbGxpbmcgdGhl IDM1MHB4IGF2YWlsYWJsZSB3aWR0aCBmcm9tIHRoZSBjb250YWluZXIuCistLT4KKworPCEtLSB3 aWR0aCB0ZXN0cyAtLT4KKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPGlmcmFtZSBjbGFz cz0iY2hpbGQiIHN0eWxlPSJ3aWR0aDogLXdlYmtpdC1tYXgtY29udGVudDsiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjMxMCI+PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVy Ij4KKyAgICA8aWZyYW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9IndpZHRoOiAtd2Via2l0LW1pbi1j b250ZW50OyIgZGF0YS1leHBlY3RlZC13aWR0aD0iMzEwIj48L2lmcmFtZT4KKzwvZGl2PgorCis8 ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBzdHlsZT0i d2lkdGg6IC13ZWJraXQtZml0LWNvbnRlbnQ7IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIzMTAiPjwv aWZyYW1lPgorPC9kaXY+CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciIgc3R5bGU9IndpZHRoOiA1 MHB4Ij4KKyAgICA8aWZyYW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9IndpZHRoOiAtd2Via2l0LWZp dC1jb250ZW50OyIgZGF0YS1leHBlY3RlZC13aWR0aD0iMzEwIj48L2lmcmFtZT4KKzwvZGl2Pgor Cis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBzdHls ZT0id2lkdGg6IC13ZWJraXQtZmlsbC1hdmFpbGFibGU7IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIz NTAiPjwvaWZyYW1lPgorPC9kaXY+CisKKzwhLS0gbWluLXdpZHRoIHRlc3RzIC0tPgorPGRpdiBj bGFzcz0iY29udGFpbmVyIj4KKyAgICA8aWZyYW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9Im1pbi13 aWR0aDogLXdlYmtpdC1tYXgtY29udGVudDsgd2lkdGg6IDEwcHg7IiBkYXRhLWV4cGVjdGVkLXdp ZHRoPSIzMTAiPjwvaWZyYW1lPgorPC9kaXY+CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+Cisg ICAgPGlmcmFtZSBjbGFzcz0iY2hpbGQiIHN0eWxlPSJtaW4td2lkdGg6IC13ZWJraXQtbWluLWNv bnRlbnQ7IHdpZHRoOiAxMHB4OyIgZGF0YS1leHBlY3RlZC13aWR0aD0iMzEwIj48L2lmcmFtZT4K KzwvZGl2PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxpZnJhbWUgY2xhc3M9ImNo aWxkIiBzdHlsZT0ibWluLXdpZHRoOiAtd2Via2l0LWZpdC1jb250ZW50OyB3aWR0aDogMTBweDsi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBjbGFz cz0iY29udGFpbmVyIiBzdHlsZT0id2lkdGg6IDUwcHgiPgorICAgIDxpZnJhbWUgY2xhc3M9ImNo aWxkIiBzdHlsZT0ibWluLXdpZHRoOiAtd2Via2l0LWZpdC1jb250ZW50OyB3aWR0aDogMTBweDsi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBjbGFz cz0iY29udGFpbmVyIj4KKyAgICA8aWZyYW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9Im1pbi13aWR0 aDogLXdlYmtpdC1maWxsLWF2YWlsYWJsZTsgd2lkdGg6IDEwcHg7IiBkYXRhLWV4cGVjdGVkLXdp ZHRoPSIzNTAiPjwvaWZyYW1lPgorPC9kaXY+CisKKzwhLS0gbWF4LXdpZHRoIHRlc3RzIC0tPgor PGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8aWZyYW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9 Im1heC13aWR0aDogLXdlYmtpdC1tYXgtY29udGVudDsgd2lkdGg6IDEwMDBweDsiIGRhdGEtZXhw ZWN0ZWQtd2lkdGg9IjMxMCI+PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFp bmVyIj4KKyAgICA8aWZyYW1lIGNsYXNzPSJjaGlsZCIgc3R5bGU9Im1heC13aWR0aDogLXdlYmtp dC1taW4tY29udGVudDsgd2lkdGg6IDEwMDBweDsiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+ PC9pZnJhbWU+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICA8aWZyYW1l IGNsYXNzPSJjaGlsZCIgc3R5bGU9Im1heC13aWR0aDogLXdlYmtpdC1maXQtY29udGVudDsgd2lk dGg6IDEwMDBweDsiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxMCI+PC9pZnJhbWU+Cis8L2Rpdj4K KworPGRpdiBjbGFzcz0iY29udGFpbmVyIiBzdHlsZT0id2lkdGg6IDUwcHgiPgorICAgIDxpZnJh bWUgY2xhc3M9ImNoaWxkIiBzdHlsZT0ibWF4LXdpZHRoOiAtd2Via2l0LWZpdC1jb250ZW50OyB3 aWR0aDogMTAwMHB4OyIgZGF0YS1leHBlY3RlZC13aWR0aD0iMzEwIj48L2lmcmFtZT4KKzwvZGl2 PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDxpZnJhbWUgY2xhc3M9ImNoaWxkIiBz dHlsZT0ibWF4LXdpZHRoOiAtd2Via2l0LWZpbGwtYXZhaWxhYmxlOyB3aWR0aDogMTAwMHB4OyIg ZGF0YS1leHBlY3RlZC13aWR0aD0iMzUwIj48L2lmcmFtZT4KKzwvZGl2PgorCis8c2NyaXB0IHNy Yz0iLi4vLi4vcmVzb3VyY2VzL2NoZWNrLWxheW91dC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0Pgor Y2hlY2tMYXlvdXQoIi5jb250YWluZXIiKTsKKzwvc2NyaXB0Pgo=