72482 2011-11-16 02:11:02 -0800 <style scoped>: rename matchRules() to matchRulesGlobally() to indicate that no scope is used 2011-11-27 23:42:52 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 49142 67720 1 rolandsteiner rolandsteiner dglazkov dominicc koivisto macpherson morrita webkit.review.bot oldest_to_newest 503721 0 rolandsteiner 2011-11-16 02:11:02 -0800 The implementation of style scoped passes the scope to be used for selector matching into the matching functions. matchRules() does not use a scope, so should be renamed to indicate this. 503722 1 115350 rolandsteiner 2011-11-16 02:13:23 -0800 Created attachment 115350 Patch 503804 2 115350 koivisto 2011-11-16 06:12:26 -0800 Comment on attachment 115350 Patch I suprised scoped matching would use a different matching function on this level. Why? (please cc me to all these) 504249 3 ap 2011-11-16 14:23:22 -0800 This feels like a name that could be confusing when you are not actively working on scoped stye code. Perhaps "...InGlobalScope" would be more clear? 504532 4 115516 rolandsteiner 2011-11-16 20:56:34 -0800 Created attachment 115516 patch, matchRulesInGlobalScope I like matchRulesInGlobalScope()! New patch with this name uploaded. 504533 5 rolandsteiner 2011-11-16 21:00:51 -0800 (In reply to comment #2) > (From update of attachment 115350 [details]) > I suprised scoped matching would use a different matching function on this level. Why? (please cc me to all these) matching Author rules will be done both globally and scoped, while other rules are matched globally only. With the rules themselves not carrying the scope, I feel the function name should make it explicit that no scoping will take place. 507102 6 115516 koivisto 2011-11-21 11:30:08 -0800 Comment on attachment 115516 patch, matchRulesInGlobalScope I added some comments to bug 67720. I'd like to see a more narrowly focused full patch before doing any code changes for this feature. 509606 7 rolandsteiner 2011-11-27 23:42:52 -0800 It's probably better to do the renaming after the functionality has landed, to avoid confusion. Marking this as invalid for now. 115350 2011-11-16 02:13:23 -0800 2011-11-16 20:56:27 -0800 Patch bug-72482-20111116191321.patch text/plain 6894 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2QzMWQ5YWM3YjYzYzZl NjA5YzNlMmJlY2FlM2M2M2QzN2MxMzQ3OC4uZDgxZWVmNjllZjI3OWEzZTNhYzZmYTRmOGY3ZjMx NjZhYmUzMmRmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTE2ICBSb2xh bmQgU3RlaW5lciAgPHJvbGFuZHN0ZWluZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIDxzdHls ZSBzY29wZWQ+OiByZW5hbWUgbWF0Y2hSdWxlcygpIHRvIG1hdGNoUnVsZXNHbG9iYWxseSgpIHRv IGluZGljYXRlIHRoYXQgbm8gc2NvcGUgaXMgdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI0ODIKKworICAgICAgICBSZW5hbWVkIG1hdGNoUnVs ZXMoKSB0byBtYXRjaFJ1bGVzR2xvYmFsbHkoKSBhbmQgY2hhbmdlZCBhbGwgY2FsbCBzaXRlcy4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKHNpbXBsZSByZW5hbWluZykuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFJ1bGVzR2xv YmFsbHkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6bWF0Y2hBbGxSdWxl cyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjptYXRjaGVzUnVsZVNldCk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFVBUnVsZXMpOgorICAg ICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6cHNldWRvU3R5bGVGb3JFbGVtZW50KToK KyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OnBzZXVkb1N0eWxlUnVsZXNGb3JF bGVtZW50KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5oOgorCiAyMDExLTExLTE2 ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBVc2UgR1F1YXJrJ3MgaW4gdGhlIEFUSyB3cmFwcGVyIHRvIGdldCBhbmQgc2V0IGFyYml0 cmFyeSBkYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5kZXggNzUy N2Q3M2VmNDJmYThiMGIzZDJhMDAyODAxNTlhMGU2OWRkMTkxZi4uMTU1OGUyZTYzYWQ3NTI2NzI4 OGIwZDRkZDllNmRkYjViYWYwMjA5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcApAQCAtNjE4LDcgKzYxOCw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YWRkTWF0 Y2hlZERlY2xhcmF0aW9uKENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiBzdHlsZURlCiAgICAg bmV3RGVjbGFyYXRpb24ubGlua01hdGNoVHlwZSA9IGxpbmtNYXRjaFR5cGU7CiB9CiAKLXZvaWQg Q1NTU3R5bGVTZWxlY3Rvcjo6bWF0Y2hSdWxlcyhSdWxlU2V0KiBydWxlcywgaW50JiBmaXJzdFJ1 bGVJbmRleCwgaW50JiBsYXN0UnVsZUluZGV4LCBib29sIGluY2x1ZGVFbXB0eVJ1bGVzKQordm9p ZCBDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFJ1bGVzR2xvYmFsbHkoUnVsZVNldCogcnVsZXMsIGlu dCYgZmlyc3RSdWxlSW5kZXgsIGludCYgbGFzdFJ1bGVJbmRleCwgYm9vbCBpbmNsdWRlRW1wdHlS dWxlcykKIHsKICAgICBtX21hdGNoZWRSdWxlcy5jbGVhcigpOwogCkBAIC03NzEsNyArNzcxLDcg QEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXRjaEFsbFJ1bGVzKE1hdGNoUmVzdWx0JiByZXN1 bHQpCiAKICAgICAvLyBOb3cgd2UgY2hlY2sgdXNlciBzaGVldCBydWxlcy4KICAgICBpZiAobV9t YXRjaEF1dGhvckFuZFVzZXJTdHlsZXMpCi0gICAgICAgIG1hdGNoUnVsZXMobV91c2VyU3R5bGUu Z2V0KCksIHJlc3VsdC5maXJzdFVzZXJSdWxlLCByZXN1bHQubGFzdFVzZXJSdWxlLCBmYWxzZSk7 CisgICAgICAgIG1hdGNoUnVsZXNHbG9iYWxseShtX3VzZXJTdHlsZS5nZXQoKSwgcmVzdWx0LmZp cnN0VXNlclJ1bGUsIHJlc3VsdC5sYXN0VXNlclJ1bGUsIGZhbHNlKTsKICAgICAgICAgCiAgICAg Ly8gTm93IGNoZWNrIGF1dGhvciBydWxlcywgYmVnaW5uaW5nIGZpcnN0IHdpdGggcHJlc2VudGF0 aW9uYWwgYXR0cmlidXRlcyBtYXBwZWQgZnJvbSBIVE1MLgogICAgIGlmIChtX3N0eWxlZEVsZW1l bnQpIHsKQEAgLTgxNyw3ICs4MTcsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hdGNoQWxs UnVsZXMoTWF0Y2hSZXN1bHQmIHJlc3VsdCkKICAgICAKICAgICAvLyBDaGVjayB0aGUgcnVsZXMg aW4gYXV0aG9yIHNoZWV0cyBuZXh0LgogICAgIGlmIChtX21hdGNoQXV0aG9yQW5kVXNlclN0eWxl cykKLSAgICAgICAgbWF0Y2hSdWxlcyhtX2F1dGhvclN0eWxlLmdldCgpLCByZXN1bHQuZmlyc3RB dXRob3JSdWxlLCByZXN1bHQubGFzdEF1dGhvclJ1bGUsIGZhbHNlKTsKKyAgICAgICAgbWF0Y2hS dWxlc0dsb2JhbGx5KG1fYXV0aG9yU3R5bGUuZ2V0KCksIHJlc3VsdC5maXJzdEF1dGhvclJ1bGUs IHJlc3VsdC5sYXN0QXV0aG9yUnVsZSwgZmFsc2UpOwogICAgICAgICAKICAgICAvLyBOb3cgY2hl Y2sgb3VyIGlubGluZSBzdHlsZSBhdHRyaWJ1dGUuCiAgICAgaWYgKG1fbWF0Y2hBdXRob3JBbmRV c2VyU3R5bGVzICYmIG1fc3R5bGVkRWxlbWVudCkgewpAQCAtOTE2LDcgKzkxNiw3IEBAIE5vZGUq IENTU1N0eWxlU2VsZWN0b3I6OmxvY2F0ZUNvdXNpbkxpc3QoRWxlbWVudCogcGFyZW50LCB1bnNp Z25lZCYgdmlzaXRlZE5vZGVDCiBib29sIENTU1N0eWxlU2VsZWN0b3I6Om1hdGNoZXNSdWxlU2V0 KFJ1bGVTZXQqIHJ1bGVTZXQpCiB7CiAgICAgaW50IGZpcnN0U2libGluZ1J1bGUgPSAtMSwgbGFz dFNpYmxpbmdSdWxlID0gLTE7Ci0gICAgbWF0Y2hSdWxlcyhydWxlU2V0LCBmaXJzdFNpYmxpbmdS dWxlLCBsYXN0U2libGluZ1J1bGUsIGZhbHNlKTsKKyAgICBtYXRjaFJ1bGVzR2xvYmFsbHkocnVs ZVNldCwgZmlyc3RTaWJsaW5nUnVsZSwgbGFzdFNpYmxpbmdSdWxlLCBmYWxzZSk7CiAgICAgaWYg KG1fbWF0Y2hlZERlY2xzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIG1f bWF0Y2hlZERlY2xzLmNsZWFyKCk7CkBAIC0xMTM3LDE3ICsxMTM3LDE3IEBAIHZvaWQgQ1NTU3R5 bGVTZWxlY3Rvcjo6bWF0Y2hVQVJ1bGVzKE1hdGNoUmVzdWx0JiByZXN1bHQpCiAgICAgLy8gRmly c3Qgd2UgbWF0Y2ggcnVsZXMgZnJvbSB0aGUgdXNlciBhZ2VudCBzaGVldC4KICAgICBSdWxlU2V0 KiB1c2VyQWdlbnRTdHlsZVNoZWV0ID0gbV9tZWRpdW0tPm1lZGlhVHlwZU1hdGNoU3BlY2lmaWMo InByaW50IikKICAgICAgICAgPyBkZWZhdWx0UHJpbnRTdHlsZSA6IGRlZmF1bHRTdHlsZTsKLSAg ICBtYXRjaFJ1bGVzKHVzZXJBZ2VudFN0eWxlU2hlZXQsIHJlc3VsdC5maXJzdFVBUnVsZSwgcmVz dWx0Lmxhc3RVQVJ1bGUsIGZhbHNlKTsKKyAgICBtYXRjaFJ1bGVzR2xvYmFsbHkodXNlckFnZW50 U3R5bGVTaGVldCwgcmVzdWx0LmZpcnN0VUFSdWxlLCByZXN1bHQubGFzdFVBUnVsZSwgZmFsc2Up OwogCiAgICAgLy8gSW4gcXVpcmtzIG1vZGUsIHdlIG1hdGNoIHJ1bGVzIGZyb20gdGhlIHF1aXJr cyB1c2VyIGFnZW50IHNoZWV0LgogICAgIGlmICghbV9jaGVja2VyLnN0cmljdFBhcnNpbmcoKSkK LSAgICAgICAgbWF0Y2hSdWxlcyhkZWZhdWx0UXVpcmtzU3R5bGUsIHJlc3VsdC5maXJzdFVBUnVs ZSwgcmVzdWx0Lmxhc3RVQVJ1bGUsIGZhbHNlKTsKKyAgICAgICAgbWF0Y2hSdWxlc0dsb2JhbGx5 KGRlZmF1bHRRdWlya3NTdHlsZSwgcmVzdWx0LmZpcnN0VUFSdWxlLCByZXN1bHQubGFzdFVBUnVs ZSwgZmFsc2UpOwogCiAgICAgLy8gSWYgZG9jdW1lbnQgdXNlcyB2aWV3IHNvdXJjZSBzdHlsZXMg KGluIHZpZXcgc291cmNlIG1vZGUgb3IgaW4geG1sIHZpZXdlciBtb2RlKSwgdGhlbiB3ZSBtYXRj aCBydWxlcyBmcm9tIHRoZSB2aWV3IHNvdXJjZSBzdHlsZSBzaGVldC4KICAgICBpZiAobV9jaGVj a2VyLmRvY3VtZW50KCktPmlzVmlld1NvdXJjZSgpKSB7CiAgICAgICAgIGlmICghZGVmYXVsdFZp ZXdTb3VyY2VTdHlsZSkKICAgICAgICAgICAgIGxvYWRWaWV3U291cmNlU3R5bGUoKTsKLSAgICAg ICAgbWF0Y2hSdWxlcyhkZWZhdWx0Vmlld1NvdXJjZVN0eWxlLCByZXN1bHQuZmlyc3RVQVJ1bGUs IHJlc3VsdC5sYXN0VUFSdWxlLCBmYWxzZSk7CisgICAgICAgIG1hdGNoUnVsZXNHbG9iYWxseShk ZWZhdWx0Vmlld1NvdXJjZVN0eWxlLCByZXN1bHQuZmlyc3RVQVJ1bGUsIHJlc3VsdC5sYXN0VUFS dWxlLCBmYWxzZSk7CiAgICAgfQogfQogCkBAIC0xNDE1LDggKzE0MTUsOCBAQCBQYXNzUmVmUHRy PFJlbmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yOjpwc2V1ZG9TdHlsZUZvckVsZW1lbnQoUHNl dWRvSWQgcHNldWRvLAogICAgIG1hdGNoVUFSdWxlcyhtYXRjaFJlc3VsdCk7CiAKICAgICBpZiAo bV9tYXRjaEF1dGhvckFuZFVzZXJTdHlsZXMpIHsKLSAgICAgICAgbWF0Y2hSdWxlcyhtX3VzZXJT dHlsZS5nZXQoKSwgbWF0Y2hSZXN1bHQuZmlyc3RVc2VyUnVsZSwgbWF0Y2hSZXN1bHQubGFzdFVz ZXJSdWxlLCBmYWxzZSk7Ci0gICAgICAgIG1hdGNoUnVsZXMobV9hdXRob3JTdHlsZS5nZXQoKSwg bWF0Y2hSZXN1bHQuZmlyc3RBdXRob3JSdWxlLCBtYXRjaFJlc3VsdC5sYXN0QXV0aG9yUnVsZSwg ZmFsc2UpOworICAgICAgICBtYXRjaFJ1bGVzR2xvYmFsbHkobV91c2VyU3R5bGUuZ2V0KCksIG1h dGNoUmVzdWx0LmZpcnN0VXNlclJ1bGUsIG1hdGNoUmVzdWx0Lmxhc3RVc2VyUnVsZSwgZmFsc2Up OworICAgICAgICBtYXRjaFJ1bGVzR2xvYmFsbHkobV9hdXRob3JTdHlsZS5nZXQoKSwgbWF0Y2hS ZXN1bHQuZmlyc3RBdXRob3JSdWxlLCBtYXRjaFJlc3VsdC5sYXN0QXV0aG9yUnVsZSwgZmFsc2Up OwogICAgIH0KIAogICAgIGlmIChtX21hdGNoZWREZWNscy5pc0VtcHR5KCkpCkBAIC0xNzU0LDE0 ICsxNzU0LDE0IEBAIFBhc3NSZWZQdHI8Q1NTUnVsZUxpc3Q+IENTU1N0eWxlU2VsZWN0b3I6OnBz ZXVkb1N0eWxlUnVsZXNGb3JFbGVtZW50KEVsZW1lbnQqIGUsCiAKICAgICAgICAgLy8gTm93IHdl IGNoZWNrIHVzZXIgc2hlZXQgcnVsZXMuCiAgICAgICAgIGlmIChtX21hdGNoQXV0aG9yQW5kVXNl clN0eWxlcykKLSAgICAgICAgICAgIG1hdGNoUnVsZXMobV91c2VyU3R5bGUuZ2V0KCksIGR1bW15 LmZpcnN0VXNlclJ1bGUsIGR1bW15Lmxhc3RVc2VyUnVsZSwgcnVsZXNUb0luY2x1ZGUgJiBFbXB0 eUNTU1J1bGVzKTsKKyAgICAgICAgICAgIG1hdGNoUnVsZXNHbG9iYWxseShtX3VzZXJTdHlsZS5n ZXQoKSwgZHVtbXkuZmlyc3RVc2VyUnVsZSwgZHVtbXkubGFzdFVzZXJSdWxlLCBydWxlc1RvSW5j bHVkZSAmIEVtcHR5Q1NTUnVsZXMpOwogICAgIH0KIAogICAgIGlmIChtX21hdGNoQXV0aG9yQW5k VXNlclN0eWxlcyAmJiAocnVsZXNUb0luY2x1ZGUgJiBBdXRob3JDU1NSdWxlcykpIHsKICAgICAg ICAgbV9zYW1lT3JpZ2luT25seSA9ICEocnVsZXNUb0luY2x1ZGUgJiBDcm9zc09yaWdpbkNTU1J1 bGVzKTsKIAogICAgICAgICAvLyBDaGVjayB0aGUgcnVsZXMgaW4gYXV0aG9yIHNoZWV0cy4KLSAg ICAgICAgbWF0Y2hSdWxlcyhtX2F1dGhvclN0eWxlLmdldCgpLCBkdW1teS5maXJzdEF1dGhvclJ1 bGUsIGR1bW15Lmxhc3RBdXRob3JSdWxlLCBydWxlc1RvSW5jbHVkZSAmIEVtcHR5Q1NTUnVsZXMp OworICAgICAgICBtYXRjaFJ1bGVzR2xvYmFsbHkobV9hdXRob3JTdHlsZS5nZXQoKSwgZHVtbXku Zmlyc3RBdXRob3JSdWxlLCBkdW1teS5sYXN0QXV0aG9yUnVsZSwgcnVsZXNUb0luY2x1ZGUgJiBF bXB0eUNTU1J1bGVzKTsKIAogICAgICAgICBtX3NhbWVPcmlnaW5Pbmx5ID0gZmFsc2U7CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKaW5kZXggOTc5ZmM5OTNmOTliZjdl OGJlODdmNDI3YTE5ZjExNzg1OWNhZTQ3MS4uYWUwYzAxNzkzYTgzMDI0N2U1ZGMxZWM5Yjc1ODFk MTIwZDA3NDJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0 b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCkBAIC0yNTMs NyArMjUzLDcgQEAgcHJpdmF0ZToKICAgICB9OwogICAgIHZvaWQgbWF0Y2hBbGxSdWxlcyhNYXRj aFJlc3VsdCYpOwogICAgIHZvaWQgbWF0Y2hVQVJ1bGVzKE1hdGNoUmVzdWx0Jik7Ci0gICAgdm9p ZCBtYXRjaFJ1bGVzKFJ1bGVTZXQqLCBpbnQmIGZpcnN0UnVsZUluZGV4LCBpbnQmIGxhc3RSdWxl SW5kZXgsIGJvb2wgaW5jbHVkZUVtcHR5UnVsZXMpOworICAgIHZvaWQgbWF0Y2hSdWxlc0dsb2Jh bGx5KFJ1bGVTZXQqLCBpbnQmIGZpcnN0UnVsZUluZGV4LCBpbnQmIGxhc3RSdWxlSW5kZXgsIGJv b2wgaW5jbHVkZUVtcHR5UnVsZXMpOwogICAgIHZvaWQgbWF0Y2hSdWxlc0Zvckxpc3QoY29uc3Qg VmVjdG9yPFJ1bGVEYXRhPiosIGludCYgZmlyc3RSdWxlSW5kZXgsIGludCYgbGFzdFJ1bGVJbmRl eCwgYm9vbCBpbmNsdWRlRW1wdHlSdWxlcyk7CiAgICAgYm9vbCBmYXN0UmVqZWN0U2VsZWN0b3Io Y29uc3QgUnVsZURhdGEmKSBjb25zdDsKICAgICB2b2lkIHNvcnRNYXRjaGVkUnVsZXMoKTsK 115516 2011-11-16 20:56:34 -0800 2011-11-21 11:30:08 -0800 patch, matchRulesInGlobalScope bug-72482-20111117135632.patch text/plain 6954 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg5NWUzYWU3YWY3ZDM3 YjFjOTE0MjhiMzI3MjMxMTlmY2E4ZmNiMC4uMjAxMTc1Yzk0ZTUzNWQzMDE4MDUwYzhjZmM5MjFk ZGQyYjYyZGExNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTE2ICBSb2xh bmQgU3RlaW5lciAgPHJvbGFuZHN0ZWluZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIDxzdHls ZSBzY29wZWQ+OiByZW5hbWUgbWF0Y2hSdWxlcygpIHRvIG1hdGNoUnVsZXNHbG9iYWxseSgpIHRv IGluZGljYXRlIHRoYXQgbm8gc2NvcGUgaXMgdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI0ODIKKworICAgICAgICBSZW5hbWVkIG1hdGNoUnVs ZXMoKSB0byBtYXRjaFJ1bGVzSW5HbG9iYWxTY29wZSgpIGFuZCBjaGFuZ2VkIGFsbCBjYWxsIHNp dGVzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cy4gKHNpbXBsZSByZW5hbWluZykKKworICAgICAgICAqIGNzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6Om1hdGNoUnVs ZXNHbG9iYWxseSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjptYXRjaEFs bFJ1bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6Om1hdGNoZXNSdWxl U2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6Om1hdGNoVUFSdWxlcyk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpwc2V1ZG9TdHlsZUZvckVsZW1l bnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6cHNldWRvU3R5bGVSdWxl c0ZvckVsZW1lbnQpOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmg6CisKIDIwMTEt MTEtMTYgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgogCiAg ICAgICAgIFVzZSBhIHNpbXBsZSBwYWdlIGNsaWVudCBmb3IgdXNlciBjb25zZW50IGluIGdldFVz ZXJNZWRpYSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5kZXggNGQ0 NTllMDg2ZGU0OGVhYmNjNjI0NTM1ZTFkNjc1NTE3ZmZjYjFmNi4uYjQwYjM5MDk1MmEzNDAwNzc2 ZGM4YzZlNDcwOTRiZTc2OGJlN2ZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcApAQCAtNjE4LDcgKzYxOCw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YWRkTWF0 Y2hlZERlY2xhcmF0aW9uKENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiBzdHlsZURlCiAgICAg bmV3RGVjbGFyYXRpb24ubGlua01hdGNoVHlwZSA9IGxpbmtNYXRjaFR5cGU7CiB9CiAKLXZvaWQg Q1NTU3R5bGVTZWxlY3Rvcjo6bWF0Y2hSdWxlcyhSdWxlU2V0KiBydWxlcywgaW50JiBmaXJzdFJ1 bGVJbmRleCwgaW50JiBsYXN0UnVsZUluZGV4LCBib29sIGluY2x1ZGVFbXB0eVJ1bGVzKQordm9p ZCBDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFJ1bGVzSW5HbG9iYWxTY29wZShSdWxlU2V0KiBydWxl cywgaW50JiBmaXJzdFJ1bGVJbmRleCwgaW50JiBsYXN0UnVsZUluZGV4LCBib29sIGluY2x1ZGVF bXB0eVJ1bGVzKQogewogICAgIG1fbWF0Y2hlZFJ1bGVzLmNsZWFyKCk7CiAKQEAgLTc3MSw3ICs3 NzEsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hdGNoQWxsUnVsZXMoTWF0Y2hSZXN1bHQm IHJlc3VsdCkKIAogICAgIC8vIE5vdyB3ZSBjaGVjayB1c2VyIHNoZWV0IHJ1bGVzLgogICAgIGlm IChtX21hdGNoQXV0aG9yQW5kVXNlclN0eWxlcykKLSAgICAgICAgbWF0Y2hSdWxlcyhtX3VzZXJT dHlsZS5nZXQoKSwgcmVzdWx0LmZpcnN0VXNlclJ1bGUsIHJlc3VsdC5sYXN0VXNlclJ1bGUsIGZh bHNlKTsKKyAgICAgICAgbWF0Y2hSdWxlc0luR2xvYmFsU2NvcGUobV91c2VyU3R5bGUuZ2V0KCks IHJlc3VsdC5maXJzdFVzZXJSdWxlLCByZXN1bHQubGFzdFVzZXJSdWxlLCBmYWxzZSk7CiAgICAg ICAgIAogICAgIC8vIE5vdyBjaGVjayBhdXRob3IgcnVsZXMsIGJlZ2lubmluZyBmaXJzdCB3aXRo IHByZXNlbnRhdGlvbmFsIGF0dHJpYnV0ZXMgbWFwcGVkIGZyb20gSFRNTC4KICAgICBpZiAobV9z dHlsZWRFbGVtZW50KSB7CkBAIC04MTcsNyArODE3LDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9y OjptYXRjaEFsbFJ1bGVzKE1hdGNoUmVzdWx0JiByZXN1bHQpCiAgICAgCiAgICAgLy8gQ2hlY2sg dGhlIHJ1bGVzIGluIGF1dGhvciBzaGVldHMgbmV4dC4KICAgICBpZiAobV9tYXRjaEF1dGhvckFu ZFVzZXJTdHlsZXMpCi0gICAgICAgIG1hdGNoUnVsZXMobV9hdXRob3JTdHlsZS5nZXQoKSwgcmVz dWx0LmZpcnN0QXV0aG9yUnVsZSwgcmVzdWx0Lmxhc3RBdXRob3JSdWxlLCBmYWxzZSk7CisgICAg ICAgIG1hdGNoUnVsZXNJbkdsb2JhbFNjb3BlKG1fYXV0aG9yU3R5bGUuZ2V0KCksIHJlc3VsdC5m aXJzdEF1dGhvclJ1bGUsIHJlc3VsdC5sYXN0QXV0aG9yUnVsZSwgZmFsc2UpOwogICAgICAgICAK ICAgICAvLyBOb3cgY2hlY2sgb3VyIGlubGluZSBzdHlsZSBhdHRyaWJ1dGUuCiAgICAgaWYgKG1f bWF0Y2hBdXRob3JBbmRVc2VyU3R5bGVzICYmIG1fc3R5bGVkRWxlbWVudCkgewpAQCAtOTE2LDcg KzkxNiw3IEBAIE5vZGUqIENTU1N0eWxlU2VsZWN0b3I6OmxvY2F0ZUNvdXNpbkxpc3QoRWxlbWVu dCogcGFyZW50LCB1bnNpZ25lZCYgdmlzaXRlZE5vZGVDCiBib29sIENTU1N0eWxlU2VsZWN0b3I6 Om1hdGNoZXNSdWxlU2V0KFJ1bGVTZXQqIHJ1bGVTZXQpCiB7CiAgICAgaW50IGZpcnN0U2libGlu Z1J1bGUgPSAtMSwgbGFzdFNpYmxpbmdSdWxlID0gLTE7Ci0gICAgbWF0Y2hSdWxlcyhydWxlU2V0 LCBmaXJzdFNpYmxpbmdSdWxlLCBsYXN0U2libGluZ1J1bGUsIGZhbHNlKTsKKyAgICBtYXRjaFJ1 bGVzSW5HbG9iYWxTY29wZShydWxlU2V0LCBmaXJzdFNpYmxpbmdSdWxlLCBsYXN0U2libGluZ1J1 bGUsIGZhbHNlKTsKICAgICBpZiAobV9tYXRjaGVkRGVjbHMuaXNFbXB0eSgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgbV9tYXRjaGVkRGVjbHMuY2xlYXIoKTsKQEAgLTExMzcsMTcgKzEx MzcsMTcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFVBUnVsZXMoTWF0Y2hSZXN1bHQm IHJlc3VsdCkKICAgICAvLyBGaXJzdCB3ZSBtYXRjaCBydWxlcyBmcm9tIHRoZSB1c2VyIGFnZW50 IHNoZWV0LgogICAgIFJ1bGVTZXQqIHVzZXJBZ2VudFN0eWxlU2hlZXQgPSBtX21lZGl1bS0+bWVk aWFUeXBlTWF0Y2hTcGVjaWZpYygicHJpbnQiKQogICAgICAgICA/IGRlZmF1bHRQcmludFN0eWxl IDogZGVmYXVsdFN0eWxlOwotICAgIG1hdGNoUnVsZXModXNlckFnZW50U3R5bGVTaGVldCwgcmVz dWx0LmZpcnN0VUFSdWxlLCByZXN1bHQubGFzdFVBUnVsZSwgZmFsc2UpOworICAgIG1hdGNoUnVs ZXNJbkdsb2JhbFNjb3BlKHVzZXJBZ2VudFN0eWxlU2hlZXQsIHJlc3VsdC5maXJzdFVBUnVsZSwg cmVzdWx0Lmxhc3RVQVJ1bGUsIGZhbHNlKTsKIAogICAgIC8vIEluIHF1aXJrcyBtb2RlLCB3ZSBt YXRjaCBydWxlcyBmcm9tIHRoZSBxdWlya3MgdXNlciBhZ2VudCBzaGVldC4KICAgICBpZiAoIW1f Y2hlY2tlci5zdHJpY3RQYXJzaW5nKCkpCi0gICAgICAgIG1hdGNoUnVsZXMoZGVmYXVsdFF1aXJr c1N0eWxlLCByZXN1bHQuZmlyc3RVQVJ1bGUsIHJlc3VsdC5sYXN0VUFSdWxlLCBmYWxzZSk7Cisg ICAgICAgIG1hdGNoUnVsZXNJbkdsb2JhbFNjb3BlKGRlZmF1bHRRdWlya3NTdHlsZSwgcmVzdWx0 LmZpcnN0VUFSdWxlLCByZXN1bHQubGFzdFVBUnVsZSwgZmFsc2UpOwogCiAgICAgLy8gSWYgZG9j dW1lbnQgdXNlcyB2aWV3IHNvdXJjZSBzdHlsZXMgKGluIHZpZXcgc291cmNlIG1vZGUgb3IgaW4g eG1sIHZpZXdlciBtb2RlKSwgdGhlbiB3ZSBtYXRjaCBydWxlcyBmcm9tIHRoZSB2aWV3IHNvdXJj ZSBzdHlsZSBzaGVldC4KICAgICBpZiAobV9jaGVja2VyLmRvY3VtZW50KCktPmlzVmlld1NvdXJj ZSgpKSB7CiAgICAgICAgIGlmICghZGVmYXVsdFZpZXdTb3VyY2VTdHlsZSkKICAgICAgICAgICAg IGxvYWRWaWV3U291cmNlU3R5bGUoKTsKLSAgICAgICAgbWF0Y2hSdWxlcyhkZWZhdWx0Vmlld1Nv dXJjZVN0eWxlLCByZXN1bHQuZmlyc3RVQVJ1bGUsIHJlc3VsdC5sYXN0VUFSdWxlLCBmYWxzZSk7 CisgICAgICAgIG1hdGNoUnVsZXNJbkdsb2JhbFNjb3BlKGRlZmF1bHRWaWV3U291cmNlU3R5bGUs IHJlc3VsdC5maXJzdFVBUnVsZSwgcmVzdWx0Lmxhc3RVQVJ1bGUsIGZhbHNlKTsKICAgICB9CiB9 CiAKQEAgLTE0MTUsOCArMTQxNSw4IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IENTU1N0eWxl U2VsZWN0b3I6OnBzZXVkb1N0eWxlRm9yRWxlbWVudChQc2V1ZG9JZCBwc2V1ZG8sCiAgICAgbWF0 Y2hVQVJ1bGVzKG1hdGNoUmVzdWx0KTsKIAogICAgIGlmIChtX21hdGNoQXV0aG9yQW5kVXNlclN0 eWxlcykgewotICAgICAgICBtYXRjaFJ1bGVzKG1fdXNlclN0eWxlLmdldCgpLCBtYXRjaFJlc3Vs dC5maXJzdFVzZXJSdWxlLCBtYXRjaFJlc3VsdC5sYXN0VXNlclJ1bGUsIGZhbHNlKTsKLSAgICAg ICAgbWF0Y2hSdWxlcyhtX2F1dGhvclN0eWxlLmdldCgpLCBtYXRjaFJlc3VsdC5maXJzdEF1dGhv clJ1bGUsIG1hdGNoUmVzdWx0Lmxhc3RBdXRob3JSdWxlLCBmYWxzZSk7CisgICAgICAgIG1hdGNo UnVsZXNJbkdsb2JhbFNjb3BlKG1fdXNlclN0eWxlLmdldCgpLCBtYXRjaFJlc3VsdC5maXJzdFVz ZXJSdWxlLCBtYXRjaFJlc3VsdC5sYXN0VXNlclJ1bGUsIGZhbHNlKTsKKyAgICAgICAgbWF0Y2hS dWxlc0luR2xvYmFsU2NvcGUobV9hdXRob3JTdHlsZS5nZXQoKSwgbWF0Y2hSZXN1bHQuZmlyc3RB dXRob3JSdWxlLCBtYXRjaFJlc3VsdC5sYXN0QXV0aG9yUnVsZSwgZmFsc2UpOwogICAgIH0KIAog ICAgIGlmIChtX21hdGNoZWREZWNscy5pc0VtcHR5KCkpCkBAIC0xNzU0LDE0ICsxNzU0LDE0IEBA IFBhc3NSZWZQdHI8Q1NTUnVsZUxpc3Q+IENTU1N0eWxlU2VsZWN0b3I6OnBzZXVkb1N0eWxlUnVs ZXNGb3JFbGVtZW50KEVsZW1lbnQqIGUsCiAKICAgICAgICAgLy8gTm93IHdlIGNoZWNrIHVzZXIg c2hlZXQgcnVsZXMuCiAgICAgICAgIGlmIChtX21hdGNoQXV0aG9yQW5kVXNlclN0eWxlcykKLSAg ICAgICAgICAgIG1hdGNoUnVsZXMobV91c2VyU3R5bGUuZ2V0KCksIGR1bW15LmZpcnN0VXNlclJ1 bGUsIGR1bW15Lmxhc3RVc2VyUnVsZSwgcnVsZXNUb0luY2x1ZGUgJiBFbXB0eUNTU1J1bGVzKTsK KyAgICAgICAgICAgIG1hdGNoUnVsZXNJbkdsb2JhbFNjb3BlKG1fdXNlclN0eWxlLmdldCgpLCBk dW1teS5maXJzdFVzZXJSdWxlLCBkdW1teS5sYXN0VXNlclJ1bGUsIHJ1bGVzVG9JbmNsdWRlICYg RW1wdHlDU1NSdWxlcyk7CiAgICAgfQogCiAgICAgaWYgKG1fbWF0Y2hBdXRob3JBbmRVc2VyU3R5 bGVzICYmIChydWxlc1RvSW5jbHVkZSAmIEF1dGhvckNTU1J1bGVzKSkgewogICAgICAgICBtX3Nh bWVPcmlnaW5Pbmx5ID0gIShydWxlc1RvSW5jbHVkZSAmIENyb3NzT3JpZ2luQ1NTUnVsZXMpOwog CiAgICAgICAgIC8vIENoZWNrIHRoZSBydWxlcyBpbiBhdXRob3Igc2hlZXRzLgotICAgICAgICBt YXRjaFJ1bGVzKG1fYXV0aG9yU3R5bGUuZ2V0KCksIGR1bW15LmZpcnN0QXV0aG9yUnVsZSwgZHVt bXkubGFzdEF1dGhvclJ1bGUsIHJ1bGVzVG9JbmNsdWRlICYgRW1wdHlDU1NSdWxlcyk7CisgICAg ICAgIG1hdGNoUnVsZXNJbkdsb2JhbFNjb3BlKG1fYXV0aG9yU3R5bGUuZ2V0KCksIGR1bW15LmZp cnN0QXV0aG9yUnVsZSwgZHVtbXkubGFzdEF1dGhvclJ1bGUsIHJ1bGVzVG9JbmNsdWRlICYgRW1w dHlDU1NSdWxlcyk7CiAKICAgICAgICAgbV9zYW1lT3JpZ2luT25seSA9IGZhbHNlOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCmluZGV4IGI0ODkzOWNhNGU1YWQ5MDNi MzhlZjAxMDYxOTBiMGUzNDUzMTI1OTAuLjM1YmE0MDM0NGU0OTkwMjc2YzBmZGQzYTBjOWYwZmVj MTYzZWQwMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9y LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaApAQCAtMjU1LDcg KzI1NSw3IEBAIHByaXZhdGU6CiAgICAgfTsKICAgICB2b2lkIG1hdGNoQWxsUnVsZXMoTWF0Y2hS ZXN1bHQmKTsKICAgICB2b2lkIG1hdGNoVUFSdWxlcyhNYXRjaFJlc3VsdCYpOwotICAgIHZvaWQg bWF0Y2hSdWxlcyhSdWxlU2V0KiwgaW50JiBmaXJzdFJ1bGVJbmRleCwgaW50JiBsYXN0UnVsZUlu ZGV4LCBib29sIGluY2x1ZGVFbXB0eVJ1bGVzKTsKKyAgICB2b2lkIG1hdGNoUnVsZXNJbkdsb2Jh bFNjb3BlKFJ1bGVTZXQqLCBpbnQmIGZpcnN0UnVsZUluZGV4LCBpbnQmIGxhc3RSdWxlSW5kZXgs IGJvb2wgaW5jbHVkZUVtcHR5UnVsZXMpOwogICAgIHZvaWQgbWF0Y2hSdWxlc0Zvckxpc3QoY29u c3QgVmVjdG9yPFJ1bGVEYXRhPiosIGludCYgZmlyc3RSdWxlSW5kZXgsIGludCYgbGFzdFJ1bGVJ bmRleCwgYm9vbCBpbmNsdWRlRW1wdHlSdWxlcyk7CiAgICAgYm9vbCBmYXN0UmVqZWN0U2VsZWN0 b3IoY29uc3QgUnVsZURhdGEmKSBjb25zdDsKICAgICB2b2lkIHNvcnRNYXRjaGVkUnVsZXMoKTsK