60718 2011-05-12 12:31:56 -0700 Switch paintOutline to use IntRect 2011-05-12 17:05:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw darin eae eric simon.fraser oldest_to_newest 403078 0 leviw 2011-05-12 12:31:56 -0700 It currently takes four ints representing a rect. 403202 1 93356 leviw 2011-05-12 15:27:43 -0700 Created attachment 93356 Patch 403204 2 93356 simon.fraser 2011-05-12 15:30:11 -0700 Comment on attachment 93356 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93356&action=review > Source/WebCore/rendering/RenderObject.h:795 > + void paintOutline(GraphicsContext*, IntRect); const IntRect& please. 403242 3 93366 leviw 2011-05-12 16:41:50 -0700 Created attachment 93366 Patch 403252 4 leviw 2011-05-12 16:59:57 -0700 Thanks for the review! 403255 5 93366 leviw 2011-05-12 17:05:16 -0700 Comment on attachment 93366 Patch Clearing flags on attachment: 93366 Committed r86400: <http://trac.webkit.org/changeset/86400> 403256 6 leviw 2011-05-12 17:05:20 -0700 All reviewed patches have been landed. Closing bug. 93356 2011-05-12 15:27:43 -0700 2011-05-12 16:41:47 -0700 Patch bug-60718-20110512152742.patch text/plain 9957 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2Mzg2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDUtMTIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludE91dGxpbmUgdG8gdXNlIEludFJlY3QK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwNzE4CisK KyAgICAgICAgU3dpdGNoaW5nIHBhaW50T3V0bGluZSB0byB1c2UgYW4gSW50UmVjdCBpbnN0ZWFk IG9mIDQgaW50cy4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMgdGhpcyBpcyBqdXN0IHJlZmFj dG9yaW5nLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjpwYWludE9iamVjdCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnBhaW50 T3V0bGluZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJS ZXBsYWNlZDo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6cGFpbnRPYmplY3QpOgorICAgICAgICAqIHJl bmRlcmluZy9zdmcvUmVuZGVyU1ZHQ29udGFpbmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclNWR0NvbnRhaW5lcjo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVy U1ZHSW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHSW1hZ2U6OnBhaW50KToK KyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1BhdGguY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyU1ZHUGF0aDo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUm9vdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSb290OjpwYWludCk6 CisKIDIwMTEtMDUtMTIgIExldmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA4NjM4NSkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MDMsNyArMjUw Myw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50T2JqZWN0KFBhaW50SW5mbyYKIAogICAgIC8v IDUuIHBhaW50IG91dGxpbmUuCiAgICAgaWYgKChwYWludFBoYXNlID09IFBhaW50UGhhc2VPdXRs aW5lIHx8IHBhaW50UGhhc2UgPT0gUGFpbnRQaGFzZVNlbGZPdXRsaW5lKSAmJiBoYXNPdXRsaW5l KCkgJiYgc3R5bGUoKS0+dmlzaWJpbGl0eSgpID09IFZJU0lCTEUpCi0gICAgICAgIHBhaW50T3V0 bGluZShwYWludEluZm8uY29udGV4dCwgdHgsIHR5LCB3aWR0aCgpLCBoZWlnaHQoKSk7CisgICAg ICAgIHBhaW50T3V0bGluZShwYWludEluZm8uY29udGV4dCwgSW50UmVjdCh0eCwgdHksIHdpZHRo KCksIGhlaWdodCgpKSk7CiAKICAgICAvLyA2LiBwYWludCBjb250aW51YXRpb24gb3V0bGluZXMu CiAgICAgaWYgKChwYWludFBoYXNlID09IFBhaW50UGhhc2VPdXRsaW5lIHx8IHBhaW50UGhhc2Ug PT0gUGFpbnRQaGFzZUNoaWxkT3V0bGluZXMpKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gODYzODUpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAyMCw3ICsx MDIwLDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmFkZFBERlVSTFJlY3QoR3JhcGhpYwogICAgIGNv bnRleHQtPnNldFVSTEZvclJlY3Qobi0+ZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwoaHJlZiksIHJl Y3QpOwogfQogCi12b2lkIFJlbmRlck9iamVjdDo6cGFpbnRPdXRsaW5lKEdyYXBoaWNzQ29udGV4 dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgdHgsIGludCB0eSwgaW50IHcsIGludCBoKQordm9pZCBS ZW5kZXJPYmplY3Q6OnBhaW50T3V0bGluZShHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4 dCwgSW50UmVjdCBwYWludFJlY3QpCiB7CiAgICAgaWYgKCFoYXNPdXRsaW5lKCkpCiAgICAgICAg IHJldHVybjsKQEAgLTEwMzYsMTkgKzEwMzYsMTYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OnBhaW50 T3V0bGluZShHcmFwaGljcwogICAgIGlmIChzdHlsZVRvVXNlLT5vdXRsaW5lU3R5bGVJc0F1dG8o KSB8fCBoYXNPdXRsaW5lQW5ub3RhdGlvbigpKSB7CiAgICAgICAgIGlmICghdGhlbWUoKS0+c3Vw cG9ydHNGb2N1c1Jpbmcoc3R5bGVUb1VzZSkpIHsKICAgICAgICAgICAgIC8vIE9ubHkgcGFpbnQg dGhlIGZvY3VzIHJpbmcgYnkgaGFuZCBpZiB0aGUgdGhlbWUgaXNuJ3QgYWJsZSB0byBkcmF3IHRo ZSBmb2N1cyByaW5nLgotICAgICAgICAgICAgcGFpbnRGb2N1c1JpbmcoZ3JhcGhpY3NDb250ZXh0 LCB0eCwgdHksIHN0eWxlVG9Vc2UpOworICAgICAgICAgICAgcGFpbnRGb2N1c1JpbmcoZ3JhcGhp Y3NDb250ZXh0LCBwYWludFJlY3QueCgpLCBwYWludFJlY3QueSgpLCBzdHlsZVRvVXNlKTsKICAg ICAgICAgfQogICAgIH0KIAogICAgIGlmIChzdHlsZVRvVXNlLT5vdXRsaW5lU3R5bGVJc0F1dG8o KSB8fCBzdHlsZVRvVXNlLT5vdXRsaW5lU3R5bGUoKSA9PSBCTk9ORSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgdHggLT0gb2Zmc2V0OwotICAgIHR5IC09IG9mZnNldDsKLSAgICB3ICs9IDIgKiBv ZmZzZXQ7Ci0gICAgaCArPSAyICogb2Zmc2V0OworICAgIHBhaW50UmVjdC5pbmZsYXRlKG9mZnNl dCk7CiAKLSAgICBpZiAoaCA8IDAgfHwgdyA8IDApCisgICAgaWYgKHBhaW50UmVjdC5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybjsKIAogI2lmICFVU0UoU0tJQSkKQEAgLTEwNTksMTQgKzEwNTYs MTQgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OnBhaW50T3V0bGluZShHcmFwaGljcwogICAgIH0KICNl bmRpZgogCi0gICAgaW50IGxlZnRPdXRlciA9IHR4IC0gb3V0bGluZVdpZHRoOwotICAgIGludCBs ZWZ0SW5uZXIgPSB0eDsKLSAgICBpbnQgcmlnaHRPdXRlciA9IHR4ICsgdyArIG91dGxpbmVXaWR0 aDsKLSAgICBpbnQgcmlnaHRJbm5lciA9IHR4ICsgdzsKLSAgICBpbnQgdG9wT3V0ZXIgPSB0eSAt IG91dGxpbmVXaWR0aDsKLSAgICBpbnQgdG9wSW5uZXIgPSB0eTsKLSAgICBpbnQgYm90dG9tT3V0 ZXIgPSB0eSArIGggKyBvdXRsaW5lV2lkdGg7Ci0gICAgaW50IGJvdHRvbUlubmVyID0gdHkgKyBo OworICAgIGludCBsZWZ0T3V0ZXIgPSBwYWludFJlY3QueCgpIC0gb3V0bGluZVdpZHRoOworICAg IGludCBsZWZ0SW5uZXIgPSBwYWludFJlY3QueCgpOworICAgIGludCByaWdodE91dGVyID0gcGFp bnRSZWN0Lm1heFgoKSArIG91dGxpbmVXaWR0aDsKKyAgICBpbnQgcmlnaHRJbm5lciA9IHBhaW50 UmVjdC5tYXhYKCk7CisgICAgaW50IHRvcE91dGVyID0gcGFpbnRSZWN0LnkoKSAtIG91dGxpbmVX aWR0aDsKKyAgICBpbnQgdG9wSW5uZXIgPSBwYWludFJlY3QueSgpOworICAgIGludCBib3R0b21P dXRlciA9IHBhaW50UmVjdC5tYXhZKCkgKyBvdXRsaW5lV2lkdGg7CisgICAgaW50IGJvdHRvbUlu bmVyID0gcGFpbnRSZWN0Lm1heFkoKTsKICAgICAKICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3Jh cGhpY3NDb250ZXh0LCBsZWZ0T3V0ZXIsIHRvcE91dGVyLCBsZWZ0SW5uZXIsIGJvdHRvbU91dGVy LCBCU0xlZnQsIG91dGxpbmVDb2xvciwgb3V0bGluZVN0eWxlLCBvdXRsaW5lV2lkdGgsIG91dGxp bmVXaWR0aCk7CiAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgbGVmdE91 dGVyLCB0b3BPdXRlciwgcmlnaHRPdXRlciwgdG9wSW5uZXIsIEJTVG9wLCBvdXRsaW5lQ29sb3Is IG91dGxpbmVTdHlsZSwgb3V0bGluZVdpZHRoLCBvdXRsaW5lV2lkdGgpOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gODYzODUpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTc5 Miw3ICs3OTIsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29s b3IsIEVCb3JkZXJTdHlsZSwgaW50IGFkamJ3MSwgaW50IGFkamJ3MiwgYm9vbCBhbnRpYWxpYXMg PSBmYWxzZSk7CiAKICAgICB2b2lkIHBhaW50Rm9jdXNSaW5nKEdyYXBoaWNzQ29udGV4dCosIGlu dCB0eCwgaW50IHR5LCBSZW5kZXJTdHlsZSopOwotICAgIHZvaWQgcGFpbnRPdXRsaW5lKEdyYXBo aWNzQ29udGV4dCosIGludCB0eCwgaW50IHR5LCBpbnQgdywgaW50IGgpOworICAgIHZvaWQgcGFp bnRPdXRsaW5lKEdyYXBoaWNzQ29udGV4dCosIEludFJlY3QpOwogICAgIHZvaWQgYWRkUERGVVJM UmVjdChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0Jik7CiAKICAgICB2aXJ0dWFsIElu dFJlY3Qgdmlld1JlY3QoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSZXBsYWNlZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclJlcGxhY2VkLmNwcAkocmV2aXNpb24gODYzODUpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTAsOCArMTEw LDkgQEAgdm9pZCBSZW5kZXJSZXBsYWNlZDo6cGFpbnQoUGFpbnRJbmZvJiBwYQogICAgICAgICBy ZXR1cm47CiAgICAgfQogCisgICAgSW50UmVjdCBwYWludFJlY3QgPSBJbnRSZWN0KEludFBvaW50 KHR4LCB0eSksIHNpemUoKSk7CiAgICAgaWYgKChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFz ZU91dGxpbmUgfHwgcGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VTZWxmT3V0bGluZSkgJiYg c3R5bGUoKS0+b3V0bGluZVdpZHRoKCkpCi0gICAgICAgIHBhaW50T3V0bGluZShwYWludEluZm8u Y29udGV4dCwgdHgsIHR5LCB3aWR0aCgpLCBoZWlnaHQoKSk7CisgICAgICAgIHBhaW50T3V0bGlu ZShwYWludEluZm8uY29udGV4dCwgcGFpbnRSZWN0KTsKICAgICAKICAgICBpZiAocGFpbnRJbmZv LnBoYXNlICE9IFBhaW50UGhhc2VGb3JlZ3JvdW5kICYmIHBhaW50SW5mby5waGFzZSAhPSBQYWlu dFBoYXNlU2VsZWN0aW9uKQogICAgICAgICByZXR1cm47CkBAIC0xMzUsNyArMTM2LDcgQEAgdm9p ZCBSZW5kZXJSZXBsYWNlZDo6cGFpbnQoUGFpbnRJbmZvJiBwYQogICAgICAgICBlbHNlIHsKICAg ICAgICAgICAgIC8vIFB1c2ggYSBjbGlwIGlmIHdlIGhhdmUgYSBib3JkZXIgcmFkaXVzLCBzaW5j ZSB3ZSB3YW50IHRvIHJvdW5kIHRoZSBmb3JlZ3JvdW5kIGNvbnRlbnQgdGhhdCBnZXRzIHBhaW50 ZWQuCiAgICAgICAgICAgICBwYWludEluZm8uY29udGV4dC0+c2F2ZSgpOwotICAgICAgICAgICAg cGFpbnRJbmZvLmNvbnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChzdHlsZSgpLT5nZXRSb3VuZGVk Qm9yZGVyRm9yKGJvcmRlclJlY3QpKTsKKyAgICAgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5h ZGRSb3VuZGVkUmVjdENsaXAoc3R5bGUoKS0+Z2V0Um91bmRlZEJvcmRlckZvcihwYWludFJlY3Qp KTsKICAgICAgICAgfQogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGFibGUuY3BwCShyZXZpc2lvbiA4NjM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUyOSw3ICs1MjksNyBAQCB2b2lk IFJlbmRlclRhYmxlOjpwYWludE9iamVjdChQYWludEluZm8mCiAKICAgICAvLyBQYWludCBvdXRs aW5lLgogICAgIGlmICgocGFpbnRQaGFzZSA9PSBQYWludFBoYXNlT3V0bGluZSB8fCBwYWludFBo YXNlID09IFBhaW50UGhhc2VTZWxmT3V0bGluZSkgJiYgaGFzT3V0bGluZSgpICYmIHN0eWxlKCkt PnZpc2liaWxpdHkoKSA9PSBWSVNJQkxFKQotICAgICAgICBwYWludE91dGxpbmUocGFpbnRJbmZv LmNvbnRleHQsIHR4LCB0eSwgd2lkdGgoKSwgaGVpZ2h0KCkpOworICAgICAgICBwYWludE91dGxp bmUocGFpbnRJbmZvLmNvbnRleHQsIEludFJlY3QoSW50UG9pbnQodHgsIHR5KSwgc2l6ZSgpKSk7 CiB9CiAKIHZvaWQgUmVuZGVyVGFibGU6OnN1YnRyYWN0Q2FwdGlvblJlY3QoSW50UmVjdCYgcmVj dCkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHQ29u dGFpbmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR0NvbnRhaW5lci5jcHAJKHJldmlzaW9uIDg2Mzg1KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdDb250YWluZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x MzQsNyArMTM0LDcgQEAgdm9pZCBSZW5kZXJTVkdDb250YWluZXI6OnBhaW50KFBhaW50SW5mbwog ICAgIC8vIFdlIHNob3VsZCBpbnN0ZWFkIGRpc2FibGUgb3VyIGNsaXAgZHVyaW5nIFBhaW50UGhh c2VPdXRsaW5lCiAgICAgaWYgKChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZU91dGxpbmUg fHwgcGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VTZWxmT3V0bGluZSkgJiYgc3R5bGUoKS0+ b3V0bGluZVdpZHRoKCkgJiYgc3R5bGUoKS0+dmlzaWJpbGl0eSgpID09IFZJU0lCTEUpIHsKICAg ICAgICAgSW50UmVjdCBwYWludFJlY3RJblBhcmVudCA9IGVuY2xvc2luZ0ludFJlY3QobG9jYWxU b1BhcmVudFRyYW5zZm9ybSgpLm1hcFJlY3QocmVwYWludFJlY3QpKTsKLSAgICAgICAgcGFpbnRP dXRsaW5lKHBhaW50SW5mby5jb250ZXh0LCBwYWludFJlY3RJblBhcmVudC54KCksIHBhaW50UmVj dEluUGFyZW50LnkoKSwgcGFpbnRSZWN0SW5QYXJlbnQud2lkdGgoKSwgcGFpbnRSZWN0SW5QYXJl bnQuaGVpZ2h0KCkpOworICAgICAgICBwYWludE91dGxpbmUocGFpbnRJbmZvLmNvbnRleHQsIHBh aW50UmVjdEluUGFyZW50KTsKICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvUmVuZGVyU1ZHSW1hZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW1hZ2UuY3BwCShyZXZpc2lvbiA4NjM4NSkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW1hZ2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMzcsOCArMTM3LDcgQEAgdm9pZCBSZW5kZXJTVkdJbWFnZTo6cGFpbnQoUGFpbnRJ bmZvJiBwYQogICAgICAgICB9CiAKICAgICAgICAgaWYgKGRyYXdzT3V0bGluZSkKLSAgICAgICAg ICAgIHBhaW50T3V0bGluZShjaGlsZFBhaW50SW5mby5jb250ZXh0LCBzdGF0aWNfY2FzdDxpbnQ+ KGJvdW5kaW5nQm94LngoKSksIHN0YXRpY19jYXN0PGludD4oYm91bmRpbmdCb3gueSgpKSwKLSAg ICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxpbnQ+KGJvdW5kaW5nQm94LndpZHRoKCkpLCBzdGF0 aWNfY2FzdDxpbnQ+KGJvdW5kaW5nQm94LmhlaWdodCgpKSk7CisgICAgICAgICAgICBwYWludE91 dGxpbmUoY2hpbGRQYWludEluZm8uY29udGV4dCwgSW50UmVjdChib3VuZGluZ0JveCkpOwogICAg IH0KIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdQYXRo LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1BhdGguY3BwCShyZXZpc2lvbiA4NjM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvUmVuZGVyU1ZHUGF0aC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzMCw4ICsyMzAsNyBAQCB2 b2lkIFJlbmRlclNWR1BhdGg6OnBhaW50KFBhaW50SW5mbyYgcGFpCiAgICAgICAgIH0KIAogICAg ICAgICBpZiAoZHJhd3NPdXRsaW5lKQotICAgICAgICAgICAgcGFpbnRPdXRsaW5lKGNoaWxkUGFp bnRJbmZvLmNvbnRleHQsIHN0YXRpY19jYXN0PGludD4oYm91bmRpbmdCb3gueCgpKSwgc3RhdGlj X2Nhc3Q8aW50Pihib3VuZGluZ0JveC55KCkpLAotICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0 PGludD4oYm91bmRpbmdCb3gud2lkdGgoKSksIHN0YXRpY19jYXN0PGludD4oYm91bmRpbmdCb3gu aGVpZ2h0KCkpKTsKKyAgICAgICAgICAgIHBhaW50T3V0bGluZShjaGlsZFBhaW50SW5mby5jb250 ZXh0LCBJbnRSZWN0KGJvdW5kaW5nQm94KSk7CiAgICAgfQogfQogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAJKHJldmlzaW9uIDg2Mzg1 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgUmVuZGVyU1ZHUm9vdDo6cGFpbnQo UGFpbnRJbmZvJiBwYWkKICAgICBjaGlsZFBhaW50SW5mby5jb250ZXh0LT5yZXN0b3JlKCk7CiAK ICAgICBpZiAoKHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlT3V0bGluZSB8fCBwYWludElu Zm8ucGhhc2UgPT0gUGFpbnRQaGFzZVNlbGZPdXRsaW5lKSAmJiBzdHlsZSgpLT5vdXRsaW5lV2lk dGgoKSAmJiBpc1Zpc2libGUpCi0gICAgICAgIHBhaW50T3V0bGluZShwYWludEluZm8uY29udGV4 dCwgYm9yZGVyQm94T3JpZ2luSW5Db250YWluZXIueCgpLCBib3JkZXJCb3hPcmlnaW5JbkNvbnRh aW5lci55KCksIHdpZHRoKCksIGhlaWdodCgpKTsKKyAgICAgICAgcGFpbnRPdXRsaW5lKHBhaW50 SW5mby5jb250ZXh0LCBJbnRSZWN0KGJvcmRlckJveE9yaWdpbkluQ29udGFpbmVyLCBzaXplKCkp KTsKIH0KIAogdm9pZCBSZW5kZXJTVkdSb290OjpkZXN0cm95KCkK 93366 2011-05-12 16:41:50 -0700 2011-05-12 17:05:16 -0700 Patch bug-60718-20110512164149.patch text/plain 10084 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2Mzg2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDUtMTIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludE91dGxpbmUgdG8gdXNlIEludFJlY3QK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwNzE4CisK KyAgICAgICAgU3dpdGNoaW5nIHBhaW50T3V0bGluZSB0byB1c2UgYW4gSW50UmVjdCBpbnN0ZWFk IG9mIDQgaW50cy4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMgdGhpcyBpcyBqdXN0IHJlZmFj dG9yaW5nLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjpwYWludE9iamVjdCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnBhaW50 T3V0bGluZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJS ZXBsYWNlZDo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6cGFpbnRPYmplY3QpOgorICAgICAgICAqIHJl bmRlcmluZy9zdmcvUmVuZGVyU1ZHQ29udGFpbmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclNWR0NvbnRhaW5lcjo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVy U1ZHSW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHSW1hZ2U6OnBhaW50KToK KyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1BhdGguY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyU1ZHUGF0aDo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUm9vdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSb290OjpwYWludCk6 CisKIDIwMTEtMDUtMTIgIExldmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA4NjM4NSkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MDMsNyArMjUw Myw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50T2JqZWN0KFBhaW50SW5mbyYKIAogICAgIC8v IDUuIHBhaW50IG91dGxpbmUuCiAgICAgaWYgKChwYWludFBoYXNlID09IFBhaW50UGhhc2VPdXRs aW5lIHx8IHBhaW50UGhhc2UgPT0gUGFpbnRQaGFzZVNlbGZPdXRsaW5lKSAmJiBoYXNPdXRsaW5l KCkgJiYgc3R5bGUoKS0+dmlzaWJpbGl0eSgpID09IFZJU0lCTEUpCi0gICAgICAgIHBhaW50T3V0 bGluZShwYWludEluZm8uY29udGV4dCwgdHgsIHR5LCB3aWR0aCgpLCBoZWlnaHQoKSk7CisgICAg ICAgIHBhaW50T3V0bGluZShwYWludEluZm8uY29udGV4dCwgSW50UmVjdCh0eCwgdHksIHdpZHRo KCksIGhlaWdodCgpKSk7CiAKICAgICAvLyA2LiBwYWludCBjb250aW51YXRpb24gb3V0bGluZXMu CiAgICAgaWYgKChwYWludFBoYXNlID09IFBhaW50UGhhc2VPdXRsaW5lIHx8IHBhaW50UGhhc2Ug PT0gUGFpbnRQaGFzZUNoaWxkT3V0bGluZXMpKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gODYzODUpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAyMCw3ICsx MDIwLDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmFkZFBERlVSTFJlY3QoR3JhcGhpYwogICAgIGNv bnRleHQtPnNldFVSTEZvclJlY3Qobi0+ZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwoaHJlZiksIHJl Y3QpOwogfQogCi12b2lkIFJlbmRlck9iamVjdDo6cGFpbnRPdXRsaW5lKEdyYXBoaWNzQ29udGV4 dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgdHgsIGludCB0eSwgaW50IHcsIGludCBoKQordm9pZCBS ZW5kZXJPYmplY3Q6OnBhaW50T3V0bGluZShHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4 dCwgY29uc3QgSW50UmVjdCYgcGFpbnRSZWN0KQogewogICAgIGlmICghaGFzT3V0bGluZSgpKQog ICAgICAgICByZXR1cm47CkBAIC0xMDM2LDE5ICsxMDM2LDE3IEBAIHZvaWQgUmVuZGVyT2JqZWN0 OjpwYWludE91dGxpbmUoR3JhcGhpY3MKICAgICBpZiAoc3R5bGVUb1VzZS0+b3V0bGluZVN0eWxl SXNBdXRvKCkgfHwgaGFzT3V0bGluZUFubm90YXRpb24oKSkgewogICAgICAgICBpZiAoIXRoZW1l KCktPnN1cHBvcnRzRm9jdXNSaW5nKHN0eWxlVG9Vc2UpKSB7CiAgICAgICAgICAgICAvLyBPbmx5 IHBhaW50IHRoZSBmb2N1cyByaW5nIGJ5IGhhbmQgaWYgdGhlIHRoZW1lIGlzbid0IGFibGUgdG8g ZHJhdyB0aGUgZm9jdXMgcmluZy4KLSAgICAgICAgICAgIHBhaW50Rm9jdXNSaW5nKGdyYXBoaWNz Q29udGV4dCwgdHgsIHR5LCBzdHlsZVRvVXNlKTsKKyAgICAgICAgICAgIHBhaW50Rm9jdXNSaW5n KGdyYXBoaWNzQ29udGV4dCwgcGFpbnRSZWN0LngoKSwgcGFpbnRSZWN0LnkoKSwgc3R5bGVUb1Vz ZSk7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoc3R5bGVUb1VzZS0+b3V0bGluZVN0eWxl SXNBdXRvKCkgfHwgc3R5bGVUb1VzZS0+b3V0bGluZVN0eWxlKCkgPT0gQk5PTkUpCiAgICAgICAg IHJldHVybjsKIAotICAgIHR4IC09IG9mZnNldDsKLSAgICB0eSAtPSBvZmZzZXQ7Ci0gICAgdyAr PSAyICogb2Zmc2V0OwotICAgIGggKz0gMiAqIG9mZnNldDsKKyAgICBJbnRSZWN0IGFkanVzdGVk UGFpbnRSZWMgPSBwYWludFJlY3Q7CisgICAgYWRqdXN0ZWRQYWludFJlYy5pbmZsYXRlKG9mZnNl dCk7CiAKLSAgICBpZiAoaCA8IDAgfHwgdyA8IDApCisgICAgaWYgKGFkanVzdGVkUGFpbnRSZWMu aXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKICNpZiAhVVNFKFNLSUEpCkBAIC0xMDU5LDE0 ICsxMDU3LDE0IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpwYWludE91dGxpbmUoR3JhcGhpY3MKICAg ICB9CiAjZW5kaWYKIAotICAgIGludCBsZWZ0T3V0ZXIgPSB0eCAtIG91dGxpbmVXaWR0aDsKLSAg ICBpbnQgbGVmdElubmVyID0gdHg7Ci0gICAgaW50IHJpZ2h0T3V0ZXIgPSB0eCArIHcgKyBvdXRs aW5lV2lkdGg7Ci0gICAgaW50IHJpZ2h0SW5uZXIgPSB0eCArIHc7Ci0gICAgaW50IHRvcE91dGVy ID0gdHkgLSBvdXRsaW5lV2lkdGg7Ci0gICAgaW50IHRvcElubmVyID0gdHk7Ci0gICAgaW50IGJv dHRvbU91dGVyID0gdHkgKyBoICsgb3V0bGluZVdpZHRoOwotICAgIGludCBib3R0b21Jbm5lciA9 IHR5ICsgaDsKKyAgICBpbnQgbGVmdE91dGVyID0gYWRqdXN0ZWRQYWludFJlYy54KCkgLSBvdXRs aW5lV2lkdGg7CisgICAgaW50IGxlZnRJbm5lciA9IGFkanVzdGVkUGFpbnRSZWMueCgpOworICAg IGludCByaWdodE91dGVyID0gYWRqdXN0ZWRQYWludFJlYy5tYXhYKCkgKyBvdXRsaW5lV2lkdGg7 CisgICAgaW50IHJpZ2h0SW5uZXIgPSBhZGp1c3RlZFBhaW50UmVjLm1heFgoKTsKKyAgICBpbnQg dG9wT3V0ZXIgPSBhZGp1c3RlZFBhaW50UmVjLnkoKSAtIG91dGxpbmVXaWR0aDsKKyAgICBpbnQg dG9wSW5uZXIgPSBhZGp1c3RlZFBhaW50UmVjLnkoKTsKKyAgICBpbnQgYm90dG9tT3V0ZXIgPSBh ZGp1c3RlZFBhaW50UmVjLm1heFkoKSArIG91dGxpbmVXaWR0aDsKKyAgICBpbnQgYm90dG9tSW5u ZXIgPSBhZGp1c3RlZFBhaW50UmVjLm1heFkoKTsKICAgICAKICAgICBkcmF3TGluZUZvckJveFNp ZGUoZ3JhcGhpY3NDb250ZXh0LCBsZWZ0T3V0ZXIsIHRvcE91dGVyLCBsZWZ0SW5uZXIsIGJvdHRv bU91dGVyLCBCU0xlZnQsIG91dGxpbmVDb2xvciwgb3V0bGluZVN0eWxlLCBvdXRsaW5lV2lkdGgs IG91dGxpbmVXaWR0aCk7CiAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwg bGVmdE91dGVyLCB0b3BPdXRlciwgcmlnaHRPdXRlciwgdG9wSW5uZXIsIEJTVG9wLCBvdXRsaW5l Q29sb3IsIG91dGxpbmVTdHlsZSwgb3V0bGluZVdpZHRoLCBvdXRsaW5lV2lkdGgpOwpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gODYzODUpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkK QEAgLTc5Miw3ICs3OTIsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgQ29sb3IsIEVCb3JkZXJTdHlsZSwgaW50IGFkamJ3MSwgaW50IGFkamJ3MiwgYm9vbCBhbnRp YWxpYXMgPSBmYWxzZSk7CiAKICAgICB2b2lkIHBhaW50Rm9jdXNSaW5nKEdyYXBoaWNzQ29udGV4 dCosIGludCB0eCwgaW50IHR5LCBSZW5kZXJTdHlsZSopOwotICAgIHZvaWQgcGFpbnRPdXRsaW5l KEdyYXBoaWNzQ29udGV4dCosIGludCB0eCwgaW50IHR5LCBpbnQgdywgaW50IGgpOworICAgIHZv aWQgcGFpbnRPdXRsaW5lKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsKICAgICB2 b2lkIGFkZFBERlVSTFJlY3QoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYpOwogCiAg ICAgdmlydHVhbCBJbnRSZWN0IHZpZXdSZWN0KCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAJKHJldmlzaW9uIDg2Mzg1KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTEwLDggKzExMCw5IEBAIHZvaWQgUmVuZGVyUmVwbGFjZWQ6OnBhaW50KFBhaW50SW5mbyYg cGEKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIEludFJlY3QgcGFpbnRSZWN0ID0gSW50 UmVjdChJbnRQb2ludCh0eCwgdHkpLCBzaXplKCkpOwogICAgIGlmICgocGFpbnRJbmZvLnBoYXNl ID09IFBhaW50UGhhc2VPdXRsaW5lIHx8IHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlU2Vs Zk91dGxpbmUpICYmIHN0eWxlKCktPm91dGxpbmVXaWR0aCgpKQotICAgICAgICBwYWludE91dGxp bmUocGFpbnRJbmZvLmNvbnRleHQsIHR4LCB0eSwgd2lkdGgoKSwgaGVpZ2h0KCkpOworICAgICAg ICBwYWludE91dGxpbmUocGFpbnRJbmZvLmNvbnRleHQsIHBhaW50UmVjdCk7CiAgICAgCiAgICAg aWYgKHBhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlRm9yZWdyb3VuZCAmJiBwYWludEluZm8u cGhhc2UgIT0gUGFpbnRQaGFzZVNlbGVjdGlvbikKICAgICAgICAgcmV0dXJuOwpAQCAtMTM1LDcg KzEzNiw3IEBAIHZvaWQgUmVuZGVyUmVwbGFjZWQ6OnBhaW50KFBhaW50SW5mbyYgcGEKICAgICAg ICAgZWxzZSB7CiAgICAgICAgICAgICAvLyBQdXNoIGEgY2xpcCBpZiB3ZSBoYXZlIGEgYm9yZGVy IHJhZGl1cywgc2luY2Ugd2Ugd2FudCB0byByb3VuZCB0aGUgZm9yZWdyb3VuZCBjb250ZW50IHRo YXQgZ2V0cyBwYWludGVkLgogICAgICAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQtPnNhdmUoKTsK LSAgICAgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5hZGRSb3VuZGVkUmVjdENsaXAoc3R5bGUo KS0+Z2V0Um91bmRlZEJvcmRlckZvcihib3JkZXJSZWN0KSk7CisgICAgICAgICAgICBwYWludElu Zm8uY29udGV4dC0+YWRkUm91bmRlZFJlY3RDbGlwKHN0eWxlKCktPmdldFJvdW5kZWRCb3JkZXJG b3IocGFpbnRSZWN0KSk7CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAkocmV2aXNpb24gODYzODUpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjksNyAr NTI5LDcgQEAgdm9pZCBSZW5kZXJUYWJsZTo6cGFpbnRPYmplY3QoUGFpbnRJbmZvJgogCiAgICAg Ly8gUGFpbnQgb3V0bGluZS4KICAgICBpZiAoKHBhaW50UGhhc2UgPT0gUGFpbnRQaGFzZU91dGxp bmUgfHwgcGFpbnRQaGFzZSA9PSBQYWludFBoYXNlU2VsZk91dGxpbmUpICYmIGhhc091dGxpbmUo KSAmJiBzdHlsZSgpLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSkKLSAgICAgICAgcGFpbnRPdXRs aW5lKHBhaW50SW5mby5jb250ZXh0LCB0eCwgdHksIHdpZHRoKCksIGhlaWdodCgpKTsKKyAgICAg ICAgcGFpbnRPdXRsaW5lKHBhaW50SW5mby5jb250ZXh0LCBJbnRSZWN0KEludFBvaW50KHR4LCB0 eSksIHNpemUoKSkpOwogfQogCiB2b2lkIFJlbmRlclRhYmxlOjpzdWJ0cmFjdENhcHRpb25SZWN0 KEludFJlY3QmIHJlY3QpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR0NvbnRhaW5lci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N2Zy9SZW5kZXJTVkdDb250YWluZXIuY3BwCShyZXZpc2lvbiA4NjM4NSkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHQ29udGFpbmVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTM0LDcgKzEzNCw3IEBAIHZvaWQgUmVuZGVyU1ZHQ29udGFpbmVyOjpwYWlu dChQYWludEluZm8KICAgICAvLyBXZSBzaG91bGQgaW5zdGVhZCBkaXNhYmxlIG91ciBjbGlwIGR1 cmluZyBQYWludFBoYXNlT3V0bGluZQogICAgIGlmICgocGFpbnRJbmZvLnBoYXNlID09IFBhaW50 UGhhc2VPdXRsaW5lIHx8IHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlU2VsZk91dGxpbmUp ICYmIHN0eWxlKCktPm91dGxpbmVXaWR0aCgpICYmIHN0eWxlKCktPnZpc2liaWxpdHkoKSA9PSBW SVNJQkxFKSB7CiAgICAgICAgIEludFJlY3QgcGFpbnRSZWN0SW5QYXJlbnQgPSBlbmNsb3NpbmdJ bnRSZWN0KGxvY2FsVG9QYXJlbnRUcmFuc2Zvcm0oKS5tYXBSZWN0KHJlcGFpbnRSZWN0KSk7Ci0g ICAgICAgIHBhaW50T3V0bGluZShwYWludEluZm8uY29udGV4dCwgcGFpbnRSZWN0SW5QYXJlbnQu eCgpLCBwYWludFJlY3RJblBhcmVudC55KCksIHBhaW50UmVjdEluUGFyZW50LndpZHRoKCksIHBh aW50UmVjdEluUGFyZW50LmhlaWdodCgpKTsKKyAgICAgICAgcGFpbnRPdXRsaW5lKHBhaW50SW5m by5jb250ZXh0LCBwYWludFJlY3RJblBhcmVudCk7CiAgICAgfQogfQogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ltYWdlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ltYWdlLmNwcAkocmV2aXNpb24g ODYzODUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ltYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTM3LDggKzEzNyw3IEBAIHZvaWQgUmVuZGVyU1ZHSW1hZ2U6 OnBhaW50KFBhaW50SW5mbyYgcGEKICAgICAgICAgfQogCiAgICAgICAgIGlmIChkcmF3c091dGxp bmUpCi0gICAgICAgICAgICBwYWludE91dGxpbmUoY2hpbGRQYWludEluZm8uY29udGV4dCwgc3Rh dGljX2Nhc3Q8aW50Pihib3VuZGluZ0JveC54KCkpLCBzdGF0aWNfY2FzdDxpbnQ+KGJvdW5kaW5n Qm94LnkoKSksCi0gICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8aW50Pihib3VuZGluZ0JveC53 aWR0aCgpKSwgc3RhdGljX2Nhc3Q8aW50Pihib3VuZGluZ0JveC5oZWlnaHQoKSkpOworICAgICAg ICAgICAgcGFpbnRPdXRsaW5lKGNoaWxkUGFpbnRJbmZvLmNvbnRleHQsIEludFJlY3QoYm91bmRp bmdCb3gpKTsKICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUGF0aC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdQYXRoLmNwcAkocmV2aXNpb24gODYzODUpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1BhdGguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzAs OCArMjMwLDcgQEAgdm9pZCBSZW5kZXJTVkdQYXRoOjpwYWludChQYWludEluZm8mIHBhaQogICAg ICAgICB9CiAKICAgICAgICAgaWYgKGRyYXdzT3V0bGluZSkKLSAgICAgICAgICAgIHBhaW50T3V0 bGluZShjaGlsZFBhaW50SW5mby5jb250ZXh0LCBzdGF0aWNfY2FzdDxpbnQ+KGJvdW5kaW5nQm94 LngoKSksIHN0YXRpY19jYXN0PGludD4oYm91bmRpbmdCb3gueSgpKSwKLSAgICAgICAgICAgICAg ICBzdGF0aWNfY2FzdDxpbnQ+KGJvdW5kaW5nQm94LndpZHRoKCkpLCBzdGF0aWNfY2FzdDxpbnQ+ KGJvdW5kaW5nQm94LmhlaWdodCgpKSk7CisgICAgICAgICAgICBwYWludE91dGxpbmUoY2hpbGRQ YWludEluZm8uY29udGV4dCwgSW50UmVjdChib3VuZGluZ0JveCkpOwogICAgIH0KIH0KIApJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCShy ZXZpc2lvbiA4NjM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH Um9vdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4OSw3ICsxODksNyBAQCB2b2lkIFJlbmRlclNW R1Jvb3Q6OnBhaW50KFBhaW50SW5mbyYgcGFpCiAgICAgY2hpbGRQYWludEluZm8uY29udGV4dC0+ cmVzdG9yZSgpOwogCiAgICAgaWYgKChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZU91dGxp bmUgfHwgcGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VTZWxmT3V0bGluZSkgJiYgc3R5bGUo KS0+b3V0bGluZVdpZHRoKCkgJiYgaXNWaXNpYmxlKQotICAgICAgICBwYWludE91dGxpbmUocGFp bnRJbmZvLmNvbnRleHQsIGJvcmRlckJveE9yaWdpbkluQ29udGFpbmVyLngoKSwgYm9yZGVyQm94 T3JpZ2luSW5Db250YWluZXIueSgpLCB3aWR0aCgpLCBoZWlnaHQoKSk7CisgICAgICAgIHBhaW50 T3V0bGluZShwYWludEluZm8uY29udGV4dCwgSW50UmVjdChib3JkZXJCb3hPcmlnaW5JbkNvbnRh aW5lciwgc2l6ZSgpKSk7CiB9CiAKIHZvaWQgUmVuZGVyU1ZHUm9vdDo6ZGVzdHJveSgpCg==