121005 2013-09-08 03:54:20 -0700 Rename needsShadowTreeWalker 2013-09-08 04:29:36 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cmarcelo commit-queue esprehn+autocc kangil.han oldest_to_newest 926426 0 koivisto 2013-09-08 03:54:20 -0700 There is no ShadowTreeWalker. 926431 1 210976 koivisto 2013-09-08 04:02:43 -0700 Created attachment 210976 patch 926432 2 210976 kling 2013-09-08 04:22:28 -0700 Comment on attachment 210976 patch View in context: https://bugs.webkit.org/attachment.cgi?id=210976&action=review r=me > Source/WebCore/ChangeLog:8 > + Renemane to needsNodeRenderingTraversalSlowPath. typo > Source/WebCore/dom/Element.cpp:1422 > + setNeedsNodeRenderingTraversalSlowPath(determineNeedsNodeRenderingTraversalSlowPath(*this)); This is so long I can't read the whole line without blinking. I don't have any better suggestions right now though :( 926433 3 koivisto 2013-09-08 04:29:36 -0700 https://trac.webkit.org/r155303 210976 2013-09-08 04:02:43 -0700 2013-09-08 04:22:28 -0700 patch rename-needsshadowtreewalker.patch text/plain 12393 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NTMwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBACisyMDEzLTA5LTA4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgbmVlZHNTaGFkb3dU cmVlV2Fsa2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjEwMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZW5lbWFuZSB0byBuZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aC4KKworICAg ICAgICAqIGRvbS9Db250YWluZXJOb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpuZWVk c05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aCk6CisgICAgICAgICogZG9tL0VsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGV0ZXJtaW5lTmVlZHNOb2RlUmVuZGVyaW5nVHJhdmVy c2FsU2xvd1BhdGgpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6cmVzZXROZWVkc05vZGVS ZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aCk6CisKKyAgICAgICAgICAgIE9ubHkgRWxlbWVudHMg Y2FuIGhhdmUgdGhpcyBmbGFnLiBNb3ZlIHRoZSBjb2RlIGhlcmUgZnJvbSBOb2RlLgorCisgICAg ICAgIChXZWJDb3JlOjpFbGVtZW50OjphZGRTaGFkb3dSb290KToKKyAgICAgICAgKFdlYkNvcmU6 OkVsZW1lbnQ6OnNldEJlZm9yZVBzZXVkb0VsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RWxl bWVudDo6c2V0QWZ0ZXJQc2V1ZG9FbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6 OmNsZWFyQmVmb3JlUHNldWRvRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpj bGVhckFmdGVyUHNldWRvRWxlbWVudCk6CisKKyAgICAgICAgICAgIFJlc2V0IGFmdGVyIGNsZWFy IHRvby4KKworICAgICAgICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAgICogZG9tL0VsZW1lbnQu aDoKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6CisgICAgICAgICogZG9tL05vZGUuaDoKKyAgICAg ICAgKFdlYkNvcmU6Ok5vZGU6OmlzSW5zZXJ0aW9uUG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6 Tm9kZTo6c2V0TmVlZHNOb2RlUmVuZGVyaW5nVHJhdmVyc2FsU2xvd1BhdGgpOgorICAgICAgICAK KyAgICAgICAgICAgIE1ha2UgcHJvdGVjdGVkLgorCisgICAgICAgICogZG9tL05vZGVSZW5kZXJp bmdUcmF2ZXJzYWwuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJpbmdUcmF2ZXJzYWw6 OnBhcmVudCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlUmVuZGVyaW5nVHJhdmVyc2FsOjpuZXh0 U2libGluZyk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlUmVuZGVyaW5nVHJhdmVyc2FsOjpwcmV2 aW91c1NpYmxpbmcpOgorCiAyMDEzLTA5LTA4ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxl LmNvbT4KIAogICAgICAgICBGcmFtZUxvYWRlcjo6aWNvbigpIHNob3VsZCByZXR1cm4gYSByZWZl cmVuY2UuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmgJKHJldmlzaW9uIDE1NTI5 NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmgJKHdvcmtpbmcgY29weSkK QEAgLTIyMCwxMiArMjIwLDEyIEBAIGlubGluZSBOb2RlKiBOb2RlOjpoaWdoZXN0QW5jZXN0b3Io KSBjb24KICAgICByZXR1cm4gaGlnaGVzdDsKIH0KIAotaW5saW5lIGJvb2wgTm9kZTo6bmVlZHNT aGFkb3dUcmVlV2Fsa2VyKCkgY29uc3QKK2lubGluZSBib29sIE5vZGU6Om5lZWRzTm9kZVJlbmRl cmluZ1RyYXZlcnNhbFNsb3dQYXRoKCkgY29uc3QKIHsKLSAgICBpZiAoZ2V0RmxhZyhOZWVkc1No YWRvd1RyZWVXYWxrZXJGbGFnKSkKKyAgICBpZiAoZ2V0RmxhZyhOZWVkc05vZGVSZW5kZXJpbmdU cmF2ZXJzYWxTbG93UGF0aEZsYWcpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBDb250YWlu ZXJOb2RlKiBwYXJlbnQgPSBwYXJlbnRPclNoYWRvd0hvc3ROb2RlKCk7Ci0gICAgcmV0dXJuIHBh cmVudCAmJiBwYXJlbnQtPmdldEZsYWcoTmVlZHNTaGFkb3dUcmVlV2Fsa2VyRmxhZyk7CisgICAg cmV0dXJuIHBhcmVudCAmJiBwYXJlbnQtPmdldEZsYWcoTmVlZHNOb2RlUmVuZGVyaW5nVHJhdmVy c2FsU2xvd1BhdGhGbGFnKTsKIH0KIAogaW5saW5lIGJvb2wgTm9kZTo6aXNUcmVlU2NvcGUoKSBj b25zdApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkocmV2aXNpb24gMTU1Mjk2KQorKysgU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDA4LDYgKzE0 MDgsMjAgQEAgdm9pZCBFbGVtZW50OjpkaWRBZmZlY3RTZWxlY3RvcihBZmZlY3RlZAogICAgIHNl dE5lZWRzU3R5bGVSZWNhbGMoKTsKIH0KIAorc3RhdGljIGJvb2wgZGV0ZXJtaW5lTmVlZHNOb2Rl UmVuZGVyaW5nVHJhdmVyc2FsU2xvd1BhdGgoY29uc3QgRWxlbWVudCYgZWxlbWVudCkKK3sKKyAg ICBpZiAoZWxlbWVudC5pc1NoYWRvd1Jvb3QoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAg aWYgKGVsZW1lbnQuaXNQc2V1ZG9FbGVtZW50KCkgfHwgZWxlbWVudC5iZWZvcmVQc2V1ZG9FbGVt ZW50KCkgfHwgZWxlbWVudC5hZnRlclBzZXVkb0VsZW1lbnQoKSkKKyAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgcmV0dXJuIGVsZW1lbnQuaXNJbnNlcnRpb25Qb2ludCgpIHx8IGVsZW1lbnQuc2hh ZG93Um9vdCgpOworfQorCit2b2lkIEVsZW1lbnQ6OnJlc2V0TmVlZHNOb2RlUmVuZGVyaW5nVHJh dmVyc2FsU2xvd1BhdGgoKQoreworICAgIHNldE5lZWRzTm9kZVJlbmRlcmluZ1RyYXZlcnNhbFNs b3dQYXRoKGRldGVybWluZU5lZWRzTm9kZVJlbmRlcmluZ1RyYXZlcnNhbFNsb3dQYXRoKCp0aGlz KSk7Cit9CisKIHZvaWQgRWxlbWVudDo6YWRkU2hhZG93Um9vdChQYXNzUmVmUHRyPFNoYWRvd1Jv b3Q+IG5ld1NoYWRvd1Jvb3QpCiB7CiAgICAgQVNTRVJUKCFzaGFkb3dSb290KCkpOwpAQCAtMTQy MSw4ICsxNDM1LDcgQEAgdm9pZCBFbGVtZW50OjphZGRTaGFkb3dSb290KFBhc3NSZWZQdHI8Uwog CiAgICAgQ2hpbGROb2RlSW5zZXJ0aW9uTm90aWZpZXIodGhpcykubm90aWZ5KHNoYWRvd1Jvb3Qp OwogCi0gICAgLy8gRXhpc3RlbmNlIG9mIHNoYWRvdyByb290cyByZXF1aXJlcyB0aGUgaG9zdCBh bmQgaXRzIGNoaWxkcmVuIHRvIGRvIHRyYXZlcnNhbCB1c2luZyBDb21wb3NlZFNoYWRvd1RyZWVX YWxrZXIuCi0gICAgc2V0TmVlZHNTaGFkb3dUcmVlV2Fsa2VyKCk7CisgICAgcmVzZXROZWVkc05v ZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aCgpOwogCiAgICAgLy8gRklYTUUoOTQ5MDUpOiBT aGFkb3dIb3N0IHNob3VsZCBiZSByZWF0dGFjaGVkIGR1cmluZyByZWNhbGNTdHlsZS4KICAgICAv LyBTZXQgc29tZSBmbGFnIGhlcmUgYW5kIHJlY3JlYXRlIHNoYWRvdyBob3N0cycgcmVuZGVyZXIg aW4KQEAgLTIzNDksMTMgKzIzNjIsMTMgQEAgUHNldWRvRWxlbWVudCogRWxlbWVudDo6YWZ0ZXJQ c2V1ZG9FbGVtZQogdm9pZCBFbGVtZW50OjpzZXRCZWZvcmVQc2V1ZG9FbGVtZW50KFBhc3NSZWZQ dHI8UHNldWRvRWxlbWVudD4gZWxlbWVudCkKIHsKICAgICBlbnN1cmVFbGVtZW50UmFyZURhdGEo KS5zZXRCZWZvcmVQc2V1ZG9FbGVtZW50KGVsZW1lbnQpOwotICAgIHJlc2V0TmVlZHNTaGFkb3dU cmVlV2Fsa2VyKCk7CisgICAgcmVzZXROZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0 aCgpOwogfQogCiB2b2lkIEVsZW1lbnQ6OnNldEFmdGVyUHNldWRvRWxlbWVudChQYXNzUmVmUHRy PFBzZXVkb0VsZW1lbnQ+IGVsZW1lbnQpCiB7CiAgICAgZW5zdXJlRWxlbWVudFJhcmVEYXRhKCku c2V0QWZ0ZXJQc2V1ZG9FbGVtZW50KGVsZW1lbnQpOwotICAgIHJlc2V0TmVlZHNTaGFkb3dUcmVl V2Fsa2VyKCk7CisgICAgcmVzZXROZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aCgp OwogfQogCiBzdGF0aWMgdm9pZCBkaXNjb25uZWN0UHNldWRvRWxlbWVudChQc2V1ZG9FbGVtZW50 KiBwc2V1ZG9FbGVtZW50KQpAQCAtMjM3NCw2ICsyMzg3LDcgQEAgdm9pZCBFbGVtZW50OjpjbGVh ckJlZm9yZVBzZXVkb0VsZW1lbnQoKQogICAgICAgICByZXR1cm47CiAgICAgZGlzY29ubmVjdFBz ZXVkb0VsZW1lbnQoZWxlbWVudFJhcmVEYXRhKCktPmJlZm9yZVBzZXVkb0VsZW1lbnQoKSk7CiAg ICAgZWxlbWVudFJhcmVEYXRhKCktPnNldEJlZm9yZVBzZXVkb0VsZW1lbnQobnVsbHB0cik7Cisg ICAgcmVzZXROZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aCgpOwogfQogCiB2b2lk IEVsZW1lbnQ6OmNsZWFyQWZ0ZXJQc2V1ZG9FbGVtZW50KCkKQEAgLTIzODIsNiArMjM5Niw3IEBA IHZvaWQgRWxlbWVudDo6Y2xlYXJBZnRlclBzZXVkb0VsZW1lbnQoKQogICAgICAgICByZXR1cm47 CiAgICAgZGlzY29ubmVjdFBzZXVkb0VsZW1lbnQoZWxlbWVudFJhcmVEYXRhKCktPmFmdGVyUHNl dWRvRWxlbWVudCgpKTsKICAgICBlbGVtZW50UmFyZURhdGEoKS0+c2V0QWZ0ZXJQc2V1ZG9FbGVt ZW50KG51bGxwdHIpOworICAgIHJlc2V0TmVlZHNOb2RlUmVuZGVyaW5nVHJhdmVyc2FsU2xvd1Bh dGgoKTsKIH0KIAogLy8gRWxlbWVudFRyYXZlcnNhbCBBUEkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2RvbS9FbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu aAkocmV2aXNpb24gMTU1Mjk2KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAkod29y a2luZyBjb3B5KQpAQCAtNTkwLDYgKzU5MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRBZnRl clBzZXVkb0VsZW1lbnQoUGFzc1JlZlB0cjxQc2V1ZG9FbGVtZW50Pik7CiAgICAgdm9pZCBjbGVh ckJlZm9yZVBzZXVkb0VsZW1lbnQoKTsKICAgICB2b2lkIGNsZWFyQWZ0ZXJQc2V1ZG9FbGVtZW50 KCk7CisgICAgdm9pZCByZXNldE5lZWRzTm9kZVJlbmRlcmluZ1RyYXZlcnNhbFNsb3dQYXRoKCk7 CiAKICAgICB2aXJ0dWFsIGJvb2wgYXJlQXV0aG9yU2hhZG93c0FsbG93ZWQoKSBjb25zdCB7IHJl dHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCB2b2lkIGRpZEFkZFVzZXJBZ2VudFNoYWRvd1Jvb3Qo U2hhZG93Um9vdCopIHsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAkocmV2aXNpb24gMTU1Mjk2KQor KysgU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDQ1LDE4 ICsxMDQ1LDYgQEAgdm9pZCBOb2RlOjpyZW1vdmVkRnJvbShDb250YWluZXJOb2RlKiBpbgogICAg ICAgICBjbGVhckZsYWcoSXNJblNoYWRvd1RyZWVGbGFnKTsKIH0KIAotYm9vbCBOb2RlOjpuZWVk c1NoYWRvd1RyZWVXYWxrZXJTbG93KCkgY29uc3QKLXsKLSAgICBpZiAoaXNTaGFkb3dSb290KCkp Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIGlmICghaXNFbGVtZW50Tm9kZSgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgY29uc3QgRWxlbWVudCogYXNFbGVtZW50ID0gdG9FbGVtZW50 KHRoaXMpOwotICAgIGlmIChhc0VsZW1lbnQtPmlzUHNldWRvRWxlbWVudCgpIHx8IGFzRWxlbWVu dC0+YmVmb3JlUHNldWRvRWxlbWVudCgpIHx8IGFzRWxlbWVudC0+YWZ0ZXJQc2V1ZG9FbGVtZW50 KCkpCi0gICAgICAgIHJldHVybiB0cnVlOwotICAgIHJldHVybiBhc0VsZW1lbnQtPmlzSW5zZXJ0 aW9uUG9pbnQoKSB8fCBhc0VsZW1lbnQtPnNoYWRvd1Jvb3QoKTsKLX0KLQogYm9vbCBOb2RlOjpp c1Jvb3RFZGl0YWJsZUVsZW1lbnQoKSBjb25zdAogewogICAgIHJldHVybiByZW5kZXJlcklzRWRp dGFibGUoKSAmJiBpc0VsZW1lbnROb2RlKCkgJiYgKCFwYXJlbnROb2RlKCkgfHwgIXBhcmVudE5v ZGUoKS0+cmVuZGVyZXJJc0VkaXRhYmxlKCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2Rl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaAkocmV2aXNpb24gMTU1 Mjk2KQorKysgU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjU1 LDE0ICsyNTUsMTEgQEAgcHVibGljOgogICAgIGJvb2wgaXNUcmVlU2NvcGUoKSBjb25zdDsKICAg ICBib29sIGlzRG9jdW1lbnRGcmFnbWVudCgpIGNvbnN0IHsgcmV0dXJuIGdldEZsYWcoSXNEb2N1 bWVudEZyYWdtZW50RmxhZyk7IH0KICAgICBib29sIGlzU2hhZG93Um9vdCgpIGNvbnN0IHsgcmV0 dXJuIGlzRG9jdW1lbnRGcmFnbWVudCgpICYmIGlzVHJlZVNjb3BlKCk7IH0KLSAgICBib29sIGlz SW5zZXJ0aW9uUG9pbnQoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKE5lZWRzU2hhZG93VHJlZVdh bGtlckZsYWcpICYmIGlzSW5zZXJ0aW9uUG9pbnROb2RlKCk7IH0KKyAgICBib29sIGlzSW5zZXJ0 aW9uUG9pbnQoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKE5lZWRzTm9kZVJlbmRlcmluZ1RyYXZl cnNhbFNsb3dQYXRoRmxhZykgJiYgaXNJbnNlcnRpb25Qb2ludE5vZGUoKTsgfQogICAgIC8vIFJl dHVybnMgTm9kZSByYXRoZXIgdGhhbiBJbnNlcnRpb25Qb2ludC4gU2hvdWxkIGJlIHVzZWQgb25s eSBmb3IgbGFuZ3VhZ2UgYmluZGluZ3MuCiAgICAgTm9kZSogaW5zZXJ0aW9uUGFyZW50Rm9yQmlu ZGluZygpIGNvbnN0OwogCi0gICAgYm9vbCBuZWVkc1NoYWRvd1RyZWVXYWxrZXIoKSBjb25zdDsK LSAgICBib29sIG5lZWRzU2hhZG93VHJlZVdhbGtlclNsb3coKSBjb25zdDsKLSAgICB2b2lkIHNl dE5lZWRzU2hhZG93VHJlZVdhbGtlcigpIHsgc2V0RmxhZyhOZWVkc1NoYWRvd1RyZWVXYWxrZXJG bGFnKTsgfQotICAgIHZvaWQgcmVzZXROZWVkc1NoYWRvd1RyZWVXYWxrZXIoKSB7IHNldEZsYWco bmVlZHNTaGFkb3dUcmVlV2Fsa2VyU2xvdygpLCBOZWVkc1NoYWRvd1RyZWVXYWxrZXJGbGFnKTsg fQorICAgIGJvb2wgbmVlZHNOb2RlUmVuZGVyaW5nVHJhdmVyc2FsU2xvd1BhdGgoKSBjb25zdDsK IAogICAgIGJvb2wgaW5OYW1lZEZsb3coKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKEluTmFtZWRG bG93RmxhZyk7IH0KICAgICBib29sIGhhc0N1c3RvbVN0eWxlUmVzb2x2ZUNhbGxiYWNrcygpIGNv bnN0IHsgcmV0dXJuIGdldEZsYWcoSGFzQ3VzdG9tU3R5bGVSZXNvbHZlQ2FsbGJhY2tzRmxhZyk7 IH0KQEAgLTYzMyw3ICs2MzAsNyBAQCBwcml2YXRlOgogICAgICAgICBIYXNDdXN0b21TdHlsZVJl c29sdmVDYWxsYmFja3NGbGFnID0gMSA8PCAyMSwKICAgICAgICAgSGFzU2NvcGVkSFRNTFN0eWxl Q2hpbGRGbGFnID0gMSA8PCAyMiwKICAgICAgICAgSGFzRXZlbnRUYXJnZXREYXRhRmxhZyA9IDEg PDwgMjMsCi0gICAgICAgIE5lZWRzU2hhZG93VHJlZVdhbGtlckZsYWcgPSAxIDw8IDI1LAorICAg ICAgICBOZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aEZsYWcgPSAxIDw8IDI1LAog ICAgICAgICBJc0luU2hhZG93VHJlZUZsYWcgPSAxIDw8IDI2LAogCiAgICAgICAgIERlZmF1bHRO b2RlRmxhZ3MgPSBJc1BhcnNpbmdDaGlsZHJlbkZpbmlzaGVkRmxhZwpAQCAtNjUyLDE0ICs2NDks MTQgQEAgcHJvdGVjdGVkOgogICAgICAgICBDcmVhdGVUZXh0ID0gRGVmYXVsdE5vZGVGbGFncyB8 IElzVGV4dEZsYWcsCiAgICAgICAgIENyZWF0ZUNvbnRhaW5lciA9IERlZmF1bHROb2RlRmxhZ3Mg fCBJc0NvbnRhaW5lckZsYWcsIAogICAgICAgICBDcmVhdGVFbGVtZW50ID0gQ3JlYXRlQ29udGFp bmVyIHwgSXNFbGVtZW50RmxhZywgCi0gICAgICAgIENyZWF0ZVBzZXVkb0VsZW1lbnQgPSAgQ3Jl YXRlRWxlbWVudCB8IEluRG9jdW1lbnRGbGFnIHwgTmVlZHNTaGFkb3dUcmVlV2Fsa2VyRmxhZywK LSAgICAgICAgQ3JlYXRlU2hhZG93Um9vdCA9IENyZWF0ZUNvbnRhaW5lciB8IElzRG9jdW1lbnRG cmFnbWVudEZsYWcgfCBOZWVkc1NoYWRvd1RyZWVXYWxrZXJGbGFnIHwgSXNJblNoYWRvd1RyZWVG bGFnLAorICAgICAgICBDcmVhdGVQc2V1ZG9FbGVtZW50ID0gIENyZWF0ZUVsZW1lbnQgfCBJbkRv Y3VtZW50RmxhZyB8IE5lZWRzTm9kZVJlbmRlcmluZ1RyYXZlcnNhbFNsb3dQYXRoRmxhZywKKyAg ICAgICAgQ3JlYXRlU2hhZG93Um9vdCA9IENyZWF0ZUNvbnRhaW5lciB8IElzRG9jdW1lbnRGcmFn bWVudEZsYWcgfCBOZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aEZsYWcgfCBJc0lu U2hhZG93VHJlZUZsYWcsCiAgICAgICAgIENyZWF0ZURvY3VtZW50RnJhZ21lbnQgPSBDcmVhdGVD b250YWluZXIgfCBJc0RvY3VtZW50RnJhZ21lbnRGbGFnLAogICAgICAgICBDcmVhdGVTdHlsZWRF bGVtZW50ID0gQ3JlYXRlRWxlbWVudCB8IElzU3R5bGVkRWxlbWVudEZsYWcsIAogICAgICAgICBD cmVhdGVIVE1MRWxlbWVudCA9IENyZWF0ZVN0eWxlZEVsZW1lbnQgfCBJc0hUTUxGbGFnLAogICAg ICAgICBDcmVhdGVTVkdFbGVtZW50ID0gQ3JlYXRlU3R5bGVkRWxlbWVudCB8IElzU1ZHRmxhZyB8 IEhhc0N1c3RvbVN0eWxlUmVzb2x2ZUNhbGxiYWNrc0ZsYWcsCiAgICAgICAgIENyZWF0ZURvY3Vt ZW50ID0gQ3JlYXRlQ29udGFpbmVyIHwgSW5Eb2N1bWVudEZsYWcsCi0gICAgICAgIENyZWF0ZUlu c2VydGlvblBvaW50ID0gQ3JlYXRlSFRNTEVsZW1lbnQgfCBOZWVkc1NoYWRvd1RyZWVXYWxrZXJG bGFnLAorICAgICAgICBDcmVhdGVJbnNlcnRpb25Qb2ludCA9IENyZWF0ZUhUTUxFbGVtZW50IHwg TmVlZHNOb2RlUmVuZGVyaW5nVHJhdmVyc2FsU2xvd1BhdGhGbGFnLAogICAgICAgICBDcmVhdGVF ZGl0aW5nVGV4dCA9IENyZWF0ZVRleHQgfCBJc0VkaXRpbmdUZXh0RmxhZywKICAgICB9OwogICAg IE5vZGUoRG9jdW1lbnQqLCBDb25zdHJ1Y3Rpb25UeXBlKTsKQEAgLTY3OCw2ICs2NzUsOCBAQCBw cm90ZWN0ZWQ6CiAKICAgICB2b2lkIHNldEhhc0N1c3RvbVN0eWxlUmVzb2x2ZUNhbGxiYWNrcygp IHsgc2V0RmxhZyh0cnVlLCBIYXNDdXN0b21TdHlsZVJlc29sdmVDYWxsYmFja3NGbGFnKTsgfQog CisgICAgdm9pZCBzZXROZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aChib29sIGZs YWcpIHsgc2V0RmxhZyhmbGFnLCBOZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aEZs YWcpOyB9CisKICAgICBEb2N1bWVudCogZG9jdW1lbnRJbnRlcm5hbCgpIGNvbnN0IHsgcmV0dXJu IHRyZWVTY29wZSgpLT5kb2N1bWVudFNjb3BlKCk7IH0KICAgICB2b2lkIHNldFRyZWVTY29wZShU cmVlU2NvcGUqIHNjb3BlKSB7IG1fdHJlZVNjb3BlID0gc2NvcGU7IH0KIApJbmRleDogU291cmNl L1dlYkNvcmUvZG9tL05vZGVSZW5kZXJpbmdUcmF2ZXJzYWwuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ1RyYXZlcnNhbC5oCShyZXZpc2lvbiAxNTUyOTYp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ1RyYXZlcnNhbC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xLDUgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBh cmUKQEAgLTI3LDU2ICsyOCw1MCBAQAogI2lmbmRlZiBOb2RlUmVuZGVyaW5nVHJhdmVyc2FsX2gK ICNkZWZpbmUgTm9kZVJlbmRlcmluZ1RyYXZlcnNhbF9oCiAKLSNpbmNsdWRlICJFbGVtZW50Lmgi CisjaW5jbHVkZSAiQ29udGFpbmVyTm9kZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNs YXNzIEluc2VydGlvblBvaW50OwotCiBuYW1lc3BhY2UgTm9kZVJlbmRlcmluZ1RyYXZlcnNhbCB7 CiAKIENvbnRhaW5lck5vZGUqIHBhcmVudChjb25zdCBOb2RlKik7Ci1Db250YWluZXJOb2RlKiBw YXJlbnRTbG93KGNvbnN0IE5vZGUqKTsKIE5vZGUqIG5leHRTaWJsaW5nKGNvbnN0IE5vZGUqKTsK LU5vZGUqIG5leHRTaWJsaW5nU2xvdyhjb25zdCBOb2RlKik7CiBOb2RlKiBwcmV2aW91c1NpYmxp bmcoY29uc3QgTm9kZSopOwotTm9kZSogcHJldmlvdXNTaWJsaW5nU2xvdyhjb25zdCBOb2RlKik7 CiAKIE5vZGUqIG5leHRJblNjb3BlKGNvbnN0IE5vZGUqKTsKIE5vZGUqIHByZXZpb3VzSW5TY29w ZShjb25zdCBOb2RlKik7CiBOb2RlKiBwYXJlbnRJblNjb3BlKGNvbnN0IE5vZGUqKTsKIE5vZGUq IGxhc3RDaGlsZEluU2NvcGUoY29uc3QgTm9kZSopOwogCitDb250YWluZXJOb2RlKiBwYXJlbnRT bG93KGNvbnN0IE5vZGUqKTsKK05vZGUqIG5leHRTaWJsaW5nU2xvdyhjb25zdCBOb2RlKik7CitO b2RlKiBwcmV2aW91c1NpYmxpbmdTbG93KGNvbnN0IE5vZGUqKTsKKwogaW5saW5lIENvbnRhaW5l ck5vZGUqIHBhcmVudChjb25zdCBOb2RlKiBub2RlKQogewotICAgIGlmICghbm9kZS0+bmVlZHNT aGFkb3dUcmVlV2Fsa2VyKCkpIHsKLSNpZm5kZWYgTkRFQlVHCi0gICAgICAgIEFTU0VSVChub2Rl LT5wYXJlbnROb2RlKCkgPT0gcGFyZW50U2xvdyhub2RlKSk7Ci0jZW5kaWYKLSAgICAgICAgcmV0 dXJuIG5vZGUtPnBhcmVudE5vZGVHdWFyYW50ZWVkSG9zdEZyZWUoKTsKLSAgICB9CisgICAgaWYg KG5vZGUtPm5lZWRzTm9kZVJlbmRlcmluZ1RyYXZlcnNhbFNsb3dQYXRoKCkpCisgICAgICAgIHJl dHVybiBwYXJlbnRTbG93KG5vZGUpOwogCi0gICAgcmV0dXJuIHBhcmVudFNsb3cobm9kZSk7Cisg ICAgQVNTRVJUKG5vZGUtPnBhcmVudE5vZGUoKSA9PSBwYXJlbnRTbG93KG5vZGUpKTsKKyAgICBy ZXR1cm4gbm9kZS0+cGFyZW50Tm9kZUd1YXJhbnRlZWRIb3N0RnJlZSgpOwogfQogCiBpbmxpbmUg Tm9kZSogbmV4dFNpYmxpbmcoY29uc3QgTm9kZSogbm9kZSkKIHsKLSAgICBpZiAoIW5vZGUtPm5l ZWRzU2hhZG93VHJlZVdhbGtlcigpKSB7Ci0gICAgICAgIEFTU0VSVChuZXh0U2libGluZ1Nsb3co bm9kZSkgPT0gbm9kZS0+bmV4dFNpYmxpbmcoKSk7Ci0gICAgICAgIHJldHVybiBub2RlLT5uZXh0 U2libGluZygpOwotICAgIH0KKyAgICBpZiAobm9kZS0+bmVlZHNOb2RlUmVuZGVyaW5nVHJhdmVy c2FsU2xvd1BhdGgoKSkKKyAgICAgICAgcmV0dXJuIG5leHRTaWJsaW5nU2xvdyhub2RlKTsKIAot ICAgIHJldHVybiBuZXh0U2libGluZ1Nsb3cobm9kZSk7CisgICAgQVNTRVJUKG5leHRTaWJsaW5n U2xvdyhub2RlKSA9PSBub2RlLT5uZXh0U2libGluZygpKTsKKyAgICByZXR1cm4gbm9kZS0+bmV4 dFNpYmxpbmcoKTsKIH0KIAogaW5saW5lIE5vZGUqIHByZXZpb3VzU2libGluZyhjb25zdCBOb2Rl KiBub2RlKQogewotICAgIGlmICghbm9kZS0+bmVlZHNTaGFkb3dUcmVlV2Fsa2VyKCkpIHsKLSAg ICAgICAgQVNTRVJUKHByZXZpb3VzU2libGluZ1Nsb3cobm9kZSkgPT0gbm9kZS0+cHJldmlvdXNT aWJsaW5nKCkpOwotICAgICAgICByZXR1cm4gbm9kZS0+cHJldmlvdXNTaWJsaW5nKCk7Ci0gICAg fQorICAgIGlmIChub2RlLT5uZWVkc05vZGVSZW5kZXJpbmdUcmF2ZXJzYWxTbG93UGF0aCgpKQor ICAgICAgICByZXR1cm4gcHJldmlvdXNTaWJsaW5nU2xvdyhub2RlKTsKIAotICAgIHJldHVybiBw cmV2aW91c1NpYmxpbmdTbG93KG5vZGUpOworICAgIEFTU0VSVChwcmV2aW91c1NpYmxpbmdTbG93 KG5vZGUpID09IG5vZGUtPnByZXZpb3VzU2libGluZygpKTsKKyAgICByZXR1cm4gbm9kZS0+cHJl dmlvdXNTaWJsaW5nKCk7CiB9CiAKIH0K