46403 2010-09-23 13:52:05 -0700 Convert InlineFlowBox's margin/border/padding accessors to be logical. 2010-09-23 14:47:28 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt oldest_to_newest 283921 0 hyatt 2010-09-23 13:52:05 -0700 Convert InlineFlowBox's margin/border/padding accessors to be logical. 283944 1 68587 hyatt 2010-09-23 14:21:04 -0700 Created attachment 68587 Patch 283977 2 hyatt 2010-09-23 14:47:28 -0700 Fixed in r68200. 68587 2010-09-23 14:21:04 -0700 2010-09-23 14:45:56 -0700 Patch patch.txt text/plain 15603 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODE5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzggQEAKKzIwMTAtMDktMjMgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQwMywgY29udmVydCB0aGUgbWFy Z2luL2JvcmRlci9wYWRkaW5nIGFjY2Vzc29ycworICAgICAgICB0byBiZSBsb2dpY2FsLgorCisg ICAgICAgICogcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5saW5lRmxvd0JveDo6Z2V0Rmxvd1NwYWNpbmdMb2dpY2FsV2lkdGgpOgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lRmxvd0JveDo6cGxhY2VCb3hlc0hvcml6b250YWxseSk6CisgICAgICAgIChX ZWJDb3JlOjpJbmxpbmVGbG93Qm94OjpwYWludEJveFNoYWRvdyk6CisgICAgICAgIChXZWJDb3Jl OjpJbmxpbmVGbG93Qm94OjpwYWludEJveERlY29yYXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6 OklubGluZUZsb3dCb3g6OnBhaW50VGV4dERlY29yYXRpb25zKToKKyAgICAgICAgKiByZW5kZXJp bmcvSW5saW5lRmxvd0JveC5oOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6SW5s aW5lRmxvd0JveCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94OjptYXJnaW5Cb3Jk ZXJQYWRkaW5nTG9naWNhbExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6 bWFyZ2luQm9yZGVyUGFkZGluZ0xvZ2ljYWxSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxp bmVGbG93Qm94OjptYXJnaW5Mb2dpY2FsTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVG bG93Qm94OjptYXJnaW5Mb2dpY2FsUmlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxv d0JveDo6Ym9yZGVyTG9naWNhbExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0Jv eDo6Ym9yZGVyTG9naWNhbFJpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUZsb3dCb3g6 OnBhZGRpbmdMb2dpY2FsTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94Ojpw YWRkaW5nTG9naWNhbFJpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUZsb3dCb3g6Omlu Y2x1ZGVMb2dpY2FsTGVmdEVkZ2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6 aW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0Jv eDo6c2V0RWRnZXMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVIb3Jpem9udGFsUG9z aXRpb25zRm9yTGluZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnRhaW5pbmdCbG9ja1dpZHRoRm9yUG9zaXRpb25l ZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhbGNBYnNvbHV0ZUhvcml6b250YWxW YWx1ZXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpjYWxjQWJzb2x1dGVIb3Jpem9u dGFsUmVwbGFjZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5 ZXJFeHRlbmRlZCk6CisKIDIwMTAtMDktMjMgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVGbG93Qm94LmNwcAkocmV2aXNpb24gNjgxODYpCisrKyBXZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVGbG93Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMsMTIgKzUzLDEyIEBA IElubGluZUZsb3dCb3g6On5JbmxpbmVGbG93Qm94KCkKIAogI2VuZGlmCiAKLWludCBJbmxpbmVG bG93Qm94OjpnZXRGbG93U3BhY2luZ1dpZHRoKCkKK2ludCBJbmxpbmVGbG93Qm94OjpnZXRGbG93 U3BhY2luZ0xvZ2ljYWxXaWR0aCgpCiB7Ci0gICAgaW50IHRvdFdpZHRoID0gbWFyZ2luQm9yZGVy UGFkZGluZ0xlZnQoKSArIG1hcmdpbkJvcmRlclBhZGRpbmdSaWdodCgpOworICAgIGludCB0b3RX aWR0aCA9IG1hcmdpbkJvcmRlclBhZGRpbmdMb2dpY2FsTGVmdCgpICsgbWFyZ2luQm9yZGVyUGFk ZGluZ0xvZ2ljYWxSaWdodCgpOwogICAgIGZvciAoSW5saW5lQm94KiBjdXJyID0gZmlyc3RDaGls ZCgpOyBjdXJyOyBjdXJyID0gY3Vyci0+bmV4dE9uTGluZSgpKSB7CiAgICAgICAgIGlmIChjdXJy LT5pc0lubGluZUZsb3dCb3goKSkKLSAgICAgICAgICAgIHRvdFdpZHRoICs9IHN0YXRpY19jYXN0 PElubGluZUZsb3dCb3gqPihjdXJyKS0+Z2V0Rmxvd1NwYWNpbmdXaWR0aCgpOworICAgICAgICAg ICAgdG90V2lkdGggKz0gc3RhdGljX2Nhc3Q8SW5saW5lRmxvd0JveCo+KGN1cnIpLT5nZXRGbG93 U3BhY2luZ0xvZ2ljYWxXaWR0aCgpOwogICAgIH0KICAgICByZXR1cm4gdG90V2lkdGg7CiB9CkBA IC0yNzAsNyArMjcwLDcgQEAgaW50IElubGluZUZsb3dCb3g6OnBsYWNlQm94ZXNIb3Jpem9udGFs bAogICAgIGxlZnRWaXN1YWxPdmVyZmxvdyA9IG1pbih4UG9zICsgYm94U2hhZG93TGVmdCwgbGVm dFZpc3VhbE92ZXJmbG93KTsKIAogICAgIGludCBzdGFydFggPSB4UG9zOwotICAgIHhQb3MgKz0g Ym9yZGVyTGVmdCgpICsgcGFkZGluZ0xlZnQoKTsKKyAgICB4UG9zICs9IGJvcmRlckxvZ2ljYWxM ZWZ0KCkgKyBwYWRkaW5nTG9naWNhbExlZnQoKTsKICAgICAKICAgICBmb3IgKElubGluZUJveCog Y3VyciA9IGZpcnN0Q2hpbGQoKTsgY3VycjsgY3VyciA9IGN1cnItPm5leHRPbkxpbmUoKSkgewog ICAgICAgICBpZiAoY3Vyci0+cmVuZGVyZXIoKS0+aXNUZXh0KCkpIHsKQEAgLTMyMCw5ICszMjAs OSBAQCBpbnQgSW5saW5lRmxvd0JveDo6cGxhY2VCb3hlc0hvcml6b250YWxsCiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICBpZiAoY3Vyci0+cmVuZGVyZXIoKS0+aXNSZW5kZXJJbmxpbmUoKSkg ewogICAgICAgICAgICAgICAgIElubGluZUZsb3dCb3gqIGZsb3cgPSBzdGF0aWNfY2FzdDxJbmxp bmVGbG93Qm94Kj4oY3Vycik7Ci0gICAgICAgICAgICAgICAgeFBvcyArPSBmbG93LT5tYXJnaW5M ZWZ0KCk7CisgICAgICAgICAgICAgICAgeFBvcyArPSBmbG93LT5tYXJnaW5Mb2dpY2FsTGVmdCgp OwogICAgICAgICAgICAgICAgIHhQb3MgPSBmbG93LT5wbGFjZUJveGVzSG9yaXpvbnRhbGx5KHhQ b3MsIG5lZWRzV29yZFNwYWNpbmcsIHRleHRCb3hEYXRhTWFwKTsKLSAgICAgICAgICAgICAgICB4 UG9zICs9IGZsb3ctPm1hcmdpblJpZ2h0KCk7CisgICAgICAgICAgICAgICAgeFBvcyArPSBmbG93 LT5tYXJnaW5Mb2dpY2FsUmlnaHQoKTsKICAgICAgICAgICAgICAgICBsZWZ0TGF5b3V0T3ZlcmZs b3cgPSBtaW4obGVmdExheW91dE92ZXJmbG93LCBmbG93LT5sZWZ0TGF5b3V0T3ZlcmZsb3coKSk7 CiAgICAgICAgICAgICAgICAgcmlnaHRMYXlvdXRPdmVyZmxvdyA9IG1heChyaWdodExheW91dE92 ZXJmbG93LCBmbG93LT5yaWdodExheW91dE92ZXJmbG93KCkpOwogICAgICAgICAgICAgICAgIGxl ZnRWaXN1YWxPdmVyZmxvdyA9IG1pbihsZWZ0VmlzdWFsT3ZlcmZsb3csIGZsb3ctPmxlZnRWaXN1 YWxPdmVyZmxvdygpKTsKQEAgLTM0Niw3ICszNDYsNyBAQCBpbnQgSW5saW5lRmxvd0JveDo6cGxh Y2VCb3hlc0hvcml6b250YWxsCiAgICAgICAgIH0KICAgICB9CiAKLSAgICB4UG9zICs9IGJvcmRl clJpZ2h0KCkgKyBwYWRkaW5nUmlnaHQoKTsKKyAgICB4UG9zICs9IGJvcmRlckxvZ2ljYWxSaWdo dCgpICsgcGFkZGluZ0xvZ2ljYWxSaWdodCgpOwogICAgIHNldExvZ2ljYWxXaWR0aCh4UG9zIC0g c3RhcnRYKTsKICAgICByaWdodFZpc3VhbE92ZXJmbG93ID0gbWF4KHgoKSArIGxvZ2ljYWxXaWR0 aCgpICsgYm94U2hhZG93UmlnaHQsIHJpZ2h0VmlzdWFsT3ZlcmZsb3cpOwogICAgIHJpZ2h0TGF5 b3V0T3ZlcmZsb3cgPSBtYXgoeCgpICsgbG9naWNhbFdpZHRoKCksIHJpZ2h0TGF5b3V0T3ZlcmZs b3cpOwpAQCAtNzQ3LDcgKzc0Nyw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnRCb3hTaGFk b3coR3JhcGgKICAgICBlbHNlIHsKICAgICAgICAgLy8gRklYTUU6IFdlIGNhbiBkbyBiZXR0ZXIg aGVyZSBpbiB0aGUgbXVsdGktbGluZSBjYXNlLiBXZSB3YW50IHRvIHB1c2ggYSBjbGlwIHNvIHRo YXQgdGhlIHNoYWRvdyBkb2Vzbid0CiAgICAgICAgIC8vIHByb3RydWRlIGluY29ycmVjdGx5IGF0 IHRoZSBlZGdlcywgYW5kIHdlIHdhbnQgdG8gcG9zc2libHkgaW5jbHVkZSBzaGFkb3dzIGNhc3Qg ZnJvbSB0aGUgcHJldmlvdXMvZm9sbG93aW5nIGxpbmVzCi0gICAgICAgIGJveE1vZGVsT2JqZWN0 KCktPnBhaW50Qm94U2hhZG93KGNvbnRleHQsIHR4LCB0eSwgdywgaCwgcywgc2hhZG93U3R5bGUs IGluY2x1ZGVMZWZ0RWRnZSgpLCBpbmNsdWRlUmlnaHRFZGdlKCkpOworICAgICAgICBib3hNb2Rl bE9iamVjdCgpLT5wYWludEJveFNoYWRvdyhjb250ZXh0LCB0eCwgdHksIHcsIGgsIHMsIHNoYWRv d1N0eWxlLCBpbmNsdWRlTG9naWNhbExlZnRFZGdlKCksIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdl KCkpOwogICAgIH0KIH0KIApAQCAtODAxLDcgKzgwMSw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6 cGFpbnRCb3hEZWNvcmF0aW9ucygKICAgICAgICAgICAgIC8vIFRoZSBzaW1wbGUgY2FzZSBpcyB3 aGVyZSB3ZSBlaXRoZXIgaGF2ZSBubyBib3JkZXIgaW1hZ2Ugb3Igd2UgYXJlIHRoZSBvbmx5IGJv eCBmb3IgdGhpcyBvYmplY3QuICBJbiB0aG9zZQogICAgICAgICAgICAgLy8gY2FzZXMgb25seSBh IHNpbmdsZSBjYWxsIHRvIGRyYXcgaXMgcmVxdWlyZWQuCiAgICAgICAgICAgICBpZiAoIWhhc0Jv cmRlckltYWdlIHx8ICghcHJldkxpbmVCb3goKSAmJiAhbmV4dExpbmVCb3goKSkpCi0gICAgICAg ICAgICAgICAgYm94TW9kZWxPYmplY3QoKS0+cGFpbnRCb3JkZXIoY29udGV4dCwgdHgsIHR5LCB3 LCBoLCByZW5kZXJlcigpLT5zdHlsZSgpLCBpbmNsdWRlTGVmdEVkZ2UoKSwgaW5jbHVkZVJpZ2h0 RWRnZSgpKTsKKyAgICAgICAgICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludEJvcmRlcihj b250ZXh0LCB0eCwgdHksIHcsIGgsIHJlbmRlcmVyKCktPnN0eWxlKCksIGluY2x1ZGVMb2dpY2Fs TGVmdEVkZ2UoKSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UoKSk7CiAgICAgICAgICAgICBlbHNl IHsKICAgICAgICAgICAgICAgICAvLyBXZSBoYXZlIGEgYm9yZGVyIGltYWdlIHRoYXQgc3BhbnMg bXVsdGlwbGUgbGluZXMuCiAgICAgICAgICAgICAgICAgLy8gV2UgbmVlZCB0byBhZGp1c3QgX3R4 IGFuZCBfdHkgYnkgdGhlIHdpZHRoIG9mIGFsbCBwcmV2aW91cyBsaW5lcy4KQEAgLTkzOSw4ICs5 MzksOCBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50VGV4dERlY29yYXRpb25zCiAgICAgaWYg KGRlY28gIT0gVEROT05FICYmIAogICAgICAgICAoKCFwYWludGVkQ2hpbGRyZW4gJiYgKChkZWNv ICYgVU5ERVJMSU5FKSB8fCAoZGVjbyAmIE9WRVJMSU5FKSkpIHx8IChwYWludGVkQ2hpbGRyZW4g JiYgKGRlY28gJiBMSU5FX1RIUk9VR0gpKSkgJiYKICAgICAgICAgc2hvdWxkRHJhd1RleHREZWNv cmF0aW9uKHJlbmRlcmVyKCkpKSB7Ci0gICAgICAgIGludCB4ID0gbV94ICsgYm9yZGVyTGVmdCgp ICsgcGFkZGluZ0xlZnQoKTsKLSAgICAgICAgaW50IHcgPSBtX2xvZ2ljYWxXaWR0aCAtIChib3Jk ZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpICsgYm9yZGVyUmlnaHQoKSArIHBhZGRpbmdSaWdodCgp KTsKKyAgICAgICAgaW50IHggPSBtX3ggKyBib3JkZXJMb2dpY2FsTGVmdCgpICsgcGFkZGluZ0xv Z2ljYWxMZWZ0KCk7CisgICAgICAgIGludCB3ID0gbV9sb2dpY2FsV2lkdGggLSAoYm9yZGVyTG9n aWNhbExlZnQoKSArIHBhZGRpbmdMb2dpY2FsTGVmdCgpICsgYm9yZGVyTG9naWNhbFJpZ2h0KCkg KyBwYWRkaW5nTG9naWNhbFJpZ2h0KCkpOwogICAgICAgICBSb290SW5saW5lQm94KiByb290TGlu ZSA9IHJvb3QoKTsKICAgICAgICAgaWYgKHJvb3RMaW5lLT5lbGxpcHNpc0JveCgpKSB7CiAgICAg ICAgICAgICBpbnQgZWxsaXBzaXNYID0gbV94ICsgcm9vdExpbmUtPmVsbGlwc2lzQm94KCktPngo KTsKQEAgLTk3OCw3ICs5NzgsNyBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50VGV4dERlY29y YXRpb25zCiAgICAgICAgIH0KIAogICAgICAgICAvLyBXZSBtdXN0IGhhdmUgY2hpbGQgYm94ZXMg YW5kIGhhdmUgZGVjb3JhdGlvbnMgZGVmaW5lZC4KLSAgICAgICAgdHggKz0gYm9yZGVyTGVmdCgp ICsgcGFkZGluZ0xlZnQoKTsKKyAgICAgICAgdHggKz0gYm9yZGVyTG9naWNhbExlZnQoKSArIHBh ZGRpbmdMb2dpY2FsTGVmdCgpOwogCiAgICAgICAgIENvbG9yIHVuZGVybGluZSwgb3ZlcmxpbmUs IGxpbmV0aHJvdWdoOwogICAgICAgICB1bmRlcmxpbmUgPSBvdmVybGluZSA9IGxpbmV0aHJvdWdo ID0gc3R5bGVUb1VzZS0+dmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5Q29sb3IpOwpA QCAtOTk2LDcgKzk5Niw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnRUZXh0RGVjb3JhdGlv bnMKIAogICAgICAgICBpbnQgYmFzZWxpbmVQb3MgPSByZW5kZXJlcigpLT5zdHlsZShtX2ZpcnN0 TGluZSktPmZvbnQoKS5hc2NlbnQoKTsKICAgICAgICAgaWYgKCFpc1Jvb3RJbmxpbmVCb3goKSkK LSAgICAgICAgICAgIGJhc2VsaW5lUG9zICs9IGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpOwor ICAgICAgICAgICAgYmFzZWxpbmVQb3MgKz0gYm94TW9kZWxPYmplY3QoKS0+Ym9yZGVyVG9wKCkg KyBib3hNb2RlbE9iamVjdCgpLT5wYWRkaW5nVG9wKCk7CiAKICAgICAgICAgYm9vbCBzZXRDbGlw ID0gZmFsc2U7CiAgICAgICAgIGludCBleHRyYU9mZnNldCA9IDA7CkluZGV4OiBXZWJDb3JlL3Jl bmRlcmluZy9JbmxpbmVGbG93Qm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lRmxvd0JveC5oCShyZXZpc2lvbiA2ODE3NykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL0lu bGluZUZsb3dCb3guaAkod29ya2luZyBjb3B5KQpAQCAtNDEsOCArNDEsOCBAQCBwdWJsaWM6CiAg ICAgICAgICwgbV9sYXN0Q2hpbGQoMCkKICAgICAgICAgLCBtX3ByZXZMaW5lQm94KDApCiAgICAg ICAgICwgbV9uZXh0TGluZUJveCgwKQotICAgICAgICAsIG1faW5jbHVkZUxlZnRFZGdlKGZhbHNl KQotICAgICAgICAsIG1faW5jbHVkZVJpZ2h0RWRnZShmYWxzZSkKKyAgICAgICAgLCBtX2luY2x1 ZGVMb2dpY2FsTGVmdEVkZ2UoZmFsc2UpCisgICAgICAgICwgbV9pbmNsdWRlTG9naWNhbFJpZ2h0 RWRnZShmYWxzZSkKICNpZm5kZWYgTkRFQlVHCiAgICAgICAgICwgbV9oYXNCYWRDaGlsZExpc3Qo ZmFsc2UpCiAjZW5kaWYKQEAgLTEwMiwzMCArMTAyLDU3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1 YWwgUmVuZGVyTGluZUJveExpc3QqIHJlbmRlcmVyTGluZUJveGVzKCkgY29uc3Q7CiAKLSAgICBp bnQgbWFyZ2luQm9yZGVyUGFkZGluZ0xlZnQoKSBjb25zdCB7IHJldHVybiBtYXJnaW5MZWZ0KCkg KyBib3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpOyB9Ci0gICAgaW50IG1hcmdpbkJvcmRlclBh ZGRpbmdSaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1hcmdpblJpZ2h0KCkgKyBib3JkZXJSaWdodCgp ICsgcGFkZGluZ1JpZ2h0KCk7IH0KLSAgICBpbnQgbWFyZ2luTGVmdCgpIGNvbnN0IHsgaWYgKGlu Y2x1ZGVMZWZ0RWRnZSgpKSByZXR1cm4gYm94TW9kZWxPYmplY3QoKS0+bWFyZ2luTGVmdCgpOyBy ZXR1cm4gMDsgfQotICAgIGludCBtYXJnaW5SaWdodCgpIGNvbnN0IHsgaWYgKGluY2x1ZGVSaWdo dEVkZ2UoKSkgcmV0dXJuIGJveE1vZGVsT2JqZWN0KCktPm1hcmdpblJpZ2h0KCk7IHJldHVybiAw OyB9Ci0gICAgaW50IGJvcmRlckxlZnQoKSBjb25zdCB7IGlmIChpbmNsdWRlTGVmdEVkZ2UoKSkg cmV0dXJuIHJlbmRlcmVyKCktPnN0eWxlKCktPmJvcmRlckxlZnRXaWR0aCgpOyByZXR1cm4gMDsg fQotICAgIGludCBib3JkZXJSaWdodCgpIGNvbnN0IHsgaWYgKGluY2x1ZGVSaWdodEVkZ2UoKSkg cmV0dXJuIHJlbmRlcmVyKCktPnN0eWxlKCktPmJvcmRlclJpZ2h0V2lkdGgoKTsgcmV0dXJuIDA7 IH0KLSAgICBpbnQgYm9yZGVyVG9wKCkgY29uc3QgeyByZXR1cm4gcmVuZGVyZXIoKS0+c3R5bGUo KS0+Ym9yZGVyVG9wV2lkdGgoKTsgfQotICAgIGludCBib3JkZXJCb3R0b20oKSBjb25zdCB7IHJl dHVybiByZW5kZXJlcigpLT5zdHlsZSgpLT5ib3JkZXJCb3R0b21XaWR0aCgpOyB9Ci0gICAgaW50 IHBhZGRpbmdMZWZ0KCkgY29uc3QgeyBpZiAoaW5jbHVkZUxlZnRFZGdlKCkpIHJldHVybiBib3hN b2RlbE9iamVjdCgpLT5wYWRkaW5nTGVmdCgpOyByZXR1cm4gMDsgfQotICAgIGludCBwYWRkaW5n UmlnaHQoKSBjb25zdCB7IGlmIChpbmNsdWRlUmlnaHRFZGdlKCkpIHJldHVybiBib3hNb2RlbE9i amVjdCgpLT5wYWRkaW5nUmlnaHQoKTsgcmV0dXJuIDA7IH0KLSAgICBpbnQgcGFkZGluZ1RvcCgp IGNvbnN0IHsgcmV0dXJuIGJveE1vZGVsT2JqZWN0KCktPnBhZGRpbmdUb3AoKTsgfQotICAgIGlu dCBwYWRkaW5nQm90dG9tKCkgY29uc3QgeyByZXR1cm4gYm94TW9kZWxPYmplY3QoKS0+cGFkZGlu Z0JvdHRvbSgpOyB9CisgICAgLy8gbG9naWNhbExlZnQgPSBsZWZ0IGluIGEgaG9yaXpvbnRhbCBs aW5lIGFuZCB0b3AgaW4gYSB2ZXJ0aWNhbCBsaW5lLgorICAgIGludCBtYXJnaW5Cb3JkZXJQYWRk aW5nTG9naWNhbExlZnQoKSBjb25zdCB7IHJldHVybiBtYXJnaW5Mb2dpY2FsTGVmdCgpICsgYm9y ZGVyTG9naWNhbExlZnQoKSArIHBhZGRpbmdMb2dpY2FsTGVmdCgpOyB9CisgICAgaW50IG1hcmdp bkJvcmRlclBhZGRpbmdMb2dpY2FsUmlnaHQoKSBjb25zdCB7IHJldHVybiBtYXJnaW5Mb2dpY2Fs UmlnaHQoKSArIGJvcmRlckxvZ2ljYWxSaWdodCgpICsgcGFkZGluZ0xvZ2ljYWxSaWdodCgpOyB9 CisgICAgaW50IG1hcmdpbkxvZ2ljYWxMZWZ0KCkgY29uc3QKKyAgICB7CisgICAgICAgIGlmICgh aW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpKQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAg IHJldHVybiAhaXNWZXJ0aWNhbCgpID8gYm94TW9kZWxPYmplY3QoKS0+bWFyZ2luTGVmdCgpIDog Ym94TW9kZWxPYmplY3QoKS0+bWFyZ2luVG9wKCk7CisgICAgfQorICAgIGludCBtYXJnaW5Mb2dp Y2FsUmlnaHQoKSBjb25zdAorICAgIHsKKyAgICAgICAgaWYgKCFpbmNsdWRlTG9naWNhbFJpZ2h0 RWRnZSgpKQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiAhaXNWZXJ0aWNh bCgpID8gYm94TW9kZWxPYmplY3QoKS0+bWFyZ2luUmlnaHQoKSA6IGJveE1vZGVsT2JqZWN0KCkt Pm1hcmdpbkJvdHRvbSgpOworICAgIH0KKyAgICBpbnQgYm9yZGVyTG9naWNhbExlZnQoKSBjb25z dAorICAgIHsKKyAgICAgICAgaWYgKCFpbmNsdWRlTG9naWNhbExlZnRFZGdlKCkpCisgICAgICAg ICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuICFpc1ZlcnRpY2FsKCkgPyByZW5kZXJlcigp LT5zdHlsZSgpLT5ib3JkZXJMZWZ0V2lkdGgoKSA6IHJlbmRlcmVyKCktPnN0eWxlKCktPmJvcmRl clRvcFdpZHRoKCk7CisgICAgfQorICAgIGludCBib3JkZXJMb2dpY2FsUmlnaHQoKSBjb25zdAor ICAgIHsKKyAgICAgICAgaWYgKCFpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSgpKQorICAgICAgICAg ICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiAhaXNWZXJ0aWNhbCgpID8gcmVuZGVyZXIoKS0+ c3R5bGUoKS0+Ym9yZGVyUmlnaHRXaWR0aCgpIDogcmVuZGVyZXIoKS0+c3R5bGUoKS0+Ym9yZGVy Qm90dG9tV2lkdGgoKTsKKyAgICB9CisgICAgaW50IHBhZGRpbmdMb2dpY2FsTGVmdCgpIGNvbnN0 CisgICAgeworICAgICAgICBpZiAoIWluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UoKSkKKyAgICAgICAg ICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gIWlzVmVydGljYWwoKSA/IGJveE1vZGVsT2Jq ZWN0KCktPnBhZGRpbmdMZWZ0KCkgOiBib3hNb2RlbE9iamVjdCgpLT5wYWRkaW5nVG9wKCk7Cisg ICAgfQorICAgIGludCBwYWRkaW5nTG9naWNhbFJpZ2h0KCkgY29uc3QKKyAgICB7CisgICAgICAg IGlmICghaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UoKSkKKyAgICAgICAgICAgIHJldHVybiAwOwor ICAgICAgICByZXR1cm4gIWlzVmVydGljYWwoKSA/IGJveE1vZGVsT2JqZWN0KCktPnBhZGRpbmdS aWdodCgpIDogYm94TW9kZWxPYmplY3QoKS0+cGFkZGluZ0JvdHRvbSgpOworICAgIH0KIAotICAg IGJvb2wgaW5jbHVkZUxlZnRFZGdlKCkgY29uc3QgeyByZXR1cm4gbV9pbmNsdWRlTGVmdEVkZ2U7 IH0KLSAgICBib29sIGluY2x1ZGVSaWdodEVkZ2UoKSBjb25zdCB7IHJldHVybiBtX2luY2x1ZGVS aWdodEVkZ2U7IH0KKyAgICBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UoKSBjb25zdCB7IHJl dHVybiBtX2luY2x1ZGVMb2dpY2FsTGVmdEVkZ2U7IH0KKyAgICBib29sIGluY2x1ZGVMb2dpY2Fs UmlnaHRFZGdlKCkgY29uc3QgeyByZXR1cm4gbV9pbmNsdWRlTG9naWNhbFJpZ2h0RWRnZTsgfQog ICAgIHZvaWQgc2V0RWRnZXMoYm9vbCBpbmNsdWRlTGVmdCwgYm9vbCBpbmNsdWRlUmlnaHQpCiAg ICAgewotICAgICAgICBtX2luY2x1ZGVMZWZ0RWRnZSA9IGluY2x1ZGVMZWZ0OwotICAgICAgICBt X2luY2x1ZGVSaWdodEVkZ2UgPSBpbmNsdWRlUmlnaHQ7CisgICAgICAgIG1faW5jbHVkZUxvZ2lj YWxMZWZ0RWRnZSA9IGluY2x1ZGVMZWZ0OworICAgICAgICBtX2luY2x1ZGVMb2dpY2FsUmlnaHRF ZGdlID0gaW5jbHVkZVJpZ2h0OwogICAgIH0KIAogICAgIC8vIEhlbHBlciBmdW5jdGlvbnMgdXNl ZCBkdXJpbmcgbGluZSBjb25zdHJ1Y3Rpb24gYW5kIHBsYWNlbWVudC4KICAgICB2b2lkIGRldGVy bWluZVNwYWNpbmdGb3JGbG93Qm94ZXMoYm9vbCBsYXN0TGluZSwgUmVuZGVyT2JqZWN0KiBlbmRP YmplY3QpOwotICAgIGludCBnZXRGbG93U3BhY2luZ1dpZHRoKCk7CisgICAgaW50IGdldEZsb3dT cGFjaW5nTG9naWNhbFdpZHRoKCk7CiAgICAgYm9vbCBvbkVuZENoYWluKFJlbmRlck9iamVjdCog ZW5kT2JqZWN0KTsKICAgICBpbnQgcGxhY2VCb3hlc0hvcml6b250YWxseShpbnQgeCwgYm9vbCYg bmVlZHNXb3JkU3BhY2luZywgR2x5cGhPdmVyZmxvd0FuZEZhbGxiYWNrRm9udHNNYXAmKTsKICAg ICB2b2lkIGNvbXB1dGVMb2dpY2FsQm94SGVpZ2h0cyhpbnQmIG1heFBvc2l0aW9uVG9wLCBpbnQm IG1heFBvc2l0aW9uQm90dG9tLApAQCAtMTc5LDggKzIwNiw4IEBAIHByb3RlY3RlZDoKICAgICBJ bmxpbmVGbG93Qm94KiBtX3ByZXZMaW5lQm94OyAvLyBUaGUgcHJldmlvdXMgYm94IHRoYXQgYWxz byB1c2VzIG91ciBSZW5kZXJPYmplY3QKICAgICBJbmxpbmVGbG93Qm94KiBtX25leHRMaW5lQm94 OyAvLyBUaGUgbmV4dCBib3ggdGhhdCBhbHNvIHVzZXMgb3VyIFJlbmRlck9iamVjdAogCi0gICAg Ym9vbCBtX2luY2x1ZGVMZWZ0RWRnZSA6IDE7Ci0gICAgYm9vbCBtX2luY2x1ZGVSaWdodEVkZ2Ug OiAxOworICAgIGJvb2wgbV9pbmNsdWRlTG9naWNhbExlZnRFZGdlIDogMTsKKyAgICBib29sIG1f aW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UgOiAxOwogICAgIGJvb2wgbV9oYXNUZXh0Q2hpbGRyZW4g OiAxOwogCiAjaWZuZGVmIE5ERUJVRwpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tMaW5lTGF5b3V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0xpbmVMYXlvdXQuY3BwCShyZXZpc2lvbiA2ODE3NykKKysrIFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyNCw3ICszMjQs NyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlSG9yaXpvbnRhbFBvc2l0CiB7CiAgICAgLy8g Rmlyc3QgZGV0ZXJtaW5lIG91ciB0b3RhbCB3aWR0aC4KICAgICBpbnQgYXZhaWxhYmxlV2lkdGgg PSBsaW5lV2lkdGgoaGVpZ2h0KCksIGZpcnN0TGluZSk7Ci0gICAgaW50IHRvdFdpZHRoID0gbGlu ZUJveC0+Z2V0Rmxvd1NwYWNpbmdXaWR0aCgpOworICAgIGludCB0b3RXaWR0aCA9IGxpbmVCb3gt PmdldEZsb3dTcGFjaW5nTG9naWNhbFdpZHRoKCk7CiAgICAgYm9vbCBuZWVkc1dvcmRTcGFjaW5n ID0gZmFsc2U7CiAgICAgdW5zaWduZWQgbnVtU3BhY2VzID0gMDsKICAgICBFVGV4dEFsaWduIHRl eHRBbGlnbiA9IHN0eWxlKCktPnRleHRBbGlnbigpOwpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCShyZXZpc2lvbiA2ODE3NykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE4NTUsMTEgKzE4NTUsMTEgQEAgaW50IFJlbmRlckJveDo6Y29u dGFpbmluZ0Jsb2NrV2lkdGhGb3JQbwogICAgIGludCBmcm9tTGVmdDsKICAgICBpbnQgZnJvbVJp Z2h0OwogICAgIGlmIChjb250YWluaW5nQmxvY2stPnN0eWxlKCktPmRpcmVjdGlvbigpID09IExU UikgewotICAgICAgICBmcm9tTGVmdCA9IGZpcnN0LT54KCkgKyBmaXJzdC0+Ym9yZGVyTGVmdCgp OwotICAgICAgICBmcm9tUmlnaHQgPSBsYXN0LT54KCkgKyBsYXN0LT5sb2dpY2FsV2lkdGgoKSAt IGxhc3QtPmJvcmRlclJpZ2h0KCk7CisgICAgICAgIGZyb21MZWZ0ID0gZmlyc3QtPmxvZ2ljYWxM ZWZ0KCkgKyBmaXJzdC0+Ym9yZGVyTG9naWNhbExlZnQoKTsKKyAgICAgICAgZnJvbVJpZ2h0ID0g bGFzdC0+bG9naWNhbExlZnQoKSArIGxhc3QtPmxvZ2ljYWxXaWR0aCgpIC0gbGFzdC0+Ym9yZGVy TG9naWNhbFJpZ2h0KCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgZnJvbVJpZ2h0ID0gZmlyc3Qt PngoKSArIGZpcnN0LT5sb2dpY2FsV2lkdGgoKSAtIGZpcnN0LT5ib3JkZXJSaWdodCgpOwotICAg ICAgICBmcm9tTGVmdCA9IGxhc3QtPngoKSArIGxhc3QtPmJvcmRlckxlZnQoKTsKKyAgICAgICAg ZnJvbVJpZ2h0ID0gZmlyc3QtPmxvZ2ljYWxMZWZ0KCkgKyBmaXJzdC0+bG9naWNhbFdpZHRoKCkg LSBmaXJzdC0+Ym9yZGVyTG9naWNhbFJpZ2h0KCk7CisgICAgICAgIGZyb21MZWZ0ID0gbGFzdC0+ bG9naWNhbExlZnQoKSArIGxhc3QtPmJvcmRlckxvZ2ljYWxMZWZ0KCk7CiAgICAgfQogCiAgICAg cmV0dXJuIG1heCgwLCAoZnJvbVJpZ2h0IC0gZnJvbUxlZnQpKTsKQEAgLTIyMDEsNyArMjIwMSw3 IEBAIHZvaWQgUmVuZGVyQm94OjpjYWxjQWJzb2x1dGVIb3Jpem9udGFsVmEKICAgICAgICAgSW5s aW5lRmxvd0JveCogZmlyc3RMaW5lID0gZmxvdy0+Zmlyc3RMaW5lQm94KCk7CiAgICAgICAgIElu bGluZUZsb3dCb3gqIGxhc3RMaW5lID0gZmxvdy0+bGFzdExpbmVCb3goKTsKICAgICAgICAgaWYg KGZpcnN0TGluZSAmJiBsYXN0TGluZSAmJiBmaXJzdExpbmUgIT0gbGFzdExpbmUpIHsKLSAgICAg ICAgICAgIHhQb3MgPSBsZWZ0VmFsdWUgKyBtYXJnaW5MZWZ0VmFsdWUgKyBsYXN0TGluZS0+Ym9y ZGVyTGVmdCgpICsgKGxhc3RMaW5lLT54KCkgLSBmaXJzdExpbmUtPngoKSk7CisgICAgICAgICAg ICB4UG9zID0gbGVmdFZhbHVlICsgbWFyZ2luTGVmdFZhbHVlICsgbGFzdExpbmUtPmJvcmRlckxv Z2ljYWxMZWZ0KCkgKyAobGFzdExpbmUtPngoKSAtIGZpcnN0TGluZS0+eCgpKTsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KQEAgLTI2MDcsNyArMjYwNyw3IEBAIHZvaWQg UmVuZGVyQm94OjpjYWxjQWJzb2x1dGVIb3Jpem9udGFsUmUKICAgICAgICAgSW5saW5lRmxvd0Jv eCogZmlyc3RMaW5lID0gZmxvdy0+Zmlyc3RMaW5lQm94KCk7CiAgICAgICAgIElubGluZUZsb3dC b3gqIGxhc3RMaW5lID0gZmxvdy0+bGFzdExpbmVCb3goKTsKICAgICAgICAgaWYgKGZpcnN0TGlu ZSAmJiBsYXN0TGluZSAmJiBmaXJzdExpbmUgIT0gbGFzdExpbmUpIHsKLSAgICAgICAgICAgIG1f ZnJhbWVSZWN0LnNldFgobGVmdFZhbHVlICsgbV9tYXJnaW5MZWZ0ICsgbGFzdExpbmUtPmJvcmRl ckxlZnQoKSArIChsYXN0TGluZS0+eCgpIC0gZmlyc3RMaW5lLT54KCkpKTsKKyAgICAgICAgICAg IG1fZnJhbWVSZWN0LnNldFgobGVmdFZhbHVlICsgbV9tYXJnaW5MZWZ0ICsgbGFzdExpbmUtPmJv cmRlckxvZ2ljYWxMZWZ0KCkgKyAobGFzdExpbmUtPngoKSAtIGZpcnN0TGluZS0+eCgpKSk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCShyZXZpc2lvbiA2ODE3NCkKKysrIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTA1LDggKzUwNSw4IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWUK ICAgICBpZiAoY29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBib29sIGluY2x1ZGVMZWZ0RWRnZSA9IGJveCA/IGJveC0+aW5jbHVkZUxlZnRFZGdlKCkg OiB0cnVlOwotICAgIGJvb2wgaW5jbHVkZVJpZ2h0RWRnZSA9IGJveCA/IGJveC0+aW5jbHVkZVJp Z2h0RWRnZSgpIDogdHJ1ZTsKKyAgICBib29sIGluY2x1ZGVMZWZ0RWRnZSA9IGJveCA/IGJveC0+ aW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSgpIDogdHJ1ZTsKKyAgICBib29sIGluY2x1ZGVSaWdodEVk Z2UgPSBib3ggPyBib3gtPmluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKCkgOiB0cnVlOwogICAgIGlu dCBiTGVmdCA9IGluY2x1ZGVMZWZ0RWRnZSA/IGJvcmRlckxlZnQoKSA6IDA7CiAgICAgaW50IGJS aWdodCA9IGluY2x1ZGVSaWdodEVkZ2UgPyBib3JkZXJSaWdodCgpIDogMDsKICAgICBpbnQgcExl ZnQgPSBpbmNsdWRlTGVmdEVkZ2UgPyBwYWRkaW5nTGVmdCgpIDogMDsK