79074 2012-02-20 21:25:33 -0800 <style scoped>: Add runtime-flag 2012-02-22 02:45:00 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 49142 1 rolandsteiner rolandsteiner dglazkov dominicc koivisto morrita oldest_to_newest 560627 0 rolandsteiner 2012-02-20 21:25:33 -0800 Add a runtime flag to enable/disable <style scoped> if compiled with ENABLE(STYLE_SCOPED). 560674 1 127920 rolandsteiner 2012-02-20 22:36:19 -0800 Created attachment 127920 Patch patch, webkit-side - adds runtime flag in WebKit (default is off), enables STYLE_SCOPED compile-time flag for Chromium. 560924 2 127920 dglazkov 2012-02-21 08:52:32 -0800 Comment on attachment 127920 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127920&action=review > Source/WebCore/css/CSSStyleSelector.cpp:451 > + // Disregard if <style scoped> is runtime-disabled. This redundant comment is redundant. > Source/WebCore/html/HTMLStyleElement.cpp:93 > + // Do nothing if <style scoped> is runtime-disabled. Ditto. 561791 3 rolandsteiner 2012-02-22 02:45:00 -0800 Committed r108474: <http://trac.webkit.org/changeset/108474> 127920 2012-02-20 22:36:19 -0800 2012-02-21 08:52:32 -0800 Patch bug-79074-20120221153617.patch text/plain 12607 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA0OTJkZTBmYWE1MTQ1 ZGM0ZTAwMjM0YTk5MjI2NTYzOGMxYmM4Yi4uNDcwNjdhZDA0YTRjOTVhYzkxOTI4ZjdkNmQwZWZl MjFjNzYwYWJjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAyLTIwICBSb2xh bmQgU3RlaW5lciAgPHJvbGFuZHN0ZWluZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIDxzdHls ZSBzY29wZWQ+OiBBZGQgcnVudGltZS1mbGFnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03OTA3NAorCisgICAgICAgIEFkZGVkIHJ1bnRpbWUtZmxhZy4K KyAgICAgICAgUXVlcnkgcnVudGltZSBmbGFnIHdoZW4gKHVuKXJlZ2lzdGVyaW5nIGEgPHN0eWxl IHNjb3BlZD4gZWxlbWVudCwgYW5kIHdoZW4gZGV0ZXJtaW5laW5nIGEgc3R5bGUgc2hlZXQncyBz Y29wZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBuZXcgdGVzdHMuIChubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eSkKKworICAgICAgICAqIGJp bmRpbmdzL2dlbmVyaWMvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5jcHA6CisgICAgICAgIChXZWJD b3JlKToKKyAgICAgICAgKiBiaW5kaW5ncy9nZW5lcmljL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMu aDoKKyAgICAgICAgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMpOgorICAgICAgICAoV2ViQ29yZTo6 UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c3R5bGVTY29wZWRFbmFibGVkKToKKyAgICAgICAgKFdl YkNvcmU6OlJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNldFN0eWxlU2NvcGVkRW5hYmxlZCk6Cisg ICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NT U3R5bGVTZWxlY3Rvcjo6ZGV0ZXJtaW5lU2NvcGluZ0VsZW1lbnQpOgorICAgICAgICAqIGh0bWwv SFRNTFN0eWxlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU3R5bGVFbGVtZW50 OjpyZWdpc3RlcldpdGhTY29waW5nTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU3R5bGVF bGVtZW50Ojp1bnJlZ2lzdGVyV2l0aFNjb3BpbmdOb2RlKToKKyAgICAgICAgKiBodG1sL0hUTUxT dHlsZUVsZW1lbnQuaWRsOgorCiAyMDEyLTAyLTE5ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgTW92ZSBzdHViIGltcGxlbWVudGF0aW9ucyBvZiBTY3Jv bGxpbmdDb29yZGluYXRvciBmdW5jdGlvbnMgaW50byBTY3JvbGxpbmdDb29yZGluYXRvck5vbmUu Y3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGNjY2JmY2U5YzQzNWE2ZGJmOTMxNjYy ZWY3ZWRlNjE4NTBhMGQ1NjAuLjg1MGUyMjczNjM3ZmIzNzczNzU1NzBlZjk0YTU5MjNhNTA1MGFl ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDIt MjAgIFJvbGFuZCBTdGVpbmVyICA8cm9sYW5kc3RlaW5lckBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgPHN0eWxlIHNjb3BlZD46IEFkZCBydW50aW1lLWZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MDc0CisKKyAgICAgICAgQWRkZWQgYSBydW50 aW1lLWZsYWcuCisgICAgICAgIEVuYWJsZSBkZWZhdWx0IFNUWUxFX1NDT1BFRCBjb21waWxlLXRp bWUgZmxhZyBmb3IgQ2hyb21pdW0uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBmZWF0dXJlcy5neXBpOiBlbmFibGUgU1RZTEVfU0NPUEVECisgICAg ICAgICogcHVibGljL1dlYlJ1bnRpbWVGZWF0dXJlcy5oOgorICAgICAgICAoV2ViUnVudGltZUZl YXR1cmVzKToKKyAgICAgICAgKiBzcmMvV2ViUnVudGltZUZlYXR1cmVzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUnVudGltZUZlYXR1cmVzOjplbmFibGVTdHlsZVNjb3BlZCk6CisgICAgICAg IChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJSdW50aW1lRmVhdHVyZXM6OmlzU3R5bGVT Y29wZWRFbmFibGVkKToKKwogMjAxMi0wMi0xOCAgcmFtYW4gVGVubmV0aSAgPHJ0ZW5uZXRpQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBUcmFjayB0aGUgTlBOIHByb3RvY29sIHZlcnNpb24gbmVn b3RpYXRlZCB3aXRoIHRoZSBzZXJ2ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2dlbmVyaWMvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9nZW5lcmljL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMuY3BwCmluZGV4IDc4ZjhkOTFk ZTUxYmEyMGJkNjFhYWRiYjJhMjBlNmQ4MDg0MmNiZTAuLjhmYWQyYzVkNzAyZTEyOGU1NmEyOTA1 MTZlYzI2ZTQxYzVkMzM0MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dl bmVyaWMvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvZ2VuZXJpYy9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmNwcApAQCAtMTg1LDQgKzE4NSw3 IEBAIGJvb2wgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6aXNTaGFkb3dET01FbmFibGVkID0gZmFs c2U7CiBib29sIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OmlzTXVsdGlwbGVTaGFkb3dTdWJ0cmVl c0VuYWJsZWQgPSBmYWxzZTsKICNlbmRpZgogCisjaWYgRU5BQkxFKFNUWUxFX1NDT1BFRCkKK2Jv b2wgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6aXNTdHlsZVNjb3BlZEVuYWJsZWQgPSBmYWxzZTsK KyNlbmRpZgogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvZ2VuZXJpYy9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmggYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9nZW5lcmljL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMuaAppbmRleCA1ZmEw NjBiNjg1NjUyODJiNjNkOGVhNDAwZGUwNzI0NGQwNTMxY2RhLi4zNjA2NWM4MmFkOGQwOGMyMDBi ZWJlODlhMjBiNThmZjE4NjE2ZDAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9nZW5lcmljL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9nZW5lcmljL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMuaApAQCAtMTk5LDYgKzE5OSwx MSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0TXVsdGlwbGVTaGFkb3dTdWJ0cmVlc0Vu YWJsZWQoYm9vbCBpc0VuYWJsZWQpIHsgaXNNdWx0aXBsZVNoYWRvd1N1YnRyZWVzRW5hYmxlZCA9 IGlzRW5hYmxlZDsgfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoU1RZTEVfU0NPUEVEKQorICAgIHN0 YXRpYyBib29sIHN0eWxlU2NvcGVkRW5hYmxlZCgpIHsgcmV0dXJuIGlzU3R5bGVTY29wZWRFbmFi bGVkOyB9CisgICAgc3RhdGljIHZvaWQgc2V0U3R5bGVTY29wZWRFbmFibGVkKGJvb2wgaXNFbmFi bGVkKSB7IGlzU3R5bGVTY29wZWRFbmFibGVkID0gaXNFbmFibGVkOyB9CisjZW5kaWYKKwogcHJp dmF0ZToKICAgICAvLyBOZXZlciBpbnN0YW50aWF0ZS4KICAgICBSdW50aW1lRW5hYmxlZEZlYXR1 cmVzKCkgeyB9CkBAIC0yNjAsNiArMjY1LDEwIEBAIHByaXZhdGU6CiAgICAgc3RhdGljIGJvb2wg aXNTaGFkb3dET01FbmFibGVkOwogICAgIHN0YXRpYyBib29sIGlzTXVsdGlwbGVTaGFkb3dTdWJ0 cmVlc0VuYWJsZWQ7CiAjZW5kaWYKKworI2lmIEVOQUJMRShTVFlMRV9TQ09QRUQpCisgICAgc3Rh dGljIGJvb2wgaXNTdHlsZVNjb3BlZEVuYWJsZWQ7CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCBi ZmQ2OGRhMmUyZjQ1ZDYyNjE4NDYzZjFhMWFjYmFkNTAwZDFmMjJhLi45Y2RiNThkMGNjMTIyZjRj OTk2ZTc0MWUzMDgxYjMwYWYzMTYxZTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuY3BwCkBAIC04OCw2ICs4OCw3IEBACiAjaW5jbHVkZSAiUmVuZGVyU3R5bGVDb25zdGFu dHMuaCIKICNpbmNsdWRlICJSZW5kZXJUaGVtZS5oIgogI2luY2x1ZGUgIlJvdGF0ZVRyYW5zZm9y bU9wZXJhdGlvbi5oIgorI2luY2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNs dWRlICJTY2FsZVRyYW5zZm9ybU9wZXJhdGlvbi5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2lu LmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKQEAgLTQ0Nyw2ICs0NDgsMTAgQEAgY29uc3QgRWxl bWVudCogQ1NTU3R5bGVTZWxlY3Rvcjo6ZGV0ZXJtaW5lU2NvcGluZ0VsZW1lbnQoY29uc3QgQ1NT U3R5bGVTaGVldCogc2gKIHsKICAgICBBU1NFUlQoc2hlZXQpOwogCisgICAgLy8gRGlzcmVnYXJk IGlmIDxzdHlsZSBzY29wZWQ+IGlzIHJ1bnRpbWUtZGlzYWJsZWQuCisgICAgaWYgKCFSdW50aW1l RW5hYmxlZEZlYXR1cmVzOjpzdHlsZVNjb3BlZEVuYWJsZWQoKSkKKyAgICAgICAgcmV0dXJuIDA7 CisKICAgICBOb2RlKiBvd25lck5vZGUgPSBzaGVldC0+ZmluZFN0eWxlU2hlZXRPd25lck5vZGUo KTsKICAgICBpZiAoIW93bmVyTm9kZSB8fCAhb3duZXJOb2RlLT5pc0hUTUxFbGVtZW50KCkgfHwg IW93bmVyTm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnN0eWxlVGFnKSkKICAgICAgICAgcmV0 dXJuIDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU3R5bGVFbGVtZW50LmNwcAppbmRleCAwYzA2 NDQ1N2I0MWE5ZDgyNmQ4NWVjODU0Yzc2NTU4NGU2ZDU5NzVmLi4xNWFiOTgyMzVkZTdiYjA4NmRj MGJhNzRhZmZhMzQ0ZDUwZDNmYWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxTdHlsZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxl bWVudC5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJBdHRyaWJ1dGUuaCIKICNpbmNs dWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgorI2luY2x1ZGUgIlJ1bnRp bWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNsdWRlICJTY3JpcHRFdmVudExpc3RlbmVyLmgiCiAj aW5jbHVkZSAiU2NyaXB0YWJsZURvY3VtZW50UGFyc2VyLmgiCiAKQEAgLTg3LDQ0ICs4OCw1MiBA QCB2b2lkIEhUTUxTdHlsZUVsZW1lbnQ6OnJlZ2lzdGVyV2l0aFNjb3BpbmdOb2RlKCkKICAgICAv LyBUaGVyZWZvcmUgd2UgY2Fubm90IHJlbHkgb24gc2NvcGVkKCkhCiAgICAgQVNTRVJUKCFtX2lz UmVnaXN0ZXJlZFdpdGhTY29waW5nTm9kZSk7CiAgICAgQVNTRVJUKGluRG9jdW1lbnQoKSk7Ci0g ICAgaWYgKCFtX2lzUmVnaXN0ZXJlZFdpdGhTY29waW5nTm9kZSkgewotICAgICAgICBDb250YWlu ZXJOb2RlKiBzY29wZSA9IHBhcmVudE5vZGUoKTsKLSAgICAgICAgaWYgKCFzY29wZSkKLSAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgaWYgKCFzY29wZS0+aXNFbGVtZW50Tm9kZSgpICYmICFz Y29wZS0+aXNTaGFkb3dSb290KCkpIHsKLSAgICAgICAgICAgIC8vIERvY3VtZW50RnJhZ21lbnQg bm9kZXMgc2hvdWxkIG5ldmVyIGJlIGluRG9jdW1lbnQsCi0gICAgICAgICAgICAvLyA8c3R5bGU+ IHNob3VsZCBub3QgYmUgYSBjaGlsZCBvZiBEb2N1bWVudCwgUEkgb3Igc29tZSBzdWNoLgotICAg ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIH0KLQotICAgICAgICBzY29wZS0+cmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpOwot ICAgICAgICBzY29wZS0+c2V0TmVlZHNTdHlsZVJlY2FsYygpOwotICAgICAgICBpZiAoaW5Eb2N1 bWVudCgpICYmICFkb2N1bWVudCgpLT5wYXJzaW5nKCkgJiYgZG9jdW1lbnQoKS0+cmVuZGVyZXIo KSkKLSAgICAgICAgICAgIGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3JDaGFuZ2VkKERlZmVyUmVj YWxjU3R5bGUpOwotCi0gICAgICAgIG1faXNSZWdpc3RlcmVkV2l0aFNjb3BpbmdOb2RlID0gdHJ1 ZTsKKyAgICBpZiAobV9pc1JlZ2lzdGVyZWRXaXRoU2NvcGluZ05vZGUpCisgICAgICAgIHJldHVy bjsKKyAgICAvLyBEbyBub3RoaW5nIGlmIDxzdHlsZSBzY29wZWQ+IGlzIHJ1bnRpbWUtZGlzYWJs ZWQuCisgICAgaWYgKCFSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzdHlsZVNjb3BlZEVuYWJsZWQo KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQ29udGFpbmVyTm9kZSogc2NvcGUgPSBwYXJlbnRO b2RlKCk7CisgICAgaWYgKCFzY29wZSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICghc2NvcGUt PmlzRWxlbWVudE5vZGUoKSAmJiAhc2NvcGUtPmlzU2hhZG93Um9vdCgpKSB7CisgICAgICAgIC8v IERvY3VtZW50RnJhZ21lbnQgbm9kZXMgc2hvdWxkIG5ldmVyIGJlIGluRG9jdW1lbnQsCisgICAg ICAgIC8vIDxzdHlsZT4gc2hvdWxkIG5vdCBiZSBhIGNoaWxkIG9mIERvY3VtZW50LCBQSSBvciBz b21lIHN1Y2guCisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm47 CiAgICAgfQorCisgICAgc2NvcGUtPnJlZ2lzdGVyU2NvcGVkSFRNTFN0eWxlQ2hpbGQoKTsKKyAg ICBzY29wZS0+c2V0TmVlZHNTdHlsZVJlY2FsYygpOworICAgIGlmIChpbkRvY3VtZW50KCkgJiYg IWRvY3VtZW50KCktPnBhcnNpbmcoKSAmJiBkb2N1bWVudCgpLT5yZW5kZXJlcigpKQorICAgICAg ICBkb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yQ2hhbmdlZChEZWZlclJlY2FsY1N0eWxlKTsKKwor ICAgIG1faXNSZWdpc3RlcmVkV2l0aFNjb3BpbmdOb2RlID0gdHJ1ZTsKIH0KIAogdm9pZCBIVE1M U3R5bGVFbGVtZW50Ojp1bnJlZ2lzdGVyV2l0aFNjb3BpbmdOb2RlKCkKIHsKICAgICAvLyBOb3Rl OiBXZSBjYW5ub3QgcmVseSBvbiB0aGUgJ3Njb3BlZCcgZWxlbWVudCBzdGlsbCBiZWluZyBwcmVz ZW50IHdoZW4gdGhpcyBtZXRob2QgaXMgaW52b2tlZC4KICAgICAvLyBUaGVyZWZvcmUgd2UgY2Fu bm90IHJlbHkgb24gc2NvcGVkKCkhCi0gICAgQVNTRVJUKG1faXNSZWdpc3RlcmVkV2l0aFNjb3Bp bmdOb2RlKTsKLSAgICBpZiAobV9pc1JlZ2lzdGVyZWRXaXRoU2NvcGluZ05vZGUpIHsKLSAgICAg ICAgQ29udGFpbmVyTm9kZSogc2NvcGUgPSBwYXJlbnROb2RlKCk7Ci0gICAgICAgIEFTU0VSVChz Y29wZSk7Ci0gICAgICAgIGlmIChzY29wZSkgewotICAgICAgICAgICAgQVNTRVJUKHNjb3BlLT5o YXNTY29wZWRIVE1MU3R5bGVDaGlsZCgpKTsKLSAgICAgICAgICAgIHNjb3BlLT51bnJlZ2lzdGVy U2NvcGVkSFRNTFN0eWxlQ2hpbGQoKTsKLSAgICAgICAgICAgIHNjb3BlLT5zZXROZWVkc1N0eWxl UmVjYWxjKCk7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGluRG9jdW1lbnQoKSAmJiAhZG9jdW1l bnQoKS0+cGFyc2luZygpICYmIGRvY3VtZW50KCktPnJlbmRlcmVyKCkpCi0gICAgICAgICAgICBk b2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yQ2hhbmdlZChEZWZlclJlY2FsY1N0eWxlKTsKLQotICAg ICAgICBtX2lzUmVnaXN0ZXJlZFdpdGhTY29waW5nTm9kZSA9IGZhbHNlOworICAgIEFTU0VSVCht X2lzUmVnaXN0ZXJlZFdpdGhTY29waW5nTm9kZSB8fCAhUnVudGltZUVuYWJsZWRGZWF0dXJlczo6 c3R5bGVTY29wZWRFbmFibGVkKCkpOworICAgIGlmICghbV9pc1JlZ2lzdGVyZWRXaXRoU2NvcGlu Z05vZGUpCisgICAgICAgIHJldHVybjsKKyAgICAvLyBEbyBub3RoaW5nIGlmIDxzdHlsZSBzY29w ZWQ+IGlzIHJ1bnRpbWUtZGlzYWJsZWQuCisgICAgaWYgKCFSdW50aW1lRW5hYmxlZEZlYXR1cmVz OjpzdHlsZVNjb3BlZEVuYWJsZWQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQ29udGFpbmVy Tm9kZSogc2NvcGUgPSBwYXJlbnROb2RlKCk7CisgICAgQVNTRVJUKHNjb3BlKTsKKyAgICBpZiAo c2NvcGUpIHsKKyAgICAgICAgQVNTRVJUKHNjb3BlLT5oYXNTY29wZWRIVE1MU3R5bGVDaGlsZCgp KTsKKyAgICAgICAgc2NvcGUtPnVucmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpOworICAg ICAgICBzY29wZS0+c2V0TmVlZHNTdHlsZVJlY2FsYygpOwogICAgIH0KKyAgICBpZiAoaW5Eb2N1 bWVudCgpICYmICFkb2N1bWVudCgpLT5wYXJzaW5nKCkgJiYgZG9jdW1lbnQoKS0+cmVuZGVyZXIo KSkKKyAgICAgICAgZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvckNoYW5nZWQoRGVmZXJSZWNhbGNT dHlsZSk7CisKKyAgICBtX2lzUmVnaXN0ZXJlZFdpdGhTY29waW5nTm9kZSA9IGZhbHNlOwogfQog I2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxlbWVu dC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQuaWRsCmluZGV4IDdh MWI2MjI5NWM5NTAzNTZlZGMzZTRmZDljYmI5YTc0NzVjZDY0NzAuLjFiOWFiZDQ3YTVjMmIyNWRm Y2M5ODQ3MDIwMjkxZjY5MGVmMThlNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTFN0eWxlRWxlbWVudC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU3R5bGVF bGVtZW50LmlkbApAQCAtMjIsNyArMjIsNyBAQCBtb2R1bGUgaHRtbCB7CiAKICAgICBpbnRlcmZh Y2UgSFRNTFN0eWxlRWxlbWVudCA6IEhUTUxFbGVtZW50IHsKICAgICAgICAgYXR0cmlidXRlIGJv b2xlYW4gZGlzYWJsZWQ7Ci0gICAgICAgIGF0dHJpYnV0ZSBbQ29uZGl0aW9uYWw9U1RZTEVfU0NP UEVEXSBib29sZWFuIHNjb3BlZDsKKyAgICAgICAgYXR0cmlidXRlIFtDb25kaXRpb25hbD1TVFlM RV9TQ09QRUQsIFY4RW5hYmxlZEF0UnVudGltZT1zdHlsZVNjb3BlZF0gYm9vbGVhbiBzY29wZWQ7 CiAgICAgICAgIGF0dHJpYnV0ZSBbUmVmbGVjdF0gRE9NU3RyaW5nIG1lZGlhOwogICAgICAgICBh dHRyaWJ1dGUgW1JlZmxlY3RdIERPTVN0cmluZyB0eXBlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2Zl YXR1cmVzLmd5cGkKaW5kZXggYmExYzZlYWNkOWJmYjRmMTkyZmZhODJlYzQ4MzU5ZDdhNmQwM2Fh NS4uNGM0NmQ0ZGU0ODNkN2MxYWVkYzg4OTQzYTE0ZTI4MGE0YjQxODJhZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vZmVhdHVyZXMuZ3lwaQpAQCAtODUsNyArODUsNyBAQAogICAgICAgJ0VOQUJMRV9T SEFSRURfV09SS0VSUz0xJywKICAgICAgICdFTkFCTEVfU01PT1RIX1NDUk9MTElORz0xJywKICAg ICAgICdFTkFCTEVfU1FMX0RBVEFCQVNFPTEnLAotICAgICAgJ0VOQUJMRV9TVFlMRV9TQ09QRUQ9 MCcsCisgICAgICAnRU5BQkxFX1NUWUxFX1NDT1BFRD0xJywKICAgICAgICdFTkFCTEVfU1ZHPTwo ZW5hYmxlX3N2ZyknLAogICAgICAgJ0VOQUJMRV9TVkdfRk9OVFM9PChlbmFibGVfc3ZnKScsCiAg ICAgICAnRU5BQkxFX1RPVUNIX0VWRU5UUz08KGVuYWJsZV90b3VjaF9ldmVudHMpJywKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlJ1bnRpbWVGZWF0dXJlcy5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUnVudGltZUZlYXR1cmVzLmgKaW5k ZXggN2UyOWFiMGRiODk4NzVlMzZmM2Y1OTMxZGE0OWFiNDAyMmE3MmI5YS4uMzRlMzk0N2Y2Mzg5 MTIzNThkMTdlNDY1NzUwNzM2MjM2ZjhkYzBiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViUnVudGltZUZlYXR1cmVzLmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViUnVudGltZUZlYXR1cmVzLmgKQEAgLTEyNCw2ICsxMjQsOSBAQCBw dWJsaWM6CiAgICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgdm9pZCBlbmFibGVTaGFkb3dET00oYm9v bCk7CiAgICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgYm9vbCBpc1NoYWRvd0RPTUVuYWJsZWQoKTsK IAorICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIHZvaWQgZW5hYmxlU3R5bGVTY29wZWQoYm9vbCk7 CisgICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgYm9vbCBpc1N0eWxlU2NvcGVkRW5hYmxlZCgpOwor CiBwcml2YXRlOgogICAgIFdlYlJ1bnRpbWVGZWF0dXJlcygpOwogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlJ1bnRpbWVGZWF0dXJlcy5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJSdW50aW1lRmVhdHVyZXMuY3BwCmluZGV4IDM4OTYzYjUy MTcxM2NmOWE4MjU0OTdhMWM5MTQxZWQ0YjEwMmMxMWQuLmYxOTYwZWIzMTQ3Njc2YjMxMjMyMmM1 MWY1Njk0ZjFjNzMxN2NkYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlJ1bnRpbWVGZWF0dXJlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViUnVudGltZUZlYXR1cmVzLmNwcApAQCAtNDUwLDUgKzQ1MCwyMyBAQCBib29sIFdlYlJ1bnRp bWVGZWF0dXJlczo6aXNTaGFkb3dET01FbmFibGVkKCkKICNlbmRpZgogfQogCit2b2lkIFdlYlJ1 bnRpbWVGZWF0dXJlczo6ZW5hYmxlU3R5bGVTY29wZWQoYm9vbCBlbmFibGUpCit7CisjaWYgRU5B QkxFKFNUWUxFX1NDT1BFRCkKKyAgICBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzZXRTdHlsZVNj b3BlZEVuYWJsZWQoZW5hYmxlKTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKGVuYWJsZSk7Cisj ZW5kaWYKK30KKworYm9vbCBXZWJSdW50aW1lRmVhdHVyZXM6OmlzU3R5bGVTY29wZWRFbmFibGVk KCkKK3sKKyNpZiBFTkFCTEUoU1RZTEVfU0NPUEVEKQorICAgIHJldHVybiBSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzdHlsZVNjb3BlZEVuYWJsZWQoKTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNl OworI2VuZGlmCit9CisKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmZhZTg3OGI3ZDAxMGM4NjU1NDBk ZDUyZTgwOGI2N2RhNjQyMTI5Yy4uYmZjYWExYjMzOTg5NmU3NWMxMjNhZjQ2Y2U1MTEwNjgxZTQ5 Nzc2NCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDEyLTAyLTIwICBSb2xhbmQgU3RlaW5lciAgPHJvbGFuZHN0ZWlu ZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIDxzdHlsZSBzY29wZWQ+OiBBZGQgcnVudGltZS1m bGFnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTA3 NAorCisgICAgICAgIEVuYWJsZSB0aGUgcnVudGltZS1mbGFnIGZvciBEUlQuIAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vVGVzdFNoZWxsLmNwcDoKKyAgICAgICAgKFRlc3RTaGVsbDo6VGVzdFNoZWxsKToK KwogMjAxMi0wMi0xOSAgSnVuZ0ppayBMZWUgIDxqdW5namlrLmxlZUBzYW1zdW5nLmNvbT4KIAog ICAgICAgICBbRUZMXSBVc2UgbW9kaWZpZXIga2V5cyB0byBleGVjdXRlIHByZS1yZW5kZXJpbmcu CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3Bw IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAppbmRleCA2ZTVm YTc0NGUzNTE0N2Q2MTdmOGRhZTRlMmU3OTk1MmFlMTE0NzhmLi5lYWI0NWFmMjkzODY1MTQ5Mjdk Y2MzZGQ3YzUxMmQzOGRlMDVkZTBhIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9UZXN0U2hlbGwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L1Rlc3RTaGVsbC5jcHAKQEAgLTEyOCw2ICsxMjgsNyBAQCBUZXN0U2hlbGw6OlRlc3RTaGVsbChi b29sIHRlc3RTaGVsbE1vZGUpCiAgICAgV2ViUnVudGltZUZlYXR1cmVzOjplbmFibGVWaWRlb1Ry YWNrKHRydWUpOwogICAgIFdlYlJ1bnRpbWVGZWF0dXJlczo6ZW5hYmxlR2FtZXBhZCh0cnVlKTsK ICAgICBXZWJSdW50aW1lRmVhdHVyZXM6OmVuYWJsZVNoYWRvd0RPTSh0cnVlKTsKKyAgICBXZWJS dW50aW1lRmVhdHVyZXM6OmVuYWJsZVN0eWxlU2NvcGVkKHRydWUpOwogCiAgICAgbV93ZWJQZXJt aXNzaW9ucyA9IGFkb3B0UHRyKG5ldyBXZWJQZXJtaXNzaW9ucyh0aGlzKSk7CiAgICAgbV9hY2Nl c3NpYmlsaXR5Q29udHJvbGxlciA9IGFkb3B0UHRyKG5ldyBBY2Nlc3NpYmlsaXR5Q29udHJvbGxl cih0aGlzKSk7Cg==