96432 2012-09-11 15:26:27 -0700 Pass the logical height and logical top into RenderBox::computeLogicalHeight 2012-09-11 16:20:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony eric hyatt ojan webkit.review.bot oldest_to_newest 717616 0 tony 2012-09-11 15:26:27 -0700 Pass the logical height and logical top into RenderBox::computeLogicalHeight 717624 1 163457 tony 2012-09-11 15:30:23 -0700 Created attachment 163457 Patch 717695 2 163457 webkit.review.bot 2012-09-11 16:20:23 -0700 Comment on attachment 163457 Patch Clearing flags on attachment: 163457 Committed r128238: <http://trac.webkit.org/changeset/128238> 717696 3 webkit.review.bot 2012-09-11 16:20:26 -0700 All reviewed patches have been landed. Closing bug. 163457 2012-09-11 15:30:23 -0700 2012-09-11 16:20:23 -0700 Patch bug-96432-20120911152957.patch text/plain 9528 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWZiYTM5MzlmMTkwMGY1 NWQyYThjMGY4Y2Q1ZDJmMjAwZTU5NjdmYi4uMjg4YWRlODJlYTRmMjQ1NDE1M2E5YzZjZmZiNmE1 NDNlNjk0Y2JhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA5LTExICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUGFzcyB0aGUgbG9naWNhbCBo ZWlnaHQgYW5kIGxvZ2ljYWwgdG9wIGludG8gUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbEhlaWdo dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY0MzIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFs bG93cyB1cyB0byBjYWxsIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQgd2l0aG91dCBm aXJzdCBoYXZpbmcgdG8gY2FsbAorICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KCkgYW5kIHNldExv Z2ljYWxUb3AoKS4gIFByZXZpb3VzbHksIGNvbXB1dGVMb2dpY2FsSGVpZ2h0IHdvdWxkIGRlcGVu ZAorICAgICAgICBvbiB0aGVzZSB2YWx1ZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0aGlz IGlzIGp1c3QgYSByZWZhY3Rvci4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojp1cGRhdGVMb2dpY2FsSGVpZ2h0KTogUGFz cyBsb2dpY2FsSGVpZ2h0IGFuZCBsb2dpY2FsVG9wIGFzIHBhcmFtcy4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOiBVc2UgcGFzc2VkIGluIHZhbHVl cyBpbnN0ZWFkIG9mIGNhbGxpbmcgbG9naWNhbEhlaWdodC9sb2dpY2FsVG9wLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQpOiBQYXNz IHRoZSBsb2dpY2FsSGVpZ2h0IGludG8gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNp bmcuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNh bEhlaWdodFVzaW5nKTogUGFzcyBpbiB0aGUgbG9naWNhbEhlaWdodCBhcyBhIHBhcmFtZXRlci4K KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChSZW5kZXJCb3gpOiBV cGRhdGUgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcgYW5kIGNvbXB1dGVMb2dp Y2FsSGVpZ2h0LgorCiAyMDEyLTA5LTExICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIFN0eWxlUmVzb2x2ZXI6OnNldFN0eWxlLCBiZWNh dXNlIGl0J3Mgbm8gbG9uZ2VyIHVzZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCmluZGV4IGFlZTRjZDcyOWMxYjZlNTdmZDkwMDA1ZTZjZGYyMjVkOWIzNThjYzIuLjBmNjQ0 NmM3NjQzZTQxZGNjNDIzZDlmMTMzZjQxZTQwMTlhYTVjZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCkBAIC0xOTY0LDcgKzE5NjQsNyBAQCBzdGF0aWMgYm9vbCBzaG91 bGRGbGlwQmVmb3JlQWZ0ZXJNYXJnaW5zKGNvbnN0IFJlbmRlclN0eWxlKiBjb250YWluaW5nQmxv Y2tTdHlsZQogdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQoKQogewogICAgIExv Z2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBjb21wdXRlZFZhbHVlczsKLSAgICBjb21wdXRlTG9n aWNhbEhlaWdodChjb21wdXRlZFZhbHVlcyk7CisgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQobG9n aWNhbEhlaWdodCgpLCBsb2dpY2FsVG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKIAogICAgIHNldExv Z2ljYWxIZWlnaHQoY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQpOwogICAgIHNldExvZ2ljYWxUb3Ao Y29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbik7CkBAIC0xOTcyLDEwICsxOTcyLDEwIEBAIHZvaWQg UmVuZGVyQm94Ojp1cGRhdGVMb2dpY2FsSGVpZ2h0KCkKICAgICBzZXRNYXJnaW5BZnRlcihjb21w dXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcik7CiB9CiAKLXZvaWQgUmVuZGVyQm94Ojpjb21w dXRlTG9naWNhbEhlaWdodChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFs dWVzKSBjb25zdAordm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KExheW91dFVu aXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMb2dpY2FsRXh0ZW50Q29t cHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdAogewotICAgIGNvbXB1dGVkVmFsdWVz Lm1fZXh0ZW50ID0gbG9naWNhbEhlaWdodCgpOwotICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRp b24gPSBsb2dpY2FsVG9wKCk7CisgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBsb2dpY2Fs SGVpZ2h0OworICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2FsVG9wOwogCiAg ICAgLy8gQ2VsbCBoZWlnaHQgaXMgbWFuYWdlZCBieSB0aGUgdGFibGUgYW5kIGlubGluZSBub24t cmVwbGFjZWQgZWxlbWVudHMgZG8gbm90IHN1cHBvcnQgYSBoZWlnaHQgcHJvcGVydHkuCiAgICAg aWYgKGlzVGFibGVDZWxsKCkgfHwgKGlzSW5saW5lKCkgJiYgIWlzUmVwbGFjZWQoKSkpCkBAIC0x OTk5LDcgKzE5OTksNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoTG9n aWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcwogICAgICAgICBpZiAoaXNU YWJsZSgpKSB7CiAgICAgICAgICAgICBpZiAoaGFzUGVycGVuZGljdWxhckNvbnRhaW5pbmdCbG9j aykgewogICAgICAgICAgICAgICAgIGJvb2wgc2hvdWxkRmxpcEJlZm9yZUFmdGVyID0gc2hvdWxk RmxpcEJlZm9yZUFmdGVyTWFyZ2lucyhjYi0+c3R5bGUoKSwgc3R5bGUoKSk7Ci0gICAgICAgICAg ICAgICAgY29tcHV0ZUlubGluZURpcmVjdGlvbk1hcmdpbnMoY2IsIGNvbnRhaW5pbmdCbG9ja0xv Z2ljYWxXaWR0aEZvckNvbnRlbnQoKSwgbG9naWNhbEhlaWdodCgpLAorICAgICAgICAgICAgICAg IGNvbXB1dGVJbmxpbmVEaXJlY3Rpb25NYXJnaW5zKGNiLCBjb250YWluaW5nQmxvY2tMb2dpY2Fs V2lkdGhGb3JDb250ZW50KCksIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50LAogICAgICAgICAgICAg ICAgICAgICBzaG91bGRGbGlwQmVmb3JlQWZ0ZXIgPyBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMu bV9hZnRlciA6IGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSwKICAgICAgICAgICAg ICAgICAgICAgc2hvdWxkRmxpcEJlZm9yZUFmdGVyID8gY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5z Lm1fYmVmb3JlIDogY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXIpOwogICAgICAgICAg ICAgfQpAQCAtMjAzOSw3ICsyMDM5LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2Fs SGVpZ2h0KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMKICAgICAg ICAgaWYgKGNoZWNrTWluTWF4SGVpZ2h0KSB7CiAgICAgICAgICAgICBoZWlnaHRSZXN1bHQgPSBj b21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1haW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxv Z2ljYWxIZWlnaHQoKSk7CiAgICAgICAgICAgICBpZiAoaGVpZ2h0UmVzdWx0ID09IC0xKQotICAg ICAgICAgICAgICAgIGhlaWdodFJlc3VsdCA9IGxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgICAg ICAgICBoZWlnaHRSZXN1bHQgPSBjb21wdXRlZFZhbHVlcy5tX2V4dGVudDsKICAgICAgICAgICAg IGhlaWdodFJlc3VsdCA9IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChoZWlnaHRSZXN1 bHQpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gVGhlIG9ubHkgdGltZXMgd2Ug ZG9uJ3QgY2hlY2sgbWluL21heCBoZWlnaHQgYXJlIHdoZW4gYSBmaXhlZCBsZW5ndGggaGFzCkBA IC0yOTMwLDcgKzI5MzAsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dp Y2FsSGVpZ2h0KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcAogICAgIGNvbXB1dGVC bG9ja1N0YXRpY0Rpc3RhbmNlKGxvZ2ljYWxUb3BMZW5ndGgsIGxvZ2ljYWxCb3R0b21MZW5ndGgs IHRoaXMsIGNvbnRhaW5lckJsb2NrKTsKIAogICAgIC8vIENhbGN1bGF0ZSBjb25zdHJhaW50IGVx dWF0aW9uIHZhbHVlcyBmb3IgJ2hlaWdodCcgY2FzZS4KLSAgICBjb21wdXRlUG9zaXRpb25lZExv Z2ljYWxIZWlnaHRVc2luZyhNYWluT3JQcmVmZXJyZWRTaXplLCBzdHlsZVRvVXNlLT5sb2dpY2Fs SGVpZ2h0KCksIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBib3JkZXJz UGx1c1BhZGRpbmcsCisgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZWRWYWx1 ZXMubV9leHRlbnQ7CisgICAgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoTWFp bk9yUHJlZmVycmVkU2l6ZSwgc3R5bGVUb1VzZS0+bG9naWNhbEhlaWdodCgpLCBjb250YWluZXJC bG9jaywgY29udGFpbmVyTG9naWNhbEhlaWdodCwgYm9yZGVyc1BsdXNQYWRkaW5nLCBsb2dpY2Fs SGVpZ2h0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxU b3BMZW5ndGgsIGxvZ2ljYWxCb3R0b21MZW5ndGgsIG1hcmdpbkJlZm9yZSwgbWFyZ2luQWZ0ZXIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMp OwogCkBAIC0yOTQxLDcgKzI5NDIsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9u ZWRMb2dpY2FsSGVpZ2h0KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcAogICAgIGlm ICghc3R5bGVUb1VzZS0+bG9naWNhbE1heEhlaWdodCgpLmlzVW5kZWZpbmVkKCkpIHsKICAgICAg ICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIG1heFZhbHVlczsKIAotICAgICAgICBjb21w dXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLT5sb2dp Y2FsTWF4SGVpZ2h0KCksIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBi b3JkZXJzUGx1c1BhZGRpbmcsCisgICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdo dFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UtPmxvZ2ljYWxNYXhIZWlnaHQoKSwgY29udGFpbmVy QmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQsIGJvcmRlcnNQbHVzUGFkZGluZywgbG9naWNh bEhlaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9n aWNhbFRvcExlbmd0aCwgbG9naWNhbEJvdHRvbUxlbmd0aCwgbWFyZ2luQmVmb3JlLCBtYXJnaW5B ZnRlciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWF4VmFs dWVzKTsKIApAQCAtMjk1Nyw3ICsyOTU4LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3Np dGlvbmVkTG9naWNhbEhlaWdodChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXAKICAg ICBpZiAoIXN0eWxlVG9Vc2UtPmxvZ2ljYWxNaW5IZWlnaHQoKS5pc1plcm8oKSkgewogICAgICAg ICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWluVmFsdWVzOwogCi0gICAgICAgIGNvbXB1 dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIHN0eWxlVG9Vc2UtPmxvZ2lj YWxNaW5IZWlnaHQoKSwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQsIGJv cmRlcnNQbHVzUGFkZGluZywKKyAgICAgICAgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0 VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS0+bG9naWNhbE1pbkhlaWdodCgpLCBjb250YWluZXJC bG9jaywgY29udGFpbmVyTG9naWNhbEhlaWdodCwgYm9yZGVyc1BsdXNQYWRkaW5nLCBsb2dpY2Fs SGVpZ2h0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2dp Y2FsVG9wTGVuZ3RoLCBsb2dpY2FsQm90dG9tTGVuZ3RoLCBtYXJnaW5CZWZvcmUsIG1hcmdpbkFm dGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtaW5WYWx1 ZXMpOwogCkBAIC0zMDEyLDcgKzMwMTMsNyBAQCBzdGF0aWMgdm9pZCBjb21wdXRlTG9naWNhbFRv cFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBvcywgY29uc3QgUgogfQog CiB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6 ZVR5cGUgaGVpZ2h0U2l6ZVR5cGUsIExlbmd0aCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLCBjb25zdCBS ZW5kZXJCb3hNb2RlbE9iamVjdCogY29udGFpbmVyQmxvY2ssCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBjb250YWluZXJMb2dp Y2FsSGVpZ2h0LCBMYXlvdXRVbml0IGJvcmRlcnNQbHVzUGFkZGluZywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGNvbnRhaW5l ckxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgYm9yZGVyc1BsdXNQYWRkaW5nLCBMYXlvdXRVbml0 IGxvZ2ljYWxIZWlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgTGVuZ3RoIGxvZ2ljYWxUb3AsIExlbmd0aCBsb2dpY2FsQm90dG9tLCBMZW5n dGggbWFyZ2luQmVmb3JlLCBMZW5ndGggbWFyZ2luQWZ0ZXIsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFs dWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKIHsKQEAgLTMwMjQsNyArMzAyNSw3IEBAIHZvaWQg UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBo ZWlnaHRTaXplVHlwZSwgTGVuCiAgICAgQVNTRVJUKCEobG9naWNhbFRvcC5pc0F1dG8oKSAmJiBs b2dpY2FsQm90dG9tLmlzQXV0bygpKSk7CiAKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRW YWx1ZTsKLSAgICBMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpZ2h0ID0gbG9naWNhbEhlaWdo dCgpIC0gYm9yZGVyc1BsdXNQYWRkaW5nOworICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxI ZWlnaHQgPSBsb2dpY2FsSGVpZ2h0IC0gYm9yZGVyc1BsdXNQYWRkaW5nOwogCiAgICAgTGF5b3V0 VW5pdCBsb2dpY2FsVG9wVmFsdWUgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmgKaW5kZXggYWYzYzQ2MjRhMGY4NDE2ZTIwMmZiZjdmZjk5MjU5ODlmYmM2ZWY4Ny4uYzRiZWJi ODBhNWQ5MjU4YmJjNWZkYTQxOWE4NGY2ODIxYWNhNDEyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guaApAQCAtMzY2LDcgKzM2Niw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg dm9pZCB1cGRhdGVMb2dpY2FsV2lkdGgoKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTG9naWNh bEhlaWdodCgpOwotICAgIHZvaWQgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoTG9naWNhbEV4dGVudENv bXB1dGVkVmFsdWVzJikgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlTG9naWNhbEhlaWdodChMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNhbEV4dGVu dENvbXB1dGVkVmFsdWVzJikgY29uc3Q7CiAKICAgICBSZW5kZXJCb3hSZWdpb25JbmZvKiByZW5k ZXJCb3hSZWdpb25JbmZvKFJlbmRlclJlZ2lvbiosIExheW91dFVuaXQgb2Zmc2V0RnJvbUxvZ2lj YWxUb3BPZkZpcnN0UGFnZSwgUmVuZGVyQm94UmVnaW9uSW5mb0ZsYWdzID0gQ2FjaGVSZW5kZXJC b3hSZWdpb25JbmZvKSBjb25zdDsKICAgICB2b2lkIGNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lv bihMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmLCBSZW5kZXJSZWdpb24qID0gMCwgTGF5b3V0 VW5pdCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlID0gWkVST19MQVlPVVRfVU5JVCkg Y29uc3Q7CkBAIC01OTIsOCArNTkyLDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBjb250YWluZXJMb2dpY2FsV2lkdGgs IExheW91dFVuaXQgYm9yZGVyc1BsdXNQYWRkaW5nLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBMZW5ndGggbG9naWNhbExlZnQsIExlbmd0aCBsb2dpY2FsUmln aHQsIExlbmd0aCBtYXJnaW5Mb2dpY2FsTGVmdCwgTGVuZ3RoIG1hcmdpbkxvZ2ljYWxSaWdodCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTG9naWNhbEV4dGVu dENvbXB1dGVkVmFsdWVzJikgY29uc3Q7Ci0gICAgdm9pZCBjb21wdXRlUG9zaXRpb25lZExvZ2lj YWxIZWlnaHRVc2luZyhTaXplVHlwZSwgTGVuZ3RoIGxvZ2ljYWxIZWlnaHQsIGNvbnN0IFJlbmRl ckJveE1vZGVsT2JqZWN0KiBjb250YWluZXJCbG9jaywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIExheW91dFVuaXQgY29udGFpbmVyTG9naWNhbEhlaWdodCwg TGF5b3V0VW5pdCBib3JkZXJzUGx1c1BhZGRpbmcsCisgICAgdm9pZCBjb21wdXRlUG9zaXRpb25l ZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSwgTGVuZ3RoIGxvZ2ljYWxIZWlnaHRMZW5ndGgs IGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0KiBjb250YWluZXJCbG9jaywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIExheW91dFVuaXQgY29udGFpbmVyTG9n aWNhbEhlaWdodCwgTGF5b3V0VW5pdCBib3JkZXJzUGx1c1BhZGRpbmcsIExheW91dFVuaXQgbG9n aWNhbEhlaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IExlbmd0aCBsb2dpY2FsVG9wLCBMZW5ndGggbG9naWNhbEJvdHRvbSwgTGVuZ3RoIG1hcmdpbkxv Z2ljYWxUb3AsIExlbmd0aCBtYXJnaW5Mb2dpY2FsQm90dG9tLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJikg Y29uc3Q7CiAK