49491 2010-11-13 01:09:29 -0800 [Qt] Path fill lacks blur shadow support 2010-11-20 19:09:12 -0800 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) All All RESOLVED FIXED HTML5, Qt, QtTriaged P2 Normal --- 34479 1 helder webkit-qt-unassigned commit-queue kling mdelaney7 oldest_to_newest 308939 0 helder 2010-11-13 01:09:29 -0800 fillPath() will draw only solid shadows, even with shadowBlur set. 308940 1 73812 helder 2010-11-13 01:11:54 -0800 Created attachment 73812 Patch 309205 2 73812 kling 2010-11-15 02:19:41 -0800 Comment on attachment 73812 Patch What about filling with a gradient or pattern with alpha? Seems like it won't be covered by this change. 311760 3 74445 helder 2010-11-19 16:57:46 -0800 Created attachment 74445 Patch 311772 4 74449 helder 2010-11-19 17:31:58 -0800 Created attachment 74449 Test for stroke gradient and fill, not path 311773 5 74449 helder 2010-11-19 17:32:50 -0800 Comment on attachment 74449 Test for stroke gradient and fill, not path Added this patch to the wrong bug. 311854 6 74445 kling 2010-11-19 20:54:49 -0800 Comment on attachment 74445 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=74445&action=review Looks good, except one thing: > WebCore/platform/graphics/qt/GraphicsContextQt.cpp:550 > + QPainter* shadowPainter = shadow->beginShadowLayer(p, path.boundingRect()); QPainterPath::boundingRect() is slow, you should use the controlPointRect() trick here since you only need an approximation. 311876 7 74468 helder 2010-11-19 22:36:21 -0800 Created attachment 74468 Use the faster controlPointRect() 311877 8 74468 kling 2010-11-19 22:38:52 -0800 Comment on attachment 74468 Use the faster controlPointRect() r=me 311904 9 74468 commit-queue 2010-11-20 02:10:08 -0800 Comment on attachment 74468 Use the faster controlPointRect() Clearing flags on attachment: 74468 Committed r72472: <http://trac.webkit.org/changeset/72472> 311905 10 commit-queue 2010-11-20 02:10:14 -0800 All reviewed patches have been landed. Closing bug. 73812 2010-11-13 01:11:54 -0800 2010-11-19 16:57:40 -0800 Patch bug-49491-20101113011153.patch text/plain 8176 helder ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwYTRmYzFlYmFhMzAzNjQwNzIxNDRkYWQzNzQ1ZDE3NmNhY2JkM2QwLi45MTBmMTQ3 MjNmY2M5MmJiMDNhMzY4NTRlMWI4N2M0OTgwMmU1NzE2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMTEtMTMgIEhlbGRlciBDb3JyZWlhICA8aGVsZGVyQHNlbmNoYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBQYXRoIGZpbGwg bGFja3MgYmx1ciBzaGFkb3cgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDk0OTEKKworICAgICAgICBBZGQgbmV3IHRlc3QgZm9yIGNoZWNr aW5nIHBhdGggZmlsbCBibHVyIHNoYWRvdy4KKworICAgICAgICAqIGZhc3QvY2FudmFzL2NhbnZh cy1maWxsUGF0aC1zaGFkb3ctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nh bnZhcy9jYW52YXMtZmlsbFBhdGgtc2hhZG93Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv Y2FudmFzL3NjcmlwdC10ZXN0cy9jYW52YXMtZmlsbFBhdGgtc2hhZG93LmpzOiBBZGRlZC4KKyAg ICAgICAgKHByaW50KToKKyAgICAgICAgKHNob3VsZE5vdEJlKToKKwogMjAxMC0xMS0xMSAgQ2Fy b2wgU3phYm8gPGNhcm9sLnN6YWJvQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBL ZW50IFRhbXVyYS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1m aWxsUGF0aC1zaGFkb3ctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2Fu dmFzLWZpbGxQYXRoLXNoYWRvdy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjQ5MzIzMzAxOTM0 ZTdlNDRlZDNlMTJhODdhZDM4MGViMDUyNTVjMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3ctZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsMzcgQEAKK0Vuc3VyZSBjb3JyZWN0IGJlaGF2aW9yIG9mIGNhbnZhcyB3aXRoIHBhdGgg ZmlsbCBzaGFkb3cKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNT IiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgZGF0YVsw XSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0 YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BBU1Mg ZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BB U1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRhWzJdIGlzIDAK K1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMg MAorUEFTUyBkYXRhWzNdIHNob3VsZCBub3QgYmUgMjU1IGFuZCBpdCdzIG5vdC4KK1BBU1MgZGF0 YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBk YXRhWzNdIHNob3VsZCBub3QgYmUgMjU1IGFuZCBpdCdzIG5vdC4KK1BBU1MgZGF0YVswXSBpcyAy NTUKK1BBU1MgZGF0YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBkYXRhWzNdIHNo b3VsZCBub3QgYmUgMjU1IGFuZCBpdCdzIG5vdC4KK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1Mg ZGF0YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBkYXRhWzNdIHNob3VsZCBub3Qg YmUgMjU1IGFuZCBpdCdzIG5vdC4KK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKwor VEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52 YXMtZmlsbFBhdGgtc2hhZG93Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMt ZmlsbFBhdGgtc2hhZG93Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTg5NTQyMDVmNTQxZmQxNDc0YjRkNDdi Y2M2N2UxMjRjNmQxYjI0NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2Fu dmFzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3cuaHRtbApAQCAtMCwwICsxLDEzIEBACis8IURPQ1RZ UEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgor PGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHls ZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9z Y3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBp ZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0IHNyYz0ic2NyaXB0LXRlc3RzL2NhbnZhcy1maWxs UGF0aC1zaGFkb3cuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9q cy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvc2NyaXB0LXRlc3RzL2NhbnZhcy1maWxsUGF0aC1zaGFk b3cuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9zY3JpcHQtdGVzdHMvY2FudmFzLWZpbGxQ YXRoLXNoYWRvdy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jODM4MjczYmM1MjE3Y2Q5NWFiMzQ2MzViZTliYjYx NzhlMTU3ZmZiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvc2Ny aXB0LXRlc3RzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3cuanMKQEAgLTAsMCArMSwxMTQgQEAKKyBk ZXNjcmlwdGlvbigiRW5zdXJlIGNvcnJlY3QgYmVoYXZpb3Igb2YgY2FudmFzIHdpdGggcGF0aCBm aWxsIHNoYWRvdyIpOworCitmdW5jdGlvbiBwcmludChtZXNzYWdlLCBjb2xvcikKK3sKKyAgICB2 YXIgcGFyYWdyYXBoID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgcGFyYWdy YXBoLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UpKTsKKyAgICBw YXJhZ3JhcGguc3R5bGUuZm9udEZhbWlseSA9ICJtb25vc3BhY2UiOworICAgIGlmIChjb2xvcikK KyAgICAgICAgcGFyYWdyYXBoLnN0eWxlLmNvbG9yID0gY29sb3I7CisgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoImNvbnNvbGUiKS5hcHBlbmRDaGlsZChwYXJhZ3JhcGgpOworfQorCitmdW5j dGlvbiBzaG91bGROb3RCZShhLCBiKQoreworICAgIHZhciBldmFsQTsKKyAgICB0cnkgeworICAg ICAgICBldmFsQSA9IGV2YWwoYSk7CisgICAgfSBjYXRjaChlKSB7CisgICAgICAgIGV2YWxBID0g ZTsKKyAgICB9CisKKyAgICBpZiAoZXZhbEEgIT0gYikKKyAgICAgICAgcHJpbnQoIlBBU1MgIiAr IGEgKyAiIHNob3VsZCBub3QgYmUgIiArIGIgKyAiIGFuZCBpdCdzIG5vdC4iLCAiZ3JlZW4iKQor ICAgIGVsc2UKKyAgICAgICAgcHJpbnQoIkZBSUwgIiArIGEgKyAiIHNob3VsZCBub3QgYmUgIiAr IGIgKyAiIGJ1dCBpdCBpcy4iLCAicmVkIik7Cit9CisKK3ZhciBjYW52YXMgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCdjYW52YXMnKTsKK2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoY2FudmFz KTsKK2NhbnZhcy5zZXRBdHRyaWJ1dGUoJ3dpZHRoJywgJzcwMCcpOworY2FudmFzLnNldEF0dHJp YnV0ZSgnaGVpZ2h0JywgJzcwMCcpOwordmFyIGN0eCA9IGNhbnZhcy5nZXRDb250ZXh0KCcyZCcp OworCitjdHguYmVnaW5QYXRoKCk7CitjdHgubW92ZVRvKDMwMCwgMzAwKTsKK2N0eC5saW5lVG8o MzAwLCA1MCk7CitjdHguYmV6aWVyQ3VydmVUbygyMDAsIDQwLCA3NSwgMTUwLCAzMCwgMzApOwor Y3R4LnF1YWRyYXRpY0N1cnZlVG8oMjUwLCA3NSwgNTAsIDMwMCk7CitjdHguc2hhZG93T2Zmc2V0 WCA9IDM1MDsKK2N0eC5zaGFkb3dDb2xvciA9ICdyZ2JhKDI1NSwgMjAsIDAsIDAuNSknOworY3R4 LnNoYWRvd0JsdXIgPSAwOworY3R4LmZpbGxTdHlsZSA9ICdyZ2JhKDAsIDAsIDI1NSwgMSknOwor Y3R4LmxpbmVXaWR0aCA9IDMwOworY3R4LmZpbGwoKTsKKworY3R4LmJlZ2luUGF0aCgpOworY3R4 Lm1vdmVUbygzMDAsNjUwKTsKK2N0eC5saW5lVG8oMzAwLDQwMCk7CitjdHguYmV6aWVyQ3VydmVU bygyMDAsIDM5MCwgNzUsIDUwMCwgMzAsIDM4MCk7CitjdHgucXVhZHJhdGljQ3VydmVUbygyNTAs IDQyNSwgNTAsIDY1MCk7CitjdHguc2hhZG93T2Zmc2V0WCA9IDM1MDsKK2N0eC5zaGFkb3dDb2xv ciA9ICdyZ2JhKDI1NSwgMCwgMCwgMC41KSc7CitjdHguc2hhZG93Qmx1ciA9IDMwOworY3R4LmZp bGxTdHlsZSA9ICdyZ2JhKDAsIDAsIDI1NSwgMSknOworY3R4LmxpbmVXaWR0aCA9IDMwOworY3R4 LmZpbGwoKTsKKwordmFyIGltYWdlRGF0YSwgZGF0YTsKKworLy8gVmVyaWZ5IHNvbGlkIHNoYWRv dy4KK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoNjQwLCAyOTAsIDEsIDEpOworZGF0YSA9 IGltYWdlRGF0YS5kYXRhOworc2hvdWxkQmUoJ2RhdGFbMF0nLCAnMjU1Jyk7CitzaG91bGRCZSgn ZGF0YVsxXScsICcyMCcpOworc2hvdWxkQmUoJ2RhdGFbMl0nLCAnMCcpOworCitpbWFnZURhdGEg PSBjdHguZ2V0SW1hZ2VEYXRhKDU3MCwgODUsIDEsIDEpOworZGF0YSA9IGltYWdlRGF0YS5kYXRh Oworc2hvdWxkQmUoJ2RhdGFbMF0nLCAnMjU1Jyk7CitzaG91bGRCZSgnZGF0YVsxXScsICcyMCcp Oworc2hvdWxkQmUoJ2RhdGFbMl0nLCAnMCcpOworCitpbWFnZURhdGEgPSBjdHguZ2V0SW1hZ2VE YXRhKDM4MCwgMzAsIDEsIDEpOworZGF0YSA9IGltYWdlRGF0YS5kYXRhOworc2hvdWxkQmUoJ2Rh dGFbMF0nLCAnMjU1Jyk7CitzaG91bGRCZSgnZGF0YVsxXScsICcyMCcpOworc2hvdWxkQmUoJ2Rh dGFbMl0nLCAnMCcpOworCitpbWFnZURhdGEgPSBjdHguZ2V0SW1hZ2VEYXRhKDQwMCwgNDAsIDEs IDEpOworZGF0YSA9IGltYWdlRGF0YS5kYXRhOworc2hvdWxkQmUoJ2RhdGFbMF0nLCAnMjU1Jyk7 CitzaG91bGRCZSgnZGF0YVsxXScsICcyMCcpOworc2hvdWxkQmUoJ2RhdGFbMl0nLCAnMCcpOwor CisvLyBWZXJpZnkgYmx1cnJ5IHNoYWRvdy4KK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEo NjQwLCA2NDAsIDEsIDEpOworZGF0YSA9IGltYWdlRGF0YS5kYXRhOworc2hvdWxkQmUoJ2RhdGFb MF0nLCAnMjU1Jyk7CitzaG91bGRCZSgnZGF0YVsxXScsICcwJyk7CitzaG91bGRCZSgnZGF0YVsy XScsICcwJyk7CitzaG91bGROb3RCZSgnZGF0YVszXScsICcyNTUnKTsKKworaW1hZ2VEYXRhID0g Y3R4LmdldEltYWdlRGF0YSg2NTAsIDQwMCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7 CitzaG91bGRCZSgnZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzAnKTsK K3Nob3VsZEJlKCdkYXRhWzJdJywgJzAnKTsKK3Nob3VsZE5vdEJlKCdkYXRhWzNdJywgJzI1NScp OworCitpbWFnZURhdGEgPSBjdHguZ2V0SW1hZ2VEYXRhKDM4MCwgMzgwLCAxLCAxKTsKK2RhdGEg PSBpbWFnZURhdGEuZGF0YTsKK3Nob3VsZEJlKCdkYXRhWzBdJywgJzI1NScpOworc2hvdWxkQmUo J2RhdGFbMV0nLCAnMCcpOworc2hvdWxkQmUoJ2RhdGFbMl0nLCAnMCcpOworc2hvdWxkTm90QmUo J2RhdGFbM10nLCAnMjU1Jyk7CisKK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoMzc1LCAz OTAsIDEsIDEpOworZGF0YSA9IGltYWdlRGF0YS5kYXRhOworc2hvdWxkQmUoJ2RhdGFbMF0nLCAn MjU1Jyk7CitzaG91bGRCZSgnZGF0YVsxXScsICcwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcw Jyk7CitzaG91bGROb3RCZSgnZGF0YVszXScsICcyNTUnKTsKKwordmFyIHN1Y2Nlc3NmdWxseVBh cnNlZCA9IHRydWU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDQzMTgxMjU3MWRjMDdjYzNjZTNlYTE0MmRiOGY1NWQ4YzQyMWUyNzMuLjc5 MzdlN2IwMzU5MGVmYWU4NDIzNmZkNjQ1MWVhNzUzYTU3Nzc1NGUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIw MTAtMTEtMTMgIEhlbGRlciBDb3JyZWlhICA8aGVsZGVyQHNlbmNoYS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBQYXRoIGZpbGwgbGFj a3MgYmx1ciBzaGFkb3cgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDk0OTEKKworICAgICAgICBBZGQgYmx1ciBzaGFkb3cgc3VwcG9ydCB0 byBmaWxsUGF0aCgpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY2FudmFzL2NhbnZhcy1maWxsUGF0 aC1zaGFkb3cuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3ND b250ZXh0UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUGF0 aCk6CisKIDIwMTAtMTEtMTEgIENhcm9sIFN6YWJvIDxjYXJvbC5zemFib0Bub2tpYS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBUYW11cmEuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCmluZGV4IDA2ZTFlMWMzNDkzMTVh YzNmNjE2YzQ3ZmEyNGI0NGM5YTJjYTVlMDcuLjQwMGQyZWQ0YmU3M2I2YWJhYWE4M2Y3MDgzNGFh ZGFjNjE1OTllODAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0UXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0UXQuY3BwCkBAIC01MzksOSArNTM5LDIwIEBAIHZvaWQgR3JhcGhpY3NDb250 ZXh0OjpmaWxsUGF0aCgpCiAgICAgcGF0aC5zZXRGaWxsUnVsZSh0b1F0RmlsbFJ1bGUoZmlsbFJ1 bGUoKSkpOwogCiAgICAgaWYgKG1fZGF0YS0+aGFzU2hhZG93KCkpIHsKLSAgICAgICAgcC0+dHJh bnNsYXRlKG1fZGF0YS0+c2hhZG93Lm9mZnNldCgpKTsKLSAgICAgICAgcC0+ZmlsbFBhdGgocGF0 aCwgUUNvbG9yKG1fZGF0YS0+c2hhZG93Lm1fY29sb3IpKTsKLSAgICAgICAgcC0+dHJhbnNsYXRl KC1tX2RhdGEtPnNoYWRvdy5vZmZzZXQoKSk7CisgICAgICAgIENvbnRleHRTaGFkb3cqIHNoYWRv dyA9IGNvbnRleHRTaGFkb3coKTsKKyAgICAgICAgaWYgKHNoYWRvdy0+bV90eXBlICE9IENvbnRl eHRTaGFkb3c6OkJsdXJTaGFkb3cpIHsKKyAgICAgICAgICAgIHAtPnRyYW5zbGF0ZShtX2RhdGEt PnNoYWRvdy5vZmZzZXQoKSk7CisgICAgICAgICAgICBwLT5maWxsUGF0aChwYXRoLCBRQ29sb3Io bV9kYXRhLT5zaGFkb3cubV9jb2xvcikpOworICAgICAgICAgICAgcC0+dHJhbnNsYXRlKC1tX2Rh dGEtPnNoYWRvdy5vZmZzZXQoKSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBRUGFp bnRlciogc2hhZG93UGFpbnRlciA9IHNoYWRvdy0+YmVnaW5TaGFkb3dMYXllcihwLCBwYXRoLmJv dW5kaW5nUmVjdCgpKTsKKyAgICAgICAgICAgIGlmIChzaGFkb3dQYWludGVyKSB7CisgICAgICAg ICAgICAgICAgc2hhZG93UGFpbnRlci0+c2V0Q29tcG9zaXRpb25Nb2RlKFFQYWludGVyOjpDb21w b3NpdGlvbk1vZGVfU291cmNlKTsKKyAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5maWxs UGF0aChwYXRoLCBRQ29sb3IobV9kYXRhLT5zaGFkb3cubV9jb2xvcikpOworICAgICAgICAgICAg ICAgIHNoYWRvdy0+ZW5kU2hhZG93TGF5ZXIocCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0K KwogICAgIH0KICAgICBpZiAobV9jb21tb24tPnN0YXRlLmZpbGxQYXR0ZXJuKSB7CiAgICAgICAg IEFmZmluZVRyYW5zZm9ybSBhZmZpbmU7Cg== 74445 2010-11-19 16:57:46 -0800 2010-11-19 22:36:17 -0800 Patch bug-49491-20101119165455.patch text/plain 8235 helder ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NzIyZGQ2ZGEwZDE0M2UyMjE4NWFlNTI2YTZjODhiYjhlODEwZDc4Li40ODM4OWI2 NDdkMWUwNzUyODI4ZDRlYmU4MzNkMTZkMTk4Y2I4NWUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMTEtMTkgIEhlbGRlciBDb3JyZWlhICA8aGVsZGVyQHNlbmNoYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBQYXRoIGZpbGwg bGFja3MgYmx1ciBzaGFkb3cgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDk0OTEKKworICAgICAgICBBZGQgbmV3IHRlc3QgZm9yIGNoZWNr aW5nIHBhdGggZmlsbCBibHVyIHNoYWRvdy4KKworICAgICAgICAqIGZhc3QvY2FudmFzL2NhbnZh cy1maWxsUGF0aC1zaGFkb3ctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nh bnZhcy9jYW52YXMtZmlsbFBhdGgtc2hhZG93Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv Y2FudmFzL3NjcmlwdC10ZXN0cy9jYW52YXMtZmlsbFBhdGgtc2hhZG93LmpzOiBBZGRlZC4KKwog MjAxMC0xMS0xOSAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2NhbnZhcy9jYW52YXMtZmlsbFBhdGgtc2hhZG93LWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3ctZXhwZWN0ZWQudHh0Cm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjY0OTMyMzMwMTkzNGU3ZTQ0ZWQzZTEyYTg3YWQzODBlYjA1MjU1YzMKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtZmlsbFBhdGgtc2hh ZG93LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDM3IEBACitFbnN1cmUgY29ycmVjdCBiZWhhdmlv ciBvZiBjYW52YXMgd2l0aCBwYXRoIGZpbGwgc2hhZG93CisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxs IHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBM RVRFIi4KKworCitQQVNTIGRhdGFbMF0gaXMgMjU1CitQQVNTIGRhdGFbMV0gaXMgMjAKK1BBU1Mg ZGF0YVsyXSBpcyAwCitQQVNTIGRhdGFbMF0gaXMgMjU1CitQQVNTIGRhdGFbMV0gaXMgMjAKK1BB U1MgZGF0YVsyXSBpcyAwCitQQVNTIGRhdGFbMF0gaXMgMjU1CitQQVNTIGRhdGFbMV0gaXMgMjAK K1BBU1MgZGF0YVsyXSBpcyAwCitQQVNTIGRhdGFbMF0gaXMgMjU1CitQQVNTIGRhdGFbMV0gaXMg MjAKK1BBU1MgZGF0YVsyXSBpcyAwCitQQVNTIGRhdGFbMF0gaXMgMjU1CitQQVNTIGRhdGFbMV0g aXMgMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0YVszXSBzaG91bGQgbm90IGJlIDI1NSBh bmQgaXQncyBub3QuCitQQVNTIGRhdGFbMF0gaXMgMjU1CitQQVNTIGRhdGFbMV0gaXMgMAorUEFT UyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0YVszXSBzaG91bGQgbm90IGJlIDI1NSBhbmQgaXQncyBu b3QuCitQQVNTIGRhdGFbMF0gaXMgMjU1CitQQVNTIGRhdGFbMV0gaXMgMAorUEFTUyBkYXRhWzJd IGlzIDAKK1BBU1MgZGF0YVszXSBzaG91bGQgbm90IGJlIDI1NSBhbmQgaXQncyBub3QuCitQQVNT IGRhdGFbMF0gaXMgMjU1CitQQVNTIGRhdGFbMV0gaXMgMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BB U1MgZGF0YVszXSBzaG91bGQgbm90IGJlIDI1NSBhbmQgaXQncyBub3QuCitQQVNTIHN1Y2Nlc3Nm dWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLWZpbGxQYXRoLXNoYWRvdy5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9jYW52YXMvY2FudmFzLWZpbGxQYXRoLXNoYWRvdy5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU4 OTU0MjA1ZjU0MWZkMTQ3NGI0ZDQ3YmNjNjdlMTI0YzZkMWIyNDQKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtZmlsbFBhdGgtc2hhZG93Lmh0bWwKQEAg LTAsMCArMSwxMyBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8v RU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vanMv cmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJj ZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cCBpZD0iZGVz Y3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdCBzcmM9InNj cmlwdC10ZXN0cy9jYW52YXMtZmlsbFBhdGgtc2hhZG93LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQg c3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3NjcmlwdC10ZXN0 cy9jYW52YXMtZmlsbFBhdGgtc2hhZG93LmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvc2Ny aXB0LXRlc3RzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3cuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzgzODI3M2Jj NTIxN2NkOTVhYjM0NjM1YmU5YmI2MTc4ZTE1N2ZmYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvY2FudmFzL3NjcmlwdC10ZXN0cy9jYW52YXMtZmlsbFBhdGgtc2hhZG93Lmpz CkBAIC0wLDAgKzEsMTE0IEBACisgZGVzY3JpcHRpb24oIkVuc3VyZSBjb3JyZWN0IGJlaGF2aW9y IG9mIGNhbnZhcyB3aXRoIHBhdGggZmlsbCBzaGFkb3ciKTsKKworZnVuY3Rpb24gcHJpbnQobWVz c2FnZSwgY29sb3IpCit7CisgICAgdmFyIHBhcmFncmFwaCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpOworICAgIHBhcmFncmFwaC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0 Tm9kZShtZXNzYWdlKSk7CisgICAgcGFyYWdyYXBoLnN0eWxlLmZvbnRGYW1pbHkgPSAibW9ub3Nw YWNlIjsKKyAgICBpZiAoY29sb3IpCisgICAgICAgIHBhcmFncmFwaC5zdHlsZS5jb2xvciA9IGNv bG9yOworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIikuYXBwZW5kQ2hpbGQo cGFyYWdyYXBoKTsKK30KKworZnVuY3Rpb24gc2hvdWxkTm90QmUoYSwgYikKK3sKKyAgICB2YXIg ZXZhbEE7CisgICAgdHJ5IHsKKyAgICAgICAgZXZhbEEgPSBldmFsKGEpOworICAgIH0gY2F0Y2go ZSkgeworICAgICAgICBldmFsQSA9IGU7CisgICAgfQorCisgICAgaWYgKGV2YWxBICE9IGIpCisg ICAgICAgIHByaW50KCJQQVNTICIgKyBhICsgIiBzaG91bGQgbm90IGJlICIgKyBiICsgIiBhbmQg aXQncyBub3QuIiwgImdyZWVuIikKKyAgICBlbHNlCisgICAgICAgIHByaW50KCJGQUlMICIgKyBh ICsgIiBzaG91bGQgbm90IGJlICIgKyBiICsgIiBidXQgaXQgaXMuIiwgInJlZCIpOworfQorCit2 YXIgY2FudmFzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnY2FudmFzJyk7Citkb2N1bWVudC5i b2R5LmFwcGVuZENoaWxkKGNhbnZhcyk7CitjYW52YXMuc2V0QXR0cmlidXRlKCd3aWR0aCcsICc3 MDAnKTsKK2NhbnZhcy5zZXRBdHRyaWJ1dGUoJ2hlaWdodCcsICc3MDAnKTsKK3ZhciBjdHggPSBj YW52YXMuZ2V0Q29udGV4dCgnMmQnKTsKKworY3R4LmJlZ2luUGF0aCgpOworY3R4Lm1vdmVUbygz MDAsIDMwMCk7CitjdHgubGluZVRvKDMwMCwgNTApOworY3R4LmJlemllckN1cnZlVG8oMjAwLCA0 MCwgNzUsIDE1MCwgMzAsIDMwKTsKK2N0eC5xdWFkcmF0aWNDdXJ2ZVRvKDI1MCwgNzUsIDUwLCAz MDApOworY3R4LnNoYWRvd09mZnNldFggPSAzNTA7CitjdHguc2hhZG93Q29sb3IgPSAncmdiYSgy NTUsIDIwLCAwLCAwLjUpJzsKK2N0eC5zaGFkb3dCbHVyID0gMDsKK2N0eC5maWxsU3R5bGUgPSAn cmdiYSgwLCAwLCAyNTUsIDEpJzsKK2N0eC5saW5lV2lkdGggPSAzMDsKK2N0eC5maWxsKCk7CisK K2N0eC5iZWdpblBhdGgoKTsKK2N0eC5tb3ZlVG8oMzAwLDY1MCk7CitjdHgubGluZVRvKDMwMCw0 MDApOworY3R4LmJlemllckN1cnZlVG8oMjAwLCAzOTAsIDc1LCA1MDAsIDMwLCAzODApOworY3R4 LnF1YWRyYXRpY0N1cnZlVG8oMjUwLCA0MjUsIDUwLCA2NTApOworY3R4LnNoYWRvd09mZnNldFgg PSAzNTA7CitjdHguc2hhZG93Q29sb3IgPSAncmdiYSgyNTUsIDAsIDAsIDAuNSknOworY3R4LnNo YWRvd0JsdXIgPSAzMDsKK2N0eC5maWxsU3R5bGUgPSAncmdiYSgwLCAwLCAyNTUsIDEpJzsKK2N0 eC5saW5lV2lkdGggPSAzMDsKK2N0eC5maWxsKCk7CisKK3ZhciBpbWFnZURhdGEsIGRhdGE7CisK Ky8vIFZlcmlmeSBzb2xpZCBzaGFkb3cuCitpbWFnZURhdGEgPSBjdHguZ2V0SW1hZ2VEYXRhKDY0 MCwgMjkwLCAxLCAxKTsKK2RhdGEgPSBpbWFnZURhdGEuZGF0YTsKK3Nob3VsZEJlKCdkYXRhWzBd JywgJzI1NScpOworc2hvdWxkQmUoJ2RhdGFbMV0nLCAnMjAnKTsKK3Nob3VsZEJlKCdkYXRhWzJd JywgJzAnKTsKKworaW1hZ2VEYXRhID0gY3R4LmdldEltYWdlRGF0YSg1NzAsIDg1LCAxLCAxKTsK K2RhdGEgPSBpbWFnZURhdGEuZGF0YTsKK3Nob3VsZEJlKCdkYXRhWzBdJywgJzI1NScpOworc2hv dWxkQmUoJ2RhdGFbMV0nLCAnMjAnKTsKK3Nob3VsZEJlKCdkYXRhWzJdJywgJzAnKTsKKworaW1h Z2VEYXRhID0gY3R4LmdldEltYWdlRGF0YSgzODAsIDMwLCAxLCAxKTsKK2RhdGEgPSBpbWFnZURh dGEuZGF0YTsKK3Nob3VsZEJlKCdkYXRhWzBdJywgJzI1NScpOworc2hvdWxkQmUoJ2RhdGFbMV0n LCAnMjAnKTsKK3Nob3VsZEJlKCdkYXRhWzJdJywgJzAnKTsKKworaW1hZ2VEYXRhID0gY3R4Lmdl dEltYWdlRGF0YSg0MDAsIDQwLCAxLCAxKTsKK2RhdGEgPSBpbWFnZURhdGEuZGF0YTsKK3Nob3Vs ZEJlKCdkYXRhWzBdJywgJzI1NScpOworc2hvdWxkQmUoJ2RhdGFbMV0nLCAnMjAnKTsKK3Nob3Vs ZEJlKCdkYXRhWzJdJywgJzAnKTsKKworLy8gVmVyaWZ5IGJsdXJyeSBzaGFkb3cuCitpbWFnZURh dGEgPSBjdHguZ2V0SW1hZ2VEYXRhKDY0MCwgNjQwLCAxLCAxKTsKK2RhdGEgPSBpbWFnZURhdGEu ZGF0YTsKK3Nob3VsZEJlKCdkYXRhWzBdJywgJzI1NScpOworc2hvdWxkQmUoJ2RhdGFbMV0nLCAn MCcpOworc2hvdWxkQmUoJ2RhdGFbMl0nLCAnMCcpOworc2hvdWxkTm90QmUoJ2RhdGFbM10nLCAn MjU1Jyk7CisKK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoNjUwLCA0MDAsIDEsIDEpOwor ZGF0YSA9IGltYWdlRGF0YS5kYXRhOworc2hvdWxkQmUoJ2RhdGFbMF0nLCAnMjU1Jyk7CitzaG91 bGRCZSgnZGF0YVsxXScsICcwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcwJyk7CitzaG91bGRO b3RCZSgnZGF0YVszXScsICcyNTUnKTsKKworaW1hZ2VEYXRhID0gY3R4LmdldEltYWdlRGF0YSgz ODAsIDM4MCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRCZSgnZGF0YVsw XScsICcyNTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzAnKTsKK3Nob3VsZEJlKCdkYXRhWzJd JywgJzAnKTsKK3Nob3VsZE5vdEJlKCdkYXRhWzNdJywgJzI1NScpOworCitpbWFnZURhdGEgPSBj dHguZ2V0SW1hZ2VEYXRhKDM3NSwgMzkwLCAxLCAxKTsKK2RhdGEgPSBpbWFnZURhdGEuZGF0YTsK K3Nob3VsZEJlKCdkYXRhWzBdJywgJzI1NScpOworc2hvdWxkQmUoJ2RhdGFbMV0nLCAnMCcpOwor c2hvdWxkQmUoJ2RhdGFbMl0nLCAnMCcpOworc2hvdWxkTm90QmUoJ2RhdGFbM10nLCAnMjU1Jyk7 CisKK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9D aGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwYWI0MGY0MzBmMTM4ZDJiMGEyNDA1 NWE3NmZiMGVlMTk5NGYwMGQwLi44OGYzYzIzZjQ4NDhhNzI4ZjhjNDRmYWU5MjMxM2IyNTU3Mzg4 ODgyIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDEwLTExLTE5ICBIZWxkZXIgQ29ycmVpYSAgPGhlbGRlckBz ZW5jaGEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gUGF0aCBmaWxsIGxhY2tzIGJsdXIgc2hhZG93IHN1cHBvcnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NDkxCisKKyAgICAgICAgQWRk IGJsdXIgc2hhZG93IHN1cHBvcnQgdG8gZmlsbFBhdGgoKS4KKworICAgICAgICBUZXN0OiBmYXN0 L2NhbnZhcy9jYW52YXMtZmlsbFBhdGgtc2hhZG93Lmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgpOgorCiAyMDEwLTExLTE5ICBOYXRlIENoYXBpbiAgPGph cGhldEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5 YWtvdi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3ND b250ZXh0UXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRl eHRRdC5jcHAKaW5kZXggODdlM2I1MGI3NWE5M2VmYWM3NzgzNjFmZmQ0MzExNDU1NjkyYzZjNS4u OWIyODI2ZTEzODgzNzE0MWY3ZDBhZmRhN2RkOTljNTE1Zjk4MTliZSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAKQEAgLTUzOSw5 ICs1MzksMjIgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxQYXRoKCkKICAgICBwYXRoLnNl dEZpbGxSdWxlKHRvUXRGaWxsUnVsZShmaWxsUnVsZSgpKSk7CiAKICAgICBpZiAobV9kYXRhLT5o YXNTaGFkb3coKSkgewotICAgICAgICBwLT50cmFuc2xhdGUobV9kYXRhLT5zaGFkb3cub2Zmc2V0 KCkpOwotICAgICAgICBwLT5maWxsUGF0aChwYXRoLCBRQ29sb3IobV9kYXRhLT5zaGFkb3cubV9j b2xvcikpOwotICAgICAgICBwLT50cmFuc2xhdGUoLW1fZGF0YS0+c2hhZG93Lm9mZnNldCgpKTsK KyAgICAgICAgQ29udGV4dFNoYWRvdyogc2hhZG93ID0gY29udGV4dFNoYWRvdygpOworICAgICAg ICBpZiAoc2hhZG93LT5tX3R5cGUgIT0gQ29udGV4dFNoYWRvdzo6Qmx1clNoYWRvdworICAgICAg ICAgICAgJiYgIW1fY29tbW9uLT5zdGF0ZS5maWxsUGF0dGVybiAmJiAhbV9jb21tb24tPnN0YXRl LmZpbGxHcmFkaWVudCkKKyAgICAgICAgeworICAgICAgICAgICAgcC0+dHJhbnNsYXRlKG1fZGF0 YS0+c2hhZG93Lm9mZnNldCgpKTsKKyAgICAgICAgICAgIHAtPmZpbGxQYXRoKHBhdGgsIFFDb2xv cihtX2RhdGEtPnNoYWRvdy5tX2NvbG9yKSk7CisgICAgICAgICAgICBwLT50cmFuc2xhdGUoLW1f ZGF0YS0+c2hhZG93Lm9mZnNldCgpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIFFQ YWludGVyKiBzaGFkb3dQYWludGVyID0gc2hhZG93LT5iZWdpblNoYWRvd0xheWVyKHAsIHBhdGgu Ym91bmRpbmdSZWN0KCkpOworICAgICAgICAgICAgaWYgKHNoYWRvd1BhaW50ZXIpIHsKKyAgICAg ICAgICAgICAgICBzaGFkb3dQYWludGVyLT5zZXRDb21wb3NpdGlvbk1vZGUoUVBhaW50ZXI6OkNv bXBvc2l0aW9uTW9kZV9Tb3VyY2UpOworICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZp bGxQYXRoKHBhdGgsIFFDb2xvcihtX2RhdGEtPnNoYWRvdy5tX2NvbG9yKSk7CisgICAgICAgICAg ICAgICAgc2hhZG93LT5lbmRTaGFkb3dMYXllcihwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorCiAgICAgfQogICAgIGlmIChtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4pIHsKICAgICAg ICAgQWZmaW5lVHJhbnNmb3JtIGFmZmluZTsK 74449 2010-11-19 17:31:58 -0800 2010-11-19 17:32:50 -0800 Test for stroke gradient and fill, not path bug-49491-20101119172909.patch text/plain 8669 helder ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2Y2JhZTg1NjhiZDlkMmI5ZTY5MGQ3NmNlZjMyZGI5NmI1MjE2OTM5Li43NzU1Nzhk YTc1OTEyODBjNTg2ZWVmYzU1MzViN2ViZjgzZTFjY2I5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMTEtMTkgIEhlbGRlciBDb3JyZWlhICA8aGVsZGVyQHNlbmNoYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBQYXRoIGZpbGwg bGFja3MgYmx1ciBzaGFkb3cgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDk0OTEKKworICAgICAgICBBZGQgbmV3IHRlc3QgZm9yIGNoZWNr aW5nIHBhdGggc3Ryb2tlIGJsdXIgc2hhZG93LgorCisgICAgICAgICogZmFzdC9jYW52YXMvY2Fu dmFzLXN0cm9rZVBhdGgtc2hhZG93LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFz dC9jYW52YXMvY2FudmFzLXN0cm9rZVBhdGgtc2hhZG93Lmh0bWw6IEFkZGVkLgorICAgICAgICAq IGZhc3QvY2FudmFzL3NjcmlwdC10ZXN0cy9jYW52YXMtc3Ryb2tlUGF0aC1zaGFkb3cuanM6IEFk ZGVkLgorCiAyMDEwLTExLTE5ICBNaWhhaSBQYXJwYXJpdGEgIDxtaWhhaXBAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQgQ2hyb21pdW0vTWFjIHJlYmFzZWxpbmUuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlUGF0aC1zaGFkb3ctZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLXN0cm9rZVBhdGgtc2hh ZG93LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41NTJiZGFmYmNmMjI4NGY4MTVhYzYyNzk5YWQ1 M2ViZTViZDEyMmRkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMv Y2FudmFzLXN0cm9rZVBhdGgtc2hhZG93LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDM3IEBACitF bnN1cmUgY29ycmVjdCBiZWhhdmlvciBvZiBjYW52YXMgd2l0aCBwYXRoIHN0cm9rZSBzaGFkb3cK KworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywg Zm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BB U1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0YVswXSBpcyAyNTUK K1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0YVswXSBpcyAy NTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0YVswXSBp cyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0YVsw XSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBkYXRh WzNdIHNob3VsZCBub3QgYmUgMjU1IGFuZCBpdCdzIG5vdC4KK1BBU1MgZGF0YVswXSBpcyAyNTUK K1BBU1MgZGF0YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBkYXRhWzNdIHNob3Vs ZCBub3QgYmUgMjU1IGFuZCBpdCdzIG5vdC4KK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0 YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBkYXRhWzNdIHNob3VsZCBub3QgYmUg MjU1IGFuZCBpdCdzIG5vdC4KK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAw CitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBkYXRhWzNdIHNob3VsZCBub3QgYmUgMjU1IGFuZCBp dCdzIG5vdC4KK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVU RQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlUGF0 aC1zaGFkb3cuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1zdHJva2VQYXRo LXNoYWRvdy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYxYTFmYzNiMWVlN2JkN2NmODQ3Yjc4OGIwNmI0YmMz Y2QzZGVlOGEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52 YXMtc3Ryb2tlUGF0aC1zaGFkb3cuaHRtbApAQCAtMCwwICsxLDEzIEBACis8IURPQ1RZUEUgSFRN TCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsg cmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3Mi PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+ Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29u c29sZSI+PC9kaXY+Cis8c2NyaXB0IHNyYz0ic2NyaXB0LXRlc3RzL2NhbnZhcy1zdHJva2VQYXRo LXNoYWRvdy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRl c3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2NhbnZhcy9zY3JpcHQtdGVzdHMvY2FudmFzLXN0cm9rZVBhdGgtc2hhZG93 LmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvc2NyaXB0LXRlc3RzL2NhbnZhcy1zdHJva2VQ YXRoLXNoYWRvdy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45ZDNhMGQ2M2Y5MTUxNGMyZDUyNWE3NzdmYWU5OGI3 OGM2MzQxNGRlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvc2Ny aXB0LXRlc3RzL2NhbnZhcy1zdHJva2VQYXRoLXNoYWRvdy5qcwpAQCAtMCwwICsxLDExNiBAQAor ZGVzY3JpcHRpb24oIkVuc3VyZSBjb3JyZWN0IGJlaGF2aW9yIG9mIGNhbnZhcyB3aXRoIHBhdGgg c3Ryb2tlIHNoYWRvdyIpOworCitmdW5jdGlvbiBwcmludChtZXNzYWdlLCBjb2xvcikKK3sKKyAg ICB2YXIgcGFyYWdyYXBoID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgcGFy YWdyYXBoLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UpKTsKKyAg ICBwYXJhZ3JhcGguc3R5bGUuZm9udEZhbWlseSA9ICJtb25vc3BhY2UiOworICAgIGlmIChjb2xv cikKKyAgICAgICAgcGFyYWdyYXBoLnN0eWxlLmNvbG9yID0gY29sb3I7CisgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoImNvbnNvbGUiKS5hcHBlbmRDaGlsZChwYXJhZ3JhcGgpOworfQorCitm dW5jdGlvbiBzaG91bGROb3RCZShhLCBiKQoreworICAgIHZhciBldmFsQTsKKyAgICB0cnkgewor ICAgICAgICBldmFsQSA9IGV2YWwoYSk7CisgICAgfSBjYXRjaChlKSB7CisgICAgICAgIGV2YWxB ID0gZTsKKyAgICB9CisKKyAgICBpZiAoZXZhbEEgIT0gYikKKyAgICAgICAgcHJpbnQoIlBBU1Mg IiArIGEgKyAiIHNob3VsZCBub3QgYmUgIiArIGIgKyAiIGFuZCBpdCdzIG5vdC4iLCAiZ3JlZW4i KQorICAgIGVsc2UKKyAgICAgICAgcHJpbnQoIkZBSUwgIiArIGEgKyAiIHNob3VsZCBub3QgYmUg IiArIGIgKyAiIGJ1dCBpdCBpcy4iLCAicmVkIik7Cit9CisKK3ZhciBjYW52YXMgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCdjYW52YXMnKTsKK2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoY2Fu dmFzKTsKK2NhbnZhcy5zZXRBdHRyaWJ1dGUoJ3dpZHRoJywgJzcwMCcpOworY2FudmFzLnNldEF0 dHJpYnV0ZSgnaGVpZ2h0JywgJzcwMCcpOwordmFyIGN0eCA9IGNhbnZhcy5nZXRDb250ZXh0KCcy ZCcpOworCitjdHguYmVnaW5QYXRoKCk7CitjdHgubW92ZVRvKDMwMCwgMzAwKTsKK2N0eC5saW5l VG8oMzAwLCA1MCk7CitjdHguYmV6aWVyQ3VydmVUbygyMDAsIDQwLCA3NSwgMTUwLCAzMCwgMzAp OworY3R4LnF1YWRyYXRpY0N1cnZlVG8oMjUwLCA3NSwgNTAsIDMwMCk7CitjdHguc2hhZG93T2Zm c2V0WCA9IDM1MDsKK2N0eC5zaGFkb3dDb2xvciA9ICdyZ2JhKDI1NSwgMjAsIDAsIDAuNSknOwor Y3R4LnNoYWRvd0JsdXIgPSAwOworY3R4LnN0cm9rZVN0eWxlID0gJ3JnYmEoMCwgMCwgMjU1LCAx KSc7CitjdHgubGluZVdpZHRoID0gMzA7CitjdHguY2xvc2VQYXRoKCk7CitjdHguc3Ryb2tlKCk7 CisKK2N0eC5iZWdpblBhdGgoKTsKK2N0eC5tb3ZlVG8oMzAwLDY1MCk7CitjdHgubGluZVRvKDMw MCw0MDApOworY3R4LmJlemllckN1cnZlVG8oMjAwLCAzOTAsIDc1LCA1MDAsIDMwLCAzODApOwor Y3R4LnF1YWRyYXRpY0N1cnZlVG8oMjUwLCA0MjUsIDUwLCA2NTApOworY3R4LnNoYWRvd09mZnNl dFggPSAzNTA7CitjdHguc2hhZG93Q29sb3IgPSAncmdiYSgyNTUsIDAsIDAsIDAuNSknOworY3R4 LnNoYWRvd0JsdXIgPSAzMDsKK2N0eC5zdHJva2VTdHlsZSA9ICdyZ2JhKDAsIDAsIDI1NSwgMSkn OworY3R4LmxpbmVXaWR0aCA9IDMwOworY3R4LmNsb3NlUGF0aCgpOworY3R4LnN0cm9rZSgpOwor Cit2YXIgaW1hZ2VEYXRhLCBkYXRhOworCisvLyBWZXJpZnkgc29saWQgc2hhZG93LgoraW1hZ2VE YXRhID0gY3R4LmdldEltYWdlRGF0YSg2NTAsIDMwMCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRh LmRhdGE7CitzaG91bGRCZSgnZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywg JzIwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcwJyk7CisKK2ltYWdlRGF0YSA9IGN0eC5nZXRJ bWFnZURhdGEoNjUwLCA1MCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRC ZSgnZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzIwJyk7CitzaG91bGRC ZSgnZGF0YVsyXScsICcwJyk7CisKK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoMzgwLCAz MCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRCZSgnZGF0YVswXScsICcy NTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzIwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcw Jyk7CisKK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoNDAwLCA0MCwgMSwgMSk7CitkYXRh ID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRCZSgnZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJl KCdkYXRhWzFdJywgJzIwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcwJyk7CisKKy8vIFZlcmlm eSBibHVycnkgc2hhZG93LgoraW1hZ2VEYXRhID0gY3R4LmdldEltYWdlRGF0YSg2NDAsIDY0MCwg MSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRCZSgnZGF0YVswXScsICcyNTUn KTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzAnKTsKK3Nob3VsZEJlKCdkYXRhWzJdJywgJzAnKTsK K3Nob3VsZE5vdEJlKCdkYXRhWzNdJywgJzI1NScpOworCitpbWFnZURhdGEgPSBjdHguZ2V0SW1h Z2VEYXRhKDY1MCwgNDAwLCAxLCAxKTsKK2RhdGEgPSBpbWFnZURhdGEuZGF0YTsKK3Nob3VsZEJl KCdkYXRhWzBdJywgJzI1NScpOworc2hvdWxkQmUoJ2RhdGFbMV0nLCAnMCcpOworc2hvdWxkQmUo J2RhdGFbMl0nLCAnMCcpOworc2hvdWxkTm90QmUoJ2RhdGFbM10nLCAnMjU1Jyk7CisKK2ltYWdl RGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoMzgwLCAzODAsIDEsIDEpOworZGF0YSA9IGltYWdlRGF0 YS5kYXRhOworc2hvdWxkQmUoJ2RhdGFbMF0nLCAnMjU1Jyk7CitzaG91bGRCZSgnZGF0YVsxXScs ICcwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcwJyk7CitzaG91bGROb3RCZSgnZGF0YVszXScs ICcyNTUnKTsKKworaW1hZ2VEYXRhID0gY3R4LmdldEltYWdlRGF0YSgzNTAsIDM4MCwgMSwgMSk7 CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRCZSgnZGF0YVswXScsICcyNTUnKTsKK3No b3VsZEJlKCdkYXRhWzFdJywgJzAnKTsKK3Nob3VsZEJlKCdkYXRhWzJdJywgJzAnKTsKK3Nob3Vs ZE5vdEJlKCdkYXRhWzNdJywgJzI1NScpOworCit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1 ZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggOWM3YTU1YzZiYmQ3N2Y0MGI0MzlhNGM1YzFlOGM2NWI4ZTMwODYzMi4uMDRmNmUwNzA0ZGNm YzRhZTQ0OTliYjZlMzU4ODUxZmVjMzdjOWFiZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMS0xOSAg SGVsZGVyIENvcnJlaWEgIDxoZWxkZXJAc2VuY2hhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFBhdGggZmlsbCBsYWNrcyBibHVyIHNo YWRvdyBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00OTQ5MQorCisgICAgICAgIEFkZCBibHVyIHNoYWRvdyBzdXBwb3J0IHRvIHN0cm9rZVBh dGgoKS4KKworICAgICAgICBUZXN0OiBmYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlUGF0aC1zaGFk b3cuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0 UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKToK KwogMjAxMC0xMS0xOSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCmluZGV4IDg3ZTNiNTBiNzVhOTNlZmFjNzc4 MzYxZmZkNDMxMTQ1NTY5MmM2YzUuLjE2OGJiMDU2MDJlNmE2MDY1YWNiYTI2NzI5ODZlYmVkNjI5 MzM3MjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3ND b250ZXh0UXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3ND b250ZXh0UXQuY3BwCkBAIC01NjcsMTIgKzU2NywyOCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 c3Ryb2tlUGF0aCgpCiAgICAgcGF0aC5zZXRGaWxsUnVsZSh0b1F0RmlsbFJ1bGUoZmlsbFJ1bGUo KSkpOwogCiAgICAgaWYgKG1fZGF0YS0+aGFzU2hhZG93KCkpIHsKLSAgICAgICAgcC0+dHJhbnNs YXRlKG1fZGF0YS0+c2hhZG93Lm9mZnNldCgpKTsKLSAgICAgICAgUVBlbiBzaGFkb3dQZW4ocGVu KTsKLSAgICAgICAgc2hhZG93UGVuLnNldENvbG9yKG1fZGF0YS0+c2hhZG93Lm1fY29sb3IpOwot ICAgICAgICBwLT5zdHJva2VQYXRoKHBhdGgsIHNoYWRvd1Blbik7Ci0gICAgICAgIHAtPnRyYW5z bGF0ZSgtbV9kYXRhLT5zaGFkb3cub2Zmc2V0KCkpOworICAgICAgICBDb250ZXh0U2hhZG93KiBz aGFkb3cgPSBjb250ZXh0U2hhZG93KCk7CisKKyAgICAgICAgaWYgKHNoYWRvdy0+bV90eXBlICE9 IENvbnRleHRTaGFkb3c6OkJsdXJTaGFkb3cKKyAgICAgICAgICAgICYmICFtX2NvbW1vbi0+c3Rh dGUuc3Ryb2tlUGF0dGVybiAmJiAhbV9jb21tb24tPnN0YXRlLnN0cm9rZUdyYWRpZW50KQorICAg ICAgICB7CisgICAgICAgICAgICBRUGVuIHNoYWRvd1BlbihwZW4pOworICAgICAgICAgICAgc2hh ZG93UGVuLnNldENvbG9yKG1fZGF0YS0+c2hhZG93Lm1fY29sb3IpOworICAgICAgICAgICAgcC0+ dHJhbnNsYXRlKG1fZGF0YS0+c2hhZG93Lm9mZnNldCgpKTsKKyAgICAgICAgICAgIHAtPnN0cm9r ZVBhdGgocGF0aCwgc2hhZG93UGVuKTsKKyAgICAgICAgICAgIHAtPnRyYW5zbGF0ZSgtbV9kYXRh LT5zaGFkb3cub2Zmc2V0KCkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgRmxvYXRS ZWN0IGJvdW5kaW5nUmVjdCA9IHBhdGguY29udHJvbFBvaW50UmVjdCgpOworICAgICAgICAgICAg Ym91bmRpbmdSZWN0LmluZmxhdGUocGVuLm1pdGVyTGltaXQoKSArIHBlbi53aWR0aEYoKSk7Cisg ICAgICAgICAgICBRUGFpbnRlciogc2hhZG93UGFpbnRlciA9IHNoYWRvdy0+YmVnaW5TaGFkb3dM YXllcihwLCBib3VuZGluZ1JlY3QpOworICAgICAgICAgICAgaWYgKHNoYWRvd1BhaW50ZXIpIHsK KyAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5zZXRPcGFjaXR5KHN0YXRpY19jYXN0PHFy ZWFsPihtX2RhdGEtPnNoYWRvdy5tX2NvbG9yLmFscGhhKCkpIC8gMjU1KTsKKyAgICAgICAgICAg ICAgICBzaGFkb3dQYWludGVyLT5zdHJva2VQYXRoKHBhdGgsIHBlbik7CisgICAgICAgICAgICAg ICAgc2hhZG93LT5lbmRTaGFkb3dMYXllcihwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQog ICAgIH0KKwogICAgIGlmIChtX2NvbW1vbi0+c3RhdGUuc3Ryb2tlUGF0dGVybikgewogICAgICAg ICBBZmZpbmVUcmFuc2Zvcm0gYWZmaW5lOwogICAgICAgICBwZW4uc2V0QnJ1c2goUUJydXNoKG1f Y29tbW9uLT5zdGF0ZS5zdHJva2VQYXR0ZXJuLT5jcmVhdGVQbGF0Zm9ybVBhdHRlcm4oYWZmaW5l KSkpOwo= 74468 2010-11-19 22:36:21 -0800 2010-11-20 02:10:08 -0800 Use the faster controlPointRect() bug-49491-20101119223620.patch text/plain 8238 helder ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5NjFjZmU4MDAzZjc2NGIyYWU4NjdkOWU0NjBhOTRkYjlkNmU5NjE3Li43MWM0ZGE1 NzZiYjVmN2YzOTg5YzkyODczNTEyZWRmNDMzMGJjM2E1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMTEtMTkgIEhlbGRlciBDb3JyZWlhICA8aGVsZGVyQHNlbmNoYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBQYXRoIGZpbGwg bGFja3MgYmx1ciBzaGFkb3cgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDk0OTEKKworICAgICAgICBBZGQgbmV3IHRlc3QgZm9yIGNoZWNr aW5nIHBhdGggZmlsbCBibHVyIHNoYWRvdy4KKworICAgICAgICAqIGZhc3QvY2FudmFzL2NhbnZh cy1maWxsUGF0aC1zaGFkb3ctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nh bnZhcy9jYW52YXMtZmlsbFBhdGgtc2hhZG93Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv Y2FudmFzL3NjcmlwdC10ZXN0cy9jYW52YXMtZmlsbFBhdGgtc2hhZG93LmpzOiBBZGRlZC4KKwog MjAxMC0xMS0xOSAgSmFtZXMgU2ltb25zZW4gIDxzaW1vbmphbUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY2FudmFzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3ctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvZmFzdC9jYW52YXMvY2FudmFzLWZpbGxQYXRoLXNoYWRvdy1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNjQ5MzIzMzAxOTM0ZTdlNDRlZDNlMTJhODdhZDM4MGViMDUyNTVjMwotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3ct ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMzcgQEAKK0Vuc3VyZSBjb3JyZWN0IGJlaGF2aW9yIG9m IGNhbnZhcyB3aXRoIHBhdGggZmlsbCBzaGFkb3cKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2Vl IGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUi LgorCisKK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBkYXRh WzJdIGlzIDAKK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFTUyBk YXRhWzJdIGlzIDAKK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAorUEFT UyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAyMAor UEFTUyBkYXRhWzJdIGlzIDAKK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAw CitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBkYXRhWzNdIHNob3VsZCBub3QgYmUgMjU1IGFuZCBp dCdzIG5vdC4KK1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAwCitQQVNTIGRh dGFbMl0gaXMgMAorUEFTUyBkYXRhWzNdIHNob3VsZCBub3QgYmUgMjU1IGFuZCBpdCdzIG5vdC4K K1BBU1MgZGF0YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMg MAorUEFTUyBkYXRhWzNdIHNob3VsZCBub3QgYmUgMjU1IGFuZCBpdCdzIG5vdC4KK1BBU1MgZGF0 YVswXSBpcyAyNTUKK1BBU1MgZGF0YVsxXSBpcyAwCitQQVNTIGRhdGFbMl0gaXMgMAorUEFTUyBk YXRhWzNdIHNob3VsZCBub3QgYmUgMjU1IGFuZCBpdCdzIG5vdC4KK1BBU1Mgc3VjY2Vzc2Z1bGx5 UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2NhbnZhcy9jYW52YXMtZmlsbFBhdGgtc2hhZG93Lmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2NhbnZhcy9jYW52YXMtZmlsbFBhdGgtc2hhZG93Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTg5NTQy MDVmNTQxZmQxNDc0YjRkNDdiY2M2N2UxMjRjNmQxYjI0NAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3cuaHRtbApAQCAtMCww ICsxLDEzIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+ Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9qcy9yZXNv dXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9q cy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlw dGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0IHNyYz0ic2NyaXB0 LXRlc3RzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3cuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvc2NyaXB0LXRlc3RzL2Nh bnZhcy1maWxsUGF0aC1zaGFkb3cuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9zY3JpcHQt dGVzdHMvY2FudmFzLWZpbGxQYXRoLXNoYWRvdy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mZjU1OTIwZDkxMzll MWZmNTRjYjNhMzM2ZTQzMTBiY2RiNDBmZTM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9jYW52YXMvc2NyaXB0LXRlc3RzL2NhbnZhcy1maWxsUGF0aC1zaGFkb3cuanMKQEAg LTAsMCArMSwxMTQgQEAKK2Rlc2NyaXB0aW9uKCJFbnN1cmUgY29ycmVjdCBiZWhhdmlvciBvZiBj YW52YXMgd2l0aCBwYXRoIGZpbGwgc2hhZG93Iik7CisKK2Z1bmN0aW9uIHByaW50KG1lc3NhZ2Us IGNvbG9yKQoreworICAgIHZhciBwYXJhZ3JhcGggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKKyAgICBwYXJhZ3JhcGguYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUo bWVzc2FnZSkpOworICAgIHBhcmFncmFwaC5zdHlsZS5mb250RmFtaWx5ID0gIm1vbm9zcGFjZSI7 CisgICAgaWYgKGNvbG9yKQorICAgICAgICBwYXJhZ3JhcGguc3R5bGUuY29sb3IgPSBjb2xvcjsK KyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLmFwcGVuZENoaWxkKHBhcmFn cmFwaCk7Cit9CisKK2Z1bmN0aW9uIHNob3VsZE5vdEJlKGEsIGIpCit7CisgICAgdmFyIGV2YWxB OworICAgIHRyeSB7CisgICAgICAgIGV2YWxBID0gZXZhbChhKTsKKyAgICB9IGNhdGNoKGUpIHsK KyAgICAgICAgZXZhbEEgPSBlOworICAgIH0KKworICAgIGlmIChldmFsQSAhPSBiKQorICAgICAg ICBwcmludCgiUEFTUyAiICsgYSArICIgc2hvdWxkIG5vdCBiZSAiICsgYiArICIgYW5kIGl0J3Mg bm90LiIsICJncmVlbiIpCisgICAgZWxzZQorICAgICAgICBwcmludCgiRkFJTCAiICsgYSArICIg c2hvdWxkIG5vdCBiZSAiICsgYiArICIgYnV0IGl0IGlzLiIsICJyZWQiKTsKK30KKwordmFyIGNh bnZhcyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2NhbnZhcycpOworZG9jdW1lbnQuYm9keS5h cHBlbmRDaGlsZChjYW52YXMpOworY2FudmFzLnNldEF0dHJpYnV0ZSgnd2lkdGgnLCAnNzAwJyk7 CitjYW52YXMuc2V0QXR0cmlidXRlKCdoZWlnaHQnLCAnNzAwJyk7Cit2YXIgY3R4ID0gY2FudmFz LmdldENvbnRleHQoJzJkJyk7CisKK2N0eC5iZWdpblBhdGgoKTsKK2N0eC5tb3ZlVG8oMzAwLCAz MDApOworY3R4LmxpbmVUbygzMDAsIDUwKTsKK2N0eC5iZXppZXJDdXJ2ZVRvKDIwMCwgNDAsIDc1 LCAxNTAsIDMwLCAzMCk7CitjdHgucXVhZHJhdGljQ3VydmVUbygyNTAsIDc1LCA1MCwgMzAwKTsK K2N0eC5zaGFkb3dPZmZzZXRYID0gMzUwOworY3R4LnNoYWRvd0NvbG9yID0gJ3JnYmEoMjU1LCAy MCwgMCwgMC41KSc7CitjdHguc2hhZG93Qmx1ciA9IDA7CitjdHguZmlsbFN0eWxlID0gJ3JnYmEo MCwgMCwgMjU1LCAxKSc7CitjdHgubGluZVdpZHRoID0gMzA7CitjdHguZmlsbCgpOworCitjdHgu YmVnaW5QYXRoKCk7CitjdHgubW92ZVRvKDMwMCw2NTApOworY3R4LmxpbmVUbygzMDAsNDAwKTsK K2N0eC5iZXppZXJDdXJ2ZVRvKDIwMCwgMzkwLCA3NSwgNTAwLCAzMCwgMzgwKTsKK2N0eC5xdWFk cmF0aWNDdXJ2ZVRvKDI1MCwgNDI1LCA1MCwgNjUwKTsKK2N0eC5zaGFkb3dPZmZzZXRYID0gMzUw OworY3R4LnNoYWRvd0NvbG9yID0gJ3JnYmEoMjU1LCAwLCAwLCAwLjUpJzsKK2N0eC5zaGFkb3dC bHVyID0gMzA7CitjdHguZmlsbFN0eWxlID0gJ3JnYmEoMCwgMCwgMjU1LCAxKSc7CitjdHgubGlu ZVdpZHRoID0gMzA7CitjdHguZmlsbCgpOworCit2YXIgaW1hZ2VEYXRhLCBkYXRhOworCisvLyBW ZXJpZnkgc29saWQgc2hhZG93LgoraW1hZ2VEYXRhID0gY3R4LmdldEltYWdlRGF0YSg2NDAsIDI5 MCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRCZSgnZGF0YVswXScsICcy NTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzIwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcw Jyk7CisKK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoNTcwLCA4NSwgMSwgMSk7CitkYXRh ID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRCZSgnZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJl KCdkYXRhWzFdJywgJzIwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcwJyk7CisKK2ltYWdlRGF0 YSA9IGN0eC5nZXRJbWFnZURhdGEoMzgwLCAzMCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRh dGE7CitzaG91bGRCZSgnZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzIw Jyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcwJyk7CisKK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFn ZURhdGEoNDAwLCA0MCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91bGRCZSgn ZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzIwJyk7CitzaG91bGRCZSgn ZGF0YVsyXScsICcwJyk7CisKKy8vIFZlcmlmeSBibHVycnkgc2hhZG93LgoraW1hZ2VEYXRhID0g Y3R4LmdldEltYWdlRGF0YSg2NDAsIDY0MCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7 CitzaG91bGRCZSgnZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzAnKTsK K3Nob3VsZEJlKCdkYXRhWzJdJywgJzAnKTsKK3Nob3VsZE5vdEJlKCdkYXRhWzNdJywgJzI1NScp OworCitpbWFnZURhdGEgPSBjdHguZ2V0SW1hZ2VEYXRhKDY1MCwgNDAwLCAxLCAxKTsKK2RhdGEg PSBpbWFnZURhdGEuZGF0YTsKK3Nob3VsZEJlKCdkYXRhWzBdJywgJzI1NScpOworc2hvdWxkQmUo J2RhdGFbMV0nLCAnMCcpOworc2hvdWxkQmUoJ2RhdGFbMl0nLCAnMCcpOworc2hvdWxkTm90QmUo J2RhdGFbM10nLCAnMjU1Jyk7CisKK2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoMzgwLCAz ODAsIDEsIDEpOworZGF0YSA9IGltYWdlRGF0YS5kYXRhOworc2hvdWxkQmUoJ2RhdGFbMF0nLCAn MjU1Jyk7CitzaG91bGRCZSgnZGF0YVsxXScsICcwJyk7CitzaG91bGRCZSgnZGF0YVsyXScsICcw Jyk7CitzaG91bGROb3RCZSgnZGF0YVszXScsICcyNTUnKTsKKworaW1hZ2VEYXRhID0gY3R4Lmdl dEltYWdlRGF0YSgzNzUsIDM5MCwgMSwgMSk7CitkYXRhID0gaW1hZ2VEYXRhLmRhdGE7CitzaG91 bGRCZSgnZGF0YVswXScsICcyNTUnKTsKK3Nob3VsZEJlKCdkYXRhWzFdJywgJzAnKTsKK3Nob3Vs ZEJlKCdkYXRhWzJdJywgJzAnKTsKK3Nob3VsZE5vdEJlKCdkYXRhWzNdJywgJzI1NScpOworCit2 YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdl TG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE2NjU2Y2VlZTM0OGYwNTFjOTUxZDI2MDEw MTU1YTZiZjRhNDg5Zi4uM2VlMTc1NmQxNjhhNTZlMDliZTFmM2FlNmU0OGY2NTdhZTQyMzk2OCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxMC0xMS0xOSAgSGVsZGVyIENvcnJlaWEgIDxoZWxkZXJAc2VuY2hh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdIFBhdGggZmlsbCBsYWNrcyBibHVyIHNoYWRvdyBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTQ5MQorCisgICAgICAgIEFkZCBibHVy IHNoYWRvdyBzdXBwb3J0IHRvIGZpbGxQYXRoKCkuCisKKyAgICAgICAgVGVzdDogZmFzdC9jYW52 YXMvY2FudmFzLWZpbGxQYXRoLXNoYWRvdy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQ6OmZpbGxQYXRoKToKKwogMjAxMC0xMS0xOSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9k aXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0 c2t5LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHRRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4 dFF0LmNwcAppbmRleCA4N2UzYjUwYjc1YTkzZWZhYzc3ODM2MWZmZDQzMTE0NTU2OTJjNmM1Li5k MWFlNTFiNWFhMzcyOTNkZjRhYWVhYjc1ZTQ0OTY4ZTQ4MTM5YjAwIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcApAQCAtNTM5LDkg KzUzOSwyMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgoKQogICAgIHBhdGguc2V0 RmlsbFJ1bGUodG9RdEZpbGxSdWxlKGZpbGxSdWxlKCkpKTsKIAogICAgIGlmIChtX2RhdGEtPmhh c1NoYWRvdygpKSB7Ci0gICAgICAgIHAtPnRyYW5zbGF0ZShtX2RhdGEtPnNoYWRvdy5vZmZzZXQo KSk7Ci0gICAgICAgIHAtPmZpbGxQYXRoKHBhdGgsIFFDb2xvcihtX2RhdGEtPnNoYWRvdy5tX2Nv bG9yKSk7Ci0gICAgICAgIHAtPnRyYW5zbGF0ZSgtbV9kYXRhLT5zaGFkb3cub2Zmc2V0KCkpOwor ICAgICAgICBDb250ZXh0U2hhZG93KiBzaGFkb3cgPSBjb250ZXh0U2hhZG93KCk7CisgICAgICAg IGlmIChzaGFkb3ctPm1fdHlwZSAhPSBDb250ZXh0U2hhZG93OjpCbHVyU2hhZG93CisgICAgICAg ICAgICAmJiAhbV9jb21tb24tPnN0YXRlLmZpbGxQYXR0ZXJuICYmICFtX2NvbW1vbi0+c3RhdGUu ZmlsbEdyYWRpZW50KQorICAgICAgICB7CisgICAgICAgICAgICBwLT50cmFuc2xhdGUobV9kYXRh LT5zaGFkb3cub2Zmc2V0KCkpOworICAgICAgICAgICAgcC0+ZmlsbFBhdGgocGF0aCwgUUNvbG9y KG1fZGF0YS0+c2hhZG93Lm1fY29sb3IpKTsKKyAgICAgICAgICAgIHAtPnRyYW5zbGF0ZSgtbV9k YXRhLT5zaGFkb3cub2Zmc2V0KCkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgUVBh aW50ZXIqIHNoYWRvd1BhaW50ZXIgPSBzaGFkb3ctPmJlZ2luU2hhZG93TGF5ZXIocCwgcGF0aC5j b250cm9sUG9pbnRSZWN0KCkpOworICAgICAgICAgICAgaWYgKHNoYWRvd1BhaW50ZXIpIHsKKyAg ICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5zZXRDb21wb3NpdGlvbk1vZGUoUVBhaW50ZXI6 OkNvbXBvc2l0aW9uTW9kZV9Tb3VyY2UpOworICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXIt PmZpbGxQYXRoKHBhdGgsIFFDb2xvcihtX2RhdGEtPnNoYWRvdy5tX2NvbG9yKSk7CisgICAgICAg ICAgICAgICAgc2hhZG93LT5lbmRTaGFkb3dMYXllcihwKTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorCiAgICAgfQogICAgIGlmIChtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4pIHsKICAg ICAgICAgQWZmaW5lVHJhbnNmb3JtIGFmZmluZTsK