156233 2016-04-05 06:38:35 -0700 Render tree teardown should be iterative 2016-04-05 08:04:40 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cdumez cmarcelo commit-queue dbarton esprehn+autocc fred.wang gyuyoung.kim kangil.han mrobinson simon.fraser oldest_to_newest 1180786 0 koivisto 2016-04-05 06:38:35 -0700 Use ComposedTreeIterator. 1180788 1 275659 koivisto 2016-04-05 06:48:49 -0700 Created attachment 275659 patch 1180789 2 commit-queue 2016-04-05 06:51:39 -0700 Attachment 275659 did not pass style-queue: ERROR: Source/WebCore/style/RenderTreeUpdater.cpp:515: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebCore/style/RenderTreeUpdater.cpp:527: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1180807 3 koivisto 2016-04-05 08:04:40 -0700 https://trac.webkit.org/r199056 275659 2016-04-05 06:48:49 -0700 2016-04-05 07:03:57 -0700 patch render-teardown.patch text/plain 14765 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTA1NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUzIEBACisyMDE2LTA0LTA1ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5kZXIgdHJlZSB0ZWFyZG93 biBzaG91bGQgYmUgaXRlcmF0aXZlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTYyMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGRvbS9Db250YWluZXJOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmRlc3Ryb3lSZW5kZXJUcmVlSWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVy Tm9kZTo6dGFrZUFsbENoaWxkcmVuRnJvbSk6CisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpkZXN0cm95UmVuZGVyVHJlZSk6CisgICAgICAg ICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGlzY29ubmVjdFBzZXVkb0Vs ZW1lbnQpOgorICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpwcmVwYXJlRm9yRG9jdW1lbnRT dXNwZW5zaW9uKToKKyAgICAgICAgKiBtYXRobWwvTWF0aE1MU2VsZWN0RWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNYXRoTUxTZWxlY3RFbGVtZW50Ojp1cGRhdGVTZWxlY3RlZENoaWxk KToKKyAgICAgICAgKiBzdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUcmVlVXBkYXRlcjo6dXBkYXRlRWxlbWVudFJlbmRlcmVyKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRyZWVVcGRhdGVyOjp1cGRhdGVUZXh0UmVuZGVyZXIpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6OnVwZGF0ZUJlZm9yZU9yQWZ0ZXJQc2V1ZG9F bGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVVcGRhdGVyOjp0ZWFyRG93blJl bmRlcmVycyk6CisKKyAgICAgICAgICAgIFRlYXIgZG93biByZW5kZXIgdHJlZSB1c2luZyBDb21w b3NlZFRyZWVJdGVyYXRvciBmb3IgdHJhdmVyc2FsLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUcmVlVXBkYXRlcjo6dGVhckRvd25SZW5kZXJlcik6CisKKyAgICAgICAgKiBzdHlsZS9SZW5k ZXJUcmVlVXBkYXRlci5oOgorICAgICAgICAqIHN0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjplbnN1cmVQbGFjZWhvbGRlclN0eWxlKToKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlOjpUcmVlUmVzb2x2ZXI6OnN0eWxlRm9yRWxlbWVudCk6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZTo6cmVzZXRTdHlsZUZvck5vblJlbmRlcmVkRGVzY2VuZGFudHMp OgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmFmZmVjdHNSZW5kZXJlZFN1YnRyZWUpOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGU6OlNlbGVjdG9yRmlsdGVyUHVzaGVyOjpTZWxlY3RvckZpbHRl clB1c2hlcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2VsZWN0b3JGaWx0 ZXJQdXNoZXI6OnB1c2gpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNlbGVj dG9yRmlsdGVyUHVzaGVyOjp+U2VsZWN0b3JGaWx0ZXJQdXNoZXIpOiBEZWxldGVkLgorCisgICAg ICAgICAgICBVbnVzZWQgY2xhc3MuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpkZXRhY2hU ZXh0UmVuZGVyZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmRldGFjaENo aWxkcmVuKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpkZXRhY2hTaGFkb3dS b290KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpkZXRhY2hTbG90QXNzaWdu ZWVzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpkZXRhY2hSZW5kZXJUcmVl KTogRGVsZXRlZC4KKworICAgICAgICAgICAgUmVtb3ZlIHRoZSBvbGQgcmVjdXJzaXZlIGNvZGUu CisKKyAgICAgICAgKiBzdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oOgorCiAyMDE2LTA0LTA1ICBB bnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdMMl0gQWxs b3cgZW5hYmxpbmcgV2ViR0wyIHdpdGggYSBydW50aW1lIGZsYWcKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2RvbS9Db250YWluZXJOb2RlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9k b20vQ29udGFpbmVyTm9kZS5jcHAJKHJldmlzaW9uIDE5OTAwNCkKKysrIFNvdXJjZS9XZWJDb3Jl L2RvbS9Db250YWluZXJOb2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDksMTMgKzQ5LDEzIEBA CiAjaW5jbHVkZSAiUmFkaW9Ob2RlTGlzdC5oIgogI2luY2x1ZGUgIlJlbmRlckJveC5oIgogI2lu Y2x1ZGUgIlJlbmRlclRoZW1lLmgiCisjaW5jbHVkZSAiUmVuZGVyVHJlZVVwZGF0ZXIuaCIKICNp bmNsdWRlICJSZW5kZXJXaWRnZXQuaCIKICNpbmNsdWRlICJSb290SW5saW5lQm94LmgiCiAjaW5j bHVkZSAiU1ZHRG9jdW1lbnRFeHRlbnNpb25zLmgiCiAjaW5jbHVkZSAiU1ZHRWxlbWVudC5oIgog I2luY2x1ZGUgIlNWR05hbWVzLmgiCiAjaW5jbHVkZSAiU2VsZWN0b3JRdWVyeS5oIgotI2luY2x1 ZGUgIlN0eWxlVHJlZVJlc29sdmVyLmgiCiAjaW5jbHVkZSAiVGVtcGxhdGVDb250ZW50RG9jdW1l bnRGcmFnbWVudC5oIgogI2luY2x1ZGUgPGFsZ29yaXRobT4KICNpbmNsdWRlIDx3dGYvQ3VycmVu dFRpbWUuaD4KQEAgLTEwMyw5ICsxMDMsOSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZGVzdHJveVJl bmRlclRyZWVJZk5lCiAgICAgaWYgKCFjaGlsZC5yZW5kZXJlcigpICYmICFjaGlsZC5pc05hbWVk Rmxvd0NvbnRlbnROb2RlKCkgJiYgIWlzPEhUTUxTbG90RWxlbWVudD4oY2hpbGQpKQogICAgICAg ICByZXR1cm47CiAgICAgaWYgKGlzPEVsZW1lbnQ+KGNoaWxkKSkKLSAgICAgICAgU3R5bGU6OmRl dGFjaFJlbmRlclRyZWUoZG93bmNhc3Q8RWxlbWVudD4oY2hpbGQpKTsKKyAgICAgICAgUmVuZGVy VHJlZVVwZGF0ZXI6OnRlYXJEb3duUmVuZGVyZXJzKGRvd25jYXN0PEVsZW1lbnQ+KGNoaWxkKSk7 CiAgICAgZWxzZSBpZiAoaXM8VGV4dD4oY2hpbGQpKQotICAgICAgICBTdHlsZTo6ZGV0YWNoVGV4 dFJlbmRlcmVyKGRvd25jYXN0PFRleHQ+KGNoaWxkKSk7CisgICAgICAgIFJlbmRlclRyZWVVcGRh dGVyOjp0ZWFyRG93blJlbmRlcmVyKGRvd25jYXN0PFRleHQ+KGNoaWxkKSk7CiB9CiAKIHZvaWQg Q29udGFpbmVyTm9kZTo6dGFrZUFsbENoaWxkcmVuRnJvbShDb250YWluZXJOb2RlKiBvbGRQYXJl bnQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHJldmlzaW9uIDE5OTAwNCkKKysrIFNv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNTMsNyAr MjM1Myw3IEBAIHZvaWQgRG9jdW1lbnQ6OmRlc3Ryb3lSZW5kZXJUcmVlKCkKICAgICBtX2FjdGl2 ZUVsZW1lbnQgPSBudWxscHRyOwogCiAgICAgaWYgKG1fZG9jdW1lbnRFbGVtZW50KQotICAgICAg ICBTdHlsZTo6ZGV0YWNoUmVuZGVyVHJlZSgqbV9kb2N1bWVudEVsZW1lbnQpOworICAgICAgICBS ZW5kZXJUcmVlVXBkYXRlcjo6dGVhckRvd25SZW5kZXJlcnMoKm1fZG9jdW1lbnRFbGVtZW50KTsK IAogICAgIGNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRWxl bWVudC5jcHAJKHJldmlzaW9uIDE5OTAwNCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzUsNiArNzUsNyBAQAogI2luY2x1ZGUgIlJlbmRlck5h bWVkRmxvd0ZyYWdtZW50LmgiCiAjaW5jbHVkZSAiUmVuZGVyUmVnaW9uLmgiCiAjaW5jbHVkZSAi UmVuZGVyVGhlbWUuaCIKKyNpbmNsdWRlICJSZW5kZXJUcmVlVXBkYXRlci5oIgogI2luY2x1ZGUg IlJlbmRlclZpZXcuaCIKICNpbmNsdWRlICJSZW5kZXJXaWRnZXQuaCIKICNpbmNsdWRlICJTVkdE b2N1bWVudEV4dGVuc2lvbnMuaCIKQEAgLTI3MDMsNyArMjcwNCw3IEBAIHN0YXRpYyB2b2lkIGRp c2Nvbm5lY3RQc2V1ZG9FbGVtZW50KFBzZXUKICAgICBpZiAoIXBzZXVkb0VsZW1lbnQpCiAgICAg ICAgIHJldHVybjsKICAgICBpZiAocHNldWRvRWxlbWVudC0+cmVuZGVyZXIoKSkKLSAgICAgICAg U3R5bGU6OmRldGFjaFJlbmRlclRyZWUoKnBzZXVkb0VsZW1lbnQpOworICAgICAgICBSZW5kZXJU cmVlVXBkYXRlcjo6dGVhckRvd25SZW5kZXJlcnMoKnBzZXVkb0VsZW1lbnQpOwogICAgIEFTU0VS VChwc2V1ZG9FbGVtZW50LT5ob3N0RWxlbWVudCgpKTsKICAgICBwc2V1ZG9FbGVtZW50LT5jbGVh ckhvc3RFbGVtZW50KCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5J bWFnZUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBs dWdJbkltYWdlRWxlbWVudC5jcHAJKHJldmlzaW9uIDE5OTAwNCkKKysrIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDYg KzQzLDcgQEAKICNpbmNsdWRlICJSZW5kZXJFbWJlZGRlZE9iamVjdC5oIgogI2luY2x1ZGUgIlJl bmRlckltYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyU25hcHNob3R0ZWRQbHVnSW4uaCIKKyNpbmNs dWRlICJSZW5kZXJUcmVlVXBkYXRlci5oIgogI2luY2x1ZGUgIlNjaGVtZVJlZ2lzdHJ5LmgiCiAj aW5jbHVkZSAiU2NyaXB0Q29udHJvbGxlci5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgi CkBAIC0zMjIsNyArMzIzLDcgQEAgdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpkaWRNb3Zl VG9OZQogdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpwcmVwYXJlRm9yRG9jdW1lbnRTdXNw ZW5zaW9uKCkKIHsKICAgICBpZiAocmVuZGVyZXIoKSkKLSAgICAgICAgU3R5bGU6OmRldGFjaFJl bmRlclRyZWUoKnRoaXMpOworICAgICAgICBSZW5kZXJUcmVlVXBkYXRlcjo6dGVhckRvd25SZW5k ZXJlcnMoKnRoaXMpOwogCiAgICAgSFRNTFBsdWdJbkVsZW1lbnQ6OnByZXBhcmVGb3JEb2N1bWVu dFN1c3BlbnNpb24oKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL21hdGhtbC9NYXRoTUxTZWxl Y3RFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9tYXRobWwvTWF0aE1M U2VsZWN0RWxlbWVudC5jcHAJKHJldmlzaW9uIDE5OTAwNCkKKysrIFNvdXJjZS9XZWJDb3JlL21h dGhtbC9NYXRoTUxTZWxlY3RFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMs NyBAQAogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIk1hdGhNTE5hbWVzLmgiCiAj aW5jbHVkZSAiUmVuZGVyTWF0aE1MUm93LmgiCisjaW5jbHVkZSAiUmVuZGVyVHJlZVVwZGF0ZXIu aCIKICNpbmNsdWRlICJTVkdFbGVtZW50LmgiCiAjaW5jbHVkZSAiU1ZHTmFtZXMuaCIKICNpbmNs dWRlICJTdHlsZVRyZWVSZXNvbHZlci5oIgpAQCAtMjAyLDcgKzIwMyw3IEBAIHZvaWQgTWF0aE1M U2VsZWN0RWxlbWVudDo6dXBkYXRlU2VsZWN0ZWQKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYg KG1fc2VsZWN0ZWRDaGlsZCAmJiBtX3NlbGVjdGVkQ2hpbGQtPnJlbmRlcmVyKCkpCi0gICAgICAg IFN0eWxlOjpkZXRhY2hSZW5kZXJUcmVlKCptX3NlbGVjdGVkQ2hpbGQpOworICAgICAgICBSZW5k ZXJUcmVlVXBkYXRlcjo6dGVhckRvd25SZW5kZXJlcnMoKm1fc2VsZWN0ZWRDaGlsZCk7CiAKICAg ICBtX3NlbGVjdGVkQ2hpbGQgPSBuZXdTZWxlY3RlZENoaWxkOwogICAgIHNldE5lZWRzU3R5bGVS ZWNhbGMoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVVcGRhdGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5j cHAJKHJldmlzaW9uIDE5OTA1NCkKKysrIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVV cGRhdGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQyLDcgKzI0Miw3IEBAIHZvaWQgUmVuZGVy VHJlZVVwZGF0ZXI6OnVwZGF0ZUVsZW1lbnRSZW4KIHsKICAgICBib29sIHNob3VsZFRlYXJEb3du UmVuZGVyZXJzID0gdXBkYXRlLmNoYW5nZSA9PSBTdHlsZTo6RGV0YWNoICYmIChlbGVtZW50LnJl bmRlcmVyKCkgfHwgZWxlbWVudC5pc05hbWVkRmxvd0NvbnRlbnROb2RlKCkpOwogICAgIGlmIChz aG91bGRUZWFyRG93blJlbmRlcmVycykKLSAgICAgICAgZGV0YWNoUmVuZGVyVHJlZShlbGVtZW50 LCBTdHlsZTo6UmVhdHRhY2hEZXRhY2gpOworICAgICAgICB0ZWFyRG93blJlbmRlcmVycyhlbGVt ZW50LCBUZWFyZG93blR5cGU6OktlZXBIb3ZlckFuZEFjdGl2ZSk7CiAKICAgICBib29sIHNob3Vs ZENyZWF0ZU5ld1JlbmRlcmVyID0gIWVsZW1lbnQucmVuZGVyZXIoKSAmJiB1cGRhdGUuc3R5bGUg JiYgIWhhc0ltcGxpY2l0RGlzcGxheUNvbnRlbnRzKGVsZW1lbnQpOwogICAgIGlmIChzaG91bGRD cmVhdGVOZXdSZW5kZXJlcikgewpAQCAtNDA5LDcgKzQwOSw3IEBAIHZvaWQgUmVuZGVyVHJlZVVw ZGF0ZXI6OnVwZGF0ZVRleHRSZW5kZXIKICAgICBpZiAoaGFzUmVuZGVyZXIpIHsKICAgICAgICAg aWYgKG5lZWRzUmVuZGVyZXIpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIFN0eWxlOjpk ZXRhY2hUZXh0UmVuZGVyZXIodGV4dCk7CisgICAgICAgIHRlYXJEb3duUmVuZGVyZXIodGV4dCk7 CiAgICAgICAgIGludmFsaWRhdGVXaGl0ZXNwYWNlT25seVRleHRTaWJsaW5nc0FmdGVyQXR0YWNo SWZOZWVkZWQodGV4dCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC01MDYsNCArNTA2LDYw IEBAIHZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6OnVwZGF0ZUJlZm9yZU9yQWYKICAgICAgICAgcHNl dWRvRWxlbWVudC0+ZGlkUmVjYWxjU3R5bGUoZWxlbWVudFVwZGF0ZS5jaGFuZ2UpOwogfQogCit2 b2lkIFJlbmRlclRyZWVVcGRhdGVyOjp0ZWFyRG93blJlbmRlcmVycyhFbGVtZW50JiByb290LCBU ZWFyZG93blR5cGUgdGVhcmRvd25UeXBlKQoreworICAgIFdpZGdldEhpZXJhcmNoeVVwZGF0ZXNT dXNwZW5zaW9uU2NvcGUgc3VzcGVuZFdpZGdldEhpZXJhcmNoeVVwZGF0ZXM7CisKKyAgICBWZWN0 b3I8RWxlbWVudCosIDMwPiB0ZWFyZG93blN0YWNrOworCisgICAgYXV0byBwdXNoID0gWyZdIChF bGVtZW50JiBlbGVtZW50KSB7CisgICAgICAgIGlmIChlbGVtZW50Lmhhc0N1c3RvbVN0eWxlUmVz b2x2ZUNhbGxiYWNrcygpKQorICAgICAgICAgICAgZWxlbWVudC53aWxsRGV0YWNoUmVuZGVyZXJz KCk7CisKKyAgICAgICAgaWYgKHRlYXJkb3duVHlwZSAhPSBUZWFyZG93blR5cGU6OktlZXBIb3Zl ckFuZEFjdGl2ZSkKKyAgICAgICAgICAgIGVsZW1lbnQuY2xlYXJIb3ZlckFuZEFjdGl2ZVN0YXR1 c0JlZm9yZURldGFjaGluZ1JlbmRlcmVyKCk7CisKKyAgICAgICAgZWxlbWVudC5jbGVhclN0eWxl RGVyaXZlZERhdGFCZWZvcmVEZXRhY2hpbmdSZW5kZXJlcigpOworCisgICAgICAgIHRlYXJkb3du U3RhY2suYXBwZW5kKCZlbGVtZW50KTsKKyAgICB9OworCisgICAgYXV0byBwb3AgPSBbJl0gKHVu c2lnbmVkIGRlcHRoKSB7CisgICAgICAgIHdoaWxlICh0ZWFyZG93blN0YWNrLnNpemUoKSA+IGRl cHRoKSB7CisgICAgICAgICAgICBhdXRvJiBlbGVtZW50ID0gKnRlYXJkb3duU3RhY2sudGFrZUxh c3QoKTsKKyAgICAgICAgICAgIGlmIChhdXRvKiByZW5kZXJlciA9IGVsZW1lbnQucmVuZGVyZXIo KSkgeworICAgICAgICAgICAgICAgIHJlbmRlcmVyLT5kZXN0cm95QW5kQ2xlYW51cEFub255bW91 c1dyYXBwZXJzKCk7CisgICAgICAgICAgICAgICAgZWxlbWVudC5zZXRSZW5kZXJlcihudWxscHRy KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChlbGVtZW50Lmhhc0N1c3RvbVN0eWxl UmVzb2x2ZUNhbGxiYWNrcygpKQorICAgICAgICAgICAgICAgIGVsZW1lbnQuZGlkRGV0YWNoUmVu ZGVyZXJzKCk7CisgICAgICAgIH0KKyAgICB9OworCisgICAgcHVzaChyb290KTsKKworICAgIGF1 dG8gZGVzY2VuZGFudHMgPSBjb21wb3NlZFRyZWVEZXNjZW5kYW50cyhyb290KTsKKyAgICBmb3Ig KGF1dG8gaXQgPSBkZXNjZW5kYW50cy5iZWdpbigpLCBlbmQgPSBkZXNjZW5kYW50cy5lbmQoKTsg aXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgIHBvcChpdC5kZXB0aCgpKTsKKworICAgICAgICBp ZiAoaXM8VGV4dD4oKml0KSkgeworICAgICAgICAgICAgdGVhckRvd25SZW5kZXJlcihkb3duY2Fz dDxUZXh0PigqaXQpKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAg ICAgcHVzaChkb3duY2FzdDxFbGVtZW50PigqaXQpKTsKKyAgICB9CisKKyAgICBwb3AoMCk7Cit9 CisKK3ZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6OnRlYXJEb3duUmVuZGVyZXIoVGV4dCYgdGV4dCkK K3sKKyAgICBhdXRvKiByZW5kZXJlciA9IHRleHQucmVuZGVyZXIoKTsKKyAgICBpZiAoIXJlbmRl cmVyKQorICAgICAgICByZXR1cm47CisgICAgcmVuZGVyZXItPmRlc3Ryb3lBbmRDbGVhbnVwQW5v bnltb3VzV3JhcHBlcnMoKTsKKyAgICB0ZXh0LnNldFJlbmRlcmVyKG51bGxwdHIpOworfQorCiB9 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVVcGRhdGVyLmgJKHJldmlzaW9u IDE5OTAwNCkKKysrIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVVcGRhdGVyLmgJKHdv cmtpbmcgY29weSkKQEAgLTUwLDYgKzUwLDEwIEBAIHB1YmxpYzoKIAogICAgIHZvaWQgY29tbWl0 KHN0ZDo6dW5pcXVlX3B0cjxjb25zdCBTdHlsZTo6VXBkYXRlPik7CiAKKyAgICBlbnVtIGNsYXNz IFRlYXJkb3duVHlwZSB7IE5vcm1hbCwgS2VlcEhvdmVyQW5kQWN0aXZlIH07CisgICAgc3RhdGlj IHZvaWQgdGVhckRvd25SZW5kZXJlcnMoRWxlbWVudCYsIFRlYXJkb3duVHlwZSA9IFRlYXJkb3du VHlwZTo6Tm9ybWFsKTsKKyAgICBzdGF0aWMgdm9pZCB0ZWFyRG93blJlbmRlcmVyKFRleHQmKTsK KwogcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZVJlbmRlclRyZWUoQ29udGFpbmVyTm9kZSYgcm9v dCk7CiAgICAgdm9pZCB1cGRhdGVUZXh0UmVuZGVyZXIoVGV4dCYpOwpJbmRleDogU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcAkocmV2aXNpb24gMTk5MDU0KQorKysg U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01MCwzNyArNTAsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBTdHls ZSB7CiAKLWNsYXNzIFNlbGVjdG9yRmlsdGVyUHVzaGVyIHsKLXB1YmxpYzoKLSAgICBlbnVtIFB1 c2hNb2RlIHsgUHVzaCwgTm9QdXNoIH07Ci0gICAgU2VsZWN0b3JGaWx0ZXJQdXNoZXIoU2VsZWN0 b3JGaWx0ZXImIHNlbGVjdG9yRmlsdGVyLCBFbGVtZW50JiBwYXJlbnQsIFB1c2hNb2RlIHB1c2hN b2RlID0gUHVzaCkKLSAgICAgICAgOiBtX3NlbGVjdG9yRmlsdGVyKHNlbGVjdG9yRmlsdGVyKQot ICAgICAgICAsIG1fcGFyZW50KHBhcmVudCkKLSAgICB7Ci0gICAgICAgIGlmIChwdXNoTW9kZSA9 PSBQdXNoKQotICAgICAgICAgICAgcHVzaCgpOwotICAgIH0KLSAgICB2b2lkIHB1c2goKQotICAg IHsKLSAgICAgICAgaWYgKG1fZGlkUHVzaCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg bV9kaWRQdXNoID0gdHJ1ZTsKLSAgICAgICAgbV9zZWxlY3RvckZpbHRlci5wdXNoUGFyZW50KCZt X3BhcmVudCk7Ci0gICAgfQotICAgIH5TZWxlY3RvckZpbHRlclB1c2hlcigpCi0gICAgewotICAg ICAgICBpZiAoIW1fZGlkUHVzaCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgbV9zZWxl Y3RvckZpbHRlci5wb3BQYXJlbnQoKTsKLSAgICB9Ci0gICAgCi1wcml2YXRlOgotICAgIFNlbGVj dG9yRmlsdGVyJiBtX3NlbGVjdG9yRmlsdGVyOwotICAgIEVsZW1lbnQmIG1fcGFyZW50OwotICAg IGJvb2wgbV9kaWRQdXNoIHsgZmFsc2UgfTsKLX07Ci0KLQogc3RhdGljIFJlbmRlclN0eWxlKiBw bGFjZWhvbGRlclN0eWxlOwogCiBzdGF0aWMgdm9pZCBlbnN1cmVQbGFjZWhvbGRlclN0eWxlKERv Y3VtZW50JiBkb2N1bWVudCkKQEAgLTE3NiwxMyArMTQ1LDYgQEAgUmVmPFJlbmRlclN0eWxlPiBU cmVlUmVzb2x2ZXI6OnN0eWxlRm9yRQogICAgIHJldHVybiBXVEZNb3ZlKGVsZW1lbnRTdHlsZS5y ZW5kZXJTdHlsZSk7CiB9CiAKLXZvaWQgZGV0YWNoVGV4dFJlbmRlcmVyKFRleHQmIHRleHROb2Rl KQotewotICAgIGlmICh0ZXh0Tm9kZS5yZW5kZXJlcigpKQotICAgICAgICB0ZXh0Tm9kZS5yZW5k ZXJlcigpLT5kZXN0cm95QW5kQ2xlYW51cEFub255bW91c1dyYXBwZXJzKCk7Ci0gICAgdGV4dE5v ZGUuc2V0UmVuZGVyZXIoMCk7Ci19Ci0KIHN0YXRpYyB2b2lkIHJlc2V0U3R5bGVGb3JOb25SZW5k ZXJlZERlc2NlbmRhbnRzKEVsZW1lbnQmIGN1cnJlbnQpCiB7CiAgICAgLy8gRklYTUU6IFRoaXMg aXMgbm90IGNvcnJlY3Qgd2l0aCBzaGFkb3cgdHJlZXMuIFRoaXMgc2hvdWxkIGJlIGRvbmUgd2l0 aCBDb21wb3NlZFRyZWVJdGVyYXRvci4KQEAgLTIwNCw3MiArMTY2LDYgQEAgc3RhdGljIHZvaWQg cmVzZXRTdHlsZUZvck5vblJlbmRlcmVkRGVzYwogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgZGV0 YWNoQ2hpbGRyZW4oQ29udGFpbmVyTm9kZSYgY3VycmVudCwgRGV0YWNoVHlwZSBkZXRhY2hUeXBl KQotewotICAgIGZvciAoTm9kZSogY2hpbGQgPSBjdXJyZW50LmZpcnN0Q2hpbGQoKTsgY2hpbGQ7 IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgaWYgKGlzPFRleHQ+KCpj aGlsZCkpCi0gICAgICAgICAgICBkZXRhY2hUZXh0UmVuZGVyZXIoZG93bmNhc3Q8VGV4dD4oKmNo aWxkKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlzPEVsZW1lbnQ+KCpjaGlsZCkpCi0gICAgICAgICAg ICBkZXRhY2hSZW5kZXJUcmVlKGRvd25jYXN0PEVsZW1lbnQ+KCpjaGlsZCksIGRldGFjaFR5cGUp OwotICAgIH0KLSAgICBjdXJyZW50LmNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7Ci19Ci0K LXN0YXRpYyB2b2lkIGRldGFjaFNoYWRvd1Jvb3QoU2hhZG93Um9vdCYgc2hhZG93Um9vdCwgRGV0 YWNoVHlwZSBkZXRhY2hUeXBlKQotewotICAgIGRldGFjaENoaWxkcmVuKHNoYWRvd1Jvb3QsIGRl dGFjaFR5cGUpOwotfQotCi0jaWYgRU5BQkxFKFNIQURPV19ET00pIHx8IEVOQUJMRShERVRBSUxT X0VMRU1FTlQpCi1zdGF0aWMgdm9pZCBkZXRhY2hTbG90QXNzaWduZWVzKEhUTUxTbG90RWxlbWVu dCYgc2xvdCwgRGV0YWNoVHlwZSBkZXRhY2hUeXBlKQotewotICAgIEFTU0VSVCghc2xvdC5yZW5k ZXJlcigpKTsKLSAgICBpZiAoYXV0byogYXNzaWduZWROb2RlcyA9IHNsb3QuYXNzaWduZWROb2Rl cygpKSB7Ci0gICAgICAgIGZvciAoYXV0byogY2hpbGQgOiAqYXNzaWduZWROb2RlcykgewotICAg ICAgICAgICAgaWYgKGlzPFRleHQ+KCpjaGlsZCkpCi0gICAgICAgICAgICAgICAgZGV0YWNoVGV4 dFJlbmRlcmVyKGRvd25jYXN0PFRleHQ+KCpjaGlsZCkpOwotICAgICAgICAgICAgZWxzZSBpZiAo aXM8RWxlbWVudD4oKmNoaWxkKSkKLSAgICAgICAgICAgICAgICBkZXRhY2hSZW5kZXJUcmVlKGRv d25jYXN0PEVsZW1lbnQ+KCpjaGlsZCksIGRldGFjaFR5cGUpOwotICAgICAgICB9Ci0gICAgfSBl bHNlCi0gICAgICAgIGRldGFjaENoaWxkcmVuKHNsb3QsIGRldGFjaFR5cGUpOwotCi0gICAgc2xv dC5jbGVhck5lZWRzU3R5bGVSZWNhbGMoKTsKLSAgICBzbG90LmNsZWFyQ2hpbGROZWVkc1N0eWxl UmVjYWxjKCk7Ci19Ci0jZW5kaWYKLQotdm9pZCBkZXRhY2hSZW5kZXJUcmVlKEVsZW1lbnQmIGN1 cnJlbnQsIERldGFjaFR5cGUgZGV0YWNoVHlwZSkKLXsKLSAgICBXaWRnZXRIaWVyYXJjaHlVcGRh dGVzU3VzcGVuc2lvblNjb3BlIHN1c3BlbmRXaWRnZXRIaWVyYXJjaHlVcGRhdGVzOwotCi0gICAg aWYgKGN1cnJlbnQuaGFzQ3VzdG9tU3R5bGVSZXNvbHZlQ2FsbGJhY2tzKCkpCi0gICAgICAgIGN1 cnJlbnQud2lsbERldGFjaFJlbmRlcmVycygpOwotCi0gICAgY3VycmVudC5jbGVhclN0eWxlRGVy aXZlZERhdGFCZWZvcmVEZXRhY2hpbmdSZW5kZXJlcigpOwotCi0gICAgLy8gRG8gbm90IHJlbW92 ZSB0aGUgZWxlbWVudCdzIGhvdmVyZWQgYW5kIGFjdGl2ZSBzdGF0dXMKLSAgICAvLyBpZiBwZXJm b3JtaW5nIGEgcmVhdHRhY2guCi0gICAgaWYgKGRldGFjaFR5cGUgIT0gUmVhdHRhY2hEZXRhY2gp Ci0gICAgICAgIGN1cnJlbnQuY2xlYXJIb3ZlckFuZEFjdGl2ZVN0YXR1c0JlZm9yZURldGFjaGlu Z1JlbmRlcmVyKCk7Ci0KLSNpZiBFTkFCTEUoU0hBRE9XX0RPTSkgfHwgRU5BQkxFKERFVEFJTFNf RUxFTUVOVCkKLSAgICBpZiAoaXM8SFRNTFNsb3RFbGVtZW50PihjdXJyZW50KSkKLSAgICAgICAg ZGV0YWNoU2xvdEFzc2lnbmVlcyhkb3duY2FzdDxIVE1MU2xvdEVsZW1lbnQ+KGN1cnJlbnQpLCBk ZXRhY2hUeXBlKTsKLSNlbmRpZgotICAgIGVsc2UgaWYgKFNoYWRvd1Jvb3QqIHNoYWRvd1Jvb3Qg PSBjdXJyZW50LnNoYWRvd1Jvb3QoKSkKLSAgICAgICAgZGV0YWNoU2hhZG93Um9vdCgqc2hhZG93 Um9vdCwgZGV0YWNoVHlwZSk7Ci0KLSAgICBkZXRhY2hDaGlsZHJlbihjdXJyZW50LCBkZXRhY2hU eXBlKTsKLQotICAgIGlmIChjdXJyZW50LnJlbmRlcmVyKCkpCi0gICAgICAgIGN1cnJlbnQucmVu ZGVyZXIoKS0+ZGVzdHJveUFuZENsZWFudXBBbm9ueW1vdXNXcmFwcGVycygpOwotICAgIGN1cnJl bnQuc2V0UmVuZGVyZXIobnVsbHB0cik7Ci0KLSAgICBpZiAoY3VycmVudC5oYXNDdXN0b21TdHls ZVJlc29sdmVDYWxsYmFja3MoKSkKLSAgICAgICAgY3VycmVudC5kaWREZXRhY2hSZW5kZXJlcnMo KTsKLX0KLQogc3RhdGljIGJvb2wgYWZmZWN0c1JlbmRlcmVkU3VidHJlZShFbGVtZW50JiBlbGVt ZW50LCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUpCiB7CiAgICAgaWYgKGVsZW1lbnQucmVu ZGVyZXIoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuaAko cmV2aXNpb24gMTk5MDU0KQorKysgU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2 ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMp IDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDEzLTIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCkBAIC0xMDgsMTAgKzEwOCw2IEBAIHByaXZhdGU6CiAgICAgc3RkOjp1 bmlxdWVfcHRyPFVwZGF0ZT4gbV91cGRhdGU7CiB9OwogCi1lbnVtIERldGFjaFR5cGUgeyBOb3Jt YWxEZXRhY2gsIFJlYXR0YWNoRGV0YWNoIH07Ci12b2lkIGRldGFjaFJlbmRlclRyZWUoRWxlbWVu dCYsIERldGFjaFR5cGUgPSBOb3JtYWxEZXRhY2gpOwotdm9pZCBkZXRhY2hUZXh0UmVuZGVyZXIo VGV4dCYpOwotCiB2b2lkIHF1ZXVlUG9zdFJlc29sdXRpb25DYWxsYmFjayhzdGQ6OmZ1bmN0aW9u PHZvaWQgKCk+KTsKIGJvb2wgcG9zdFJlc29sdXRpb25DYWxsYmFja3NBcmVTdXNwZW5kZWQoKTsK IAo=