179425 2017-11-08 07:34:23 -0800 Remove Element::isInlineElementContinuation 2017-11-15 12:06:34 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1369420 0 koivisto 2017-11-08 07:34:23 -0800 It is really just isInline+isContinuation test and most callers know it is an inline already. 1369423 1 326327 koivisto 2017-11-08 07:40:48 -0800 Created attachment 326327 patch 1369434 2 326327 commit-queue 2017-11-08 08:39:05 -0800 Comment on attachment 326327 patch Clearing flags on attachment: 326327 Committed r224583: <https://trac.webkit.org/changeset/224583> 1369435 3 commit-queue 2017-11-08 08:39:07 -0800 All reviewed patches have been landed. Closing bug. 1372069 4 webkit-bug-importer 2017-11-15 12:06:34 -0800 <rdar://problem/35566948> 326327 2017-11-08 07:40:48 -0800 2017-11-08 08:39:05 -0800 patch remove-isInlineElementContinuation.patch text/plain 10011 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNDU3OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE3LTExLTA4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgRWxlbWVudDo6aXNJ bmxpbmVFbGVtZW50Q29udGludWF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNzk0MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJdCBpcyByZWFsbHkganVzdCBpc0lubGluZStpc0NvbnRpbnVhdGlv biB0ZXN0IGFuZCBtb3N0IGNhbGxlcnMga25vdyBpdCBpcyBhbiBpbmxpbmUgYWxyZWFkeS4KKwor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpmaXJzdENoaWxkQ29uc2lkZXJpbmdDb250aW51YXRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6c3RhcnRPZkNvbnRpbnVhdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6 Zmlyc3RDaGlsZElzSW5saW5lQ29udGludWF0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94OjpkZXRlcm1p bmVTcGFjaW5nRm9yRmxvd0JveGVzKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUZsb3dCb3g6 OnBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFkZENvbnRpbnVhdGlvbldpdGhPdXRsaW5lKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy RWxlbWVudDo6c2V0SXNDb250aW51YXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxl bWVudDo6aXNFbGVtZW50Q29udGludWF0aW9uIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckVsZW1lbnQ6OmlzSW5saW5lRWxlbWVudENvbnRpbnVhdGlvbiBjb25zdCk6 IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJJbmxpbmU6OnVwZGF0ZUhpdFRlc3RSZXN1bHQpOgorICAgICAgICAqIHJlbmRl cmluZy9saW5lL0xpbmVJbmxpbmVIZWFkZXJzLmg6CisgICAgICAgIChXZWJDb3JlOjpoYXNJbmxp bmVEaXJlY3Rpb25Cb3JkZXJzUGFkZGluZ09yTWFyZ2luKToKKwogMjAxNy0xMS0wOCAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMYXlvdXRTdGF0ZSBjbGVhbnVw XSBNYWtlIHB1YmxpYyBkYXRhIG1lbWJlcnMgcHJpdmF0ZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0 LmNwcAkocmV2aXNpb24gMjI0NTYwKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgzLDcgKzE4 Myw3IEBAIHN0YXRpYyBpbmxpbmUgUmVuZGVyT2JqZWN0KiBmaXJzdENoaWxkQ28KICAgICAvLyBX ZSBkb24ndCB3YW50IHRvIGluY2x1ZGUgdGhlIGVuZCBvZiBhIGNvbnRpbnVhdGlvbiBhcyB0aGUg Zmlyc3RDaGlsZCBvZiB0aGUKICAgICAvLyBhbm9ueW1vdXMgcGFyZW50LCBiZWNhdXNlIGV2ZXJ5 dGhpbmcgaGFzIGFscmVhZHkgYmVlbiBsaW5rZWQgdXAgdmlhIGNvbnRpbnVhdGlvbi4KICAgICAv LyBDU1MgZmlyc3QtbGV0dGVyIHNlbGVjdG9yIGlzIGFuIGV4YW1wbGUgb2YgdGhpcyBjYXNlLgot ICAgIGlmIChyZW5kZXJlci5pc0Fub255bW91cygpICYmIGlzPFJlbmRlckVsZW1lbnQ+KGZpcnN0 Q2hpbGQpICYmIGRvd25jYXN0PFJlbmRlckVsZW1lbnQ+KCpmaXJzdENoaWxkKS5pc0lubGluZUVs ZW1lbnRDb250aW51YXRpb24oKSkKKyAgICBpZiAocmVuZGVyZXIuaXNBbm9ueW1vdXMoKSAmJiBp czxSZW5kZXJJbmxpbmU+KGZpcnN0Q2hpbGQpICYmIGRvd25jYXN0PFJlbmRlcklubGluZT4oKmZp cnN0Q2hpbGQpLmlzQ29udGludWF0aW9uKCkpCiAgICAgICAgIGZpcnN0Q2hpbGQgPSBudWxscHRy OwogICAgIAogICAgIGlmICghZmlyc3RDaGlsZCAmJiBpc0lubGluZVdpdGhDb250aW51YXRpb24o cmVuZGVyZXIpKQpAQCAtMjUxLDcgKzI1MSw3IEBAIHN0YXRpYyBpbmxpbmUgUmVuZGVySW5saW5l KiBzdGFydE9mQ29udGkKICAgICBpZiAoIWlzPFJlbmRlckVsZW1lbnQ+KHJlbmRlcmVyKSkKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgYXV0byYgcmVuZGVyRWxlbWVudCA9IGRvd25jYXN0 PFJlbmRlckVsZW1lbnQ+KHJlbmRlcmVyKTsKLSAgICBpZiAocmVuZGVyRWxlbWVudC5pc0lubGlu ZUVsZW1lbnRDb250aW51YXRpb24oKSAmJiBpczxSZW5kZXJJbmxpbmU+KHJlbmRlckVsZW1lbnQu ZWxlbWVudCgpLT5yZW5kZXJlcigpKSkKKyAgICBpZiAoaXM8UmVuZGVySW5saW5lPihyZW5kZXJF bGVtZW50KSAmJiByZW5kZXJFbGVtZW50LmlzQ29udGludWF0aW9uKCkgJiYgaXM8UmVuZGVySW5s aW5lPihyZW5kZXJFbGVtZW50LmVsZW1lbnQoKS0+cmVuZGVyZXIoKSkpCiAgICAgICAgIHJldHVy biBkb3duY2FzdDxSZW5kZXJJbmxpbmU+KHJlbmRlcmVyLm5vZGUoKS0+cmVuZGVyZXIoKSk7CiAK ICAgICAvLyBCbG9ja3Mgd2l0aCBhIHByZXZpb3VzIGNvbnRpbnVhdGlvbiBhbHdheXMgaGF2ZSBh IG5leHQgY29udGludWF0aW9uCkBAIC0zMTAsNyArMzEwLDcgQEAgc3RhdGljIGlubGluZSBSZW5k ZXJPYmplY3QqIGNoaWxkQmVmb3JlQwogc3RhdGljIGlubGluZSBib29sIGZpcnN0Q2hpbGRJc0lu bGluZUNvbnRpbnVhdGlvbihSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKIHsKICAgICBSZW5kZXJP YmplY3QqIGNoaWxkID0gcmVuZGVyZXIuZmlyc3RDaGlsZCgpOwotICAgIHJldHVybiBpczxSZW5k ZXJFbGVtZW50PihjaGlsZCkgJiYgZG93bmNhc3Q8UmVuZGVyRWxlbWVudD4oKmNoaWxkKS5pc0lu bGluZUVsZW1lbnRDb250aW51YXRpb24oKTsKKyAgICByZXR1cm4gaXM8UmVuZGVySW5saW5lPihj aGlsZCkgJiYgZG93bmNhc3Q8UmVuZGVySW5saW5lPigqY2hpbGQpLmlzQ29udGludWF0aW9uKCk7 CiB9CiAKIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnBy ZXZpb3VzU2libGluZygpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lu bGluZUZsb3dCb3guY3BwCShyZXZpc2lvbiAyMjQ1NjApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvSW5saW5lRmxvd0JveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwOCw3ICszMDgsNyBA QCB2b2lkIElubGluZUZsb3dCb3g6OmRldGVybWluZVNwYWNpbmdGb3JGCiAgICAgICAgIC8vIENo ZWNrIHRvIHNlZSBpZiBhbGwgaW5pdGlhbCBsaW5lcyBhcmUgdW5jb25zdHJ1Y3RlZC4gIElmIHNv LCB0aGVuCiAgICAgICAgIC8vIHdlIGtub3cgdGhlIGlubGluZSBiZWdhbiBvbiB0aGlzIGxpbmUg KHVubGVzcyB3ZSBhcmUgYSBjb250aW51YXRpb24pLgogICAgICAgICBjb25zdCBhdXRvJiBsaW5l Qm94TGlzdCA9IGlubGluZUZsb3cubGluZUJveGVzKCk7Ci0gICAgICAgIGlmICghbGluZUJveExp c3QuZmlyc3RMaW5lQm94KCktPmlzQ29uc3RydWN0ZWQoKSAmJiAhcmVuZGVyZXIoKS5pc0lubGlu ZUVsZW1lbnRDb250aW51YXRpb24oKSkgeworICAgICAgICBpZiAoIWxpbmVCb3hMaXN0LmZpcnN0 TGluZUJveCgpLT5pc0NvbnN0cnVjdGVkKCkgJiYgIWlubGluZUZsb3cuaXNDb250aW51YXRpb24o KSkgewogI2lmIEVOQUJMRShDU1NfQk9YX0RFQ09SQVRJT05fQlJFQUspCiAgICAgICAgICAgICBp ZiAocmVuZGVyZXIoKS5zdHlsZSgpLmJveERlY29yYXRpb25CcmVhaygpID09IERDTE9ORSkKICAg ICAgICAgICAgICAgICBpbmNsdWRlTGVmdEVkZ2UgPSBpbmNsdWRlUmlnaHRFZGdlID0gdHJ1ZTsK QEAgLTExNTUsNyArMTE1NSw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnQoUGFpbnRJbmZv JiBwYWkKICAgICAgICAgICAgICAgICBSZW5kZXJJbmxpbmUmIGlubGluZUZsb3cgPSBkb3duY2Fz dDxSZW5kZXJJbmxpbmU+KHJlbmRlcmVyKCkpOwogCiAgICAgICAgICAgICAgICAgUmVuZGVyQmxv Y2sqIGNvbnRhaW5pbmdCbG9jayA9IG51bGxwdHI7Ci0gICAgICAgICAgICAgICAgYm9vbCBjb250 YWluaW5nQmxvY2tQYWludHNDb250aW51YXRpb25PdXRsaW5lID0gaW5saW5lRmxvdy5jb250aW51 YXRpb24oKSB8fCBpbmxpbmVGbG93LmlzSW5saW5lRWxlbWVudENvbnRpbnVhdGlvbigpOworICAg ICAgICAgICAgICAgIGJvb2wgY29udGFpbmluZ0Jsb2NrUGFpbnRzQ29udGludWF0aW9uT3V0bGlu ZSA9IGlubGluZUZsb3cuY29udGludWF0aW9uKCkgfHwgaW5saW5lRmxvdy5pc0NvbnRpbnVhdGlv bigpOwogICAgICAgICAgICAgICAgIGlmIChjb250YWluaW5nQmxvY2tQYWludHNDb250aW51YXRp b25PdXRsaW5lKSB7ICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFNl ZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ2OTAuIFdlIGN1cnJl bnRseSBkb24ndCByZWNvbm5lY3QgaW5saW5lIGNvbnRpbnVhdGlvbnMKICAgICAgICAgICAgICAg ICAgICAgLy8gYWZ0ZXIgYSBjaGlsZCByZW1vdmFsLiBBcyBhIHJlc3VsdCwgdGhvc2UgbWVyZ2Vk IGlubGluZXMgZG8gbm90IGdldCBzZXBlcmF0ZWQgYW5kIGhlbmNlIG5vdCBnZXQgZW5jbG9zZWQg YnkKQEAgLTExNzgsNyArMTE3OCw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnQoUGFpbnRJ bmZvJiBwYWkKICAgICAgICAgICAgICAgICAgICAgLy8gQWRkIG91cnNlbHZlcyB0byB0aGUgY29u dGFpbmluZyBibG9jayBvZiB0aGUgZW50aXJlIGNvbnRpbnVhdGlvbiBzbyB0aGF0IGl0IGNhbgog ICAgICAgICAgICAgICAgICAgICAvLyBwYWludCB1cyBhdG9taWNhbGx5LgogICAgICAgICAgICAg ICAgICAgICBjb250YWluaW5nQmxvY2stPmFkZENvbnRpbnVhdGlvbldpdGhPdXRsaW5lKGRvd25j YXN0PFJlbmRlcklubGluZT4ocmVuZGVyZXIoKS5lbGVtZW50KCktPnJlbmRlcmVyKCkpKTsKLSAg ICAgICAgICAgICAgICB9IGVsc2UgaWYgKCFpbmxpbmVGbG93LmlzSW5saW5lRWxlbWVudENvbnRp bnVhdGlvbigpKQorICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoIWlubGluZUZsb3cuaXNDb250 aW51YXRpb24oKSkKICAgICAgICAgICAgICAgICAgICAgcGFpbnRJbmZvLm91dGxpbmVPYmplY3Rz LT5hZGQoJmlubGluZUZsb3cpOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKHBh aW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlTWFzaykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gMjI0NTYxKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc0Niw3ICsx NzQ2LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6YWRkQ29udGludWF0aW9uV2l0aE91dAogewogICAg IC8vIFdlIGNhbid0IG1ha2UgdGhpcyB3b3JrIGlmIHRoZSBpbmxpbmUgaXMgaW4gYSBsYXllci4g IFdlJ2xsIGp1c3QgcmVseSBvbiB0aGUgYnJva2VuCiAgICAgLy8gd2F5IG9mIHBhaW50aW5nLgot ICAgIEFTU0VSVCghZmxvdy0+bGF5ZXIoKSAmJiAhZmxvdy0+aXNJbmxpbmVFbGVtZW50Q29udGlu dWF0aW9uKCkpOworICAgIEFTU0VSVCghZmxvdy0+bGF5ZXIoKSAmJiAhZmxvdy0+aXNDb250aW51 YXRpb24oKSk7CiAgICAgCiAgICAgQ29udGludWF0aW9uT3V0bGluZVRhYmxlTWFwKiB0YWJsZSA9 IGNvbnRpbnVhdGlvbk91dGxpbmVUYWJsZSgpOwogICAgIExpc3RIYXNoU2V0PFJlbmRlcklubGlu ZSo+KiBjb250aW51YXRpb25zID0gdGFibGUtPmdldCh0aGlzKTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaAkocmV2aXNpb24gMjI0NTYwKQorKysgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjI3 LDggKzIyNyw2IEBAIHB1YmxpYzoKICAgICBib29sIGhhc0NvbnRpbnVhdGlvbkNoYWluTm9kZSgp IGNvbnN0IHsgcmV0dXJuIG1faGFzQ29udGludWF0aW9uQ2hhaW5Ob2RlOyB9CiAgICAgYm9vbCBp c0NvbnRpbnVhdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1faXNDb250aW51YXRpb247IH0KICAgICB2 b2lkIHNldElzQ29udGludWF0aW9uKCkgeyBtX2lzQ29udGludWF0aW9uID0gdHJ1ZTsgfQotICAg IGJvb2wgaXNFbGVtZW50Q29udGludWF0aW9uKCkgY29uc3QgeyByZXR1cm4gaXNDb250aW51YXRp b24oKSAmJiAhaXNBbm9ueW1vdXMoKTsgfQotICAgIGJvb2wgaXNJbmxpbmVFbGVtZW50Q29udGlu dWF0aW9uKCkgY29uc3QgeyByZXR1cm4gaXNFbGVtZW50Q29udGludWF0aW9uKCkgJiYgaXNJbmxp bmUoKTsgfQogICAgIGJvb2wgaXNGaXJzdExldHRlcigpIGNvbnN0IHsgcmV0dXJuIG1faXNGaXJz dExldHRlcjsgfQogICAgIHZvaWQgc2V0SXNGaXJzdExldHRlcigpIHsgbV9pc0ZpcnN0TGV0dGVy ID0gdHJ1ZTsgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmNwcAkocmV2aXNpb24gMjI0NTYwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl cklubGluZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc0LDcgKzc0LDcgQEAgdm9pZCBSZW5kZXJJ bmxpbmU6OndpbGxCZURlc3Ryb3llZCgpCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIC8vIE1h a2Ugc3VyZSB3ZSBkbyBub3QgcmV0YWluICJ0aGlzIiBpbiB0aGUgY29udGludWF0aW9uIG91dGxp bmUgdGFibGUgbWFwIG9mIG91ciBjb250YWluaW5nIGJsb2Nrcy4KICAgICBpZiAocGFyZW50KCkg JiYgc3R5bGUoKS52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSAmJiBoYXNPdXRsaW5lKCkpIHsKLSAg ICAgICAgYm9vbCBjb250YWluaW5nQmxvY2tQYWludHNDb250aW51YXRpb25PdXRsaW5lID0gY29u dGludWF0aW9uKCkgfHwgaXNJbmxpbmVFbGVtZW50Q29udGludWF0aW9uKCk7CisgICAgICAgIGJv b2wgY29udGFpbmluZ0Jsb2NrUGFpbnRzQ29udGludWF0aW9uT3V0bGluZSA9IGNvbnRpbnVhdGlv bigpIHx8IGlzQ29udGludWF0aW9uKCk7CiAgICAgICAgIGlmIChjb250YWluaW5nQmxvY2tQYWlu dHNDb250aW51YXRpb25PdXRsaW5lKSB7CiAgICAgICAgICAgICBpZiAoUmVuZGVyQmxvY2sqIGNi ID0gY29udGFpbmluZ0Jsb2NrKCkpIHsKICAgICAgICAgICAgICAgICBpZiAoUmVuZGVyQmxvY2sq IGNiQ2IgPSBjYi0+Y29udGFpbmluZ0Jsb2NrKCkpCkBAIC0xMzk0LDcgKzEzOTQsNyBAQCB2b2lk IFJlbmRlcklubGluZTo6dXBkYXRlSGl0VGVzdFJlc3VsdChICiAKICAgICBMYXlvdXRQb2ludCBs b2NhbFBvaW50KHBvaW50KTsKICAgICBpZiAoRWxlbWVudCogZWxlbWVudCA9IHRoaXMtPmVsZW1l bnQoKSkgewotICAgICAgICBpZiAoaXNJbmxpbmVFbGVtZW50Q29udGludWF0aW9uKCkpIHsKKyAg ICAgICAgaWYgKGlzQ29udGludWF0aW9uKCkpIHsKICAgICAgICAgICAgIC8vIFdlJ3JlIGluIHRo ZSBjb250aW51YXRpb24gb2YgYSBzcGxpdCBpbmxpbmUuICBBZGp1c3Qgb3VyIGxvY2FsIHBvaW50 IHRvIGJlIGluIHRoZSBjb29yZGluYXRlIHNwYWNlCiAgICAgICAgICAgICAvLyBvZiB0aGUgcHJp bmNpcGFsIHJlbmRlcmVyJ3MgY29udGFpbmluZyBibG9jay4gIFRoaXMgd2lsbCBlbmQgdXAgYmVp bmcgdGhlIGlubmVyTm9uU2hhcmVkTm9kZS4KICAgICAgICAgICAgIFJlbmRlckJsb2NrKiBmaXJz dEJsb2NrID0gZWxlbWVudC0+cmVuZGVyZXIoKS0+Y29udGFpbmluZ0Jsb2NrKCk7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lSW5saW5lSGVhZGVycy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVJbmxpbmVIZWFkZXJzLmgJ KHJldmlzaW9uIDIyNDU2MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVJ bmxpbmVIZWFkZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDExICszNCwxMSBAQCBpbmxpbmUg Ym9vbCBoYXNJbmxpbmVEaXJlY3Rpb25Cb3JkZXJzUGFkCiB7CiAgICAgLy8gV2hlcmUgYW4gZW1w dHkgaW5saW5lIGlzIHNwbGl0IGFjcm9zcyBhbm9ueW1vdXMgYmxvY2tzIHdlIHNob3VsZCBvbmx5 IGdpdmUgbGluZWJveGVzIHRvIHRoZSAnc2lkZXMnIG9mIHRoZQogICAgIC8vIGlubGluZSB0aGF0 IGhhdmUgYm9yZGVycywgcGFkZGluZyBvciBtYXJnaW4uCi0gICAgYm9vbCBzaG91bGRBcHBseVN0 YXJ0Qm9yZGVyUGFkZGluZ09yTWFyZ2luID0gIWZsb3cucGFyZW50KCktPmlzQW5vbnltb3VzQmxv Y2soKSB8fCAhZmxvdy5pc0lubGluZUVsZW1lbnRDb250aW51YXRpb24oKTsKKyAgICBib29sIHNo b3VsZEFwcGx5U3RhcnRCb3JkZXJQYWRkaW5nT3JNYXJnaW4gPSAhZmxvdy5wYXJlbnQoKS0+aXNB bm9ueW1vdXNCbG9jaygpIHx8ICFmbG93LmlzQ29udGludWF0aW9uKCk7CiAgICAgaWYgKHNob3Vs ZEFwcGx5U3RhcnRCb3JkZXJQYWRkaW5nT3JNYXJnaW4gJiYgKGZsb3cuYm9yZGVyU3RhcnQoKSB8 fCBmbG93Lm1hcmdpblN0YXJ0KCkgfHwgZmxvdy5wYWRkaW5nU3RhcnQoKSkpCiAgICAgICAgIHJl dHVybiB0cnVlOwogCi0gICAgYm9vbCBzaG91bGRBcHBseUVuZEJvcmRlclBhZGRpbmdPck1hcmdp biA9ICFmbG93LnBhcmVudCgpLT5pc0Fub255bW91c0Jsb2NrKCkgfHwgZmxvdy5pc0lubGluZUVs ZW1lbnRDb250aW51YXRpb24oKSB8fCAhZmxvdy5pbmxpbmVFbGVtZW50Q29udGludWF0aW9uKCk7 CisgICAgYm9vbCBzaG91bGRBcHBseUVuZEJvcmRlclBhZGRpbmdPck1hcmdpbiA9ICFmbG93LnBh cmVudCgpLT5pc0Fub255bW91c0Jsb2NrKCkgfHwgZmxvdy5pc0NvbnRpbnVhdGlvbigpIHx8ICFm bG93LmlubGluZUVsZW1lbnRDb250aW51YXRpb24oKTsKICAgICByZXR1cm4gc2hvdWxkQXBwbHlF bmRCb3JkZXJQYWRkaW5nT3JNYXJnaW4gJiYgKGZsb3cuYm9yZGVyRW5kKCkgfHwgZmxvdy5tYXJn aW5FbmQoKSB8fCBmbG93LnBhZGRpbmdFbmQoKSk7CiB9CiAK