150267 2015-10-16 19:42:42 -0700 RenderBlockFlow::xPositionForFloatIncludingMargin/yPositionForFloatIncludingMargin/flipFloatForWritingModeForChild should all take FloatingObject reference. 2015-10-17 12:15:35 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1134138 0 zalan 2015-10-16 19:42:42 -0700 instead of FloatingObject* 1134143 1 263358 zalan 2015-10-16 21:00:30 -0700 Created attachment 263358 Patch 1134221 2 263358 commit-queue 2015-10-17 12:15:31 -0700 Comment on attachment 263358 Patch Clearing flags on attachment: 263358 Committed r191246: <http://trac.webkit.org/changeset/191246> 1134222 3 commit-queue 2015-10-17 12:15:35 -0700 All reviewed patches have been landed. Closing bug. 263358 2015-10-16 21:00:30 -0700 2015-10-17 12:15:31 -0700 Patch bug-150267-20151016205950.patch text/plain 12174 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxMjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVmNzA1YzdiMWY4ZGI1 MWE1Mjk0ZjExZDExMjhmMDM3NTM1NTZjZC4uNDY1NGY4NzRhYTBjNjA4ZTNmN2I5YzE2MjY5YWJl ZDczOWZiNTljMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE1LTEwLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVuZGVyQmxvY2tGbG93Ojp4 UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGluZ01hcmdpbi95UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGlu Z01hcmdpbi9mbGlwRmxvYXRGb3JXcml0aW5nTW9kZUZvckNoaWxkCisgICAgICAgIHNob3VsZCBh bGwgdGFrZSBGbG9hdGluZ09iamVjdCByZWZlcmVuY2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAyNjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCbG9ja0Zsb3c6OmFkZE92ZXJmbG93RnJvbUZsb2F0cyk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9ja0Zsb3c6OnBhaW50RmxvYXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrRmxvdzo6Y2xpcE91dEZsb2F0aW5nT2JqZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCbG9ja0Zsb3c6OmFkZE92ZXJoYW5naW5nRmxvYXRzKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrRmxvdzo6ZmxpcEZsb2F0Rm9yV3JpdGluZ01vZGVGb3JDaGlsZCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmhpdFRlc3RGbG9hdHMpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjphZGp1c3RGb3JCb3JkZXJGaXQpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrRmxvdzo6eFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2tGbG93Ojp5UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGluZ01hcmdpbik6 CisKKzIwMTUtMTAtMTYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKwogICAgICAg ICBSZW5kZXJCbG9ja0Zsb3c6Oipsb2dpY2FsKkZvckZsb2F0IHNob3VsZCB0YWtlIEZsb2F0aW5n T2JqZWN0IHJlZmVyZW5jZS4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MDI2NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0Zsb3cuY3BwCmluZGV4IDkxYjkzMGRlOTliZmU1ODdjNjk3N2VlYjQ5MzhjMjlkYTA4OGJkYjcu LjI4NjY0OWNmNDA0NjdhNDE5YjQ1MGE5ZmY5MDQxNjcyZDcxN2MwZTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0yMTI3LDkgKzIxMjcsOSBA QCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6YWRkT3ZlcmZsb3dGcm9tRmxvYXRzKCkKICAgICBjb25z dCBGbG9hdGluZ09iamVjdFNldCYgZmxvYXRpbmdPYmplY3RTZXQgPSBtX2Zsb2F0aW5nT2JqZWN0 cy0+c2V0KCk7CiAgICAgYXV0byBlbmQgPSBmbG9hdGluZ09iamVjdFNldC5lbmQoKTsKICAgICBm b3IgKGF1dG8gaXQgPSBmbG9hdGluZ09iamVjdFNldC5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQp IHsKLSAgICAgICAgRmxvYXRpbmdPYmplY3QqIHIgPSBpdC0+Z2V0KCk7Ci0gICAgICAgIGlmIChy LT5pc0Rlc2NlbmRhbnQoKSkKLSAgICAgICAgICAgIGFkZE92ZXJmbG93RnJvbUNoaWxkKCZyLT5y ZW5kZXJlcigpLCBJbnRTaXplKHhQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKHIpLCB5 UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGluZ01hcmdpbihyKSkpOworICAgICAgICBjb25zdCBhdXRv JiBmbG9hdGluZ09iamVjdCA9ICppdC0+Z2V0KCk7CisgICAgICAgIGlmIChmbG9hdGluZ09iamVj dC5pc0Rlc2NlbmRhbnQoKSkKKyAgICAgICAgICAgIGFkZE92ZXJmbG93RnJvbUNoaWxkKCZmbG9h dGluZ09iamVjdC5yZW5kZXJlcigpLCBJbnRTaXplKHhQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5n TWFyZ2luKGZsb2F0aW5nT2JqZWN0KSwgeVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4o ZmxvYXRpbmdPYmplY3QpKSk7CiAgICAgfQogfQogCkBAIC0yMTkwLDIzICsyMTkwLDI2IEBAIHZv aWQgUmVuZGVyQmxvY2tGbG93OjpwYWludEZsb2F0cyhQYWludEluZm8mIHBhaW50SW5mbywgY29u c3QgTGF5b3V0UG9pbnQmIHBhaW50CiAgICAgY29uc3QgRmxvYXRpbmdPYmplY3RTZXQmIGZsb2F0 aW5nT2JqZWN0U2V0ID0gbV9mbG9hdGluZ09iamVjdHMtPnNldCgpOwogICAgIGF1dG8gZW5kID0g ZmxvYXRpbmdPYmplY3RTZXQuZW5kKCk7CiAgICAgZm9yIChhdXRvIGl0ID0gZmxvYXRpbmdPYmpl Y3RTZXQuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIEZsb2F0aW5nT2JqZWN0 KiByID0gaXQtPmdldCgpOworICAgICAgICBjb25zdCBhdXRvJiBmbG9hdGluZ09iamVjdCA9ICpp dC0+Z2V0KCk7CisgICAgICAgIGF1dG8mIHJlbmRlcmVyID0gZmxvYXRpbmdPYmplY3QucmVuZGVy ZXIoKTsKICAgICAgICAgLy8gT25seSBwYWludCB0aGUgb2JqZWN0IGlmIG91ciBtX3Nob3VsZFBh aW50IGZsYWcgaXMgc2V0LgotICAgICAgICBpZiAoci0+c2hvdWxkUGFpbnQoKSAmJiAhci0+cmVu ZGVyZXIoKS5oYXNTZWxmUGFpbnRpbmdMYXllcigpKSB7CisgICAgICAgIGlmIChmbG9hdGluZ09i amVjdC5zaG91bGRQYWludCgpICYmICFyZW5kZXJlci5oYXNTZWxmUGFpbnRpbmdMYXllcigpKSB7 CiAgICAgICAgICAgICBQYWludEluZm8gY3VycmVudFBhaW50SW5mbyhwYWludEluZm8pOwogICAg ICAgICAgICAgY3VycmVudFBhaW50SW5mby5waGFzZSA9IHByZXNlcnZlUGhhc2UgPyBwYWludElu Zm8ucGhhc2UgOiBQYWludFBoYXNlQmxvY2tCYWNrZ3JvdW5kOwogICAgICAgICAgICAgLy8gRklY TUU6IExheW91dFBvaW50IHZlcnNpb24gb2YgeFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJn aW4gd291bGQgbWFrZSB0aGlzIG11Y2ggY2xlYW5lci4KLSAgICAgICAgICAgIExheW91dFBvaW50 IGNoaWxkUG9pbnQgPSBmbGlwRmxvYXRGb3JXcml0aW5nTW9kZUZvckNoaWxkKHIsIExheW91dFBv aW50KHBhaW50T2Zmc2V0LngoKSArIHhQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKHIp IC0gci0+cmVuZGVyZXIoKS54KCksIHBhaW50T2Zmc2V0LnkoKSArIHlQb3NpdGlvbkZvckZsb2F0 SW5jbHVkaW5nTWFyZ2luKHIpIC0gci0+cmVuZGVyZXIoKS55KCkpKTsKLSAgICAgICAgICAgIHIt PnJlbmRlcmVyKCkucGFpbnQoY3VycmVudFBhaW50SW5mbywgY2hpbGRQb2ludCk7CisgICAgICAg ICAgICBMYXlvdXRQb2ludCBjaGlsZFBvaW50ID0gZmxpcEZsb2F0Rm9yV3JpdGluZ01vZGVGb3JD aGlsZChmbG9hdGluZ09iamVjdCwKKyAgICAgICAgICAgICAgICBMYXlvdXRQb2ludChwYWludE9m ZnNldC54KCkgKyB4UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGluZ01hcmdpbihmbG9hdGluZ09iamVj dCkgLSByZW5kZXJlci54KCksCisgICAgICAgICAgICAgICAgcGFpbnRPZmZzZXQueSgpICsgeVBv c2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmplY3QpIC0gcmVuZGVyZXIu eSgpKSk7CisgICAgICAgICAgICByZW5kZXJlci5wYWludChjdXJyZW50UGFpbnRJbmZvLCBjaGls ZFBvaW50KTsKICAgICAgICAgICAgIGlmICghcHJlc2VydmVQaGFzZSkgewogICAgICAgICAgICAg ICAgIGN1cnJlbnRQYWludEluZm8ucGhhc2UgPSBQYWludFBoYXNlQ2hpbGRCbG9ja0JhY2tncm91 bmRzOwotICAgICAgICAgICAgICAgIHItPnJlbmRlcmVyKCkucGFpbnQoY3VycmVudFBhaW50SW5m bywgY2hpbGRQb2ludCk7CisgICAgICAgICAgICAgICAgcmVuZGVyZXIucGFpbnQoY3VycmVudFBh aW50SW5mbywgY2hpbGRQb2ludCk7CiAgICAgICAgICAgICAgICAgY3VycmVudFBhaW50SW5mby5w aGFzZSA9IFBhaW50UGhhc2VGbG9hdDsKLSAgICAgICAgICAgICAgICByLT5yZW5kZXJlcigpLnBh aW50KGN1cnJlbnRQYWludEluZm8sIGNoaWxkUG9pbnQpOworICAgICAgICAgICAgICAgIHJlbmRl cmVyLnBhaW50KGN1cnJlbnRQYWludEluZm8sIGNoaWxkUG9pbnQpOwogICAgICAgICAgICAgICAg IGN1cnJlbnRQYWludEluZm8ucGhhc2UgPSBQYWludFBoYXNlRm9yZWdyb3VuZDsKLSAgICAgICAg ICAgICAgICByLT5yZW5kZXJlcigpLnBhaW50KGN1cnJlbnRQYWludEluZm8sIGNoaWxkUG9pbnQp OworICAgICAgICAgICAgICAgIHJlbmRlcmVyLnBhaW50KGN1cnJlbnRQYWludEluZm8sIGNoaWxk UG9pbnQpOwogICAgICAgICAgICAgICAgIGN1cnJlbnRQYWludEluZm8ucGhhc2UgPSBQYWludFBo YXNlT3V0bGluZTsKLSAgICAgICAgICAgICAgICByLT5yZW5kZXJlcigpLnBhaW50KGN1cnJlbnRQ YWludEluZm8sIGNoaWxkUG9pbnQpOworICAgICAgICAgICAgICAgIHJlbmRlcmVyLnBhaW50KGN1 cnJlbnRQYWludEluZm8sIGNoaWxkUG9pbnQpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAg ICAgfQpAQCAtMjIxOCwxMCArMjIyMSwxMCBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y2xpcE91 dEZsb2F0aW5nT2JqZWN0cyhSZW5kZXJCbG9jayYgcm9vdEJsb2NrLCBjb25zdCBQYWludAogICAg ICAgICBjb25zdCBGbG9hdGluZ09iamVjdFNldCYgZmxvYXRpbmdPYmplY3RTZXQgPSBtX2Zsb2F0 aW5nT2JqZWN0cy0+c2V0KCk7CiAgICAgICAgIGF1dG8gZW5kID0gZmxvYXRpbmdPYmplY3RTZXQu ZW5kKCk7CiAgICAgICAgIGZvciAoYXV0byBpdCA9IGZsb2F0aW5nT2JqZWN0U2V0LmJlZ2luKCk7 IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICAgICAgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5n T2JqZWN0ID0gaXQtPmdldCgpOworICAgICAgICAgICAgY29uc3QgYXV0byYgZmxvYXRpbmdPYmpl Y3QgPSAqaXQtPmdldCgpOwogICAgICAgICAgICAgTGF5b3V0UmVjdCBmbG9hdEJveChvZmZzZXRG cm9tUm9vdEJsb2NrLndpZHRoKCkgKyB4UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGluZ01hcmdpbihm bG9hdGluZ09iamVjdCksCiAgICAgICAgICAgICAgICAgb2Zmc2V0RnJvbVJvb3RCbG9jay5oZWln aHQoKSArIHlQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKGZsb2F0aW5nT2JqZWN0KSwK LSAgICAgICAgICAgICAgICBmbG9hdGluZ09iamVjdC0+cmVuZGVyZXIoKS53aWR0aCgpLCBmbG9h dGluZ09iamVjdC0+cmVuZGVyZXIoKS5oZWlnaHQoKSk7CisgICAgICAgICAgICAgICAgZmxvYXRp bmdPYmplY3QucmVuZGVyZXIoKS53aWR0aCgpLCBmbG9hdGluZ09iamVjdC5yZW5kZXJlcigpLmhl aWdodCgpKTsKICAgICAgICAgICAgIHJvb3RCbG9jay5mbGlwRm9yV3JpdGluZ01vZGUoZmxvYXRC b3gpOwogICAgICAgICAgICAgZmxvYXRCb3gubW92ZShyb290QmxvY2tQaHlzaWNhbFBvc2l0aW9u LngoKSwgcm9vdEJsb2NrUGh5c2ljYWxQb3NpdGlvbi55KCkpOwogICAgICAgICAgICAgcGFpbnRJ bmZvLT5jb250ZXh0KCkuY2xpcE91dChzbmFwcGVkSW50UmVjdChmbG9hdEJveCkpOwpAQCAtMjY5 NSw3ICsyNjk4LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJCbG9ja0Zsb3c6OmFkZE92ZXJoYW5naW5n RmxvYXRzKFJlbmRlckJsb2NrRmxvdyYgY2hpbGQsIGJvb2wgbWEKICAgICAgICAgICAgIAogICAg ICAgICAgICAgLy8gU2luY2UgdGhlIGZsb2F0IGRvZXNuJ3Qgb3ZlcmhhbmcsIGl0IGRpZG4ndCBn ZXQgcHV0IGludG8gb3VyIGxpc3QuIFdlIG5lZWQgdG8gYWRkIGl0cyBvdmVyZmxvdyBpbiB0byB0 aGUgY2hpbGQgbm93LgogICAgICAgICAgICAgaWYgKGZsb2F0aW5nT2JqZWN0LmlzRGVzY2VuZGFu dCgpKQotICAgICAgICAgICAgICAgIGNoaWxkLmFkZE92ZXJmbG93RnJvbUNoaWxkKCZyZW5kZXJl ciwgTGF5b3V0U2l6ZSh4UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGluZ01hcmdpbigmZmxvYXRpbmdP YmplY3QpLCB5UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGluZ01hcmdpbigmZmxvYXRpbmdPYmplY3Qp KSk7CisgICAgICAgICAgICAgICAgY2hpbGQuYWRkT3ZlcmZsb3dGcm9tQ2hpbGQoJnJlbmRlcmVy LCBMYXlvdXRTaXplKHhQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKGZsb2F0aW5nT2Jq ZWN0KSwgeVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmplY3QpKSk7 CiAgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIGxvd2VzdEZsb2F0TG9naWNhbEJvdHRvbTsK QEAgLTI4MDIsNyArMjgwNSw3IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjptYXJrU2libGluZ3NX aXRoRmxvYXRzRm9yTGF5b3V0KFJlbmRlckJveCogZmxvYXRUb1JlbW92ZSkKICAgICB9CiB9CiAK LUxheW91dFBvaW50IFJlbmRlckJsb2NrRmxvdzo6ZmxpcEZsb2F0Rm9yV3JpdGluZ01vZGVGb3JD aGlsZChjb25zdCBGbG9hdGluZ09iamVjdCogY2hpbGQsIGNvbnN0IExheW91dFBvaW50JiBwb2lu dCkgY29uc3QKK0xheW91dFBvaW50IFJlbmRlckJsb2NrRmxvdzo6ZmxpcEZsb2F0Rm9yV3JpdGlu Z01vZGVGb3JDaGlsZChjb25zdCBGbG9hdGluZ09iamVjdCYgY2hpbGQsIGNvbnN0IExheW91dFBv aW50JiBwb2ludCkgY29uc3QKIHsKICAgICBpZiAoIXN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3Jp dGluZ01vZGUoKSkKICAgICAgICAgcmV0dXJuIHBvaW50OwpAQCAtMjgxMSw4ICsyODE0LDggQEAg TGF5b3V0UG9pbnQgUmVuZGVyQmxvY2tGbG93OjpmbGlwRmxvYXRGb3JXcml0aW5nTW9kZUZvckNo aWxkKGNvbnN0IEZsb2F0aW5nT2JqZWMKICAgICAvLyBpdCdzIGdvaW5nIHRvIGdldCBhZGRlZCBi YWNrIGluLiBXZSBoaWRlIHRoaXMgY29tcGxpY2F0aW9uIGhlcmUgc28gdGhhdCB0aGUgY2FsbGlu ZyBjb2RlIGxvb2tzIG5vcm1hbCBmb3IgdGhlIHVuZmxpcHBlZAogICAgIC8vIGNhc2UuCiAgICAg aWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgIHJldHVybiBMYXlvdXRQb2lu dChwb2ludC54KCksIHBvaW50LnkoKSArIGhlaWdodCgpIC0gY2hpbGQtPnJlbmRlcmVyKCkuaGVp Z2h0KCkgLSAyICogeVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oY2hpbGQpKTsKLSAg ICByZXR1cm4gTGF5b3V0UG9pbnQocG9pbnQueCgpICsgd2lkdGgoKSAtIGNoaWxkLT5yZW5kZXJl cigpLndpZHRoKCkgLSAyICogeFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oY2hpbGQp LCBwb2ludC55KCkpOworICAgICAgICByZXR1cm4gTGF5b3V0UG9pbnQocG9pbnQueCgpLCBwb2lu dC55KCkgKyBoZWlnaHQoKSAtIGNoaWxkLnJlbmRlcmVyKCkuaGVpZ2h0KCkgLSAyICogeVBvc2l0 aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oY2hpbGQpKTsKKyAgICByZXR1cm4gTGF5b3V0UG9p bnQocG9pbnQueCgpICsgd2lkdGgoKSAtIGNoaWxkLnJlbmRlcmVyKCkud2lkdGgoKSAtIDIgKiB4 UG9zaXRpb25Gb3JGbG9hdEluY2x1ZGluZ01hcmdpbihjaGlsZCksIHBvaW50LnkoKSk7CiB9CiAK IExheW91dFVuaXQgUmVuZGVyQmxvY2tGbG93OjpnZXRDbGVhckRlbHRhKFJlbmRlckJveCYgY2hp bGQsIExheW91dFVuaXQgbG9naWNhbFRvcCkKQEAgLTI5MDAsMTIgKzI5MDMsMTMgQEAgYm9vbCBS ZW5kZXJCbG9ja0Zsb3c6OmhpdFRlc3RGbG9hdHMoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVl c3QsIEhpdFRlc3RSZXN1bHQKICAgICBhdXRvIGJlZ2luID0gZmxvYXRpbmdPYmplY3RTZXQuYmVn aW4oKTsKICAgICBmb3IgKGF1dG8gaXQgPSBmbG9hdGluZ09iamVjdFNldC5lbmQoKTsgaXQgIT0g YmVnaW47KSB7CiAgICAgICAgIC0taXQ7Ci0gICAgICAgIEZsb2F0aW5nT2JqZWN0KiBmbG9hdGlu Z09iamVjdCA9IGl0LT5nZXQoKTsKLSAgICAgICAgaWYgKGZsb2F0aW5nT2JqZWN0LT5zaG91bGRQ YWludCgpICYmICFmbG9hdGluZ09iamVjdC0+cmVuZGVyZXIoKS5oYXNTZWxmUGFpbnRpbmdMYXll cigpKSB7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IHhPZmZzZXQgPSB4UG9zaXRpb25Gb3JGbG9h dEluY2x1ZGluZ01hcmdpbihmbG9hdGluZ09iamVjdCkgLSBmbG9hdGluZ09iamVjdC0+cmVuZGVy ZXIoKS54KCk7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IHlPZmZzZXQgPSB5UG9zaXRpb25Gb3JG bG9hdEluY2x1ZGluZ01hcmdpbihmbG9hdGluZ09iamVjdCkgLSBmbG9hdGluZ09iamVjdC0+cmVu ZGVyZXIoKS55KCk7CisgICAgICAgIGNvbnN0IGF1dG8mIGZsb2F0aW5nT2JqZWN0ID0gKml0LT5n ZXQoKTsKKyAgICAgICAgYXV0byYgcmVuZGVyZXIgPSBmbG9hdGluZ09iamVjdC5yZW5kZXJlcigp OworICAgICAgICBpZiAoZmxvYXRpbmdPYmplY3Quc2hvdWxkUGFpbnQoKSAmJiAhcmVuZGVyZXIu aGFzU2VsZlBhaW50aW5nTGF5ZXIoKSkgeworICAgICAgICAgICAgTGF5b3V0VW5pdCB4T2Zmc2V0 ID0geFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmplY3QpIC0gcmVu ZGVyZXIueCgpOworICAgICAgICAgICAgTGF5b3V0VW5pdCB5T2Zmc2V0ID0geVBvc2l0aW9uRm9y RmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmplY3QpIC0gcmVuZGVyZXIueSgpOwogICAg ICAgICAgICAgTGF5b3V0UG9pbnQgY2hpbGRQb2ludCA9IGZsaXBGbG9hdEZvcldyaXRpbmdNb2Rl Rm9yQ2hpbGQoZmxvYXRpbmdPYmplY3QsIGFkanVzdGVkTG9jYXRpb24gKyBMYXlvdXRTaXplKHhP ZmZzZXQsIHlPZmZzZXQpKTsKLSAgICAgICAgICAgIGlmIChmbG9hdGluZ09iamVjdC0+cmVuZGVy ZXIoKS5oaXRUZXN0KHJlcXVlc3QsIHJlc3VsdCwgbG9jYXRpb25JbkNvbnRhaW5lciwgY2hpbGRQ b2ludCkpIHsKKyAgICAgICAgICAgIGlmIChyZW5kZXJlci5oaXRUZXN0KHJlcXVlc3QsIHJlc3Vs dCwgbG9jYXRpb25JbkNvbnRhaW5lciwgY2hpbGRQb2ludCkpIHsKICAgICAgICAgICAgICAgICB1 cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgbG9jYXRpb25JbkNvbnRhaW5lci5wb2ludCgpIC0g dG9MYXlvdXRTaXplKGNoaWxkUG9pbnQpKTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICAgICAgICAgIH0KQEAgLTI5NTksMTEgKzI5NjMsMTEgQEAgdm9pZCBSZW5kZXJCbG9ja0Zs b3c6OmFkanVzdEZvckJvcmRlckZpdChMYXlvdXRVbml0IHgsIExheW91dFVuaXQmIGxlZnQsIExh eW91dFUKICAgICAgICAgY29uc3QgRmxvYXRpbmdPYmplY3RTZXQmIGZsb2F0aW5nT2JqZWN0U2V0 ID0gbV9mbG9hdGluZ09iamVjdHMtPnNldCgpOwogICAgICAgICBhdXRvIGVuZCA9IGZsb2F0aW5n T2JqZWN0U2V0LmVuZCgpOwogICAgICAgICBmb3IgKGF1dG8gaXQgPSBmbG9hdGluZ09iamVjdFNl dC5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgICAgIEZsb2F0aW5nT2JqZWN0 KiByID0gaXQtPmdldCgpOworICAgICAgICAgICAgY29uc3QgYXV0byYgZmxvYXRpbmdPYmplY3Qg PSAqaXQtPmdldCgpOwogICAgICAgICAgICAgLy8gT25seSBleGFtaW5lIHRoZSBvYmplY3QgaWYg b3VyIG1fc2hvdWxkUGFpbnQgZmxhZyBpcyBzZXQuCi0gICAgICAgICAgICBpZiAoci0+c2hvdWxk UGFpbnQoKSkgewotICAgICAgICAgICAgICAgIExheW91dFVuaXQgZmxvYXRMZWZ0ID0geFBvc2l0 aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4ocikgLSByLT5yZW5kZXJlcigpLngoKTsKLSAgICAg ICAgICAgICAgICBMYXlvdXRVbml0IGZsb2F0UmlnaHQgPSBmbG9hdExlZnQgKyByLT5yZW5kZXJl cigpLndpZHRoKCk7CisgICAgICAgICAgICBpZiAoZmxvYXRpbmdPYmplY3Quc2hvdWxkUGFpbnQo KSkgeworICAgICAgICAgICAgICAgIExheW91dFVuaXQgZmxvYXRMZWZ0ID0geFBvc2l0aW9uRm9y RmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmplY3QpIC0gZmxvYXRpbmdPYmplY3QucmVu ZGVyZXIoKS54KCk7CisgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBmbG9hdFJpZ2h0ID0gZmxv YXRMZWZ0ICsgZmxvYXRpbmdPYmplY3QucmVuZGVyZXIoKS53aWR0aCgpOwogICAgICAgICAgICAg ICAgIGxlZnQgPSBzdGQ6Om1pbihsZWZ0LCBmbG9hdExlZnQpOwogICAgICAgICAgICAgICAgIHJp Z2h0ID0gc3RkOjptYXgocmlnaHQsIGZsb2F0UmlnaHQpOwogICAgICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCmluZGV4IDJlYTBmZjFhZTAzMGI4 MjQwZGJiNmRmOWRhOWNkMjU3ODY2Y2M2YTAuLmFhMDY1OGFhMmQzMTYyZTM0ZDY3YmM3MGM2Mjk4 NTE5NzY5Njg3ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmgKQEAgLTMzMywxMCArMzMzLDEwIEBAIHB1YmxpYzoKICAgICAgICAgICAgIGZsb2F0aW5nT2Jq ZWN0LnNldEhlaWdodChsb2dpY2FsV2lkdGgpOwogICAgIH0KIAotICAgIExheW91dFVuaXQgeFBv c2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oY29uc3QgRmxvYXRpbmdPYmplY3QqIGNoaWxk KSBjb25zdCB7IHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQtPngoKSAr IGNoaWxkLT5yZW5kZXJlcigpLm1hcmdpbkxlZnQoKSA6IGNoaWxkLT54KCkgKyBtYXJnaW5CZWZv cmVGb3JDaGlsZChjaGlsZC0+cmVuZGVyZXIoKSk7IH0KLSAgICBMYXlvdXRVbml0IHlQb3NpdGlv bkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBjaGlsZCkgY29u c3QgeyByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLT55KCkgKyBtYXJn aW5CZWZvcmVGb3JDaGlsZChjaGlsZC0+cmVuZGVyZXIoKSkgOiBjaGlsZC0+eSgpICsgY2hpbGQt PnJlbmRlcmVyKCkubWFyZ2luVG9wKCk7IH0KKyAgICBMYXlvdXRVbml0IHhQb3NpdGlvbkZvckZs b2F0SW5jbHVkaW5nTWFyZ2luKGNvbnN0IEZsb2F0aW5nT2JqZWN0JiBmbG9hdGluZ09iamVjdCkg Y29uc3QgeyByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGZsb2F0aW5nT2JqZWN0 LngoKSArIGZsb2F0aW5nT2JqZWN0LnJlbmRlcmVyKCkubWFyZ2luTGVmdCgpIDogZmxvYXRpbmdP YmplY3QueCgpICsgbWFyZ2luQmVmb3JlRm9yQ2hpbGQoZmxvYXRpbmdPYmplY3QucmVuZGVyZXIo KSk7IH0KKyAgICBMYXlvdXRVbml0IHlQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKGNv bnN0IEZsb2F0aW5nT2JqZWN0JiBmbG9hdGluZ09iamVjdCkgY29uc3QgeyByZXR1cm4gaXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKSA/IGZsb2F0aW5nT2JqZWN0LnkoKSArIG1hcmdpbkJlZm9yZUZv ckNoaWxkKGZsb2F0aW5nT2JqZWN0LnJlbmRlcmVyKCkpIDogZmxvYXRpbmdPYmplY3QueSgpICsg ZmxvYXRpbmdPYmplY3QucmVuZGVyZXIoKS5tYXJnaW5Ub3AoKTsgfQogCi0gICAgTGF5b3V0UG9p bnQgZmxpcEZsb2F0Rm9yV3JpdGluZ01vZGVGb3JDaGlsZChjb25zdCBGbG9hdGluZ09iamVjdCos IGNvbnN0IExheW91dFBvaW50JikgY29uc3Q7CisgICAgTGF5b3V0UG9pbnQgZmxpcEZsb2F0Rm9y V3JpdGluZ01vZGVGb3JDaGlsZChjb25zdCBGbG9hdGluZ09iamVjdCYsIGNvbnN0IExheW91dFBv aW50JikgY29uc3Q7CiAKICAgICBSZW5kZXJMaW5lQm94TGlzdCYgbGluZUJveGVzKCkgeyByZXR1 cm4gbV9saW5lQm94ZXM7IH0KICAgICBjb25zdCBSZW5kZXJMaW5lQm94TGlzdCYgbGluZUJveGVz KCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94ZXM7IH0K