127221 2014-01-18 09:00:39 -0800 Remove DocumentParser::pinToMainThread() and related code 2014-01-18 09:07:29 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue esprehn+autocc gyuyoung.kim japhet kangil.han oldest_to_newest 969448 0 andersca 2014-01-18 09:00:39 -0800 Remove DocumentParser::pinToMainThread() and related code 969449 1 221552 andersca 2014-01-18 09:01:07 -0800 Created attachment 221552 Patch 969450 2 221552 kling 2014-01-18 09:06:21 -0800 Comment on attachment 221552 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221552&action=review r=me > Source/WebCore/dom/DocumentParser.h:-53 > - virtual void pinToMainThread() { } Stupid that we always ate this virtual in unthreaded builds. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:74 > + , m_tokenizer(HTMLTokenizer::create(m_options)) Maybe this doesn't need to be heap allocated anymore. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:88 > - ASSERT(shouldUseThreading() || (m_token && m_tokenizer)); > + ASSERT(m_token); > + ASSERT(m_tokenizer); I guess we shouldn't even really need these assertions in the end. 969451 3 andersca 2014-01-18 09:07:29 -0800 Committed r162254: <http://trac.webkit.org/changeset/162254> 221552 2014-01-18 09:01:07 -0800 2014-01-18 09:06:20 -0800 Patch bug-127221-20140118090105.patch text/plain 10777 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTA1MDdmMjA2YzQ2N2I4 ODY4MWNlMGQ1Nzc1OWJjODA2YWY1YTdmMS4uMDAwNzUyNWM2YzM0ZmY0YThlZjQ3OGIyYzIxYzgx ODYyMjM5NGIwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE0LTAxLTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIERvY3Vt ZW50UGFyc2VyOjpwaW5Ub01haW5UaHJlYWQoKSBhbmQgcmVsYXRlZCBjb2RlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcyMjEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2V0Q29udGVudCk6CisgICAgICAgICogZG9t L0RvY3VtZW50UGFyc2VyLmg6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFy c2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6SFRNTERvY3Vt ZW50UGFyc2VyKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuaDoK KyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUGFyc2VyT3B0aW9ucy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MUGFyc2VyT3B0aW9uczo6SFRNTFBhcnNlck9wdGlvbnMpOgorICAgICAgICAq IGh0bWwvcGFyc2VyL0hUTUxQYXJzZXJPcHRpb25zLmg6CisgICAgICAgICogaHRtbC9wYXJzZXIv SFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6 cHJvY2Vzc0VuZFRhZyk6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50V3JpdGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50V3JpdGVyOjpyZXBsYWNlRG9jdW1lbnQpOgorCisyMDE0 LTAxLTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAg UmVtb3ZlIEhUTUxQYXJzZXJUaHJlYWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyNzIyMAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAzMzUw ODBhYjAzMGE4MzFmNDRkNDEyN2M5ODMwYTQxMDUzZTJlNWQxLi4yNTE3ZTA0NzFhMDBjZDE3NWJl ZDBhMDU0ZjYwNGU4Njg1YTI3MjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTEzNTAs NyArMTM1MCw2IEBAIHZvaWQgRG9jdW1lbnQ6OnNldENvbnRlbnQoY29uc3QgU3RyaW5nJiBjb250 ZW50KQogICAgIC8vIG5vdCBpbXBsZW1lbnRlZCBmb3IgdGhlIFhNTCBwYXJzZXIgYXMgaXQncyBu b3JtYWxseSBzeW5vbnltb3VzIHdpdGgKICAgICAvLyBkb2N1bWVudC53cml0ZSgpLiBhcHBlbmQo KSB3aWxsIGVuZCB1cCB5aWVsZGluZywgYnV0IGNsb3NlKCkgd2lsbAogICAgIC8vIHB1bXAgdGhl IHRva2VuaXplciBzeW5jcmhvbm91c2x5IGFuZCBmaW5pc2ggdGhlIHBhcnNlLgotICAgIG1fcGFy c2VyLT5waW5Ub01haW5UaHJlYWQoKTsKICAgICBtX3BhcnNlci0+YXBwZW5kKGNvbnRlbnQuaW1w bCgpKTsKICAgICBjbG9zZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50UGFyc2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRQYXJzZXIuaAppbmRl eCAwYjA2NGE1ODczYzAwYzlkZjJkZGEzOTEwMGEwZDZiOTZjYjkxODFlLi43YjJmMDE3OGVhOTQy Yjk3OGFkMzgyNjY5Yjk0NDA4NjdlNTgxMjJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnRQYXJzZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRQYXJz ZXIuaApAQCAtNTAsOCArNTAsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGFwcGVuZEJ5 dGVzKERvY3VtZW50V3JpdGVyJiwgY29uc3QgY2hhciogYnl0ZXMsIHNpemVfdCBsZW5ndGgpID0g MDsKICAgICB2aXJ0dWFsIHZvaWQgZmx1c2goRG9jdW1lbnRXcml0ZXImKSA9IDA7CiAKLSAgICB2 aXJ0dWFsIHZvaWQgcGluVG9NYWluVGhyZWFkKCkgeyB9Ci0KICAgICAvLyBGSVhNRTogYXBwZW5k KCkgc2hvdWxkIGJlIHByaXZhdGUsIGJ1dCBEb2N1bWVudFdyaXRlcjo6cmVwbGFjZURvY3VtZW50 IHVzZXMgaXQgZm9yIG5vdy4KICAgICAvLyBGSVhNRTogVGhpcyByZWFsbHkgc2hvdWxkIHRha2Ug YSBQYXNzT3duUHRyIHRvIHNpZ25pZnkgdGhhdCBpdCBleHBlY3RzIHRvIHRha2UKICAgICAvLyBv d25lcnNoaXAgb2YgdGhlIGJ1ZmZlci4gVGhlIHBhcnNlciBleHBlY3RzIHRoZSBQYXNzUmVmUHRy IHRvIGhvbGQgdGhlIG9ubHkgcmVmIG9mIHRoZSBTdHJpbmdJbXBsLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKaW5kZXggZTU5NGFlNzI2 YzBjOTRlNmY4NGZhY2UxZjM0ZDY0MjA5MzhmZjI3My4uYjY1MjU1MjM5ZWM0YjYzN2QwNDE3ZGY1 Mjk0ZTM0ZmM2ODQ0NzNiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIv SFRNTERvY3VtZW50UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I VE1MRG9jdW1lbnRQYXJzZXIuY3BwCkBAIC03MCw4ICs3MCw4IEBAIHN0YXRpYyBIVE1MVG9rZW5p emVyOjpTdGF0ZSB0b2tlbml6ZXJTdGF0ZUZvckNvbnRleHRFbGVtZW50KEVsZW1lbnQqIGNvbnRl eHRFbGVtCiBIVE1MRG9jdW1lbnRQYXJzZXI6OkhUTUxEb2N1bWVudFBhcnNlcihIVE1MRG9jdW1l bnQmIGRvY3VtZW50KQogICAgIDogU2NyaXB0YWJsZURvY3VtZW50UGFyc2VyKGRvY3VtZW50KQog ICAgICwgbV9vcHRpb25zKGRvY3VtZW50KQotICAgICwgbV90b2tlbihtX29wdGlvbnMudXNlVGhy ZWFkaW5nID8gbnVsbHB0ciA6IGFkb3B0UHRyKG5ldyBIVE1MVG9rZW4pKQotICAgICwgbV90b2tl bml6ZXIobV9vcHRpb25zLnVzZVRocmVhZGluZyA/IG51bGxwdHIgOiBIVE1MVG9rZW5pemVyOjpj cmVhdGUobV9vcHRpb25zKSkKKyAgICAsIG1fdG9rZW4oYWRvcHRQdHIobmV3IEhUTUxUb2tlbikp CisgICAgLCBtX3Rva2VuaXplcihIVE1MVG9rZW5pemVyOjpjcmVhdGUobV9vcHRpb25zKSkKICAg ICAsIG1fc2NyaXB0UnVubmVyKEhUTUxTY3JpcHRSdW5uZXI6OmNyZWF0ZShkb2N1bWVudCwgKnRo aXMpKQogICAgICwgbV90cmVlQnVpbGRlcihIVE1MVHJlZUJ1aWxkZXI6OmNyZWF0ZSgqdGhpcywg ZG9jdW1lbnQsIHBhcnNlckNvbnRlbnRQb2xpY3koKSwgbV9vcHRpb25zKSkKICAgICAsIG1fcGFy c2VyU2NoZWR1bGVyKEhUTUxQYXJzZXJTY2hlZHVsZXI6OmNyZWF0ZSgqdGhpcykpCkBAIC04MCwx MiArODAsMTIgQEAgSFRNTERvY3VtZW50UGFyc2VyOjpIVE1MRG9jdW1lbnRQYXJzZXIoSFRNTERv Y3VtZW50JiBkb2N1bWVudCkKICAgICAsIG1fd2Vha0ZhY3RvcnkodGhpcykKICNlbmRpZgogICAg ICwgbV9wcmVsb2FkZXIoYWRvcHRQdHIobmV3IEhUTUxSZXNvdXJjZVByZWxvYWRlcihkb2N1bWVu dCkpKQotICAgICwgbV9pc1Bpbm5lZFRvTWFpblRocmVhZChmYWxzZSkKICAgICAsIG1fZW5kV2Fz RGVsYXllZChmYWxzZSkKICAgICAsIG1faGF2ZUJhY2tncm91bmRQYXJzZXIoZmFsc2UpCiAgICAg LCBtX3B1bXBTZXNzaW9uTmVzdGluZ0xldmVsKDApCiB7Ci0gICAgQVNTRVJUKHNob3VsZFVzZVRo cmVhZGluZygpIHx8IChtX3Rva2VuICYmIG1fdG9rZW5pemVyKSk7CisgICAgQVNTRVJUKG1fdG9r ZW4pOworICAgIEFTU0VSVChtX3Rva2VuaXplcik7CiB9CiAKIC8vIEZJWE1FOiBNZW1iZXIgdmFy aWFibGVzIHNob3VsZCBiZSBncm91cGVkIGludG8gc2VsZi1pbml0aWFsaXppbmcgc3RydWN0cyB0 bwpAQCAtMTAwLDEyICsxMDAsMTAgQEAgSFRNTERvY3VtZW50UGFyc2VyOjpIVE1MRG9jdW1lbnRQ YXJzZXIoRG9jdW1lbnRGcmFnbWVudCYgZnJhZ21lbnQsIEVsZW1lbnQqIGNvbnQKICNpZiBFTkFC TEUoVEhSRUFERURfSFRNTF9QQVJTRVIpCiAgICAgLCBtX3dlYWtGYWN0b3J5KHRoaXMpCiAjZW5k aWYKLSAgICAsIG1faXNQaW5uZWRUb01haW5UaHJlYWQodHJ1ZSkKICAgICAsIG1fZW5kV2FzRGVs YXllZChmYWxzZSkKICAgICAsIG1faGF2ZUJhY2tncm91bmRQYXJzZXIoZmFsc2UpCiAgICAgLCBt X3B1bXBTZXNzaW9uTmVzdGluZ0xldmVsKDApCiB7Ci0gICAgQVNTRVJUKCFzaG91bGRVc2VUaHJl YWRpbmcoKSk7CiAgICAgYm9vbCByZXBvcnRFcnJvcnMgPSBmYWxzZTsgLy8gRm9yIG5vdyBkb2N1 bWVudCBmcmFnbWVudCBwYXJzaW5nIG5ldmVyIHJlcG9ydHMgZXJyb3JzLgogICAgIG1fdG9rZW5p emVyLT5zZXRTdGF0ZSh0b2tlbml6ZXJTdGF0ZUZvckNvbnRleHRFbGVtZW50KGNvbnRleHRFbGVt ZW50LCByZXBvcnRFcnJvcnMsIG1fb3B0aW9ucykpOwogICAgIG1feHNzQXVkaXRvci5pbml0Rm9y RnJhZ21lbnQoKTsKQEAgLTEyMCwyMCArMTE4LDYgQEAgSFRNTERvY3VtZW50UGFyc2VyOjp+SFRN TERvY3VtZW50UGFyc2VyKCkKICAgICBBU1NFUlQoIW1faGF2ZUJhY2tncm91bmRQYXJzZXIpOwog fQogCi0jaWYgRU5BQkxFKFRIUkVBREVEX0hUTUxfUEFSU0VSKQotdm9pZCBIVE1MRG9jdW1lbnRQ YXJzZXI6OnBpblRvTWFpblRocmVhZCgpCi17Ci0gICAgQVNTRVJUKCFtX2hhdmVCYWNrZ3JvdW5k UGFyc2VyKTsKLSAgICBBU1NFUlQoIW1faXNQaW5uZWRUb01haW5UaHJlYWQpOwotICAgIG1faXNQ aW5uZWRUb01haW5UaHJlYWQgPSB0cnVlOwotICAgIGlmICghbV90b2tlbml6ZXIpIHsKLSAgICAg ICAgQVNTRVJUKCFtX3Rva2VuKTsKLSAgICAgICAgbV90b2tlbiA9IGFkb3B0UHRyKG5ldyBIVE1M VG9rZW4pOwotICAgICAgICBtX3Rva2VuaXplciA9IEhUTUxUb2tlbml6ZXI6OmNyZWF0ZShtX29w dGlvbnMpOwotICAgIH0KLX0KLSNlbmRpZgotCiB2b2lkIEhUTUxEb2N1bWVudFBhcnNlcjo6ZGV0 YWNoKCkKIHsKICNpZiBFTkFCTEUoVEhSRUFERURfSFRNTF9QQVJTRVIpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oCmluZGV4IGE2NWUwYzg1NGUx MzQyNWIyODQ0Y2UzZjY0OGJmMzY3NzlkYzA4ZTguLjI3ZTk0NjFkYzhlZmMyZDc5ZjIwODcyN2Ix OTVkYjZhMzNhYTNmZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxEb2N1bWVudFBhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxE b2N1bWVudFBhcnNlci5oCkBAIC0xMTMsOSArMTEzLDYgQEAgcHJpdmF0ZToKICAgICB9CiAKICAg ICAvLyBEb2N1bWVudFBhcnNlcgotI2lmIEVOQUJMRShUSFJFQURFRF9IVE1MX1BBUlNFUikKLSAg ICB2aXJ0dWFsIHZvaWQgcGluVG9NYWluVGhyZWFkKCkgb3ZlcnJpZGU7Ci0jZW5kaWYKICAgICB2 aXJ0dWFsIHZvaWQgZGV0YWNoKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIGhhc0luc2Vy dGlvblBvaW50KCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIHByb2Nlc3NpbmdEYXRhKCkg Y29uc3Qgb3ZlcnJpZGU7CkBAIC0xMjksNyArMTI2LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFs IHZvaWQgd2F0Y2hGb3JMb2FkKENhY2hlZFJlc291cmNlKikgb3ZlcnJpZGU7CiAgICAgdmlydHVh bCB2b2lkIHN0b3BXYXRjaGluZ0ZvckxvYWQoQ2FjaGVkUmVzb3VyY2UqKSBvdmVycmlkZTsKICAg ICB2aXJ0dWFsIEhUTUxJbnB1dFN0cmVhbSYgaW5wdXRTdHJlYW0oKSBvdmVycmlkZSB7IHJldHVy biBtX2lucHV0OyB9Ci0gICAgdmlydHVhbCBib29sIGhhc1ByZWxvYWRTY2FubmVyKCkgY29uc3Qg b3ZlcnJpZGUgeyByZXR1cm4gbV9wcmVsb2FkU2Nhbm5lci5nZXQoKSAmJiAhc2hvdWxkVXNlVGhy ZWFkaW5nKCk7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaGFzUHJlbG9hZFNjYW5uZXIoKSBjb25zdCBv dmVycmlkZSB7IHJldHVybiBtX3ByZWxvYWRTY2FubmVyLmdldCgpOyB9CiAgICAgdmlydHVhbCB2 b2lkIGFwcGVuZEN1cnJlbnRJbnB1dFN0cmVhbVRvUHJlbG9hZFNjYW5uZXJBbmRTY2FuKCkgb3Zl cnJpZGU7CiAKICAgICAvLyBDYWNoZWRSZXNvdXJjZUNsaWVudApAQCAtMTY2LDggKzE2Myw2IEBA IHByaXZhdGU6CiAgICAgdm9pZCBhdHRlbXB0VG9SdW5EZWZlcnJlZFNjcmlwdHNBbmRFbmQoKTsK ICAgICB2b2lkIGVuZCgpOwogCi0gICAgYm9vbCBzaG91bGRVc2VUaHJlYWRpbmcoKSBjb25zdCB7 IHJldHVybiBtX29wdGlvbnMudXNlVGhyZWFkaW5nICYmICFtX2lzUGlubmVkVG9NYWluVGhyZWFk OyB9Ci0KICAgICBib29sIGlzUGFyc2luZ0ZyYWdtZW50KCkgY29uc3Q7CiAgICAgYm9vbCBpc1Nj aGVkdWxlZEZvclJlc3VtZSgpIGNvbnN0OwogICAgIGJvb2wgaW5QdW1wU2Vzc2lvbigpIGNvbnN0 IHsgcmV0dXJuIG1fcHVtcFNlc3Npb25OZXN0aW5nTGV2ZWwgPiAwOyB9CkBAIC0yMDAsNyArMTk1 LDYgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgIE93blB0cjxIVE1MUmVzb3VyY2VQcmVsb2FkZXI+ IG1fcHJlbG9hZGVyOwogCi0gICAgYm9vbCBtX2lzUGlubmVkVG9NYWluVGhyZWFkOwogICAgIGJv b2wgbV9lbmRXYXNEZWxheWVkOwogICAgIGJvb2wgbV9oYXZlQmFja2dyb3VuZFBhcnNlcjsKICAg ICB1bnNpZ25lZCBtX3B1bXBTZXNzaW9uTmVzdGluZ0xldmVsOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlck9wdGlvbnMuY3BwIGIvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlck9wdGlvbnMuY3BwCmluZGV4IGI4Y2Y1NGJkY2FiZTBj MmIwZTJkMjg0YTIyNzEwNThmYTVhZDMwNzUuLjAwMGQ0YjAyYjJlZjI3NWNmMjA1MDIxNTNmNmQ5 MDkxZGI4NzdmNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQ YXJzZXJPcHRpb25zLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFy c2VyT3B0aW9ucy5jcHAKQEAgLTM5LDcgKzM5LDYgQEAgSFRNTFBhcnNlck9wdGlvbnM6OkhUTUxQ YXJzZXJPcHRpb25zKCkKICAgICA6IHNjcmlwdEVuYWJsZWQoZmFsc2UpCiAgICAgLCBwbHVnaW5z RW5hYmxlZChmYWxzZSkKICAgICAsIHVzZVByZUhUTUw1UGFyc2VyUXVpcmtzKGZhbHNlKQotICAg ICwgdXNlVGhyZWFkaW5nKGZhbHNlKQogICAgICwgbWF4aW11bURPTVRyZWVEZXB0aChTZXR0aW5n czo6ZGVmYXVsdE1heGltdW1IVE1MUGFyc2VyRE9NVHJlZURlcHRoKQogewogfQpAQCAtNTIsMTQg KzUxLDYgQEAgSFRNTFBhcnNlck9wdGlvbnM6OkhUTUxQYXJzZXJPcHRpb25zKERvY3VtZW50JiBk b2N1bWVudCkKIAogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50LnNldHRpbmdzKCk7 CiAgICAgdXNlUHJlSFRNTDVQYXJzZXJRdWlya3MgPSBzZXR0aW5ncyAmJiBzZXR0aW5ncy0+dXNl UHJlSFRNTDVQYXJzZXJRdWlya3MoKTsKLSNpZiBFTkFCTEUoVEhSRUFERURfSFRNTF9QQVJTRVIp Ci0gICAgLy8gV2UgZm9yY2UgdGhlIG1haW4tdGhyZWFkIHBhcnNlciBmb3IgYWJvdXQ6Ymxhbmss IGphdmFzY3JpcHQ6IGFuZCBkYXRhOiB1cmxzIGZvciBjb21wYXRpYmlsaXR5Ci0gICAgLy8gd2l0 aCBoaXN0b3JpY2FsIHN5bmNocm9ub3VzIGxvYWRpbmcvcGFyc2luZyBiZWhhdmlvciBvZiB0aG9z ZSBzY2hlbWVzLgotICAgIHVzZVRocmVhZGluZyA9IHNldHRpbmdzICYmIHNldHRpbmdzLT50aHJl YWRlZEhUTUxQYXJzZXIoKSAmJiAhZG9jdW1lbnQtPnVybCgpLmlzQmxhbmtVUkwoKQotICAgICAg ICAmJiAoc2V0dGluZ3MtPnVzZVRocmVhZGVkSFRNTFBhcnNlckZvckRhdGFVUkxzKCkgfHwgIWRv Y3VtZW50LT51cmwoKS5wcm90b2NvbElzRGF0YSgpKTsKLSNlbHNlCi0gICAgdXNlVGhyZWFkaW5n ID0gZmFsc2U7Ci0jZW5kaWYKICAgICBtYXhpbXVtRE9NVHJlZURlcHRoID0gc2V0dGluZ3MgPyBz ZXR0aW5ncy0+bWF4aW11bUhUTUxQYXJzZXJET01UcmVlRGVwdGgoKSA6IFNldHRpbmdzOjpkZWZh dWx0TWF4aW11bUhUTUxQYXJzZXJET01UcmVlRGVwdGg7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJPcHRpb25zLmggYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9IVE1MUGFyc2VyT3B0aW9ucy5oCmluZGV4IDg4OThjMmQwMzFlMTZjODk1 OTBmMzQ0NjRiNmNiODYwNWJiMDVkNGUuLjFkNzljMmJlYmZlZDdkNzQ2N2Q2NzhlZjhlMDkzMjZl ODZlYWRhZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJz ZXJPcHRpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlck9w dGlvbnMuaApAQCAtMzgsNyArMzgsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBzY3JpcHRFbmFibGVk OwogICAgIGJvb2wgcGx1Z2luc0VuYWJsZWQ7CiAgICAgYm9vbCB1c2VQcmVIVE1MNVBhcnNlclF1 aXJrczsKLSAgICBib29sIHVzZVRocmVhZGluZzsKICAgICB1bnNpZ25lZCBtYXhpbXVtRE9NVHJl ZURlcHRoOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRN TFRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVp bGRlci5jcHAKaW5kZXggMWExYTBhYWViODNjY2VkZDJiODRlZGUyZGMxODU4OWQyZWYxOTEwOC4u MzQ2NTNlNzNkMGNmNWFiMTg1NWFmMDdjNmUwMjQ4ZGZjNzVlNDVkMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCkBAIC0yMjEyLDcgKzIyMTIs NyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyhBdG9taWNIVE1MVG9rZW4q IHRva2VuKQogICAgICAgICAgICAgICAgIC8vIHNlbGYtY2xvc2luZyBzY3JpcHQgdGFnIHdhcyBl bmNvdW50ZXJlZCBhbmQgcHJlLUhUTUw1IHBhcnNlcgogICAgICAgICAgICAgICAgIC8vIHF1aXJr cyBhcmUgZW5hYmxlZC4gV2UgbXVzdCBzZXQgdGhlIHRva2VuaXplcidzIHN0YXRlIHRvCiAgICAg ICAgICAgICAgICAgLy8gRGF0YVN0YXRlIGV4cGxpY2l0bHkgaWYgdGhlIHRva2VuaXplciBkaWRu J3QgaGF2ZSBhIGNoYW5jZSB0by4KLSAgICAgICAgICAgICAgICBBU1NFUlQobV9wYXJzZXIudG9r ZW5pemVyKCktPnN0YXRlKCkgPT0gSFRNTFRva2VuaXplcjo6RGF0YVN0YXRlIHx8IG1fb3B0aW9u cy51c2VQcmVIVE1MNVBhcnNlclF1aXJrcyB8fCBtX29wdGlvbnMudXNlVGhyZWFkaW5nKTsKKyAg ICAgICAgICAgICAgICBBU1NFUlQobV9wYXJzZXIudG9rZW5pemVyKCktPnN0YXRlKCkgPT0gSFRN TFRva2VuaXplcjo6RGF0YVN0YXRlIHx8IG1fb3B0aW9ucy51c2VQcmVIVE1MNVBhcnNlclF1aXJr cyk7CiAgICAgICAgICAgICAgICAgbV9wYXJzZXIudG9rZW5pemVyKCktPnNldFN0YXRlKEhUTUxU b2tlbml6ZXI6OkRhdGFTdGF0ZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50V3JpdGVyLmNwcAppbmRleCAzMGJmZTA1MTRk ZWE0OWRiMGYwYTZiNWFiMTZkOWMwZThiNjNlMjAwLi43NDJlYjk5MDczN2QwNjZmZTc2ODEzYzBh MTQ5ZDA3YTM4ZDk5ZGVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1l bnRXcml0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRlci5j cHAKQEAgLTgyLDEyICs4Miw4IEBAIHZvaWQgRG9jdW1lbnRXcml0ZXI6OnJlcGxhY2VEb2N1bWVu dChjb25zdCBTdHJpbmcmIHNvdXJjZSwgRG9jdW1lbnQqIG93bmVyRG9jdW1lCiAKICAgICAgICAg Ly8gRklYTUU6IFRoaXMgc2hvdWxkIGNhbGwgRG9jdW1lbnRQYXJzZXI6OmFwcGVuZEJ5dGVzIGlu c3RlYWQgb2YgYXBwZW5kCiAgICAgICAgIC8vIHRvIHN1cHBvcnQgUmF3RGF0YURvY3VtZW50UGFy c2Vycy4KLSAgICAgICAgaWYgKERvY3VtZW50UGFyc2VyKiBwYXJzZXIgPSBtX2ZyYW1lLT5kb2N1 bWVudCgpLT5wYXJzZXIoKSkgewotICAgICAgICAgICAgcGFyc2VyLT5waW5Ub01haW5UaHJlYWQo KTsKLSAgICAgICAgICAgIC8vIEJlY2F1c2Ugd2UncmUgcGlubmVkIHRvIHRoZSBtYWluIHRocmVh ZCB3ZSBkb24ndCBuZWVkIHRvIHdvcnJ5IGFib3V0Ci0gICAgICAgICAgICAvLyBwYXNzaW5nIG93 bmVyc2hpcCBvZiB0aGUgc291cmNlIHN0cmluZy4KKyAgICAgICAgaWYgKERvY3VtZW50UGFyc2Vy KiBwYXJzZXIgPSBtX2ZyYW1lLT5kb2N1bWVudCgpLT5wYXJzZXIoKSkKICAgICAgICAgICAgIHBh cnNlci0+YXBwZW5kKHNvdXJjZS5pbXBsKCkpOwotICAgICAgICB9CiAgICAgfQogCiAgICAgZW5k KCk7Cg==