64360 2011-07-12 07:32:34 -0700 Move useRepaintBounds from RenderBlock::layoutRunsAndFloats to LineLayoutState 2011-07-18 14:46:02 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 achicu webkit-unassigned hyatt mihnea morrita rniwa tony webkit.review.bot oldest_to_newest 435639 0 achicu 2011-07-12 07:32:34 -0700 Fixing the following FIXME from RenderBlockLineLayout.cpp // FIXME: Should useRepaintBounds be on the LineLayoutState? // It appears to be used to track the case where we're only repainting a subset of our lines. 435641 1 100483 achicu 2011-07-12 07:34:23 -0700 Created attachment 100483 Patch 435842 2 achicu 2011-07-12 12:03:06 -0700 I'm trying to split the RenderBlock::layoutRunsAndFloats into smaller methods. In the end it should make it easier to fix floats bugs that affect CSS Columns. I will add a master bug for it. 436232 3 100483 morrita 2011-07-12 21:37:24 -0700 Comment on attachment 100483 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100483&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:853 > + bool useRepaintBounds() const { return m_useRepaintBounds; } "uses" or "shouldUse"? (I know original variable name was wrong....) > Source/WebCore/rendering/RenderBlockLineLayout.cpp:-1293 > - if (!useRepaintBounds) Could you elaborate why we don't need this? 436267 4 100483 achicu 2011-07-12 23:09:09 -0700 Comment on attachment 100483 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100483&action=review Thanks for the review! >> Source/WebCore/rendering/RenderBlockLineLayout.cpp:853 >> + bool useRepaintBounds() const { return m_useRepaintBounds; } > > "uses" or "shouldUse"? (I know original variable name was wrong....) Ok. >> Source/WebCore/rendering/RenderBlockLineLayout.cpp:-1293 >> - if (!useRepaintBounds) > > Could you elaborate why we don't need this? Every time the updateRepaintRangeFromBox was called there was an if (!useRepaintBounds) useRepaintBounds = true. So I've moved it to updateRepaintRangeFromBox and removed the if clause. It should be faster to just update it every time than to check it and update only if needed. 436307 5 100642 achicu 2011-07-13 01:43:14 -0700 Created attachment 100642 Patch - Changed useRepaintBounds to usesRepaintBounds. 437296 6 100642 tony 2011-07-14 13:47:40 -0700 Comment on attachment 100642 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100642&action=review > Source/WebCore/ChangeLog:8 > + No new tests needed. Please specify why no new tests are needed (e.g., because it's just a refactor). 437581 7 100935 achicu 2011-07-14 23:15:50 -0700 Created attachment 100935 Patch Thanks for review. I've added the reason in the ChangeLog file. I'm not a committer, so I'm uploading the file again for review. 437605 8 100935 webkit.review.bot 2011-07-15 00:23:14 -0700 Comment on attachment 100935 Patch Clearing flags on attachment: 100935 Committed r91057: <http://trac.webkit.org/changeset/91057> 437606 9 webkit.review.bot 2011-07-15 00:23:20 -0700 All reviewed patches have been landed. Closing bug. 438737 10 rniwa 2011-07-18 14:46:02 -0700 Some Chromium UI tests appear to start failing after this change but it's probably just a flake: http://build.chromium.org/p/chromium.webkit/builders/Mac10.6%20Tests/builds/5799 http://build.chromium.org/p/chromium.webkit/builders/Mac10.6%20Tests/builds/5800 100483 2011-07-12 07:34:23 -0700 2011-07-13 01:43:14 -0700 Patch bug64360.patch text/plain 7052 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMDQ1MzhlLi4xNjMxODQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDctMTIgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIE1vdmUgdXNlUmVwYWludEJvdW5kcyBmcm9tIFJlbmRlckJsb2NrOjpsYXlvdXRS dW5zQW5kRmxvYXRzIHRvIExpbmVMYXlvdXRTdGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQzNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2Nr TGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMaW5lTGF5b3V0U3RhdGU6OkxpbmVM YXlvdXRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpMaW5lTGF5b3V0U3RhdGU6OnVzZVJlcGFp bnRCb3VuZHMpOgorICAgICAgICAoV2ViQ29yZTo6TGluZUxheW91dFN0YXRlOjpzZXRSZXBhaW50 UmFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6TGluZUxheW91dFN0YXRlOjp1cGRhdGVSZXBhaW50 UmFuZ2VGcm9tQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRSdW5z QW5kRmxvYXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpkZXRlcm1pbmVTdGFy dFBvc2l0aW9uKToKKwogMjAxMS0wNy0xMSAgWmVuZyBIdWlxaW5nICA8aHVpcWluZy56ZW5nQGlu dGVsLmNvbT4KIAogICAgICAgICBPcHRpbWl6ZSBIVE1MSW5wdXRFbGVtZW50Ojp1cGRhdGVDaGVj a2VkUmFkaW9CdXR0b25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCmluZGV4 IDIzNDYyZDQuLjkxYWVmY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5o CkBAIC01NDMsNyArNTQzLDcgQEAgcHJpdmF0ZToKICAgICB9OwogCiAgICAgdm9pZCBjaGVja0Zs b2F0c0luQ2xlYW5MaW5lKFJvb3RJbmxpbmVCb3gqLCBWZWN0b3I8RmxvYXRXaXRoUmVjdD4mLCBz aXplX3QmIGZsb2F0SW5kZXgsIGJvb2wmIGVuY291bnRlcmVkTmV3RmxvYXQsIGJvb2wmIGRpcnRp ZWRCeUZsb2F0KTsKLSAgICBSb290SW5saW5lQm94KiBkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExp bmVMYXlvdXRTdGF0ZSYsIExpbmVJbmZvJiwgSW5saW5lQmlkaVJlc29sdmVyJiwgVmVjdG9yPEZs b2F0V2l0aFJlY3Q+JiwgdW5zaWduZWQmIG51bUNsZWFuRmxvYXRzLCBib29sJiB1c2VSZXBhaW50 Qm91bmRzKTsKKyAgICBSb290SW5saW5lQm94KiBkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExpbmVM YXlvdXRTdGF0ZSYsIExpbmVJbmZvJiwgSW5saW5lQmlkaVJlc29sdmVyJiwgVmVjdG9yPEZsb2F0 V2l0aFJlY3Q+JiwgdW5zaWduZWQmIG51bUNsZWFuRmxvYXRzKTsKICAgICBSb290SW5saW5lQm94 KiBkZXRlcm1pbmVFbmRQb3NpdGlvbihSb290SW5saW5lQm94KiBzdGFydEJveCwgVmVjdG9yPEZs b2F0V2l0aFJlY3Q+Jiwgc2l6ZV90IGZsb2F0SW5kZXgsIElubGluZUl0ZXJhdG9yJiBjbGVhbkxp bmVTdGFydCwgQmlkaVN0YXR1cyYgY2xlYW5MaW5lQmlkaVN0YXR1cywgaW50JiB5UG9zKTsKICAg ICBib29sIG1hdGNoZWRFbmRMaW5lKExpbmVMYXlvdXRTdGF0ZSYsIGNvbnN0IElubGluZUJpZGlS ZXNvbHZlciYsIGNvbnN0IElubGluZUl0ZXJhdG9yJiBlbmRMaW5lU3RhcnQsIGNvbnN0IEJpZGlT dGF0dXMmIGVuZExpbmVTdGF0dXMsIFJvb3RJbmxpbmVCb3gqJiBlbmRMaW5lLCBpbnQmIGVuZFlQ b3MpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tM aW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwCmluZGV4IGMzYzhkZTUuLmFlNjVkZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBAIC04NDQsMTQgKzg0NCwy MyBAQCBwdWJsaWM6CiAgICAgICAgIDogbV9pc0Z1bGxMYXlvdXQoZnVsbExheW91dCkKICAgICAg ICAgLCBtX3JlcGFpbnRMb2dpY2FsVG9wKHJlcGFpbnRMb2dpY2FsVG9wKQogICAgICAgICAsIG1f cmVwYWludExvZ2ljYWxCb3R0b20ocmVwYWludExvZ2ljYWxCb3R0b20pCisgICAgICAgICwgbV91 c2VSZXBhaW50Qm91bmRzKGZhbHNlKQogICAgIHsgfQogCiAgICAgdm9pZCBtYXJrRm9yRnVsbExh eW91dCgpIHsgbV9pc0Z1bGxMYXlvdXQgPSB0cnVlOyB9CiAgICAgYm9vbCBpc0Z1bGxMYXlvdXQo KSBjb25zdCB7IHJldHVybiBtX2lzRnVsbExheW91dDsgfQogCi0gICAgdm9pZCBzZXRSZXBhaW50 UmFuZ2UoaW50IGxvZ2ljYWxIZWlnaHQpIHsgbV9yZXBhaW50TG9naWNhbFRvcCA9IG1fcmVwYWlu dExvZ2ljYWxCb3R0b20gPSBsb2dpY2FsSGVpZ2h0OyB9CisgICAgYm9vbCB1c2VSZXBhaW50Qm91 bmRzKCkgY29uc3QgeyByZXR1cm4gbV91c2VSZXBhaW50Qm91bmRzOyB9CisKKyAgICB2b2lkIHNl dFJlcGFpbnRSYW5nZShpbnQgbG9naWNhbEhlaWdodCkKKyAgICB7IAorICAgICAgICBtX3VzZVJl cGFpbnRCb3VuZHMgPSB0cnVlOworICAgICAgICBtX3JlcGFpbnRMb2dpY2FsVG9wID0gbV9yZXBh aW50TG9naWNhbEJvdHRvbSA9IGxvZ2ljYWxIZWlnaHQ7IAorICAgIH0KKyAgICAKICAgICB2b2lk IHVwZGF0ZVJlcGFpbnRSYW5nZUZyb21Cb3goUm9vdElubGluZUJveCogYm94LCBpbnQgcGFnaW5h dGlvbkRlbHRhID0gMCkKICAgICB7CisgICAgICAgIG1fdXNlUmVwYWludEJvdW5kcyA9IHRydWU7 CiAgICAgICAgIG1fcmVwYWludExvZ2ljYWxUb3AgPSBtaW4obV9yZXBhaW50TG9naWNhbFRvcCwg Ym94LT5sb2dpY2FsVG9wVmlzdWFsT3ZlcmZsb3coKSArIG1pbihwYWdpbmF0aW9uRGVsdGEsIDAp KTsKICAgICAgICAgbV9yZXBhaW50TG9naWNhbEJvdHRvbSA9IG1heChtX3JlcGFpbnRMb2dpY2Fs Qm90dG9tLCBib3gtPmxvZ2ljYWxCb3R0b21WaXN1YWxPdmVyZmxvdygpICsgbWF4KHBhZ2luYXRp b25EZWx0YSwgMCkpOwogICAgIH0KQEAgLTg2Miw2ICs4NzEsOCBAQCBwcml2YXRlOgogICAgIC8v IEZJWE1FOiBTaG91bGQgdGhpcyBiZSBhIHJhbmdlIG9iamVjdCBpbnN0ZWFkIG9mIHR3byBpbnRz PwogICAgIGludCYgbV9yZXBhaW50TG9naWNhbFRvcDsKICAgICBpbnQmIG1fcmVwYWludExvZ2lj YWxCb3R0b207CisgICAgCisgICAgYm9vbCBtX3VzZVJlcGFpbnRCb3VuZHM7CiB9OwogCiBzdGF0 aWMgdm9pZCBkZWxldGVMaW5lUmFuZ2UoTGluZUxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgUmVu ZGVyQXJlbmEqIGFyZW5hLCBSb290SW5saW5lQm94KiBzdGFydExpbmUsIFJvb3RJbmxpbmVCb3gq IHN0b3BMaW5lID0gMCkKQEAgLTg4MywxMSArODk0LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5 b3V0UnVuc0FuZEZsb2F0cyhMaW5lTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBib29sIGhhc0lu bGkKICAgICBJbmxpbmVCaWRpUmVzb2x2ZXIgcmVzb2x2ZXI7CiAgICAgdW5zaWduZWQgZmxvYXRJ bmRleDsKICAgICBMaW5lSW5mbyBsaW5lSW5mbzsKLSAgICAvLyBGSVhNRTogU2hvdWxkIHVzZVJl cGFpbnRCb3VuZHMgYmUgb24gdGhlIExpbmVMYXlvdXRTdGF0ZT8KLSAgICAvLyBJdCBhcHBlYXJz IHRvIGJlIHVzZWQgdG8gdHJhY2sgdGhlIGNhc2Ugd2hlcmUgd2UncmUgb25seSByZXBhaW50aW5n IGEgc3Vic2V0IG9mIG91ciBsaW5lcy4KLSAgICBib29sIHVzZVJlcGFpbnRCb3VuZHMgPSBmYWxz ZTsKLQotICAgIFJvb3RJbmxpbmVCb3gqIHN0YXJ0TGluZSA9IGRldGVybWluZVN0YXJ0UG9zaXRp b24obGF5b3V0U3RhdGUsIGxpbmVJbmZvLCByZXNvbHZlciwgZmxvYXRzLCBmbG9hdEluZGV4LCB1 c2VSZXBhaW50Qm91bmRzKTsKKyAgICBSb290SW5saW5lQm94KiBzdGFydExpbmUgPSBkZXRlcm1p bmVTdGFydFBvc2l0aW9uKGxheW91dFN0YXRlLCBsaW5lSW5mbywgcmVzb2x2ZXIsIGZsb2F0cywg ZmxvYXRJbmRleCk7CiAKICAgICAvLyBGSVhNRTogVGhpcyB3b3VsZCBtYWtlIG1vcmUgc2Vuc2Ug b3V0c2lkZSBvZiB0aGlzIGZ1bmN0aW9uLCBidXQgc2luY2UKICAgICAvLyBkZXRlcm1pbmVTdGFy dFBvc2l0aW9uIGNhbiBjaGFuZ2UgdGhlIGZ1bGxMYXlvdXQgZmxhZyB3ZSBoYXZlIHRvIGRvIHRo aXMgaGVyZS4gRmFpbHVyZSB0byBjYWxsCkBAIC05MTgsMTAgKzkyNSw4IEBAIHZvaWQgUmVuZGVy QmxvY2s6OmxheW91dFJ1bnNBbmRGbG9hdHMoTGluZUxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwg Ym9vbCBoYXNJbmxpCiAgICAgICAgIDAgOiBkZXRlcm1pbmVFbmRQb3NpdGlvbihzdGFydExpbmUs IGZsb2F0cywgZmxvYXRJbmRleCwgY2xlYW5MaW5lU3RhcnQsIGNsZWFuTGluZUJpZGlTdGF0dXMs IGVuZExpbmVMb2dpY2FsVG9wKTsKIAogICAgIGlmIChzdGFydExpbmUpIHsKLSAgICAgICAgaWYg KCF1c2VSZXBhaW50Qm91bmRzKSB7Ci0gICAgICAgICAgICB1c2VSZXBhaW50Qm91bmRzID0gdHJ1 ZTsKKyAgICAgICAgaWYgKCFsYXlvdXRTdGF0ZS51c2VSZXBhaW50Qm91bmRzKCkpCiAgICAgICAg ICAgICBsYXlvdXRTdGF0ZS5zZXRSZXBhaW50UmFuZ2UobG9naWNhbEhlaWdodCgpKTsKLSAgICAg ICAgfQogICAgICAgICBkZWxldGVMaW5lUmFuZ2UobGF5b3V0U3RhdGUsIHJlbmRlckFyZW5hKCks IHN0YXJ0TGluZSk7CiAgICAgfQogCkBAIC0xMDExLDcgKzEwMTYsNyBAQCB2b2lkIFJlbmRlckJs b2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGJv b2wgaGFzSW5saQogCiAgICAgICAgICAgICBpZiAobGluZUJveCkgewogICAgICAgICAgICAgICAg IGxpbmVCb3gtPnNldExpbmVCcmVha0luZm8oZW5kLm1fb2JqLCBlbmQubV9wb3MsIHJlc29sdmVy LnN0YXR1cygpKTsKLSAgICAgICAgICAgICAgICBpZiAodXNlUmVwYWludEJvdW5kcykKKyAgICAg ICAgICAgICAgICBpZiAobGF5b3V0U3RhdGUudXNlUmVwYWludEJvdW5kcygpKQogICAgICAgICAg ICAgICAgICAgICBsYXlvdXRTdGF0ZS51cGRhdGVSZXBhaW50UmFuZ2VGcm9tQm94KGxpbmVCb3gp OwogCiAgICAgICAgICAgICAgICAgaWYgKHBhZ2luYXRlZCkgewpAQCAtMTAyMCw3ICsxMDI1LDcg QEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0UnVuc0FuZEZsb2F0cyhMaW5lTGF5b3V0U3RhdGUm IGxheW91dFN0YXRlLCBib29sIGhhc0lubGkKICAgICAgICAgICAgICAgICAgICAgaWYgKGFkanVz dG1lbnQpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGludCBvbGRMaW5lV2lkdGggPSBhdmFp bGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKG9sZExvZ2ljYWxIZWlnaHQsIGxpbmVJbmZvLmlzRmly c3RMaW5lKCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgbGluZUJveC0+YWRqdXN0QmxvY2tE aXJlY3Rpb25Qb3NpdGlvbihhZGp1c3RtZW50KTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlm ICh1c2VSZXBhaW50Qm91bmRzKQorICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGxheW91dFN0 YXRlLnVzZVJlcGFpbnRCb3VuZHMoKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXlv dXRTdGF0ZS51cGRhdGVSZXBhaW50UmFuZ2VGcm9tQm94KGxpbmVCb3gpOwogCiAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAoYXZhaWxhYmxlTG9naWNhbFdpZHRoRm9yTGluZShvbGRMb2dpY2Fs SGVpZ2h0ICsgYWRqdXN0bWVudCwgbGluZUluZm8uaXNGaXJzdExpbmUoKSkgIT0gb2xkTGluZVdp ZHRoKSB7CkBAIC0xMjY3LDcgKzEyNzIsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjaGVja0Zsb2F0 c0luQ2xlYW5MaW5lKFJvb3RJbmxpbmVCb3gqIGxpbmUsIFZlY3RvcjxGbG9hdFdpdGhSZQogfQog CiBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lU3RhcnRQb3NpdGlvbihMaW5l TGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBMaW5lSW5mbyYgbGluZUluZm8sIElubGluZUJpZGlS ZXNvbHZlciYgcmVzb2x2ZXIsIFZlY3RvcjxGbG9hdFdpdGhSZWN0PiYgZmxvYXRzLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQmIG51 bUNsZWFuRmxvYXRzLCBib29sJiB1c2VSZXBhaW50Qm91bmRzKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQmIG51bUNsZWFuRmxvYXRz KQogewogICAgIFJvb3RJbmxpbmVCb3gqIGN1cnIgPSAwOwogICAgIFJvb3RJbmxpbmVCb3gqIGxh c3QgPSAwOwpAQCAtMTI5MCw5ICsxMjk1LDYgQEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2s6 OmRldGVybWluZVN0YXJ0UG9zaXRpb24oTGluZUxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwKICAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICB9CiAKLSAg ICAgICAgICAgICAgICAgICAgaWYgKCF1c2VSZXBhaW50Qm91bmRzKQotICAgICAgICAgICAgICAg ICAgICAgICAgdXNlUmVwYWludEJvdW5kcyA9IHRydWU7Ci0KICAgICAgICAgICAgICAgICAgICAg bGF5b3V0U3RhdGUudXBkYXRlUmVwYWludFJhbmdlRnJvbUJveChjdXJyLCBwYWdpbmF0aW9uRGVs dGEpOwogICAgICAgICAgICAgICAgICAgICBjdXJyLT5hZGp1c3RCbG9ja0RpcmVjdGlvblBvc2l0 aW9uKHBhZ2luYXRpb25EZWx0YSk7CiAgICAgICAgICAgICAgICAgfQo= 100642 2011-07-13 01:43:14 -0700 2011-07-14 23:15:50 -0700 Patch bug64360_1.patch text/plain 7087 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NTRmYTQwLi4wMjY2YzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDctMTMgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIE1vdmUgdXNlUmVwYWludEJvdW5kcyBmcm9tIFJlbmRlckJsb2NrOjpsYXlvdXRS dW5zQW5kRmxvYXRzIHRvIExpbmVMYXlvdXRTdGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQzNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2Nr TGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMaW5lTGF5b3V0U3RhdGU6OkxpbmVM YXlvdXRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpMaW5lTGF5b3V0U3RhdGU6OnVzZXNSZXBh aW50Qm91bmRzKToKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVMYXlvdXRTdGF0ZTo6c2V0UmVwYWlu dFJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVMYXlvdXRTdGF0ZTo6dXBkYXRlUmVwYWlu dFJhbmdlRnJvbUJveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0UnVu c0FuZEZsb2F0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lU3Rh cnRQb3NpdGlvbik6CisKIDIwMTEtMDctMTIgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2ds ZS5jb20+CiAKICAgICAgICAgW1JlZmFjdG9yaW5nXVtTaGFkb3dDb250ZW50RWxlbWVudF0gRm9y d2FyZGVkIG5vZGUgbGlzdCBzaG91bGQgYmUgYSBsaW5rZWQtbGlzdC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggMDI2NGJhNC4uNTAwZGY3NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTU0Myw3ICs1NDMsNyBAQCBwcml2YXRlOgog ICAgIH07CiAKICAgICB2b2lkIGNoZWNrRmxvYXRzSW5DbGVhbkxpbmUoUm9vdElubGluZUJveCos IFZlY3RvcjxGbG9hdFdpdGhSZWN0PiYsIHNpemVfdCYgZmxvYXRJbmRleCwgYm9vbCYgZW5jb3Vu dGVyZWROZXdGbG9hdCwgYm9vbCYgZGlydGllZEJ5RmxvYXQpOwotICAgIFJvb3RJbmxpbmVCb3gq IGRldGVybWluZVN0YXJ0UG9zaXRpb24oTGluZUxheW91dFN0YXRlJiwgTGluZUluZm8mLCBJbmxp bmVCaWRpUmVzb2x2ZXImLCBWZWN0b3I8RmxvYXRXaXRoUmVjdD4mLCB1bnNpZ25lZCYgbnVtQ2xl YW5GbG9hdHMsIGJvb2wmIHVzZVJlcGFpbnRCb3VuZHMpOworICAgIFJvb3RJbmxpbmVCb3gqIGRl dGVybWluZVN0YXJ0UG9zaXRpb24oTGluZUxheW91dFN0YXRlJiwgTGluZUluZm8mLCBJbmxpbmVC aWRpUmVzb2x2ZXImLCBWZWN0b3I8RmxvYXRXaXRoUmVjdD4mLCB1bnNpZ25lZCYgbnVtQ2xlYW5G bG9hdHMpOwogICAgIFJvb3RJbmxpbmVCb3gqIGRldGVybWluZUVuZFBvc2l0aW9uKFJvb3RJbmxp bmVCb3gqIHN0YXJ0Qm94LCBWZWN0b3I8RmxvYXRXaXRoUmVjdD4mLCBzaXplX3QgZmxvYXRJbmRl eCwgSW5saW5lSXRlcmF0b3ImIGNsZWFuTGluZVN0YXJ0LCBCaWRpU3RhdHVzJiBjbGVhbkxpbmVC aWRpU3RhdHVzLCBpbnQmIHlQb3MpOwogICAgIGJvb2wgbWF0Y2hlZEVuZExpbmUoTGluZUxheW91 dFN0YXRlJiwgY29uc3QgSW5saW5lQmlkaVJlc29sdmVyJiwgY29uc3QgSW5saW5lSXRlcmF0b3Im IGVuZExpbmVTdGFydCwgY29uc3QgQmlkaVN0YXR1cyYgZW5kTGluZVN0YXR1cywgUm9vdElubGlu ZUJveComIGVuZExpbmUsIGludCYgZW5kWVBvcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKaW5kZXggYzNjOGRlNS4uMzE2MzE1 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxh eW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxh eW91dC5jcHAKQEAgLTg0NCwxNCArODQ0LDIzIEBAIHB1YmxpYzoKICAgICAgICAgOiBtX2lzRnVs bExheW91dChmdWxsTGF5b3V0KQogICAgICAgICAsIG1fcmVwYWludExvZ2ljYWxUb3AocmVwYWlu dExvZ2ljYWxUb3ApCiAgICAgICAgICwgbV9yZXBhaW50TG9naWNhbEJvdHRvbShyZXBhaW50TG9n aWNhbEJvdHRvbSkKKyAgICAgICAgLCBtX3VzZXNSZXBhaW50Qm91bmRzKGZhbHNlKQogICAgIHsg fQogCiAgICAgdm9pZCBtYXJrRm9yRnVsbExheW91dCgpIHsgbV9pc0Z1bGxMYXlvdXQgPSB0cnVl OyB9CiAgICAgYm9vbCBpc0Z1bGxMYXlvdXQoKSBjb25zdCB7IHJldHVybiBtX2lzRnVsbExheW91 dDsgfQogCi0gICAgdm9pZCBzZXRSZXBhaW50UmFuZ2UoaW50IGxvZ2ljYWxIZWlnaHQpIHsgbV9y ZXBhaW50TG9naWNhbFRvcCA9IG1fcmVwYWludExvZ2ljYWxCb3R0b20gPSBsb2dpY2FsSGVpZ2h0 OyB9CisgICAgYm9vbCB1c2VzUmVwYWludEJvdW5kcygpIGNvbnN0IHsgcmV0dXJuIG1fdXNlc1Jl cGFpbnRCb3VuZHM7IH0KKworICAgIHZvaWQgc2V0UmVwYWludFJhbmdlKGludCBsb2dpY2FsSGVp Z2h0KQorICAgIHsgCisgICAgICAgIG1fdXNlc1JlcGFpbnRCb3VuZHMgPSB0cnVlOworICAgICAg ICBtX3JlcGFpbnRMb2dpY2FsVG9wID0gbV9yZXBhaW50TG9naWNhbEJvdHRvbSA9IGxvZ2ljYWxI ZWlnaHQ7IAorICAgIH0KKyAgICAKICAgICB2b2lkIHVwZGF0ZVJlcGFpbnRSYW5nZUZyb21Cb3go Um9vdElubGluZUJveCogYm94LCBpbnQgcGFnaW5hdGlvbkRlbHRhID0gMCkKICAgICB7CisgICAg ICAgIG1fdXNlc1JlcGFpbnRCb3VuZHMgPSB0cnVlOwogICAgICAgICBtX3JlcGFpbnRMb2dpY2Fs VG9wID0gbWluKG1fcmVwYWludExvZ2ljYWxUb3AsIGJveC0+bG9naWNhbFRvcFZpc3VhbE92ZXJm bG93KCkgKyBtaW4ocGFnaW5hdGlvbkRlbHRhLCAwKSk7CiAgICAgICAgIG1fcmVwYWludExvZ2lj YWxCb3R0b20gPSBtYXgobV9yZXBhaW50TG9naWNhbEJvdHRvbSwgYm94LT5sb2dpY2FsQm90dG9t VmlzdWFsT3ZlcmZsb3coKSArIG1heChwYWdpbmF0aW9uRGVsdGEsIDApKTsKICAgICB9CkBAIC04 NjIsNiArODcxLDggQEAgcHJpdmF0ZToKICAgICAvLyBGSVhNRTogU2hvdWxkIHRoaXMgYmUgYSBy YW5nZSBvYmplY3QgaW5zdGVhZCBvZiB0d28gaW50cz8KICAgICBpbnQmIG1fcmVwYWludExvZ2lj YWxUb3A7CiAgICAgaW50JiBtX3JlcGFpbnRMb2dpY2FsQm90dG9tOworICAgIAorICAgIGJvb2wg bV91c2VzUmVwYWludEJvdW5kczsKIH07CiAKIHN0YXRpYyB2b2lkIGRlbGV0ZUxpbmVSYW5nZShM aW5lTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBSZW5kZXJBcmVuYSogYXJlbmEsIFJvb3RJbmxp bmVCb3gqIHN0YXJ0TGluZSwgUm9vdElubGluZUJveCogc3RvcExpbmUgPSAwKQpAQCAtODgzLDEx ICs4OTQsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKExpbmVMYXlv dXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGJvb2wgaGFzSW5saQogICAgIElubGluZUJpZGlSZXNvbHZl ciByZXNvbHZlcjsKICAgICB1bnNpZ25lZCBmbG9hdEluZGV4OwogICAgIExpbmVJbmZvIGxpbmVJ bmZvOwotICAgIC8vIEZJWE1FOiBTaG91bGQgdXNlUmVwYWludEJvdW5kcyBiZSBvbiB0aGUgTGlu ZUxheW91dFN0YXRlPwotICAgIC8vIEl0IGFwcGVhcnMgdG8gYmUgdXNlZCB0byB0cmFjayB0aGUg Y2FzZSB3aGVyZSB3ZSdyZSBvbmx5IHJlcGFpbnRpbmcgYSBzdWJzZXQgb2Ygb3VyIGxpbmVzLgot ICAgIGJvb2wgdXNlUmVwYWludEJvdW5kcyA9IGZhbHNlOwotCi0gICAgUm9vdElubGluZUJveCog c3RhcnRMaW5lID0gZGV0ZXJtaW5lU3RhcnRQb3NpdGlvbihsYXlvdXRTdGF0ZSwgbGluZUluZm8s IHJlc29sdmVyLCBmbG9hdHMsIGZsb2F0SW5kZXgsIHVzZVJlcGFpbnRCb3VuZHMpOworICAgIFJv b3RJbmxpbmVCb3gqIHN0YXJ0TGluZSA9IGRldGVybWluZVN0YXJ0UG9zaXRpb24obGF5b3V0U3Rh dGUsIGxpbmVJbmZvLCByZXNvbHZlciwgZmxvYXRzLCBmbG9hdEluZGV4KTsKIAogICAgIC8vIEZJ WE1FOiBUaGlzIHdvdWxkIG1ha2UgbW9yZSBzZW5zZSBvdXRzaWRlIG9mIHRoaXMgZnVuY3Rpb24s IGJ1dCBzaW5jZQogICAgIC8vIGRldGVybWluZVN0YXJ0UG9zaXRpb24gY2FuIGNoYW5nZSB0aGUg ZnVsbExheW91dCBmbGFnIHdlIGhhdmUgdG8gZG8gdGhpcyBoZXJlLiBGYWlsdXJlIHRvIGNhbGwK QEAgLTkxOCwxMCArOTI1LDggQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0UnVuc0FuZEZsb2F0 cyhMaW5lTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBib29sIGhhc0lubGkKICAgICAgICAgMCA6 IGRldGVybWluZUVuZFBvc2l0aW9uKHN0YXJ0TGluZSwgZmxvYXRzLCBmbG9hdEluZGV4LCBjbGVh bkxpbmVTdGFydCwgY2xlYW5MaW5lQmlkaVN0YXR1cywgZW5kTGluZUxvZ2ljYWxUb3ApOwogCiAg ICAgaWYgKHN0YXJ0TGluZSkgewotICAgICAgICBpZiAoIXVzZVJlcGFpbnRCb3VuZHMpIHsKLSAg ICAgICAgICAgIHVzZVJlcGFpbnRCb3VuZHMgPSB0cnVlOworICAgICAgICBpZiAoIWxheW91dFN0 YXRlLnVzZXNSZXBhaW50Qm91bmRzKCkpCiAgICAgICAgICAgICBsYXlvdXRTdGF0ZS5zZXRSZXBh aW50UmFuZ2UobG9naWNhbEhlaWdodCgpKTsKLSAgICAgICAgfQogICAgICAgICBkZWxldGVMaW5l UmFuZ2UobGF5b3V0U3RhdGUsIHJlbmRlckFyZW5hKCksIHN0YXJ0TGluZSk7CiAgICAgfQogCkBA IC0xMDExLDcgKzEwMTYsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRz KExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGJvb2wgaGFzSW5saQogCiAgICAgICAgICAg ICBpZiAobGluZUJveCkgewogICAgICAgICAgICAgICAgIGxpbmVCb3gtPnNldExpbmVCcmVha0lu Zm8oZW5kLm1fb2JqLCBlbmQubV9wb3MsIHJlc29sdmVyLnN0YXR1cygpKTsKLSAgICAgICAgICAg ICAgICBpZiAodXNlUmVwYWludEJvdW5kcykKKyAgICAgICAgICAgICAgICBpZiAobGF5b3V0U3Rh dGUudXNlc1JlcGFpbnRCb3VuZHMoKSkKICAgICAgICAgICAgICAgICAgICAgbGF5b3V0U3RhdGUu dXBkYXRlUmVwYWludFJhbmdlRnJvbUJveChsaW5lQm94KTsKIAogICAgICAgICAgICAgICAgIGlm IChwYWdpbmF0ZWQpIHsKQEAgLTEwMjAsNyArMTAyNSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6Omxh eW91dFJ1bnNBbmRGbG9hdHMoTGluZUxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgYm9vbCBoYXNJ bmxpCiAgICAgICAgICAgICAgICAgICAgIGlmIChhZGp1c3RtZW50KSB7CiAgICAgICAgICAgICAg ICAgICAgICAgICBpbnQgb2xkTGluZVdpZHRoID0gYXZhaWxhYmxlTG9naWNhbFdpZHRoRm9yTGlu ZShvbGRMb2dpY2FsSGVpZ2h0LCBsaW5lSW5mby5pc0ZpcnN0TGluZSgpKTsKICAgICAgICAgICAg ICAgICAgICAgICAgIGxpbmVCb3gtPmFkanVzdEJsb2NrRGlyZWN0aW9uUG9zaXRpb24oYWRqdXN0 bWVudCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAodXNlUmVwYWludEJvdW5kcykKKyAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChsYXlvdXRTdGF0ZS51c2VzUmVwYWludEJvdW5kcygp KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxheW91dFN0YXRlLnVwZGF0ZVJlcGFpbnRS YW5nZUZyb21Cb3gobGluZUJveCk7CiAKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChhdmFp bGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKG9sZExvZ2ljYWxIZWlnaHQgKyBhZGp1c3RtZW50LCBs aW5lSW5mby5pc0ZpcnN0TGluZSgpKSAhPSBvbGRMaW5lV2lkdGgpIHsKQEAgLTEyNjcsNyArMTI3 Miw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNoZWNrRmxvYXRzSW5DbGVhbkxpbmUoUm9vdElubGlu ZUJveCogbGluZSwgVmVjdG9yPEZsb2F0V2l0aFJlCiB9CiAKIFJvb3RJbmxpbmVCb3gqIFJlbmRl ckJsb2NrOjpkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3Rh dGUsIExpbmVJbmZvJiBsaW5lSW5mbywgSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgVmVj dG9yPEZsb2F0V2l0aFJlY3Q+JiBmbG9hdHMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCYgbnVtQ2xlYW5GbG9hdHMsIGJvb2wmIHVz ZVJlcGFpbnRCb3VuZHMpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCYgbnVtQ2xlYW5GbG9hdHMpCiB7CiAgICAgUm9vdElubGluZUJv eCogY3VyciA9IDA7CiAgICAgUm9vdElubGluZUJveCogbGFzdCA9IDA7CkBAIC0xMjkwLDkgKzEy OTUsNiBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lU3RhcnRQb3NpdGlv bihMaW5lTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLAogICAgICAgICAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgICAgICBpZiAo IXVzZVJlcGFpbnRCb3VuZHMpCi0gICAgICAgICAgICAgICAgICAgICAgICB1c2VSZXBhaW50Qm91 bmRzID0gdHJ1ZTsKLQogICAgICAgICAgICAgICAgICAgICBsYXlvdXRTdGF0ZS51cGRhdGVSZXBh aW50UmFuZ2VGcm9tQm94KGN1cnIsIHBhZ2luYXRpb25EZWx0YSk7CiAgICAgICAgICAgICAgICAg ICAgIGN1cnItPmFkanVzdEJsb2NrRGlyZWN0aW9uUG9zaXRpb24ocGFnaW5hdGlvbkRlbHRhKTsK ICAgICAgICAgICAgICAgICB9Cg== 100935 2011-07-14 23:15:50 -0700 2011-07-15 00:23:14 -0700 Patch bug64360_2.patch text/plain 7166 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2NGQ4N2VmLi44MjcyZmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDctMTQgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIE1vdmUgdXNlUmVwYWludEJvdW5kcyBmcm9tIFJlbmRlckJsb2NrOjpsYXlvdXRS dW5zQW5kRmxvYXRzIHRvIExpbmVMYXlvdXRTdGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQzNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkIGJlY2F1c2UgdGhlIHBh dGNoIGlzIGp1c3QgYSByZWZhY3Rvci4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9j ay5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGluZUxheW91dFN0YXRlOjpMaW5lTGF5b3V0U3RhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6TGluZUxheW91dFN0YXRlOjp1c2VzUmVwYWludEJvdW5kcyk6CisgICAgICAg IChXZWJDb3JlOjpMaW5lTGF5b3V0U3RhdGU6OnNldFJlcGFpbnRSYW5nZSk6CisgICAgICAgIChX ZWJDb3JlOjpMaW5lTGF5b3V0U3RhdGU6OnVwZGF0ZVJlcGFpbnRSYW5nZUZyb21Cb3gpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmxheW91dFJ1bnNBbmRGbG9hdHMpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmRldGVybWluZVN0YXJ0UG9zaXRpb24pOgorCiAyMDEx LTA3LTE0ICBTcmF2YW5LdW1hciBTICA8c3JhdmFuLmtlbkBnbWFpbC5jb20+CiAKICAgICAgICAg UmVwbGFjZWQgaXNDaGVja2VkKCkgd2l0aCBzaG91bGRBcHBlYXJDaGVja2VkKCkgaW4gSFRNTElu cHV0RWxlbWVudC5jcHAgYWxvbmcgd2l0aCBhbGwgdGhlIGNvcnJlc3BvbmRpbmcgZnVuY3Rpb24g Y2FsbHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCmluZGV4IDI4ZDI1ZjAu LjIzNTkyZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCkBAIC01NDMs NyArNTQzLDcgQEAgcHJpdmF0ZToKICAgICB9OwogCiAgICAgdm9pZCBjaGVja0Zsb2F0c0luQ2xl YW5MaW5lKFJvb3RJbmxpbmVCb3gqLCBWZWN0b3I8RmxvYXRXaXRoUmVjdD4mLCBzaXplX3QmIGZs b2F0SW5kZXgsIGJvb2wmIGVuY291bnRlcmVkTmV3RmxvYXQsIGJvb2wmIGRpcnRpZWRCeUZsb2F0 KTsKLSAgICBSb290SW5saW5lQm94KiBkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExpbmVMYXlvdXRT dGF0ZSYsIExpbmVJbmZvJiwgSW5saW5lQmlkaVJlc29sdmVyJiwgVmVjdG9yPEZsb2F0V2l0aFJl Y3Q+JiwgdW5zaWduZWQmIG51bUNsZWFuRmxvYXRzLCBib29sJiB1c2VSZXBhaW50Qm91bmRzKTsK KyAgICBSb290SW5saW5lQm94KiBkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExpbmVMYXlvdXRTdGF0 ZSYsIExpbmVJbmZvJiwgSW5saW5lQmlkaVJlc29sdmVyJiwgVmVjdG9yPEZsb2F0V2l0aFJlY3Q+ JiwgdW5zaWduZWQmIG51bUNsZWFuRmxvYXRzKTsKICAgICBSb290SW5saW5lQm94KiBkZXRlcm1p bmVFbmRQb3NpdGlvbihSb290SW5saW5lQm94KiBzdGFydEJveCwgVmVjdG9yPEZsb2F0V2l0aFJl Y3Q+Jiwgc2l6ZV90IGZsb2F0SW5kZXgsIElubGluZUl0ZXJhdG9yJiBjbGVhbkxpbmVTdGFydCwg QmlkaVN0YXR1cyYgY2xlYW5MaW5lQmlkaVN0YXR1cywgaW50JiB5UG9zKTsKICAgICBib29sIG1h dGNoZWRFbmRMaW5lKExpbmVMYXlvdXRTdGF0ZSYsIGNvbnN0IElubGluZUJpZGlSZXNvbHZlciYs IGNvbnN0IElubGluZUl0ZXJhdG9yJiBlbmRMaW5lU3RhcnQsIGNvbnN0IEJpZGlTdGF0dXMmIGVu ZExpbmVTdGF0dXMsIFJvb3RJbmxpbmVCb3gqJiBlbmRMaW5lLCBpbnQmIGVuZFlQb3MpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3Bw CmluZGV4IGMzYzhkZTUuLjMxNjMxNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBAIC04NDQsMTQgKzg0NCwyMyBAQCBwdWJs aWM6CiAgICAgICAgIDogbV9pc0Z1bGxMYXlvdXQoZnVsbExheW91dCkKICAgICAgICAgLCBtX3Jl cGFpbnRMb2dpY2FsVG9wKHJlcGFpbnRMb2dpY2FsVG9wKQogICAgICAgICAsIG1fcmVwYWludExv Z2ljYWxCb3R0b20ocmVwYWludExvZ2ljYWxCb3R0b20pCisgICAgICAgICwgbV91c2VzUmVwYWlu dEJvdW5kcyhmYWxzZSkKICAgICB7IH0KIAogICAgIHZvaWQgbWFya0ZvckZ1bGxMYXlvdXQoKSB7 IG1faXNGdWxsTGF5b3V0ID0gdHJ1ZTsgfQogICAgIGJvb2wgaXNGdWxsTGF5b3V0KCkgY29uc3Qg eyByZXR1cm4gbV9pc0Z1bGxMYXlvdXQ7IH0KIAotICAgIHZvaWQgc2V0UmVwYWludFJhbmdlKGlu dCBsb2dpY2FsSGVpZ2h0KSB7IG1fcmVwYWludExvZ2ljYWxUb3AgPSBtX3JlcGFpbnRMb2dpY2Fs Qm90dG9tID0gbG9naWNhbEhlaWdodDsgfQorICAgIGJvb2wgdXNlc1JlcGFpbnRCb3VuZHMoKSBj b25zdCB7IHJldHVybiBtX3VzZXNSZXBhaW50Qm91bmRzOyB9CisKKyAgICB2b2lkIHNldFJlcGFp bnRSYW5nZShpbnQgbG9naWNhbEhlaWdodCkKKyAgICB7IAorICAgICAgICBtX3VzZXNSZXBhaW50 Qm91bmRzID0gdHJ1ZTsKKyAgICAgICAgbV9yZXBhaW50TG9naWNhbFRvcCA9IG1fcmVwYWludExv Z2ljYWxCb3R0b20gPSBsb2dpY2FsSGVpZ2h0OyAKKyAgICB9CisgICAgCiAgICAgdm9pZCB1cGRh dGVSZXBhaW50UmFuZ2VGcm9tQm94KFJvb3RJbmxpbmVCb3gqIGJveCwgaW50IHBhZ2luYXRpb25E ZWx0YSA9IDApCiAgICAgeworICAgICAgICBtX3VzZXNSZXBhaW50Qm91bmRzID0gdHJ1ZTsKICAg ICAgICAgbV9yZXBhaW50TG9naWNhbFRvcCA9IG1pbihtX3JlcGFpbnRMb2dpY2FsVG9wLCBib3gt PmxvZ2ljYWxUb3BWaXN1YWxPdmVyZmxvdygpICsgbWluKHBhZ2luYXRpb25EZWx0YSwgMCkpOwog ICAgICAgICBtX3JlcGFpbnRMb2dpY2FsQm90dG9tID0gbWF4KG1fcmVwYWludExvZ2ljYWxCb3R0 b20sIGJveC0+bG9naWNhbEJvdHRvbVZpc3VhbE92ZXJmbG93KCkgKyBtYXgocGFnaW5hdGlvbkRl bHRhLCAwKSk7CiAgICAgfQpAQCAtODYyLDYgKzg3MSw4IEBAIHByaXZhdGU6CiAgICAgLy8gRklY TUU6IFNob3VsZCB0aGlzIGJlIGEgcmFuZ2Ugb2JqZWN0IGluc3RlYWQgb2YgdHdvIGludHM/CiAg ICAgaW50JiBtX3JlcGFpbnRMb2dpY2FsVG9wOwogICAgIGludCYgbV9yZXBhaW50TG9naWNhbEJv dHRvbTsKKyAgICAKKyAgICBib29sIG1fdXNlc1JlcGFpbnRCb3VuZHM7CiB9OwogCiBzdGF0aWMg dm9pZCBkZWxldGVMaW5lUmFuZ2UoTGluZUxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgUmVuZGVy QXJlbmEqIGFyZW5hLCBSb290SW5saW5lQm94KiBzdGFydExpbmUsIFJvb3RJbmxpbmVCb3gqIHN0 b3BMaW5lID0gMCkKQEAgLTg4MywxMSArODk0LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0 UnVuc0FuZEZsb2F0cyhMaW5lTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBib29sIGhhc0lubGkK ICAgICBJbmxpbmVCaWRpUmVzb2x2ZXIgcmVzb2x2ZXI7CiAgICAgdW5zaWduZWQgZmxvYXRJbmRl eDsKICAgICBMaW5lSW5mbyBsaW5lSW5mbzsKLSAgICAvLyBGSVhNRTogU2hvdWxkIHVzZVJlcGFp bnRCb3VuZHMgYmUgb24gdGhlIExpbmVMYXlvdXRTdGF0ZT8KLSAgICAvLyBJdCBhcHBlYXJzIHRv IGJlIHVzZWQgdG8gdHJhY2sgdGhlIGNhc2Ugd2hlcmUgd2UncmUgb25seSByZXBhaW50aW5nIGEg c3Vic2V0IG9mIG91ciBsaW5lcy4KLSAgICBib29sIHVzZVJlcGFpbnRCb3VuZHMgPSBmYWxzZTsK LQotICAgIFJvb3RJbmxpbmVCb3gqIHN0YXJ0TGluZSA9IGRldGVybWluZVN0YXJ0UG9zaXRpb24o bGF5b3V0U3RhdGUsIGxpbmVJbmZvLCByZXNvbHZlciwgZmxvYXRzLCBmbG9hdEluZGV4LCB1c2VS ZXBhaW50Qm91bmRzKTsKKyAgICBSb290SW5saW5lQm94KiBzdGFydExpbmUgPSBkZXRlcm1pbmVT dGFydFBvc2l0aW9uKGxheW91dFN0YXRlLCBsaW5lSW5mbywgcmVzb2x2ZXIsIGZsb2F0cywgZmxv YXRJbmRleCk7CiAKICAgICAvLyBGSVhNRTogVGhpcyB3b3VsZCBtYWtlIG1vcmUgc2Vuc2Ugb3V0 c2lkZSBvZiB0aGlzIGZ1bmN0aW9uLCBidXQgc2luY2UKICAgICAvLyBkZXRlcm1pbmVTdGFydFBv c2l0aW9uIGNhbiBjaGFuZ2UgdGhlIGZ1bGxMYXlvdXQgZmxhZyB3ZSBoYXZlIHRvIGRvIHRoaXMg aGVyZS4gRmFpbHVyZSB0byBjYWxsCkBAIC05MTgsMTAgKzkyNSw4IEBAIHZvaWQgUmVuZGVyQmxv Y2s6OmxheW91dFJ1bnNBbmRGbG9hdHMoTGluZUxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgYm9v bCBoYXNJbmxpCiAgICAgICAgIDAgOiBkZXRlcm1pbmVFbmRQb3NpdGlvbihzdGFydExpbmUsIGZs b2F0cywgZmxvYXRJbmRleCwgY2xlYW5MaW5lU3RhcnQsIGNsZWFuTGluZUJpZGlTdGF0dXMsIGVu ZExpbmVMb2dpY2FsVG9wKTsKIAogICAgIGlmIChzdGFydExpbmUpIHsKLSAgICAgICAgaWYgKCF1 c2VSZXBhaW50Qm91bmRzKSB7Ci0gICAgICAgICAgICB1c2VSZXBhaW50Qm91bmRzID0gdHJ1ZTsK KyAgICAgICAgaWYgKCFsYXlvdXRTdGF0ZS51c2VzUmVwYWludEJvdW5kcygpKQogICAgICAgICAg ICAgbGF5b3V0U3RhdGUuc2V0UmVwYWludFJhbmdlKGxvZ2ljYWxIZWlnaHQoKSk7Ci0gICAgICAg IH0KICAgICAgICAgZGVsZXRlTGluZVJhbmdlKGxheW91dFN0YXRlLCByZW5kZXJBcmVuYSgpLCBz dGFydExpbmUpOwogICAgIH0KIApAQCAtMTAxMSw3ICsxMDE2LDcgQEAgdm9pZCBSZW5kZXJCbG9j azo6bGF5b3V0UnVuc0FuZEZsb2F0cyhMaW5lTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBib29s IGhhc0lubGkKIAogICAgICAgICAgICAgaWYgKGxpbmVCb3gpIHsKICAgICAgICAgICAgICAgICBs aW5lQm94LT5zZXRMaW5lQnJlYWtJbmZvKGVuZC5tX29iaiwgZW5kLm1fcG9zLCByZXNvbHZlci5z dGF0dXMoKSk7Ci0gICAgICAgICAgICAgICAgaWYgKHVzZVJlcGFpbnRCb3VuZHMpCisgICAgICAg ICAgICAgICAgaWYgKGxheW91dFN0YXRlLnVzZXNSZXBhaW50Qm91bmRzKCkpCiAgICAgICAgICAg ICAgICAgICAgIGxheW91dFN0YXRlLnVwZGF0ZVJlcGFpbnRSYW5nZUZyb21Cb3gobGluZUJveCk7 CiAKICAgICAgICAgICAgICAgICBpZiAocGFnaW5hdGVkKSB7CkBAIC0xMDIwLDcgKzEwMjUsNyBA QCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKExpbmVMYXlvdXRTdGF0ZSYg bGF5b3V0U3RhdGUsIGJvb2wgaGFzSW5saQogICAgICAgICAgICAgICAgICAgICBpZiAoYWRqdXN0 bWVudCkgewogICAgICAgICAgICAgICAgICAgICAgICAgaW50IG9sZExpbmVXaWR0aCA9IGF2YWls YWJsZUxvZ2ljYWxXaWR0aEZvckxpbmUob2xkTG9naWNhbEhlaWdodCwgbGluZUluZm8uaXNGaXJz dExpbmUoKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBsaW5lQm94LT5hZGp1c3RCbG9ja0Rp cmVjdGlvblBvc2l0aW9uKGFkanVzdG1lbnQpOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYg KHVzZVJlcGFpbnRCb3VuZHMpCisgICAgICAgICAgICAgICAgICAgICAgICBpZiAobGF5b3V0U3Rh dGUudXNlc1JlcGFpbnRCb3VuZHMoKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXlv dXRTdGF0ZS51cGRhdGVSZXBhaW50UmFuZ2VGcm9tQm94KGxpbmVCb3gpOwogCiAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAoYXZhaWxhYmxlTG9naWNhbFdpZHRoRm9yTGluZShvbGRMb2dpY2Fs SGVpZ2h0ICsgYWRqdXN0bWVudCwgbGluZUluZm8uaXNGaXJzdExpbmUoKSkgIT0gb2xkTGluZVdp ZHRoKSB7CkBAIC0xMjY3LDcgKzEyNzIsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjaGVja0Zsb2F0 c0luQ2xlYW5MaW5lKFJvb3RJbmxpbmVCb3gqIGxpbmUsIFZlY3RvcjxGbG9hdFdpdGhSZQogfQog CiBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lU3RhcnRQb3NpdGlvbihMaW5l TGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBMaW5lSW5mbyYgbGluZUluZm8sIElubGluZUJpZGlS ZXNvbHZlciYgcmVzb2x2ZXIsIFZlY3RvcjxGbG9hdFdpdGhSZWN0PiYgZmxvYXRzLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQmIG51 bUNsZWFuRmxvYXRzLCBib29sJiB1c2VSZXBhaW50Qm91bmRzKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQmIG51bUNsZWFuRmxvYXRz KQogewogICAgIFJvb3RJbmxpbmVCb3gqIGN1cnIgPSAwOwogICAgIFJvb3RJbmxpbmVCb3gqIGxh c3QgPSAwOwpAQCAtMTI5MCw5ICsxMjk1LDYgQEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2s6 OmRldGVybWluZVN0YXJ0UG9zaXRpb24oTGluZUxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwKICAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICB9CiAKLSAg ICAgICAgICAgICAgICAgICAgaWYgKCF1c2VSZXBhaW50Qm91bmRzKQotICAgICAgICAgICAgICAg ICAgICAgICAgdXNlUmVwYWludEJvdW5kcyA9IHRydWU7Ci0KICAgICAgICAgICAgICAgICAgICAg bGF5b3V0U3RhdGUudXBkYXRlUmVwYWludFJhbmdlRnJvbUJveChjdXJyLCBwYWdpbmF0aW9uRGVs dGEpOwogICAgICAgICAgICAgICAgICAgICBjdXJyLT5hZGp1c3RCbG9ja0RpcmVjdGlvblBvc2l0 aW9uKHBhZ2luYXRpb25EZWx0YSk7CiAgICAgICAgICAgICAgICAgfQo=