127322 2014-01-20 16:55:42 -0800 Move user style sheet handling to UserContentController 2014-01-20 17:46:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue esprehn+autocc kangil.han oldest_to_newest 970081 0 andersca 2014-01-20 16:55:42 -0800 Move user style sheet handling to UserContentController 970082 1 221705 andersca 2014-01-20 16:56:25 -0800 Created attachment 221705 Patch 970084 2 221705 kling 2014-01-20 17:00:39 -0800 Comment on attachment 221705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221705&action=review r=me > Source/WebCore/dom/DocumentStyleSheetCollection.cpp:145 > + const UserContentController* userContentController = owningPage->userContentController(); auto? > Source/WebCore/dom/DocumentStyleSheetCollection.cpp:149 > + const UserStyleSheetMap* userStyleSheets = userContentController->userStyleSheets(); auto? 970100 3 andersca 2014-01-20 17:46:42 -0800 Committed r162395: <http://trac.webkit.org/changeset/162395> 221705 2014-01-20 16:56:25 -0800 2014-01-20 17:00:39 -0800 Patch bug-127322-20140120165624.patch text/plain 13033 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjcxMjUwZDEzY2Y3ZWJk Nzg5M2Y2MGQzYmMyYWU1NGE0ZWFiMmRjMC4uODQwMDNjNDk2ODZmMTY3YzU2MWI5ZjVjZDA5ZTJj MTExOTRhYjMwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE0LTAxLTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSB1c2VyIHN0 eWxlIHNoZWV0IGhhbmRsaW5nIHRvIFVzZXJDb250ZW50Q29udHJvbGxlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MzIyCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xNTg2MTI5Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb246OnVwZGF0ZUluamVj dGVkU3R5bGVTaGVldENhY2hlKToKKyAgICAgICAgKiBwYWdlL1BhZ2VHcm91cC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OmFkZFVzZXJTdHlsZVNoZWV0VG9Xb3JsZCk6CisgICAg ICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OnJlbW92ZVVzZXJTdHlsZVNoZWV0RnJvbVdvcmxkKToK KyAgICAgICAgKFdlYkNvcmU6OlBhZ2VHcm91cDo6cmVtb3ZlVXNlclN0eWxlU2hlZXRzRnJvbVdv cmxkKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VHcm91cDo6cmVtb3ZlQWxsVXNlckNvbnRlbnQp OgorICAgICAgICAqIHBhZ2UvUGFnZUdyb3VwLmg6CisgICAgICAgICogcGFnZS9Vc2VyQ29udGVu dENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VXNlckNvbnRlbnRDb250cm9sbGVy OjphZGRVc2VyU3R5bGVTaGVldCk6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVudENvbnRy b2xsZXI6OnJlbW92ZVVzZXJTdHlsZVNoZWV0KToKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250 ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclN0eWxlU2hlZXRzKToKKyAgICAgICAgKFdlYkNvcmU6 OlVzZXJDb250ZW50Q29udHJvbGxlcjo6cmVtb3ZlQWxsVXNlckNvbnRlbnQpOgorICAgICAgICAo V2ViQ29yZTo6VXNlckNvbnRlbnRDb250cm9sbGVyOjppbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNo ZWV0Q2FjaGVJbkFsbEZyYW1lcyk6CisgICAgICAgICogcGFnZS9Vc2VyQ29udGVudENvbnRyb2xs ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250ZW50Q29udHJvbGxlcjo6dXNlclN0eWxl U2hlZXRzKToKKworMjAxNC0wMS0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCiAgICAgICAgIFVzZXJDb250ZW50Q29udHJvbGxlciBzaG91bGQga2VlcCB0cmFjayBv ZiB1c2VyIHNjcmlwdHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNzMxNwogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU4NjEyOTY+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbi5jcHAKaW5k ZXggMTU5MzA2MThlNmVlMzk4Nzk2MjU1YTM3MjljYWM2N2JkNTcxODk3Mi4uN2M0MWY2YmIwMTY2 MGE5ODMxZTE0NzgyZGY0MGE4NDUzNDhjYmFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcApAQCAtNDMsNiArNDMsNyBAQAog I2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKICNpbmNsdWRlICJTdHlsZVNoZWV0Q29udGVudHMu aCIKICNpbmNsdWRlICJTdHlsZVNoZWV0TGlzdC5oIgorI2luY2x1ZGUgIlVzZXJDb250ZW50Q29u dHJvbGxlci5oIgogI2luY2x1ZGUgIlVzZXJDb250ZW50VVJMUGF0dGVybi5oIgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CkBAIC0xNDAsMjcgKzE0MSwzMCBAQCB2b2lkIERvY3VtZW50U3R5bGVTaGVl dENvbGxlY3Rpb246OnVwZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlKCkgY29uc3QKICAgICBQ YWdlKiBvd25pbmdQYWdlID0gbV9kb2N1bWVudC5wYWdlKCk7CiAgICAgaWYgKCFvd25pbmdQYWdl KQogICAgICAgICByZXR1cm47Ci0gICAgICAgIAotICAgIGNvbnN0IFBhZ2VHcm91cCYgcGFnZUdy b3VwID0gb3duaW5nUGFnZS0+Z3JvdXAoKTsKLSAgICBjb25zdCBVc2VyU3R5bGVTaGVldE1hcCog c2hlZXRzTWFwID0gcGFnZUdyb3VwLnVzZXJTdHlsZVNoZWV0cygpOwotICAgIGlmICghc2hlZXRz TWFwKQorCisgICAgY29uc3QgVXNlckNvbnRlbnRDb250cm9sbGVyKiB1c2VyQ29udGVudENvbnRy b2xsZXIgPSBvd25pbmdQYWdlLT51c2VyQ29udGVudENvbnRyb2xsZXIoKTsKKyAgICBpZiAoIXVz ZXJDb250ZW50Q29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgY29uc3QgVXNlclN0 eWxlU2hlZXRNYXAqIHVzZXJTdHlsZVNoZWV0cyA9IHVzZXJDb250ZW50Q29udHJvbGxlci0+dXNl clN0eWxlU2hlZXRzKCk7CisgICAgaWYgKCF1c2VyU3R5bGVTaGVldHMpCiAgICAgICAgIHJldHVy bjsKIAotICAgIFVzZXJTdHlsZVNoZWV0TWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBzaGVldHNN YXAtPmVuZCgpOwotICAgIGZvciAoVXNlclN0eWxlU2hlZXRNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gc2hlZXRzTWFwLT5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgY29uc3Qg VXNlclN0eWxlU2hlZXRWZWN0b3IqIHNoZWV0cyA9IGl0LT52YWx1ZS5nZXQoKTsKLSAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHNoZWV0cy0+c2l6ZSgpOyArK2kpIHsKLSAgICAgICAg ICAgIGNvbnN0IFVzZXJTdHlsZVNoZWV0KiBzaGVldCA9IHNoZWV0cy0+YXQoaSkuZ2V0KCk7Cisg ICAgZm9yIChhdXRvJiBzdHlsZVNoZWV0cyA6IHVzZXJTdHlsZVNoZWV0cy0+dmFsdWVzKCkpIHsK KyAgICAgICAgZm9yIChjb25zdCBhdXRvJiBzaGVldCA6ICpzdHlsZVNoZWV0cykgewogICAgICAg ICAgICAgaWYgKHNoZWV0LT5pbmplY3RlZEZyYW1lcygpID09IEluamVjdEluVG9wRnJhbWVPbmx5 ICYmIG1fZG9jdW1lbnQub3duZXJFbGVtZW50KCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7 CisKICAgICAgICAgICAgIGlmICghVXNlckNvbnRlbnRVUkxQYXR0ZXJuOjptYXRjaGVzUGF0dGVy bnMobV9kb2N1bWVudC51cmwoKSwgc2hlZXQtPndoaXRlbGlzdCgpLCBzaGVldC0+YmxhY2tsaXN0 KCkpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCiAgICAgICAgICAgICBSZWZQdHI8Q1NT U3R5bGVTaGVldD4gZ3JvdXBTaGVldCA9IENTU1N0eWxlU2hlZXQ6OmNyZWF0ZUlubGluZShjb25z dF9jYXN0PERvY3VtZW50Jj4obV9kb2N1bWVudCksIHNoZWV0LT51cmwoKSk7CiAgICAgICAgICAg ICBib29sIGlzVXNlclN0eWxlU2hlZXQgPSBzaGVldC0+bGV2ZWwoKSA9PSBVc2VyU3R5bGVVc2Vy TGV2ZWw7CiAgICAgICAgICAgICBpZiAoaXNVc2VyU3R5bGVTaGVldCkKICAgICAgICAgICAgICAg ICBtX2luamVjdGVkVXNlclN0eWxlU2hlZXRzLmFwcGVuZChncm91cFNoZWV0KTsKICAgICAgICAg ICAgIGVsc2UKICAgICAgICAgICAgICAgICBtX2luamVjdGVkQXV0aG9yU3R5bGVTaGVldHMuYXBw ZW5kKGdyb3VwU2hlZXQpOworCiAgICAgICAgICAgICBncm91cFNoZWV0LT5jb250ZW50cygpLnNl dElzVXNlclN0eWxlU2hlZXQoaXNVc2VyU3R5bGVTaGVldCk7CiAgICAgICAgICAgICBncm91cFNo ZWV0LT5jb250ZW50cygpLnBhcnNlU3RyaW5nKHNoZWV0LT5zb3VyY2UoKSk7CiAgICAgICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNwcAppbmRleCBiYThkMWRlYzNhMDY1NzU5YTA1Yjc3ZmI1 MjYwZDc4N2E5NGZhYjY2Li4wOTE2OTU0OWU2NGVmNGQwNTcyZGJhMWUxMjdlYTRjMWRmNWZlYTg2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwCkBAIC0yODYsMTUgKzI4Niw4IEBAIHZvaWQg UGFnZUdyb3VwOjphZGRVc2VyU2NyaXB0VG9Xb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkLCBj b25zdCBTdHJpbmcmIHNvdXJjCiB2b2lkIFBhZ2VHcm91cDo6YWRkVXNlclN0eWxlU2hlZXRUb1dv cmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIGNvbnN0IFN0cmluZyYgc291cmNlLCBjb25zdCBV UkwmIHVybCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHdoaXRlbGlzdCwgY29uc3QgVmVjdG9yPFN0 cmluZz4mIGJsYWNrbGlzdCwgVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1l cywgVXNlclN0eWxlTGV2ZWwgbGV2ZWwsIFVzZXJTdHlsZUluamVjdGlvblRpbWUgaW5qZWN0aW9u VGltZSkKIHsKICAgICBhdXRvIHVzZXJTdHlsZVNoZWV0ID0gc3RkOjptYWtlX3VuaXF1ZTxVc2Vy U3R5bGVTaGVldD4oc291cmNlLCB1cmwsIHdoaXRlbGlzdCwgYmxhY2tsaXN0LCBpbmplY3RlZEZy YW1lcywgbGV2ZWwpOwotICAgIGlmICghbV91c2VyU3R5bGVTaGVldHMpCi0gICAgICAgIG1fdXNl clN0eWxlU2hlZXRzID0gc3RkOjptYWtlX3VuaXF1ZTxVc2VyU3R5bGVTaGVldE1hcD4oKTsKLSAg ICBzdGQ6OnVuaXF1ZV9wdHI8VXNlclN0eWxlU2hlZXRWZWN0b3I+JiBzdHlsZVNoZWV0c0luV29y bGQgPSBtX3VzZXJTdHlsZVNoZWV0cy0+YWRkKCZ3b3JsZCwgbnVsbHB0cikuaXRlcmF0b3ItPnZh bHVlOwotICAgIGlmICghc3R5bGVTaGVldHNJbldvcmxkKQotICAgICAgICBzdHlsZVNoZWV0c0lu V29ybGQgPSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJTdHlsZVNoZWV0VmVjdG9yPigpOwotICAgIHN0 eWxlU2hlZXRzSW5Xb3JsZC0+YXBwZW5kKHN0ZDo6bW92ZSh1c2VyU3R5bGVTaGVldCkpOworICAg IG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5hZGRVc2VyU3R5bGVTaGVldCh3b3JsZCwgc3RkOjpt b3ZlKHVzZXJTdHlsZVNoZWV0KSwgaW5qZWN0aW9uVGltZSk7CiAKLSAgICBpZiAoaW5qZWN0aW9u VGltZSA9PSBJbmplY3RJbkV4aXN0aW5nRG9jdW1lbnRzKQotICAgICAgICBpbnZhbGlkYXRlSW5q ZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lcygpOwogfQogCiB2b2lkIFBhZ2VHcm91cDo6 cmVtb3ZlVXNlclNjcmlwdEZyb21Xb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkLCBjb25zdCBV UkwmIHVybCkKQEAgLTMwNCwyOSArMjk3LDcgQEAgdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJT Y3JpcHRGcm9tV29ybGQoRE9NV3JhcHBlcldvcmxkJiB3b3JsZCwgY29uc3QgVVJMJiB1cmwKIAog dm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJTdHlsZVNoZWV0RnJvbVdvcmxkKERPTVdyYXBwZXJX b3JsZCYgd29ybGQsIGNvbnN0IFVSTCYgdXJsKQogewotICAgIGlmICghbV91c2VyU3R5bGVTaGVl dHMpCi0gICAgICAgIHJldHVybjsKLQotICAgIGF1dG8gaXQgPSBtX3VzZXJTdHlsZVNoZWV0cy0+ ZmluZCgmd29ybGQpOwotICAgIGJvb2wgc2hlZXRzQ2hhbmdlZCA9IGZhbHNlOwotICAgIGlmIChp dCA9PSBtX3VzZXJTdHlsZVNoZWV0cy0+ZW5kKCkpCi0gICAgICAgIHJldHVybjsKLSAgICAKLSAg ICBhdXRvIHN0eWxlc2hlZXRzID0gaXQtPnZhbHVlLmdldCgpOwotICAgIGZvciAoaW50IGkgPSBz dHlsZXNoZWV0cy0+c2l6ZSgpIC0gMTsgaSA+PSAwOyAtLWkpIHsKLSAgICAgICAgaWYgKHN0eWxl c2hlZXRzLT5hdChpKS0+dXJsKCkgPT0gdXJsKSB7Ci0gICAgICAgICAgICBzdHlsZXNoZWV0cy0+ cmVtb3ZlKGkpOwotICAgICAgICAgICAgc2hlZXRzQ2hhbmdlZCA9IHRydWU7Ci0gICAgICAgIH0K LSAgICB9Ci0gICAgICAgIAotICAgIGlmICghc2hlZXRzQ2hhbmdlZCkKLSAgICAgICAgcmV0dXJu OwotCi0gICAgaWYgKHN0eWxlc2hlZXRzLT5pc0VtcHR5KCkpCi0gICAgICAgIG1fdXNlclN0eWxl U2hlZXRzLT5yZW1vdmUoaXQpOwotCi0gICAgaW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENh Y2hlSW5BbGxGcmFtZXMoKTsKKyAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+cmVtb3ZlVXNl clN0eWxlU2hlZXQod29ybGQsIHVybCk7CiB9CiAKIHZvaWQgUGFnZUdyb3VwOjpyZW1vdmVVc2Vy U2NyaXB0c0Zyb21Xb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkKQpAQCAtMzM2LDM0ICszMDcs MTIgQEAgdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJTY3JpcHRzRnJvbVdvcmxkKERPTVdyYXBw ZXJXb3JsZCYgd29ybGQpCiAKIHZvaWQgUGFnZUdyb3VwOjpyZW1vdmVVc2VyU3R5bGVTaGVldHNG cm9tV29ybGQoRE9NV3JhcHBlcldvcmxkJiB3b3JsZCkKIHsKLSAgICBpZiAoIW1fdXNlclN0eWxl U2hlZXRzKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAoIW1fdXNlclN0eWxlU2hlZXRzLT5y ZW1vdmUoJndvcmxkKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaW52YWxpZGF0ZUluamVjdGVk U3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKTsKKyAgICBtX3VzZXJDb250ZW50Q29udHJvbGxl ci0+cmVtb3ZlVXNlclN0eWxlU2hlZXRzKHdvcmxkKTsKIH0KIAogdm9pZCBQYWdlR3JvdXA6OnJl bW92ZUFsbFVzZXJDb250ZW50KCkKIHsKICAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+cmVt b3ZlQWxsVXNlckNvbnRlbnQoKTsKLQotICAgIGlmIChtX3VzZXJTdHlsZVNoZWV0cykgewotICAg ICAgICBtX3VzZXJTdHlsZVNoZWV0cyA9IG51bGxwdHI7Ci0gICAgICAgIGludmFsaWRhdGVJbmpl Y3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCk7Ci0gICAgfQotfQotCi12b2lkIFBhZ2VH cm91cDo6aW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKQotewot ICAgIC8vIENsZWFyIG91ciBjYWNoZWQgc2hlZXRzIGFuZCBoYXZlIHRoZW0ganVzdCByZXBhcnNl LgotICAgIGZvciAoYXV0byBpdCA9IG1fcGFnZXMuYmVnaW4oKSwgZW5kID0gbV9wYWdlcy5lbmQo KTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIGZvciAoRnJhbWUqIGZyYW1lID0gJigqaXQp LT5tYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQo KSkgewotICAgICAgICAgICAgZnJhbWUtPmRvY3VtZW50KCktPnN0eWxlU2hlZXRDb2xsZWN0aW9u KCkuaW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlKCk7Ci0gICAgICAgICAgICBmcmFt ZS0+ZG9jdW1lbnQoKS0+c3R5bGVSZXNvbHZlckNoYW5nZWQoRGVmZXJSZWNhbGNTdHlsZSk7Ci0g ICAgICAgIH0KLSAgICB9CiB9CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlR3JvdXAuaAppbmRleCBhOWY1YTgwMWFlYjlkZmI2MDU5NTI5YjNjM2VlNTliMTExM2RjOGQw Li5mM2M2OTdiZDgyMDQ4ZjlhMjQyNDI5NTA0NzQzMWY2MjZhNGMyNGVlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZUdyb3VwLmgKQEAgLTEwMCw4ICsxMDAsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIHZvaWQgcmVtb3ZlVXNlclN0eWxlU2hlZXRzRnJvbVdvcmxkKERPTVdyYXBwZXJXb3JsZCYp OwogICAgICAgICB2b2lkIHJlbW92ZUFsbFVzZXJDb250ZW50KCk7CiAKLSAgICAgICAgY29uc3Qg VXNlclN0eWxlU2hlZXRNYXAqIHVzZXJTdHlsZVNoZWV0cygpIGNvbnN0IHsgcmV0dXJuIG1fdXNl clN0eWxlU2hlZXRzLmdldCgpOyB9Ci0KICAgICAgICAgR3JvdXBTZXR0aW5ncyYgZ3JvdXBTZXR0 aW5ncygpIGNvbnN0IHsgcmV0dXJuICptX2dyb3VwU2V0dGluZ3M7IH0KIAogI2lmIEVOQUJMRShW SURFT19UUkFDSykKQEAgLTExMSw3ICsxMDksNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAg ICBwcml2YXRlOgogICAgICAgICB2b2lkIGFkZFZpc2l0ZWRMaW5rKExpbmtIYXNoKTsKLSAgICAg ICAgdm9pZCBpbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lcygpOwog CiAgICAgICAgIFN0cmluZyBtX25hbWU7CiAgICAgICAgIEhhc2hTZXQ8UGFnZSo+IG1fcGFnZXM7 CkBAIC0xMjQsNyArMTIxLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBIYXNoTWFw PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4sIFJlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPj4gbV90cmFu c2llbnRMb2NhbFN0b3JhZ2VNYXA7CiAKICAgICAgICAgUmVmUHRyPFVzZXJDb250ZW50Q29udHJv bGxlcj4gbV91c2VyQ29udGVudENvbnRyb2xsZXI7Ci0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxV c2VyU3R5bGVTaGVldE1hcD4gbV91c2VyU3R5bGVTaGVldHM7CiAKICAgICAgICAgY29uc3Qgc3Rk Ojp1bmlxdWVfcHRyPEdyb3VwU2V0dGluZ3M+IG1fZ3JvdXBTZXR0aW5nczsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuY3BwCmluZGV4IGVkNDU4NWY1YTVm ZWFmODg0MjU0YTEyOGZjYTdiOWJjODZkZjEyMmQuLjk1ZmE1ZmRmZDFjYmQ5OWZjYmY2MWUxZWYz MTJjNmJlYTZkNWM2M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRl bnRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29u dHJvbGxlci5jcHAKQEAgLTI3LDcgKzI3LDExIEBACiAjaW5jbHVkZSAiVXNlckNvbnRlbnRDb250 cm9sbGVyLmgiCiAKICNpbmNsdWRlICJET01XcmFwcGVyV29ybGQuaCIKKyNpbmNsdWRlICJEb2N1 bWVudC5oIgorI2luY2x1ZGUgIk1haW5GcmFtZS5oIgorI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNs dWRlICJVc2VyU2NyaXB0LmgiCisjaW5jbHVkZSAiVXNlclN0eWxlU2hlZXQuaCIKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCkBAIC05NCw5ICs5OCw3NyBAQCB2b2lkIFVzZXJDb250ZW50Q29udHJv bGxlcjo6cmVtb3ZlVXNlclNjcmlwdHMoRE9NV3JhcHBlcldvcmxkJiB3b3JsZCkKICAgICBtX3Vz ZXJTY3JpcHRzLT5yZW1vdmUoJndvcmxkKTsKIH0KIAordm9pZCBVc2VyQ29udGVudENvbnRyb2xs ZXI6OmFkZFVzZXJTdHlsZVNoZWV0KERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIHN0ZDo6dW5pcXVl X3B0cjxVc2VyU3R5bGVTaGVldD4gdXNlclN0eWxlU2hlZXQsIFVzZXJTdHlsZUluamVjdGlvblRp bWUgaW5qZWN0aW9uVGltZSkKK3sKKyAgICBpZiAoIW1fdXNlclN0eWxlU2hlZXRzKQorICAgICAg ICBtX3VzZXJTdHlsZVNoZWV0cyA9IHN0ZDo6bWFrZV91bmlxdWU8VXNlclN0eWxlU2hlZXRNYXA+ KCk7CisKKyAgICBhdXRvJiBzdHlsZVNoZWV0c0luV29ybGQgPSBtX3VzZXJTdHlsZVNoZWV0cy0+ YWRkKCZ3b3JsZCwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOworICAgIGlmICghc3R5bGVTaGVl dHNJbldvcmxkKQorICAgICAgICBzdHlsZVNoZWV0c0luV29ybGQgPSBzdGQ6Om1ha2VfdW5pcXVl PFVzZXJTdHlsZVNoZWV0VmVjdG9yPigpOworICAgIHN0eWxlU2hlZXRzSW5Xb3JsZC0+YXBwZW5k KHN0ZDo6bW92ZSh1c2VyU3R5bGVTaGVldCkpOworCisgICAgaWYgKGluamVjdGlvblRpbWUgPT0g SW5qZWN0SW5FeGlzdGluZ0RvY3VtZW50cykKKyAgICAgICAgaW52YWxpZGF0ZUluamVjdGVkU3R5 bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKTsKK30KKwordm9pZCBVc2VyQ29udGVudENvbnRyb2xs ZXI6OnJlbW92ZVVzZXJTdHlsZVNoZWV0KERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIGNvbnN0IFVS TCYgdXJsKQoreworICAgIGlmICghbV91c2VyU3R5bGVTaGVldHMpCisgICAgICAgIHJldHVybjsK KworICAgIGF1dG8gaXQgPSBtX3VzZXJTdHlsZVNoZWV0cy0+ZmluZCgmd29ybGQpOworICAgIGlm IChpdCA9PSBtX3VzZXJTdHlsZVNoZWV0cy0+ZW5kKCkpCisgICAgICAgIHJldHVybjsKKworICAg IGF1dG8mIHN0eWxlc2hlZXRzID0gKml0LT52YWx1ZTsKKworICAgIGJvb2wgc2hlZXRzQ2hhbmdl ZCA9IGZhbHNlOworICAgIGZvciAoaW50IGkgPSBzdHlsZXNoZWV0cy5zaXplKCkgLSAxOyBpID49 IDA7IC0taSkgeworICAgICAgICBpZiAoc3R5bGVzaGVldHNbaV0tPnVybCgpID09IHVybCkgewor ICAgICAgICAgICAgc3R5bGVzaGVldHMucmVtb3ZlKGkpOworICAgICAgICAgICAgc2hlZXRzQ2hh bmdlZCA9IHRydWU7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoIXNoZWV0c0NoYW5nZWQp CisgICAgICAgIHJldHVybjsKKworICAgIGlmIChzdHlsZXNoZWV0cy5pc0VtcHR5KCkpCisgICAg ICAgIG1fdXNlclN0eWxlU2hlZXRzLT5yZW1vdmUoaXQpOworCisgICAgaW52YWxpZGF0ZUluamVj dGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKTsKK30KKwordm9pZCBVc2VyQ29udGVudENv bnRyb2xsZXI6OnJlbW92ZVVzZXJTdHlsZVNoZWV0cyhET01XcmFwcGVyV29ybGQmIHdvcmxkKQor eworICAgIGlmICghbV91c2VyU3R5bGVTaGVldHMpCisgICAgICAgIHJldHVybjsKKworICAgIGlm ICghbV91c2VyU3R5bGVTaGVldHMtPnJlbW92ZSgmd29ybGQpKQorICAgICAgICByZXR1cm47CisK KyAgICBpbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lcygpOworfQor CiB2b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6cmVtb3ZlQWxsVXNlckNvbnRlbnQoKQogewog ICAgIG1fdXNlclNjcmlwdHMgPSBudWxscHRyOworCisgICAgaWYgKG1fdXNlclN0eWxlU2hlZXRz KSB7CisgICAgICAgIG1fdXNlclN0eWxlU2hlZXRzID0gbnVsbHB0cjsKKyAgICAgICAgaW52YWxp ZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKTsKKyAgICB9Cit9CisKK3Zv aWQgVXNlckNvbnRlbnRDb250cm9sbGVyOjppbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2Fj aGVJbkFsbEZyYW1lcygpCit7CisgICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdlcykgeworICAg ICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9ICZwYWdlLT5tYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1l ID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkgeworICAgICAgICAgICAgZnJhbWUtPmRv Y3VtZW50KCktPnN0eWxlU2hlZXRDb2xsZWN0aW9uKCkuaW52YWxpZGF0ZUluamVjdGVkU3R5bGVT aGVldENhY2hlKCk7CisgICAgICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+c3R5bGVSZXNvbHZl ckNoYW5nZWQoRGVmZXJSZWNhbGNTdHlsZSk7CisgICAgICAgIH0KKyAgICB9CiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNv bnRlbnRDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJv bGxlci5oCmluZGV4IDc2NTFjNjNkODU4YTNjOWU3OGNjNWU4YTQ0NmVlZTA0ZDg4YzRiMzguLjlk ZGI4ZDBlMTM3M2IyOGI4OGJmYjNjM2NhNjY5MDAxYzc2ZTAxODUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuaApAQCAtMjcsNiArMjcsNyBAQAogI2RlZmlu ZSBVc2VyQ29udGVudENvbnRyb2xsZXJfaAogCiAjaW5jbHVkZSAiVXNlclNjcmlwdFR5cGVzLmgi CisjaW5jbHVkZSAiVXNlclN0eWxlU2hlZXRUeXBlcy5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0 Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+ CkBAIC0zNyw2ICszOCw3IEBAIGNsYXNzIERPTVdyYXBwZXJXb3JsZDsKIGNsYXNzIFBhZ2U7CiBj bGFzcyBVUkw7CiBjbGFzcyBVc2VyU2NyaXB0OworY2xhc3MgVXNlclN0eWxlU2hlZXQ7CiAKIGNs YXNzIFVzZXJDb250ZW50Q29udHJvbGxlciA6IHB1YmxpYyBSZWZDb3VudGVkPFVzZXJDb250ZW50 Q29udHJvbGxlcj4gewogcHVibGljOgpAQCAtNTIsMTQgKzU0LDIzIEBAIHB1YmxpYzoKICAgICB2 b2lkIHJlbW92ZVVzZXJTY3JpcHQoRE9NV3JhcHBlcldvcmxkJiwgY29uc3QgVVJMJik7CiAgICAg dm9pZCByZW1vdmVVc2VyU2NyaXB0cyhET01XcmFwcGVyV29ybGQmKTsKIAorICAgIGNvbnN0IFVz ZXJTdHlsZVNoZWV0TWFwKiB1c2VyU3R5bGVTaGVldHMoKSBjb25zdCB7IHJldHVybiBtX3VzZXJT dHlsZVNoZWV0cy5nZXQoKTsgfQorCisgICAgdm9pZCBhZGRVc2VyU3R5bGVTaGVldChET01XcmFw cGVyV29ybGQmLCBzdGQ6OnVuaXF1ZV9wdHI8VXNlclN0eWxlU2hlZXQ+LCBVc2VyU3R5bGVJbmpl Y3Rpb25UaW1lKTsKKyAgICB2b2lkIHJlbW92ZVVzZXJTdHlsZVNoZWV0KERPTVdyYXBwZXJXb3Js ZCYsIGNvbnN0IFVSTCYpOworICAgIHZvaWQgcmVtb3ZlVXNlclN0eWxlU2hlZXRzKERPTVdyYXBw ZXJXb3JsZCYpOworCiAgICAgdm9pZCByZW1vdmVBbGxVc2VyQ29udGVudCgpOwogCiBwcml2YXRl OgogICAgIFVzZXJDb250ZW50Q29udHJvbGxlcigpOwogCisgICAgdm9pZCBpbnZhbGlkYXRlSW5q ZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lcygpOworCiAgICAgSGFzaFNldDxQYWdlKj4g bV9wYWdlczsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxVc2VyU2NyaXB0TWFwPiBtX3VzZXJTY3Jp cHRzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxVc2VyU3R5bGVTaGVldE1hcD4gbV91c2VyU3R5bGVT aGVldHM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==