120705 2013-09-04 15:33:37 -0700 Move logical(Left|Right)FloatOffsetForLine methods into FloatingObjects 2013-09-09 11:46:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 120779 1 bjonesbe bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 924645 0 bjonesbe 2013-09-04 15:33:37 -0700 Move logical(Left|Right)FloatOffsetForLine methods into FloatingObjects 924649 1 210502 bjonesbe 2013-09-04 15:40:37 -0700 Created attachment 210502 Patch Port patch from blink 926819 2 210502 commit-queue 2013-09-09 11:46:21 -0700 Comment on attachment 210502 Patch Clearing flags on attachment: 210502 Committed r155368: <http://trac.webkit.org/changeset/155368> 926820 3 commit-queue 2013-09-09 11:46:22 -0700 All reviewed patches have been landed. Closing bug. 210502 2013-09-04 15:40:37 -0700 2013-09-09 11:46:20 -0700 Patch bug-120705-20130904154036.patch text/plain 9495 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1MDY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTYyY2E0ODUwMDNjMTRh MmM1NGFmYmZiY2MyMTY0YzY4NWVhYWZhNC4uN2FiY2Q4YjU5NDgwYjVkYzlmNDg2MTZmYzBiZTNl MTYxYjFiMDFiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEzLTA5LTA0ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCisgICAgICAgIE1vdmUgbG9naWNhbChM ZWZ0fFJpZ2h0KUZsb2F0T2Zmc2V0Rm9yTGluZSBtZXRob2RzIGludG8gRmxvYXRpbmdPYmplY3Rz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA3MDUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVzZSBh cmUgdGhlIG9ubHkgY29uc3VtZXJzIG9mIHRoZSBDYWxjdWxhdGVGbG9hdE9mZnNldEFkYXB0ZXIg YW5kCisgICAgICAgIHRoZSBwbGFjZWQgZmxvYXRzIHRyZWUsIHNvIGl0IHdpbGwgYWxsb3cgdXMg dG8gcmVkdWNlIHRoZSBwdWJsaWMKKyAgICAgICAgaW50ZXJmYWNlIG9mIEZsb2F0aW5nT2JqZWN0 cyBhbmQgbWFrZSB0aGUgcGxhY2VkIGZsb2F0cyB0cmVlIHByaXZhdGUuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmxvZ2ljYWxMZWZ0 RmxvYXRPZmZzZXRGb3JMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsb2dp Y2FsUmlnaHRGbG9hdE9mZnNldEZvckxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxv Y2s6OkZsb2F0aW5nT2JqZWN0czo6bG9naWNhbExlZnRPZmZzZXQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OkZsb2F0aW5nT2JqZWN0czo6bG9naWNhbFJpZ2h0T2Zmc2V0KToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpGbG9hdGluZ09iamVjdHM6OnBsYWNlZEZsb2F0c1RyZWUpOgorCisyMDEzLTA5LTA0 ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCiAgICAgICAgIEZsb2F0aW5n T2JqZWN0cyBzaG91bGQgbWFuYWdlIGNsZWFuaW5nIGl0J3MgbGluZSBib3ggdHJlZSBwb2ludGVy cyBpdHNlbGYKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMDY5MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCAz ODliMjlmOWQzOGUzMDlmYTVkYzJkN2U0MTM3MDAyNzQzOTFmZTdiLi4zZWVkZGFlY2RmMThhM2Qz ODM3ZGRmZDQ1ZDA2YTVjNzI5OTlkMzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKQEAgLTQ1NTcsMjkgKzQ1NTcsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJCbG9j azo6bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yQ29udGVudChSZW5kZXJSZWdpb24qIHJlZ2lvbikgY29u c3QKIAogTGF5b3V0VW5pdCBSZW5kZXJCbG9jazo6bG9naWNhbExlZnRGbG9hdE9mZnNldEZvckxp bmUoTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGZpeGVkT2Zmc2V0LCBMYXlvdXRV bml0KiBoZWlnaHRSZW1haW5pbmcsIExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgU2hhcGVPdXRz aWRlRmxvYXRPZmZzZXRNb2RlIG9mZnNldE1vZGUpIGNvbnN0CiB7Ci0jaWYgIUVOQUJMRShDU1Nf U0hBUEVTKQotICAgIFVOVVNFRF9QQVJBTShvZmZzZXRNb2RlKTsKLSNlbmRpZgotICAgIExheW91 dFVuaXQgbGVmdCA9IGZpeGVkT2Zmc2V0OwotICAgIGlmIChtX2Zsb2F0aW5nT2JqZWN0cyAmJiBt X2Zsb2F0aW5nT2JqZWN0cy0+aGFzTGVmdE9iamVjdHMoKSkgewotICAgICAgICBDb21wdXRlRmxv YXRPZmZzZXRBZGFwdGVyPEZsb2F0aW5nT2JqZWN0OjpGbG9hdExlZnQ+IGFkYXB0ZXIodGhpcywg cm91bmRUb0ludChsb2dpY2FsVG9wKSwgcm91bmRUb0ludChsb2dpY2FsVG9wICsgbG9naWNhbEhl aWdodCksIGxlZnQpOwotICAgICAgICBtX2Zsb2F0aW5nT2JqZWN0cy0+cGxhY2VkRmxvYXRzVHJl ZSgpLmFsbE92ZXJsYXBzV2l0aEFkYXB0ZXIoYWRhcHRlcik7Ci0KLSAgICAgICAgaWYgKGhlaWdo dFJlbWFpbmluZykKLSAgICAgICAgICAgICpoZWlnaHRSZW1haW5pbmcgPSBhZGFwdGVyLmdldEhl aWdodFJlbWFpbmluZygpOworICAgIGlmIChtX2Zsb2F0aW5nT2JqZWN0cyAmJiBtX2Zsb2F0aW5n T2JqZWN0cy0+aGFzTGVmdE9iamVjdHMoKSkKKyAgICAgICAgcmV0dXJuIG1fZmxvYXRpbmdPYmpl Y3RzLT5sb2dpY2FsTGVmdE9mZnNldChmaXhlZE9mZnNldCwgbG9naWNhbFRvcCwgbG9naWNhbEhl aWdodCwgb2Zmc2V0TW9kZSwgaGVpZ2h0UmVtYWluaW5nKTsKIAotI2lmIEVOQUJMRShDU1NfU0hB UEVTKQotICAgICAgICBjb25zdCBGbG9hdGluZ09iamVjdCogb3V0ZXJtb3N0RmxvYXQgPSBhZGFw dGVyLm91dGVybW9zdEZsb2F0KCk7Ci0gICAgICAgIGlmIChvZmZzZXRNb2RlID09IFNoYXBlT3V0 c2lkZUZsb2F0U2hhcGVPZmZzZXQgJiYgb3V0ZXJtb3N0RmxvYXQpIHsKLSAgICAgICAgICAgIGlm IChTaGFwZU91dHNpZGVJbmZvKiBzaGFwZU91dHNpZGUgPSBvdXRlcm1vc3RGbG9hdC0+cmVuZGVy ZXIoKS0+c2hhcGVPdXRzaWRlSW5mbygpKSB7Ci0gICAgICAgICAgICAgICAgc2hhcGVPdXRzaWRl LT5jb21wdXRlU2VnbWVudHNGb3JDb250YWluaW5nQmxvY2tMaW5lKGxvZ2ljYWxUb3AsIG91dGVy bW9zdEZsb2F0LT5sb2dpY2FsVG9wKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpLCBsb2dpY2Fs SGVpZ2h0KTsKLSAgICAgICAgICAgICAgICBsZWZ0ICs9IHNoYXBlT3V0c2lkZS0+cmlnaHRTZWdt ZW50TWFyZ2luQm94RGVsdGEoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotI2VuZGlmCi0g ICAgfQotCi0gICAgcmV0dXJuIGxlZnQ7CisgICAgcmV0dXJuIGZpeGVkT2Zmc2V0OwogfQogCiBM YXlvdXRVbml0IFJlbmRlckJsb2NrOjphZGp1c3RMb2dpY2FsTGVmdE9mZnNldEZvckxpbmUoTGF5 b3V0VW5pdCBvZmZzZXRGcm9tRmxvYXRzLCBib29sIGFwcGx5VGV4dEluZGVudCkgY29uc3QKQEAg LTQ2MjQsMzQgKzQ2MDUsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJCbG9jazo6YWRqdXN0TG9naWNh bExlZnRPZmZzZXRGb3JMaW5lKExheW91dFVuaXQgb2Zmc2V0RnJvbUZsb2EKIAogTGF5b3V0VW5p dCBSZW5kZXJCbG9jazo6bG9naWNhbFJpZ2h0RmxvYXRPZmZzZXRGb3JMaW5lKExheW91dFVuaXQg bG9naWNhbFRvcCwgTGF5b3V0VW5pdCBmaXhlZE9mZnNldCwgTGF5b3V0VW5pdCogaGVpZ2h0UmVt YWluaW5nLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIFNoYXBlT3V0c2lkZUZsb2F0T2Zmc2V0 TW9kZSBvZmZzZXRNb2RlKSBjb25zdAogewotI2lmICFFTkFCTEUoQ1NTX1NIQVBFUykKLSAgICBV TlVTRURfUEFSQU0ob2Zmc2V0TW9kZSk7Ci0jZW5kaWYKLSAgICBMYXlvdXRVbml0IHJpZ2h0ID0g Zml4ZWRPZmZzZXQ7Ci0gICAgaWYgKG1fZmxvYXRpbmdPYmplY3RzICYmIG1fZmxvYXRpbmdPYmpl Y3RzLT5oYXNSaWdodE9iamVjdHMoKSkgewotICAgICAgICBMYXlvdXRVbml0IHJpZ2h0RmxvYXRP ZmZzZXQgPSBmaXhlZE9mZnNldDsKLSAgICAgICAgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxG bG9hdGluZ09iamVjdDo6RmxvYXRSaWdodD4gYWRhcHRlcih0aGlzLCByb3VuZFRvSW50KGxvZ2lj YWxUb3ApLCByb3VuZFRvSW50KGxvZ2ljYWxUb3AgKyBsb2dpY2FsSGVpZ2h0KSwgcmlnaHRGbG9h dE9mZnNldCk7Ci0gICAgICAgIG1fZmxvYXRpbmdPYmplY3RzLT5wbGFjZWRGbG9hdHNUcmVlKCku YWxsT3ZlcmxhcHNXaXRoQWRhcHRlcihhZGFwdGVyKTsKLQotICAgICAgICBpZiAoaGVpZ2h0UmVt YWluaW5nKQotICAgICAgICAgICAgKmhlaWdodFJlbWFpbmluZyA9IGFkYXB0ZXIuZ2V0SGVpZ2h0 UmVtYWluaW5nKCk7CisgICAgaWYgKG1fZmxvYXRpbmdPYmplY3RzICYmIG1fZmxvYXRpbmdPYmpl Y3RzLT5oYXNSaWdodE9iamVjdHMoKSkKKyAgICAgICAgcmV0dXJuIG1fZmxvYXRpbmdPYmplY3Rz LT5sb2dpY2FsUmlnaHRPZmZzZXQoZml4ZWRPZmZzZXQsIGxvZ2ljYWxUb3AsIGxvZ2ljYWxIZWln aHQsIG9mZnNldE1vZGUsIGhlaWdodFJlbWFpbmluZyk7CiAKLSNpZiBFTkFCTEUoQ1NTX1NIQVBF UykKLSAgICAgICAgY29uc3QgRmxvYXRpbmdPYmplY3QqIG91dGVybW9zdEZsb2F0ID0gYWRhcHRl ci5vdXRlcm1vc3RGbG9hdCgpOwotICAgICAgICBpZiAob2Zmc2V0TW9kZSA9PSBTaGFwZU91dHNp ZGVGbG9hdFNoYXBlT2Zmc2V0ICYmIG91dGVybW9zdEZsb2F0KSB7Ci0gICAgICAgICAgICBpZiAo U2hhcGVPdXRzaWRlSW5mbyogc2hhcGVPdXRzaWRlID0gb3V0ZXJtb3N0RmxvYXQtPnJlbmRlcmVy KCktPnNoYXBlT3V0c2lkZUluZm8oKSkgewotICAgICAgICAgICAgICAgIHNoYXBlT3V0c2lkZS0+ Y29tcHV0ZVNlZ21lbnRzRm9yQ29udGFpbmluZ0Jsb2NrTGluZShsb2dpY2FsVG9wLCBvdXRlcm1v c3RGbG9hdC0+bG9naWNhbFRvcChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSwgbG9naWNhbEhl aWdodCk7Ci0gICAgICAgICAgICAgICAgcmlnaHRGbG9hdE9mZnNldCArPSBzaGFwZU91dHNpZGUt PmxlZnRTZWdtZW50TWFyZ2luQm94RGVsdGEoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQot I2Vsc2UKLSAgICAgICAgVU5VU0VEX1BBUkFNKG9mZnNldE1vZGUpOwotI2VuZGlmCi0KLSAgICAg ICAgcmlnaHQgPSBtaW4ocmlnaHQsIHJpZ2h0RmxvYXRPZmZzZXQpOwotICAgIH0KLQotICAgIHJl dHVybiByaWdodDsKKyAgICByZXR1cm4gZml4ZWRPZmZzZXQ7CiB9CiAKIExheW91dFVuaXQgUmVu ZGVyQmxvY2s6OmFkanVzdExvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoTGF5b3V0VW5pdCBvZmZz ZXRGcm9tRmxvYXRzLCBib29sIGFwcGx5VGV4dEluZGVudCkgY29uc3QKQEAgLTgzNDMsNiArODMw MCw1OCBAQCB2b2lkIFJlbmRlckJsb2NrOjpGbG9hdGluZ09iamVjdHM6OmNvbXB1dGVQbGFjZWRG bG9hdHNUcmVlKCkKICAgICB9CiB9CiAKK0xheW91dFVuaXQgUmVuZGVyQmxvY2s6OkZsb2F0aW5n T2JqZWN0czo6bG9naWNhbExlZnRPZmZzZXQoTGF5b3V0VW5pdCBmaXhlZE9mZnNldCwgTGF5b3V0 VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIFNoYXBlT3V0c2lkZUZs b2F0T2Zmc2V0TW9kZSBvZmZzZXRNb2RlLCBMYXlvdXRVbml0ICpoZWlnaHRSZW1haW5pbmcpCit7 CisjaWYgIUVOQUJMRShDU1NfU0hBUEVTKQorICAgIFVOVVNFRF9QQVJBTShvZmZzZXRNb2RlKTsK KyNlbmRpZgorCisgICAgTGF5b3V0VW5pdCBvZmZzZXQgPSBmaXhlZE9mZnNldDsKKyAgICBDb21w dXRlRmxvYXRPZmZzZXRBZGFwdGVyPEZsb2F0aW5nT2JqZWN0OjpGbG9hdExlZnQ+IGFkYXB0ZXIo bV9yZW5kZXJlciwgcm91bmRUb0ludChsb2dpY2FsVG9wKSwgcm91bmRUb0ludChsb2dpY2FsVG9w ICsgbG9naWNhbEhlaWdodCksIG9mZnNldCk7CisgICAgcGxhY2VkRmxvYXRzVHJlZSgpLmFsbE92 ZXJsYXBzV2l0aEFkYXB0ZXIoYWRhcHRlcik7CisKKyAgICBpZiAoaGVpZ2h0UmVtYWluaW5nKQor ICAgICAgICAqaGVpZ2h0UmVtYWluaW5nID0gYWRhcHRlci5nZXRIZWlnaHRSZW1haW5pbmcoKTsK KworI2lmIEVOQUJMRShDU1NfU0hBUEVTKQorICAgIGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBvdXRl cm1vc3RGbG9hdCA9IGFkYXB0ZXIub3V0ZXJtb3N0RmxvYXQoKTsKKyAgICBpZiAob2Zmc2V0TW9k ZSA9PSBTaGFwZU91dHNpZGVGbG9hdFNoYXBlT2Zmc2V0ICYmIG91dGVybW9zdEZsb2F0KSB7Cisg ICAgICAgIGlmIChTaGFwZU91dHNpZGVJbmZvKiBzaGFwZU91dHNpZGUgPSBvdXRlcm1vc3RGbG9h dC0+cmVuZGVyZXIoKS0+c2hhcGVPdXRzaWRlSW5mbygpKSB7CisgICAgICAgICAgICBzaGFwZU91 dHNpZGUtPmNvbXB1dGVTZWdtZW50c0ZvckNvbnRhaW5pbmdCbG9ja0xpbmUobG9naWNhbFRvcCwg b3V0ZXJtb3N0RmxvYXQtPmxvZ2ljYWxUb3AobV9ob3Jpem9udGFsV3JpdGluZ01vZGUpLCBsb2dp Y2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIG9mZnNldCArPSBzaGFwZU91dHNpZGUtPnJpZ2h0U2Vn bWVudE1hcmdpbkJveERlbHRhKCk7CisgICAgICAgIH0KKyAgICB9CisjZW5kaWYKKworICAgIHJl dHVybiBvZmZzZXQ7Cit9CisKK0xheW91dFVuaXQgUmVuZGVyQmxvY2s6OkZsb2F0aW5nT2JqZWN0 czo6bG9naWNhbFJpZ2h0T2Zmc2V0KExheW91dFVuaXQgZml4ZWRPZmZzZXQsIExheW91dFVuaXQg bG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBTaGFwZU91dHNpZGVGbG9hdE9m ZnNldE1vZGUgb2Zmc2V0TW9kZSwgTGF5b3V0VW5pdCAqaGVpZ2h0UmVtYWluaW5nKQoreworI2lm ICFFTkFCTEUoQ1NTX1NIQVBFUykKKyAgICBVTlVTRURfUEFSQU0ob2Zmc2V0TW9kZSk7CisjZW5k aWYKKworICAgIExheW91dFVuaXQgb2Zmc2V0ID0gZml4ZWRPZmZzZXQ7CisgICAgQ29tcHV0ZUZs b2F0T2Zmc2V0QWRhcHRlcjxGbG9hdGluZ09iamVjdDo6RmxvYXRSaWdodD4gYWRhcHRlcihtX3Jl bmRlcmVyLCByb3VuZFRvSW50KGxvZ2ljYWxUb3ApLCByb3VuZFRvSW50KGxvZ2ljYWxUb3AgKyBs b2dpY2FsSGVpZ2h0KSwgb2Zmc2V0KTsKKyAgICBwbGFjZWRGbG9hdHNUcmVlKCkuYWxsT3Zlcmxh cHNXaXRoQWRhcHRlcihhZGFwdGVyKTsKKworICAgIGlmIChoZWlnaHRSZW1haW5pbmcpCisgICAg ICAgICpoZWlnaHRSZW1haW5pbmcgPSBhZGFwdGVyLmdldEhlaWdodFJlbWFpbmluZygpOworCisj aWYgRU5BQkxFKENTU19TSEFQRVMpCisgICAgY29uc3QgRmxvYXRpbmdPYmplY3QqIG91dGVybW9z dEZsb2F0ID0gYWRhcHRlci5vdXRlcm1vc3RGbG9hdCgpOworICAgIGlmIChvZmZzZXRNb2RlID09 IFNoYXBlT3V0c2lkZUZsb2F0U2hhcGVPZmZzZXQgJiYgb3V0ZXJtb3N0RmxvYXQpIHsKKyAgICAg ICAgaWYgKFNoYXBlT3V0c2lkZUluZm8qIHNoYXBlT3V0c2lkZSA9IG91dGVybW9zdEZsb2F0LT5y ZW5kZXJlcigpLT5zaGFwZU91dHNpZGVJbmZvKCkpIHsKKyAgICAgICAgICAgIHNoYXBlT3V0c2lk ZS0+Y29tcHV0ZVNlZ21lbnRzRm9yQ29udGFpbmluZ0Jsb2NrTGluZShsb2dpY2FsVG9wLCBvdXRl cm1vc3RGbG9hdC0+bG9naWNhbFRvcChtX2hvcml6b250YWxXcml0aW5nTW9kZSksIGxvZ2ljYWxI ZWlnaHQpOworICAgICAgICAgICAgb2Zmc2V0ICs9IHNoYXBlT3V0c2lkZS0+bGVmdFNlZ21lbnRN YXJnaW5Cb3hEZWx0YSgpOworICAgICAgICB9CisgICAgfQorI2VuZGlmCisKKyAgICByZXR1cm4g bWluKGZpeGVkT2Zmc2V0LCBvZmZzZXQpOworfQorCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFj dGVyVHlwZT4KIHN0YXRpYyBpbmxpbmUgVGV4dFJ1biBjb25zdHJ1Y3RUZXh0UnVuSW50ZXJuYWwo UmVuZGVyT2JqZWN0KiBjb250ZXh0LCBjb25zdCBGb250JiBmb250LCBjb25zdCBDaGFyYWN0ZXJU eXBlKiBjaGFyYWN0ZXJzLCBpbnQgbGVuZ3RoLCBSZW5kZXJTdHlsZSogc3R5bGUsIFRleHRSdW46 OkV4cGFuc2lvbkJlaGF2aW9yIGV4cGFuc2lvbikKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmgKaW5kZXggZmVmZDM4NjI1YzljODM3ZTFhOGIyNzJhZGIwM2FmZDg3NWFhYTdh Yy4uMDU5NjgwMzQ2MzY3MWNmZjhlMjFlYmMyMzhjOTczYzhjNjM2NDAwMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTEyNjMsMTkgKzEyNjMsMTcgQEAgcHVibGlj OgogICAgICAgICBib29sIGhhc0xlZnRPYmplY3RzKCkgY29uc3QgeyByZXR1cm4gbV9sZWZ0T2Jq ZWN0c0NvdW50ID4gMDsgfQogICAgICAgICBib29sIGhhc1JpZ2h0T2JqZWN0cygpIGNvbnN0IHsg cmV0dXJuIG1fcmlnaHRPYmplY3RzQ291bnQgPiAwOyB9CiAgICAgICAgIGNvbnN0IEZsb2F0aW5n T2JqZWN0U2V0JiBzZXQoKSBjb25zdCB7IHJldHVybiBtX3NldDsgfQotICAgICAgICBjb25zdCBG bG9hdGluZ09iamVjdFRyZWUmIHBsYWNlZEZsb2F0c1RyZWUoKQotICAgICAgICB7Ci0gICAgICAg ICAgICBjb21wdXRlUGxhY2VkRmxvYXRzVHJlZUlmTmVlZGVkKCk7Ci0gICAgICAgICAgICByZXR1 cm4gbV9wbGFjZWRGbG9hdHNUcmVlOyAKLSAgICAgICAgfQogICAgICAgICB2b2lkIGNsZWFyTGlu ZUJveFRyZWVQb2ludGVycygpOworICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0T2Zmc2V0 KExheW91dFVuaXQgZml4ZWRPZmZzZXQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5p dCBsb2dpY2FsSGVpZ2h0LCBTaGFwZU91dHNpZGVGbG9hdE9mZnNldE1vZGUgPSBTaGFwZU91dHNp ZGVGbG9hdFNoYXBlT2Zmc2V0LCBMYXlvdXRVbml0KiBoZWlnaHRSZW1haW5pbmcgPSAwKTsKKyAg ICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsUmlnaHRPZmZzZXQoTGF5b3V0VW5pdCBmaXhlZE9mZnNl dCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIFNoYXBl T3V0c2lkZUZsb2F0T2Zmc2V0TW9kZSA9IFNoYXBlT3V0c2lkZUZsb2F0U2hhcGVPZmZzZXQsIExh eW91dFVuaXQqIGhlaWdodFJlbWFpbmluZyA9IDApOwogICAgIHByaXZhdGU6CiAgICAgICAgIEZs b2F0aW5nT2JqZWN0cyhjb25zdCBSZW5kZXJCbG9jayosIGJvb2wgaG9yaXpvbnRhbFdyaXRpbmdN b2RlKTsKICAgICAgICAgdm9pZCBjb21wdXRlUGxhY2VkRmxvYXRzVHJlZSgpOwotICAgICAgICBp bmxpbmUgdm9pZCBjb21wdXRlUGxhY2VkRmxvYXRzVHJlZUlmTmVlZGVkKCkKKyAgICAgICAgY29u c3QgRmxvYXRpbmdPYmplY3RUcmVlJiBwbGFjZWRGbG9hdHNUcmVlKCkKICAgICAgICAgewogICAg ICAgICAgICAgaWYgKCFtX3BsYWNlZEZsb2F0c1RyZWUuaXNJbml0aWFsaXplZCgpKQogICAgICAg ICAgICAgICAgIGNvbXB1dGVQbGFjZWRGbG9hdHNUcmVlKCk7CisgICAgICAgICAgICByZXR1cm4g bV9wbGFjZWRGbG9hdHNUcmVlOwogICAgICAgICB9CiAgICAgICAgIHZvaWQgaW5jcmVhc2VPYmpl Y3RzQ291bnQoRmxvYXRpbmdPYmplY3Q6OlR5cGUpOwogICAgICAgICB2b2lkIGRlY3JlYXNlT2Jq ZWN0c0NvdW50KEZsb2F0aW5nT2JqZWN0OjpUeXBlKTsK