55950 2011-03-08 11:09:15 -0800 addInlineStyleIfNeeded should take EditingStyle 2011-03-08 12:45:50 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 49956 1 rniwa webkit-unassigned darin eric oldest_to_newest 364038 0 rniwa 2011-03-08 11:09:15 -0800 This is a cleanup. 364061 1 85068 rniwa 2011-03-08 11:36:29 -0800 Created attachment 85068 cleanup 364066 2 85068 darin 2011-03-08 11:44:49 -0800 Comment on attachment 85068 cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=85068&action=review > Source/WebCore/editing/ApplyStyleCommand.cpp:79 > - explicit StyleChange(CSSStyleDeclaration*, const Position&); > + explicit StyleChange(EditingStyle*, const Position&); It doesn’t make any sense to use the explicit keyword on a constructor that can’t be called with a single argument. So “explicit” should be removed here. 364080 3 rniwa 2011-03-08 11:57:56 -0800 (In reply to comment #2) > (From update of attachment 85068 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=85068&action=review > > > Source/WebCore/editing/ApplyStyleCommand.cpp:79 > > - explicit StyleChange(CSSStyleDeclaration*, const Position&); > > + explicit StyleChange(EditingStyle*, const Position&); > > It doesn’t make any sense to use the explicit keyword on a constructor that can’t be called with a single argument. So “explicit” should be removed here. That's what I thought. Okay, I'm getting rid of that. Thanks for the review. 364114 4 rniwa 2011-03-08 12:45:50 -0800 Landed as http://trac.webkit.org/changeset/80580. 85068 2011-03-08 11:36:29 -0800 2011-03-08 11:44:49 -0800 cleanup bug-55950-20110308113628.patch text/plain 11335 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNTcyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDMtMDggIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgYWRkSW5saW5lU3R5bGVJZk5lZWRlZCBzaG91bGQgdGFrZSBFZGl0 aW5nU3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU1OTUwCisKKyAgICAgICAgRGVwbG95ZWQgRWRpdGluZ1N0eWxlIGluIGFkZElubGluZVN0eWxl SWZOZWVkZWQsIFN0eWxlQ2hhbmdlOjpTdHlsZUNoYW5nZSwgYW5kIFN0eWxlQ2hhbmdlOjppbml0 LgorICAgICAgICBBbHNvIGV4dHJhY3RlZCBFZGl0aW5nU3R5bGU6OnN0eWxlSXNQcmVzZW50SW5D b21wdXRlZFN0eWxlT2ZOb2RlIGZyb20gcmVtb3ZlU3R5bGVGcm9tUnVuQmVmb3JlQXBwbHlpbmdT dHlsZS4KKworICAgICAgICAqIGVkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVDaGFuZ2U6OlN0eWxlQ2hhbmdlKTogVGFrZXMgRWRpdGluZ1N0eWxl IGluc3RlYWQgb2YgQ1NTU3R5bGVEZWNsYXJhdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl Q2hhbmdlOjppbml0KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0eWxlQ29tbWFu ZDo6YXBwbHlCbG9ja1N0eWxlKTogSW5zdGFudGlhdGVzIFN0eWxlQ2hhbmdlLgorICAgICAgICAo V2ViQ29yZTo6QXBwbHlTdHlsZUNvbW1hbmQ6OmFwcGx5SW5saW5lU3R5bGVUb05vZGVSYW5nZSk6 IENhbGxzIGFkZElubGluZVN0eWxlSWZOZWVkZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0 eWxlQ29tbWFuZDo6cmVtb3ZlU3R5bGVGcm9tUnVuQmVmb3JlQXBwbHlpbmdTdHlsZSk6IENhbGxz IHN0eWxlSXNQcmVzZW50SW5Db21wdXRlZFN0eWxlT2ZOb2RlLgorICAgICAgICAoV2ViQ29yZTo6 QXBwbHlTdHlsZUNvbW1hbmQ6OnJlbW92ZUlubGluZVN0eWxlRnJvbUVsZW1lbnQpOiBDYWxscyBF ZGl0aW5nU3R5bGU6Om1lcmdlSW5saW5lU3R5bGVPZkVsZW1lbnQKKyAgICAgICAgaW5zdGVhZCBv ZiBtYW51YWxseSBtZXJnaW5nIHN0eWxlcy4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5U3R5bGVD b21tYW5kOjphcHBseUlubGluZVN0eWxlVG9QdXNoRG93bik6IENhbGxzIGFkZElubGluZVN0eWxl SWZOZWVkZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0eWxlQ29tbWFuZDo6YWRkSW5saW5l U3R5bGVJZk5lZWRlZCk6IFRha2VzIEVkaXRpbmdTdHlsZSBpbnN0ZWFkIG9mIENTU011dGFibGVT dHlsZURlY2xhcmF0aW9uLgorICAgICAgICAqIGVkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuaDoK KyAgICAgICAgKiBlZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmg6CisgICAgICAgICogZWRp dGluZy9FZGl0aW5nU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0eWxlOjpz dHlsZUlzUHJlc2VudEluQ29tcHV0ZWRTdHlsZU9mTm9kZSk6IEV4dHJhY3RlZCBmcm9tIHJlbW92 ZVN0eWxlRnJvbVJ1bkJlZm9yZUFwcGx5aW5nU3R5bGUuCisgICAgICAgICogZWRpdGluZy9FZGl0 aW5nU3R5bGUuaDoKKwogMjAxMS0wMy0wOCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCShyZXZpc2lvbiA4MDU2NCkKKysr IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC03Niw3ICs3Niw3IEBAIHN0YXRpYyBSR0JBMzIgZ2V0UkdCQUZvbnRDb2xvcihDU1NT dHlsZUQKIAogY2xhc3MgU3R5bGVDaGFuZ2UgewogcHVibGljOgotICAgIGV4cGxpY2l0IFN0eWxl Q2hhbmdlKENTU1N0eWxlRGVjbGFyYXRpb24qLCBjb25zdCBQb3NpdGlvbiYpOworICAgIGV4cGxp Y2l0IFN0eWxlQ2hhbmdlKEVkaXRpbmdTdHlsZSosIGNvbnN0IFBvc2l0aW9uJik7CiAKICAgICBT dHJpbmcgY3NzU3R5bGUoKSBjb25zdCB7IHJldHVybiBtX2Nzc1N0eWxlOyB9CiAgICAgYm9vbCBh cHBseUJvbGQoKSBjb25zdCB7IHJldHVybiBtX2FwcGx5Qm9sZDsgfQpAQCAtMTExLDcgKzExMSw3 IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuICEoKnRoaXMgPT0gb3RoZXIpOwogICAgIH0KIHBy aXZhdGU6Ci0gICAgdm9pZCBpbml0KFBhc3NSZWZQdHI8Q1NTU3R5bGVEZWNsYXJhdGlvbj4sIGNv bnN0IFBvc2l0aW9uJik7CisgICAgdm9pZCBpbml0KEVkaXRpbmdTdHlsZSosIGNvbnN0IFBvc2l0 aW9uJik7CiAgICAgdm9pZCByZWNvbmNpbGVUZXh0RGVjb3JhdGlvblByb3BlcnRpZXMoQ1NTTXV0 YWJsZVN0eWxlRGVjbGFyYXRpb24qKTsKICAgICB2b2lkIGV4dHJhY3RUZXh0U3R5bGVzKERvY3Vt ZW50KiwgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qLCBib29sIHNob3VsZFVzZUZpeGVkRm9u dERlZmF1bHRTaXplKTsKIApAQCAtMTI4LDcgKzEyOCw3IEBAIHByaXZhdGU6CiB9OwogCiAKLVN0 eWxlQ2hhbmdlOjpTdHlsZUNoYW5nZShDU1NTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSwgY29uc3Qg UG9zaXRpb24mIHBvc2l0aW9uKQorU3R5bGVDaGFuZ2U6OlN0eWxlQ2hhbmdlKEVkaXRpbmdTdHls ZSogc3R5bGUsIGNvbnN0IFBvc2l0aW9uJiBwb3NpdGlvbikKICAgICA6IG1fYXBwbHlCb2xkKGZh bHNlKQogICAgICwgbV9hcHBseUl0YWxpYyhmYWxzZSkKICAgICAsIG1fYXBwbHlVbmRlcmxpbmUo ZmFsc2UpCkBAIC0xMzksMTQgKzEzOSwxNCBAQCBTdHlsZUNoYW5nZTo6U3R5bGVDaGFuZ2UoQ1NT U3R5bGVEZWNsYXJhCiAgICAgaW5pdChzdHlsZSwgcG9zaXRpb24pOwogfQogCi12b2lkIFN0eWxl Q2hhbmdlOjppbml0KFBhc3NSZWZQdHI8Q1NTU3R5bGVEZWNsYXJhdGlvbj4gc3R5bGUsIGNvbnN0 IFBvc2l0aW9uJiBwb3NpdGlvbikKK3ZvaWQgU3R5bGVDaGFuZ2U6OmluaXQoRWRpdGluZ1N0eWxl KiBzdHlsZSwgY29uc3QgUG9zaXRpb24mIHBvc2l0aW9uKQogewogICAgIERvY3VtZW50KiBkb2N1 bWVudCA9IHBvc2l0aW9uLmFuY2hvck5vZGUoKSA/IHBvc2l0aW9uLmFuY2hvck5vZGUoKS0+ZG9j dW1lbnQoKSA6IDA7Ci0gICAgaWYgKCFzdHlsZSB8fCAhZG9jdW1lbnQgfHwgIWRvY3VtZW50LT5m cmFtZSgpKQorICAgIGlmICghc3R5bGUgfHwgIXN0eWxlLT5zdHlsZSgpIHx8ICFkb2N1bWVudCB8 fCAhZG9jdW1lbnQtPmZyYW1lKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFJlZlB0cjxDU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24+IGNvbXB1dGVkU3R5bGUgPSBwb3NpdGlvbi5jb21wdXRl ZFN0eWxlKCk7Ci0gICAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBtdXRhYmxl U3R5bGUgPSBnZXRQcm9wZXJ0aWVzTm90SW4oc3R5bGUuZ2V0KCksIGNvbXB1dGVkU3R5bGUuZ2V0 KCkpOworICAgIFJlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gbXV0YWJsZVN0eWxl ID0gZ2V0UHJvcGVydGllc05vdEluKHN0eWxlLT5zdHlsZSgpLCBjb21wdXRlZFN0eWxlLmdldCgp KTsKIAogICAgIHJlY29uY2lsZVRleHREZWNvcmF0aW9uUHJvcGVydGllcyhtdXRhYmxlU3R5bGUu Z2V0KCkpOwogICAgIGlmICghZG9jdW1lbnQtPmZyYW1lKCktPmVkaXRvcigpLT5zaG91bGRTdHls ZVdpdGhDU1MoKSkKQEAgLTE1OCw4ICsxNTgsOCBAQCB2b2lkIFN0eWxlQ2hhbmdlOjppbml0KFBh c3NSZWZQdHI8Q1NTU3R5CiAKICAgICAvLyBJZiB1bmljb2RlLWJpZGkgaXMgcHJlc2VudCBpbiBt dXRhYmxlU3R5bGUgYW5kIGRpcmVjdGlvbiBpcyBub3QsIHRoZW4gYWRkIGRpcmVjdGlvbiB0byBt dXRhYmxlU3R5bGUuCiAgICAgLy8gRklYTUU6IFNob3VsZG4ndCB0aGlzIGJlIGRvbmUgaW4gZ2V0 UHJvcGVydGllc05vdEluPwotICAgIGlmIChtdXRhYmxlU3R5bGUtPmdldFByb3BlcnR5Q1NTVmFs dWUoQ1NTUHJvcGVydHlVbmljb2RlQmlkaSkgJiYgIXN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVl KENTU1Byb3BlcnR5RGlyZWN0aW9uKSkKLSAgICAgICAgbXV0YWJsZVN0eWxlLT5zZXRQcm9wZXJ0 eShDU1NQcm9wZXJ0eURpcmVjdGlvbiwgc3R5bGUtPmdldFByb3BlcnR5VmFsdWUoQ1NTUHJvcGVy dHlEaXJlY3Rpb24pKTsKKyAgICBpZiAobXV0YWJsZVN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVl KENTU1Byb3BlcnR5VW5pY29kZUJpZGkpICYmICFzdHlsZS0+c3R5bGUoKS0+Z2V0UHJvcGVydHlD U1NWYWx1ZShDU1NQcm9wZXJ0eURpcmVjdGlvbikpCisgICAgICAgIG11dGFibGVTdHlsZS0+c2V0 UHJvcGVydHkoQ1NTUHJvcGVydHlEaXJlY3Rpb24sIHN0eWxlLT5zdHlsZSgpLT5nZXRQcm9wZXJ0 eVZhbHVlKENTU1Byb3BlcnR5RGlyZWN0aW9uKSk7CiAKICAgICAvLyBTYXZlIHRoZSByZXN1bHQg Zm9yIGxhdGVyCiAgICAgbV9jc3NTdHlsZSA9IG11dGFibGVTdHlsZS0+Y3NzVGV4dCgpLnN0cmlw V2hpdGVTcGFjZSgpOwpAQCAtNTkxLDcgKzU5MSw3IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6 OmFwcGx5QmxvY2tTdHlsZSgKICAgICBWaXNpYmxlUG9zaXRpb24gbmV4dFBhcmFncmFwaFN0YXJ0 KGVuZE9mUGFyYWdyYXBoKHBhcmFncmFwaFN0YXJ0KS5uZXh0KCkpOwogICAgIFZpc2libGVQb3Np dGlvbiBiZXlvbmRFbmQoZW5kT2ZQYXJhZ3JhcGgodmlzaWJsZUVuZCkubmV4dCgpKTsKICAgICB3 aGlsZSAocGFyYWdyYXBoU3RhcnQuaXNOb3ROdWxsKCkgJiYgcGFyYWdyYXBoU3RhcnQgIT0gYmV5 b25kRW5kKSB7Ci0gICAgICAgIFN0eWxlQ2hhbmdlIHN0eWxlQ2hhbmdlKHN0eWxlLT5zdHlsZSgp LCBwYXJhZ3JhcGhTdGFydC5kZWVwRXF1aXZhbGVudCgpKTsKKyAgICAgICAgU3R5bGVDaGFuZ2Ug c3R5bGVDaGFuZ2Uoc3R5bGUsIHBhcmFncmFwaFN0YXJ0LmRlZXBFcXVpdmFsZW50KCkpOwogICAg ICAgICBpZiAoc3R5bGVDaGFuZ2UuY3NzU3R5bGUoKS5sZW5ndGgoKSB8fCBtX3JlbW92ZU9ubHkp IHsKICAgICAgICAgICAgIFJlZlB0cjxOb2RlPiBibG9jayA9IGVuY2xvc2luZ0Jsb2NrKHBhcmFn cmFwaFN0YXJ0LmRlZXBFcXVpdmFsZW50KCkuZGVwcmVjYXRlZE5vZGUoKSk7CiAgICAgICAgICAg ICBpZiAoIW1fcmVtb3ZlT25seSkgewpAQCAtMTA4MCw3ICsxMDgwLDcgQEAgdm9pZCBBcHBseVN0 eWxlQ29tbWFuZDo6YXBwbHlJbmxpbmVTdHlsZQogCiAgICAgICAgIGlmICghcmVtb3ZlU3R5bGVG cm9tUnVuQmVmb3JlQXBwbHlpbmdTdHlsZShzdHlsZSwgcnVuU3RhcnQsIHJ1bkVuZCkpCiAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgYWRkSW5saW5lU3R5bGVJZk5lZWRlZChzdHlsZS0+ c3R5bGUoKSwgcnVuU3RhcnQuZ2V0KCksIHJ1bkVuZC5nZXQoKSwgQWRkU3R5bGVkRWxlbWVudCk7 CisgICAgICAgIGFkZElubGluZVN0eWxlSWZOZWVkZWQoc3R5bGUsIHJ1blN0YXJ0LmdldCgpLCBy dW5FbmQuZ2V0KCksIEFkZFN0eWxlZEVsZW1lbnQpOwogICAgIH0KIH0KIApAQCAtMTA5OSw3ICsx MDk5LDcgQEAgYm9vbCBBcHBseVN0eWxlQ29tbWFuZDo6cmVtb3ZlU3R5bGVGcm9tUgogICAgICAg ICBpZiAobm9kZS0+Y2hpbGROb2RlQ291bnQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICAvLyBXZSBkb24ndCBjb25zaWRlciBtX2lzSW5saW5lRWxlbWVudFRvUmVtb3ZlRnVuY3Rp b24gaGVyZSBiZWNhdXNlIHdlIG5ldmVyIGFwcGx5IHN0eWxlIHdoZW4gbV9pc0lubGluZUVsZW1l bnRUb1JlbW92ZUZ1bmN0aW9uIGlzIHNwZWNpZmllZAotICAgICAgICBpZiAoKCFzdHlsZS0+aXNF bXB0eSgpICYmIGdldFByb3BlcnRpZXNOb3RJbihzdHlsZS0+c3R5bGUoKSwgY29tcHV0ZWRTdHls ZShub2RlKS5nZXQoKSktPmxlbmd0aCgpKQorICAgICAgICBpZiAoIXN0eWxlLT5zdHlsZUlzUHJl c2VudEluQ29tcHV0ZWRTdHlsZU9mTm9kZShub2RlKQogICAgICAgICAgICAgfHwgKG1fc3R5bGVk SW5saW5lRWxlbWVudCAmJiAhZW5jbG9zaW5nTm9kZVdpdGhUYWcocG9zaXRpb25CZWZvcmVOb2Rl KG5vZGUpLCBtX3N0eWxlZElubGluZUVsZW1lbnQtPnRhZ1FOYW1lKCkpKSkgewogICAgICAgICAg ICAgbmVlZFRvQXBwbHlTdHlsZSA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKQEAgLTExNDEs MTkgKzExNDEsMTEgQEAgYm9vbCBBcHBseVN0eWxlQ29tbWFuZDo6cmVtb3ZlSW5saW5lU3R5bAog ICAgICAgICBpZiAobW9kZSA9PSBSZW1vdmVOb25lKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgIEFTU0VSVChleHRyYWN0ZWRTdHlsZSk7Ci0gICAgICAgIGlmIChlbGVtZW50LT5p bmxpbmVTdHlsZURlY2woKSkgewotICAgICAgICAgICAgaWYgKGV4dHJhY3RlZFN0eWxlLT5zdHls ZSgpKQotICAgICAgICAgICAgICAgIGV4dHJhY3RlZFN0eWxlLT5zdHlsZSgpLT5tZXJnZShlbGVt ZW50LT5pbmxpbmVTdHlsZURlY2woKSk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgZXh0cmFjdGVkU3R5bGUtPnNldFN0eWxlKGVsZW1lbnQtPmlubGluZVN0eWxlRGVjbCgpLT5j b3B5KCkpOwotICAgICAgICB9CisgICAgICAgIGV4dHJhY3RlZFN0eWxlLT5tZXJnZUlubGluZVN0 eWxlT2ZFbGVtZW50KGVsZW1lbnQuZ2V0KCkpOwogICAgICAgICByZW1vdmVOb2RlUHJlc2Vydmlu Z0NoaWxkcmVuKGVsZW1lbnQpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBp ZiAoIXN0eWxlLT5zdHlsZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBib29sIHJl bW92ZWQgPSBmYWxzZTsKICAgICBpZiAocmVtb3ZlSW1wbGljaXRseVN0eWxlZEVsZW1lbnQoc3R5 bGUsIGVsZW1lbnQuZ2V0KCksIG1vZGUsIGV4dHJhY3RlZFN0eWxlKSkKICAgICAgICAgcmVtb3Zl ZCA9IHRydWU7CkBAIC0xMjk2LDcgKzEyODgsNyBAQCB2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjph cHBseUlubGluZVN0eWxlCiAgICAgLy8gV2UgY2FuJ3Qgd3JhcCBub2RlIHdpdGggdGhlIHN0eWxl ZCBlbGVtZW50IGhlcmUgYmVjYXVzZSBuZXcgc3R5bGVkIGVsZW1lbnQgd2lsbCBuZXZlciBiZSBy ZW1vdmVkIGlmIHdlIGRpZC4KICAgICAvLyBJZiB3ZSBtb2RpZmllZCB0aGUgY2hpbGQgcG9pbnRl ciBpbiBwdXNoRG93bklubGluZVN0eWxlQXJvdW5kTm9kZSB0byBwb2ludCB0byBuZXcgc3R5bGUg ZWxlbWVudAogICAgIC8vIHRoZW4gd2UgZmFsbCBpbnRvIGFuIGluZmluaXRlIGxvb3Agd2hlcmUg d2Uga2VlcCByZW1vdmluZyBhbmQgYWRkaW5nIHN0eWxlZCBlbGVtZW50IHdyYXBwaW5nIG5vZGUu Ci0gICAgYWRkSW5saW5lU3R5bGVJZk5lZWRlZChuZXdJbmxpbmVTdHlsZS0+c3R5bGUoKSwgbm9k ZSwgbm9kZSwgRG9Ob3RBZGRTdHlsZWRFbGVtZW50KTsKKyAgICBhZGRJbmxpbmVTdHlsZUlmTmVl ZGVkKG5ld0lubGluZVN0eWxlLmdldCgpLCBub2RlLCBub2RlLCBEb05vdEFkZFN0eWxlZEVsZW1l bnQpOwogfQogCiB2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjpwdXNoRG93bklubGluZVN0eWxlQXJv dW5kTm9kZShFZGl0aW5nU3R5bGUqIHN0eWxlLCBOb2RlKiB0YXJnZXROb2RlKQpAQCAtMTY4OSw3 ICsxNjgxLDcgQEAgdm9pZCBBcHBseVN0eWxlQ29tbWFuZDo6YWRkQmxvY2tTdHlsZShjbwogICAg IHNldE5vZGVBdHRyaWJ1dGUoYmxvY2ssIHN0eWxlQXR0ciwgY3NzVGV4dCk7CiB9CiAKLXZvaWQg QXBwbHlTdHlsZUNvbW1hbmQ6OmFkZElubGluZVN0eWxlSWZOZWVkZWQoQ1NTTXV0YWJsZVN0eWxl RGVjbGFyYXRpb24gKnN0eWxlLCBQYXNzUmVmUHRyPE5vZGU+IHBhc3NlZFN0YXJ0LCBQYXNzUmVm UHRyPE5vZGU+IHBhc3NlZEVuZCwgRUFkZFN0eWxlZEVsZW1lbnQgYWRkU3R5bGVkRWxlbWVudCkK K3ZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6OmFkZElubGluZVN0eWxlSWZOZWVkZWQoRWRpdGluZ1N0 eWxlKiBzdHlsZSwgUGFzc1JlZlB0cjxOb2RlPiBwYXNzZWRTdGFydCwgUGFzc1JlZlB0cjxOb2Rl PiBwYXNzZWRFbmQsIEVBZGRTdHlsZWRFbGVtZW50IGFkZFN0eWxlZEVsZW1lbnQpCiB7CiAgICAg aWYgKCFwYXNzZWRTdGFydCB8fCAhcGFzc2VkRW5kIHx8ICFwYXNzZWRTdGFydC0+aW5Eb2N1bWVu dCgpIHx8ICFwYXNzZWRFbmQtPmluRG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuOwpJbmRleDog U291cmNlL1dlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuaAkocmV2aXNpb24gODA1 NjQpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmgJKHdvcmtp bmcgY29weSkKQEAgLTk3LDcgKzk3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGZpeFJhbmdlQW5k QXBwbHlJbmxpbmVTdHlsZShFZGl0aW5nU3R5bGUqLCBjb25zdCBQb3NpdGlvbiYgc3RhcnQsIGNv bnN0IFBvc2l0aW9uJiBlbmQpOwogICAgIHZvaWQgYXBwbHlJbmxpbmVTdHlsZVRvTm9kZVJhbmdl KEVkaXRpbmdTdHlsZSosIE5vZGUqIHN0YXJ0Tm9kZSwgTm9kZSogcGFzdEVuZE5vZGUpOwogICAg IHZvaWQgYWRkQmxvY2tTdHlsZShjb25zdCBTdHlsZUNoYW5nZSYsIEhUTUxFbGVtZW50Kik7Ci0g ICAgdm9pZCBhZGRJbmxpbmVTdHlsZUlmTmVlZGVkKENTU011dGFibGVTdHlsZURlY2xhcmF0aW9u KiwgUGFzc1JlZlB0cjxOb2RlPiBzdGFydCwgUGFzc1JlZlB0cjxOb2RlPiBlbmQsIEVBZGRTdHls ZWRFbGVtZW50IGFkZFN0eWxlZEVsZW1lbnQgPSBBZGRTdHlsZWRFbGVtZW50KTsKKyAgICB2b2lk IGFkZElubGluZVN0eWxlSWZOZWVkZWQoRWRpdGluZ1N0eWxlKiwgUGFzc1JlZlB0cjxOb2RlPiBz dGFydCwgUGFzc1JlZlB0cjxOb2RlPiBlbmQsIEVBZGRTdHlsZWRFbGVtZW50ID0gQWRkU3R5bGVk RWxlbWVudCk7CiAgICAgdm9pZCBzcGxpdFRleHRBdFN0YXJ0KGNvbnN0IFBvc2l0aW9uJiBzdGFy dCwgY29uc3QgUG9zaXRpb24mIGVuZCk7CiAgICAgdm9pZCBzcGxpdFRleHRBdEVuZChjb25zdCBQ b3NpdGlvbiYgc3RhcnQsIGNvbnN0IFBvc2l0aW9uJiBlbmQpOwogICAgIHZvaWQgc3BsaXRUZXh0 RWxlbWVudEF0U3RhcnQoY29uc3QgUG9zaXRpb24mIHN0YXJ0LCBjb25zdCBQb3NpdGlvbiYgZW5k KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5k LmgJKHJldmlzaW9uIDgwNTY0KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVF ZGl0Q29tbWFuZC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICszMiw2IEBACiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAotY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvbjsKIGNsYXNzIEVkaXRpbmdT dHlsZTsKIGNsYXNzIEhUTUxFbGVtZW50OwogY2xhc3MgU3R5bGVkRWxlbWVudDsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAJKHJldmlzaW9uIDgwNTY0KQorKysg U291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC02NzUsNiArNjc1LDExIEBAIGJvb2wgRWRpdGluZ1N0eWxlOjpleHRyYWN0Q29uZmxpY3RpbmdJ bXAKICAgICByZXR1cm4gcmVtb3ZlZDsKIH0KIAorYm9vbCBFZGl0aW5nU3R5bGU6OnN0eWxlSXNQ cmVzZW50SW5Db21wdXRlZFN0eWxlT2ZOb2RlKE5vZGUqIG5vZGUpIGNvbnN0Cit7CisgICAgcmV0 dXJuICFtX211dGFibGVTdHlsZSB8fCAhZ2V0UHJvcGVydGllc05vdEluKG1fbXV0YWJsZVN0eWxl LmdldCgpLCBjb21wdXRlZFN0eWxlKG5vZGUpLmdldCgpKS0+bGVuZ3RoKCk7Cit9CisKIHZvaWQg RWRpdGluZ1N0eWxlOjpwcmVwYXJlVG9BcHBseUF0KGNvbnN0IFBvc2l0aW9uJiBwb3NpdGlvbiwg U2hvdWxkUHJlc2VydmVXcml0aW5nRGlyZWN0aW9uIHNob3VsZFByZXNlcnZlV3JpdGluZ0RpcmVj dGlvbikKIHsKICAgICBpZiAoIW1fbXV0YWJsZVN0eWxlKQpJbmRleDogU291cmNlL1dlYkNvcmUv ZWRpdGluZy9FZGl0aW5nU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRpbmdTdHlsZS5oCShyZXZpc2lvbiA4MDU2NCkKKysrIFNvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRWRpdGluZ1N0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTExMyw2ICsxMTMsNyBAQCBw dWJsaWM6CiAgICAgYm9vbCBjb25mbGljdHNXaXRoSW1wbGljaXRTdHlsZU9mQXR0cmlidXRlcyhI VE1MRWxlbWVudCopIGNvbnN0OwogICAgIGJvb2wgZXh0cmFjdENvbmZsaWN0aW5nSW1wbGljaXRT dHlsZU9mQXR0cmlidXRlcyhIVE1MRWxlbWVudCosIFNob3VsZFByZXNlcnZlV3JpdGluZ0RpcmVj dGlvbiwgRWRpdGluZ1N0eWxlKiBleHRyYWN0ZWRTdHlsZSwKICAgICAgICAgICAgIFZlY3RvcjxR dWFsaWZpZWROYW1lPiYgY29uZmxpY3RpbmdBdHRyaWJ1dGVzLCBTaG91bGRFeHRyYWN0TWF0Y2hp bmdTdHlsZSkgY29uc3Q7CisgICAgYm9vbCBzdHlsZUlzUHJlc2VudEluQ29tcHV0ZWRTdHlsZU9m Tm9kZShOb2RlKikgY29uc3Q7CiAgICAgdm9pZCBwcmVwYXJlVG9BcHBseUF0KGNvbnN0IFBvc2l0 aW9uJiwgU2hvdWxkUHJlc2VydmVXcml0aW5nRGlyZWN0aW9uID0gRG9Ob3RQcmVzZXJ2ZVdyaXRp bmdEaXJlY3Rpb24pOwogICAgIHZvaWQgbWVyZ2VUeXBpbmdTdHlsZShEb2N1bWVudCopOwogICAg IHZvaWQgbWVyZ2VJbmxpbmVTdHlsZU9mRWxlbWVudChTdHlsZWRFbGVtZW50Kik7Cg==