136654 2014-09-08 18:27:04 -0700 Clean up some ENABLE(PICTURE_SIZES) stuff, don't change function signatures inside #ifdefs 2014-09-19 01:47:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 136942 1 simon.fraser simon.fraser commit-queue esprehn+autocc gyuyoung.kim koivisto simon.fraser yoav oldest_to_newest 1034018 0 simon.fraser 2014-09-08 18:27:04 -0700 Clean up some ENABLE(PICTURE_SIZES) stuff, don't change function signatures inside #ifdefs 1034019 1 237828 simon.fraser 2014-09-08 18:28:36 -0700 Created attachment 237828 Patch 1034033 2 237828 darin 2014-09-08 19:41:51 -0700 Comment on attachment 237828 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237828&action=review > Source/WebCore/html/parser/HTMLDocumentParser.cpp:329 > + m_preloadScanner->scan(m_preloader.get(), document()->baseElementURL(), document()->renderView(), document()->frame()); Seems bizarre to pass both a RenderView* and a Frame*. Why not just pass a Document& instead? It seems to me that SourceSizeList::parseSizesAttribute should also just take a Document&. And the same for every level in between. 1034066 3 simon.fraser 2014-09-08 23:01:21 -0700 Yes, I thought the same thing. I'll do that. 1034182 4 237862 simon.fraser 2014-09-09 15:13:34 -0700 Created attachment 237862 Patch 1034309 5 237862 darin 2014-09-10 08:28:40 -0700 Comment on attachment 237862 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237862&action=review > Source/WebCore/html/parser/HTMLPreloadScanner.cpp:102 > for (HTMLToken::AttributeList::const_iterator iter = attributes.begin(); iter != attributes.end(); ++iter) { Opportunity for new-style for loop. > Source/WebCore/html/parser/HTMLPreloadScanner.cpp:112 > + sourceSize = SourceSizeList::parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame()); I suggest pushing down Document& even further, and changing the interface to SourceSizeList to take Document&. > Source/WebCore/html/parser/HTMLPreloadScanner.h:50 > + void scan(const HTMLToken&, PreloadRequestStream& requests, Document&); I don’t think the argument name “requests” adds anything here. > Source/WebCore/html/parser/HTMLPreloadScanner.h:130 > + void scan(HTMLResourcePreloader*, Document&); Should be HTMLResourcePreloader&. 1034321 6 237862 commit-queue 2014-09-10 08:54:47 -0700 Comment on attachment 237862 Patch Clearing flags on attachment: 237862 Committed r173464: <http://trac.webkit.org/changeset/173464> 1034322 7 commit-queue 2014-09-10 08:54:51 -0700 All reviewed patches have been landed. Closing bug. 237828 2014-09-08 18:28:36 -0700 2014-09-08 23:01:32 -0700 Patch bug-136654-20140908182831.patch text/plain 11764 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYxOWI4ZDU0Y2VmOWY0 ZDA5YjEyNjBjZDNkZmI0NTQ0N2Y1MjNmNy4uNWU4MmUwOTI4NzY1MDZmNTM0Yzc3M2E5NjFjMGZl YmEzN2VkYWY5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA5LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIHNv bWUgRU5BQkxFKFBJQ1RVUkVfU0laRVMpIHN0dWZmLCBkb24ndCBjaGFuZ2UgZnVuY3Rpb24gc2ln bmF0dXJlcyBpbnNpZGUgI2lmZGVmcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM2NjU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkaW5nIHBhcmFtZXRlcnMgaW5zaWRlIGFuICNpZmRlZiBtYWtlcyBm b3IgdW5yZWFkYWJsZSBjb2RlLCBzbyByZW1vdmUgc29tZQorICAgICAgICAjaWYgRU5BQkxFKFBJ Q1RVUkVfU0laRVMpIHJlbGF0ZWQgdG8gdGhlIHByZWxvYWQgc2Nhbm5lci4KKyAgICAgICAgCisg ICAgICAgIEFsc28gZml4IGEgY291cGxlIG9mIHVzZXMgb2YgI2lmIEVOQUJMRV9QSUNUVVJFX1NJ WkVTLgorCisgICAgICAgICogaHRtbC9IVE1MSW1hZ2VFbGVtZW50Lmg6CisgICAgICAgICogaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxE b2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9j dW1lbnRQYXJzZXI6Omluc2VydCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJz ZXI6OmFwcGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OmFwcGVu ZEN1cnJlbnRJbnB1dFN0cmVhbVRvUHJlbG9hZFNjYW5uZXJBbmRTY2FuKToKKyAgICAgICAgKiBo dG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VG9r ZW5QcmVsb2FkU2Nhbm5lcjo6c2Nhbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUHJlbG9hZFNj YW5uZXI6OnNjYW4pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5o OgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxTcmNzZXRQYXJzZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6cGlja0Jlc3RJbWFnZUNhbmRpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpiZXN0 Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1M U3Jjc2V0UGFyc2VyLmg6CisKIDIwMTQtMDktMDggIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWx3YXlzIHVwZGF0ZSB0aGUgcmVmZXJyZXIgaGVhZGVy IGluIENhY2hlZFJlc291cmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJ bWFnZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCmlu ZGV4IDdjZmJmNzBlY2IyNGQ2ZDIzMWI5MmMxZjQwNzdjZWM1Mjk2MjFhYmEuLjMyNDk0OGIxYjE3 YmNlY2M4NmVlNjg3MjUyNjFhN2YwMzhiM2Q2NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElt YWdlRWxlbWVudC5oCkBAIC00OCw3ICs0OCw3IEBAIHB1YmxpYzoKIAogICAgIGludCBuYXR1cmFs V2lkdGgoKSBjb25zdDsKICAgICBpbnQgbmF0dXJhbEhlaWdodCgpIGNvbnN0OwotI2lmIEVOQUJM RV9QSUNUVVJFX1NJWkVTCisjaWYgRU5BQkxFKFBJQ1RVUkVfU0laRVMpCiAgICAgY29uc3QgQXRv bWljU3RyaW5nJiBjdXJyZW50U3JjKCkgY29uc3QgeyByZXR1cm4gbV9jdXJyZW50U3JjOyB9CiAj ZW5kaWYKIApAQCAtMTI3LDcgKzEyNyw3IEBAIHByaXZhdGU6CiAgICAgSFRNTEZvcm1FbGVtZW50 KiBtX2Zvcm07CiAgICAgQ29tcG9zaXRlT3BlcmF0b3IgbV9jb21wb3NpdGVPcGVyYXRvcjsKICAg ICBBdG9taWNTdHJpbmcgbV9iZXN0Rml0SW1hZ2VVUkw7Ci0jaWYgRU5BQkxFX1BJQ1RVUkVfU0la RVMKKyNpZiBFTkFCTEUoUElDVFVSRV9TSVpFUykKICAgICBBdG9taWNTdHJpbmcgbV9jdXJyZW50 U3JjOwogI2VuZGlmCiAgICAgQXRvbWljU3RyaW5nIG1fbG93ZXJjYXNlZFVzZW1hcDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4 IDc0ODNmMTM0ZTE2MDhlZjg0NjU3ZWUxYWY1MTc3NTBiMzYyYjFiMTAuLmVhOGJlMjhiYTk4YTcz MmFmODg2MTk0MmM1ZmVhMTNlYjI1Y2U1ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtMzI2LDExICszMjYsNyBAQCB2b2lk IEhUTUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcihTeW5jaHJvbm91c01vZGUgbW9kZSkK ICAgICAgICAgICAgIG1fcHJlbG9hZFNjYW5uZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEhUTUxQcmVs b2FkU2Nhbm5lcj4obV9vcHRpb25zLCBkb2N1bWVudCgpLT51cmwoKSwgZG9jdW1lbnQoKS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgICAgICAgICBtX3ByZWxvYWRTY2FubmVyLT5hcHBlbmRU b0VuZChtX2lucHV0LmN1cnJlbnQoKSk7CiAgICAgICAgIH0KLSAgICAgICAgbV9wcmVsb2FkU2Nh bm5lci0+c2NhbihtX3ByZWxvYWRlci5nZXQoKSwgZG9jdW1lbnQoKS0+YmFzZUVsZW1lbnRVUkwo KQotI2lmIEVOQUJMRShQSUNUVVJFX1NJWkVTKQotICAgICAgICAgICAgLCBkb2N1bWVudCgpLT5y ZW5kZXJWaWV3KCksIGRvY3VtZW50KCktPmZyYW1lKCkKLSNlbmRpZgotICAgICAgICApOworICAg ICAgICBtX3ByZWxvYWRTY2FubmVyLT5zY2FuKG1fcHJlbG9hZGVyLmdldCgpLCBkb2N1bWVudCgp LT5iYXNlRWxlbWVudFVSTCgpLCBkb2N1bWVudCgpLT5yZW5kZXJWaWV3KCksIGRvY3VtZW50KCkt PmZyYW1lKCkpOwogICAgIH0KIAogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkV3Jp dGVIVE1MKGNvb2tpZSwgbV9pbnB1dC5jdXJyZW50KCkuY3VycmVudExpbmUoKS56ZXJvQmFzZWRJ bnQoKSk7CkBAIC0zOTIsMTEgKzM4OCw3IEBAIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjppbnNl cnQoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UpCiAgICAgICAgICAgICBtX2luc2VydGlv blByZWxvYWRTY2FubmVyID0gc3RkOjptYWtlX3VuaXF1ZTxIVE1MUHJlbG9hZFNjYW5uZXI+KG1f b3B0aW9ucywgZG9jdW1lbnQoKS0+dXJsKCksIGRvY3VtZW50KCktPmRldmljZVNjYWxlRmFjdG9y KCkpOwogICAgICAgICB9CiAgICAgICAgIG1faW5zZXJ0aW9uUHJlbG9hZFNjYW5uZXItPmFwcGVu ZFRvRW5kKHNvdXJjZSk7Ci0gICAgICAgIG1faW5zZXJ0aW9uUHJlbG9hZFNjYW5uZXItPnNjYW4o bV9wcmVsb2FkZXIuZ2V0KCksIGRvY3VtZW50KCktPmJhc2VFbGVtZW50VVJMKCkKLSNpZiBFTkFC TEUoUElDVFVSRV9TSVpFUykKLSAgICAgICAgICAgICwgZG9jdW1lbnQoKS0+cmVuZGVyVmlldygp LCBkb2N1bWVudCgpLT5mcmFtZSgpCi0jZW5kaWYKLSAgICAgICAgKTsKKyAgICAgICAgbV9pbnNl cnRpb25QcmVsb2FkU2Nhbm5lci0+c2NhbihtX3ByZWxvYWRlci5nZXQoKSwgZG9jdW1lbnQoKS0+ YmFzZUVsZW1lbnRVUkwoKSwgZG9jdW1lbnQoKS0+cmVuZGVyVmlldygpLCBkb2N1bWVudCgpLT5m cmFtZSgpKTsKICAgICB9CiAKICAgICBlbmRJZkRlbGF5ZWQoKTsKQEAgLTQyMCwxMSArNDEyLDcg QEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6OmFwcGVuZChQYXNzUmVmUHRyPFN0cmluZ0ltcGw+ IGlucHV0U291cmNlKQogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbV9wcmVsb2FkU2Nh bm5lci0+YXBwZW5kVG9FbmQoc291cmNlKTsKICAgICAgICAgICAgIGlmIChpc1dhaXRpbmdGb3JT Y3JpcHRzKCkpCi0gICAgICAgICAgICAgICAgbV9wcmVsb2FkU2Nhbm5lci0+c2NhbihtX3ByZWxv YWRlci5nZXQoKSwgZG9jdW1lbnQoKS0+YmFzZUVsZW1lbnRVUkwoKQotI2lmIEVOQUJMRShQSUNU VVJFX1NJWkVTKQotICAgICAgICAgICAgICAgICAgICAsIGRvY3VtZW50KCktPnJlbmRlclZpZXco KSwgZG9jdW1lbnQoKS0+ZnJhbWUoKQotI2VuZGlmCi0gICAgICAgICAgICAgICAgKTsKKyAgICAg ICAgICAgICAgICBtX3ByZWxvYWRTY2FubmVyLT5zY2FuKG1fcHJlbG9hZGVyLmdldCgpLCBkb2N1 bWVudCgpLT5iYXNlRWxlbWVudFVSTCgpLCBkb2N1bWVudCgpLT5yZW5kZXJWaWV3KCksIGRvY3Vt ZW50KCktPmZyYW1lKCkpOwogICAgICAgICB9CiAgICAgfQogCkBAIC01NjIsMTEgKzU1MCw3IEBA IHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjphcHBlbmRDdXJyZW50SW5wdXRTdHJlYW1Ub1ByZWxv YWRTY2FubmVyQW5kU2NhbigpCiB7CiAgICAgQVNTRVJUKG1fcHJlbG9hZFNjYW5uZXIpOwogICAg IG1fcHJlbG9hZFNjYW5uZXItPmFwcGVuZFRvRW5kKG1faW5wdXQuY3VycmVudCgpKTsKLSAgICBt X3ByZWxvYWRTY2FubmVyLT5zY2FuKG1fcHJlbG9hZGVyLmdldCgpLCBkb2N1bWVudCgpLT5iYXNl RWxlbWVudFVSTCgpCi0jaWYgRU5BQkxFKFBJQ1RVUkVfU0laRVMpCi0gICAgICAgICwgZG9jdW1l bnQoKS0+cmVuZGVyVmlldygpLCBkb2N1bWVudCgpLT5mcmFtZSgpCi0jZW5kaWYKLSAgICApOwor ICAgIG1fcHJlbG9hZFNjYW5uZXItPnNjYW4obV9wcmVsb2FkZXIuZ2V0KCksIGRvY3VtZW50KCkt PmJhc2VFbGVtZW50VVJMKCksIGRvY3VtZW50KCktPnJlbmRlclZpZXcoKSwgZG9jdW1lbnQoKS0+ ZnJhbWUoKSk7CiB9CiAKIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpub3RpZnlGaW5pc2hlZChD YWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcAppbmRleCA1NjZlYTYyZTEzNTgzMGYxOGFl NzBhNzlmYmE4YjljNjk3NTk2MGIwLi4wMWM1ZDVlZGUyNGM1MTQ4MjEyNWU1MzVjZGVlMzYxZTgy MjkzMDAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUHJlbG9h ZFNjYW5uZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2Fk U2Nhbm5lci5jcHAKQEAgLTI3OSwxMSArMjc5LDcgQEAgdm9pZCBUb2tlblByZWxvYWRTY2FubmVy OjpyZXdpbmRUbyhUb2tlblByZWxvYWRTY2FubmVyQ2hlY2twb2ludCBjaGVja3BvaW50SW5kZXgK ICAgICBtX2NoZWNrcG9pbnRzLmNsZWFyKCk7CiB9CiAKLXZvaWQgVG9rZW5QcmVsb2FkU2Nhbm5l cjo6c2Nhbihjb25zdCBIVE1MVG9rZW4mIHRva2VuLCBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPFBy ZWxvYWRSZXF1ZXN0Pj4mIHJlcXVlc3RzCi0jaWYgRU5BQkxFKFBJQ1RVUkVfU0laRVMpCi0gICAg ICAgICwgUmVuZGVyVmlldyogdmlldywgRnJhbWUqIGZyYW1lCi0jZW5kaWYKLSAgICAgICAgKQor dm9pZCBUb2tlblByZWxvYWRTY2FubmVyOjpzY2FuKGNvbnN0IEhUTUxUb2tlbiYgdG9rZW4sIFZl Y3RvcjxzdGQ6OnVuaXF1ZV9wdHI8UHJlbG9hZFJlcXVlc3Q+PiYgcmVxdWVzdHMsIFJlbmRlclZp ZXcqIHZpZXcsIEZyYW1lKiBmcmFtZSkKIHsKICAgICBzd2l0Y2ggKHRva2VuLnR5cGUoKSkgewog ICAgIGNhc2UgSFRNTFRva2VuOjpDaGFyYWN0ZXI6CkBAIC0zMzQsMTEgKzMzMCw3IEBAIHZvaWQg VG9rZW5QcmVsb2FkU2Nhbm5lcjo6c2Nhbihjb25zdCBIVE1MVG9rZW4mIHRva2VuLCBWZWN0b3I8 c3RkOjp1bmlxdWVfcHRyPFByCiAgICAgICAgIH0KIAogICAgICAgICBTdGFydFRhZ1NjYW5uZXIg c2Nhbm5lcih0YWdJZCwgbV9kZXZpY2VTY2FsZUZhY3Rvcik7Ci0gICAgICAgIHNjYW5uZXIucHJv Y2Vzc0F0dHJpYnV0ZXModG9rZW4uYXR0cmlidXRlcygpCi0jaWYgRU5BQkxFKFBJQ1RVUkVfU0la RVMpCi0gICAgICAgICAgICAsIHZpZXcsIGZyYW1lCi0jZW5kaWYKLSAgICAgICAgICAgICk7Cisg ICAgICAgIHNjYW5uZXIucHJvY2Vzc0F0dHJpYnV0ZXModG9rZW4uYXR0cmlidXRlcygpLCB2aWV3 LCBmcmFtZSk7CiAgICAgICAgIGlmIChhdXRvIHJlcXVlc3QgPSBzY2FubmVyLmNyZWF0ZVByZWxv YWRSZXF1ZXN0KG1fcHJlZGljdGVkQmFzZUVsZW1lbnRVUkwpKQogICAgICAgICAgICAgcmVxdWVz dHMuYXBwZW5kKFdURjo6bW92ZShyZXF1ZXN0KSk7CiAgICAgICAgIHJldHVybjsKQEAgLTM3Miwx MSArMzY0LDcgQEAgdm9pZCBIVE1MUHJlbG9hZFNjYW5uZXI6OmFwcGVuZFRvRW5kKGNvbnN0IFNl Z21lbnRlZFN0cmluZyYgc291cmNlKQogICAgIG1fc291cmNlLmFwcGVuZChzb3VyY2UpOwogfQog Ci12b2lkIEhUTUxQcmVsb2FkU2Nhbm5lcjo6c2NhbihIVE1MUmVzb3VyY2VQcmVsb2FkZXIqIHBy ZWxvYWRlciwgY29uc3QgVVJMJiBzdGFydGluZ0Jhc2VFbGVtZW50VVJMCi0jaWYgRU5BQkxFKFBJ Q1RVUkVfU0laRVMpCi0gICAgICAgICwgUmVuZGVyVmlldyogdmlldywgRnJhbWUqIGZyYW1lCi0j ZW5kaWYKLSAgICAgICAgKQordm9pZCBIVE1MUHJlbG9hZFNjYW5uZXI6OnNjYW4oSFRNTFJlc291 cmNlUHJlbG9hZGVyKiBwcmVsb2FkZXIsIGNvbnN0IFVSTCYgc3RhcnRpbmdCYXNlRWxlbWVudFVS TCwgUmVuZGVyVmlldyogdmlldywgRnJhbWUqIGZyYW1lKQogewogICAgIEFTU0VSVChpc01haW5U aHJlYWQoKSk7IC8vIEhUTUxUb2tlbml6ZXI6OnVwZGF0ZVN0YXRlRm9yIG9ubHkgd29ya3Mgb24g dGhlIG1haW4gdGhyZWFkLgogCkBAIC0zODksMTEgKzM3Nyw3IEBAIHZvaWQgSFRNTFByZWxvYWRT Y2FubmVyOjpzY2FuKEhUTUxSZXNvdXJjZVByZWxvYWRlciogcHJlbG9hZGVyLCBjb25zdCBVUkwm IHN0YXJ0CiAgICAgd2hpbGUgKG1fdG9rZW5pemVyLT5uZXh0VG9rZW4obV9zb3VyY2UsIG1fdG9r ZW4pKSB7CiAgICAgICAgIGlmIChtX3Rva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW46OlN0YXJ0VGFn KQogICAgICAgICAgICAgbV90b2tlbml6ZXItPnVwZGF0ZVN0YXRlRm9yKEF0b21pY1N0cmluZyht X3Rva2VuLm5hbWUoKSkpOwotICAgICAgICBtX3NjYW5uZXIuc2NhbihtX3Rva2VuLCByZXF1ZXN0 cwotI2lmIEVOQUJMRShQSUNUVVJFX1NJWkVTKQotICAgICAgICAgICAgLCB2aWV3LCBmcmFtZQot I2VuZGlmCi0gICAgICAgICAgICApOworICAgICAgICBtX3NjYW5uZXIuc2NhbihtX3Rva2VuLCBy ZXF1ZXN0cywgdmlldywgZnJhbWUpOwogICAgICAgICBtX3Rva2VuLmNsZWFyKCk7CiAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5u ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5oCmlu ZGV4IGI2N2E1MWEwNjJjZDAxZjAyOTUxYjNiZDEwMjhlYTA0NDZmMDRkYmIuLjQwNDY3YTJhNjNh MDM1MzQ0NDMwM2VhOTczYjRiODFkNTExZjExNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5oCkBAIC00NywxMSArNDcsNyBAQCBwdWJsaWM6 CiAgICAgZXhwbGljaXQgVG9rZW5QcmVsb2FkU2Nhbm5lcihjb25zdCBVUkwmIGRvY3VtZW50VVJM LCBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9IDEuMCk7CiAgICAgflRva2VuUHJlbG9hZFNjYW5u ZXIoKTsKIAotICAgIHZvaWQgc2Nhbihjb25zdCBIVE1MVG9rZW4mLCBQcmVsb2FkUmVxdWVzdFN0 cmVhbSYgcmVxdWVzdHMKLSNpZiBFTkFCTEVfUElDVFVSRV9TSVpFUwotICAgICAgICAsIFJlbmRl clZpZXcqLCBGcmFtZSoKLSNlbmRpZgotICAgICAgICApOworICAgIHZvaWQgc2Nhbihjb25zdCBI VE1MVG9rZW4mLCBQcmVsb2FkUmVxdWVzdFN0cmVhbSYgcmVxdWVzdHMsIFJlbmRlclZpZXcqLCBG cmFtZSopOwogCiAgICAgdm9pZCBzZXRQcmVkaWN0ZWRCYXNlRWxlbWVudFVSTChjb25zdCBVUkwm IHVybCkgeyBtX3ByZWRpY3RlZEJhc2VFbGVtZW50VVJMID0gdXJsOyB9CiAKQEAgLTEzMSwxMSAr MTI3LDcgQEAgcHVibGljOgogICAgIH5IVE1MUHJlbG9hZFNjYW5uZXIoKTsKIAogICAgIHZvaWQg YXBwZW5kVG9FbmQoY29uc3QgU2VnbWVudGVkU3RyaW5nJik7Ci0gICAgdm9pZCBzY2FuKEhUTUxS ZXNvdXJjZVByZWxvYWRlciosIGNvbnN0IFVSTCYgZG9jdW1lbnRCYXNlRWxlbWVudFVSTAotI2lm IEVOQUJMRV9QSUNUVVJFX1NJWkVTCi0gICAgICAgICwgUmVuZGVyVmlldyosIEZyYW1lKgotI2Vu ZGlmCi0gICAgICAgICk7CisgICAgdm9pZCBzY2FuKEhUTUxSZXNvdXJjZVByZWxvYWRlciosIGNv bnN0IFVSTCYgZG9jdW1lbnRCYXNlRWxlbWVudFVSTCwgUmVuZGVyVmlldyosIEZyYW1lKik7CiAK IHByaXZhdGU6CiAgICAgVG9rZW5QcmVsb2FkU2Nhbm5lciBtX3NjYW5uZXI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MU3Jjc2V0UGFyc2VyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxTcmNzZXRQYXJzZXIuY3BwCmluZGV4IGYyZjFhNWYw MWMwNWVmYWRiNWVlZTRhYzUwMTQ3YzBlMGZjNjJkYjIuLmI1YWNlZmE1Yzk2ZjZhMGQ3OWUyOGIz YzU5MTY5ZDc0YjY0ZjlkMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2Vy L0hUTUxTcmNzZXRQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxTcmNzZXRQYXJzZXIuY3BwCkBAIC0yMjksMTIgKzIyOSwxMiBAQCBWZWN0b3I8SW1hZ2VDYW5k aWRhdGU+IHBhcnNlSW1hZ2VDYW5kaWRhdGVzRnJvbVNyY3NldEF0dHJpYnV0ZShTdHJpbmdWaWV3 IGF0dHJpYgogICAgICAgICByZXR1cm4gcGFyc2VJbWFnZUNhbmRpZGF0ZXNGcm9tU3Jjc2V0QXR0 cmlidXRlPFVDaGFyPihhdHRyaWJ1dGUuY2hhcmFjdGVyczE2KCksIGF0dHJpYnV0ZS5sZW5ndGgo KSk7CiB9CiAKLXN0YXRpYyBJbWFnZUNhbmRpZGF0ZSBwaWNrQmVzdEltYWdlQ2FuZGlkYXRlKGZs b2F0IGRldmljZVNjYWxlRmFjdG9yLCBWZWN0b3I8SW1hZ2VDYW5kaWRhdGU+JiBpbWFnZUNhbmRp ZGF0ZXMKLSNpZiBFTkFCTEUoUElDVFVSRV9TSVpFUykKLSAgICAsIHVuc2lnbmVkIHNvdXJjZVNp emUKLSNlbmRpZgotICAgICkKK3N0YXRpYyBJbWFnZUNhbmRpZGF0ZSBwaWNrQmVzdEltYWdlQ2Fu ZGlkYXRlKGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBWZWN0b3I8SW1hZ2VDYW5kaWRhdGU+JiBp bWFnZUNhbmRpZGF0ZXMsIHVuc2lnbmVkIHNvdXJjZVNpemUpCiB7CisjaWYgIUVOQUJMRShQSUNU VVJFX1NJWkVTKQorICAgIFVOVVNFRF9QQVJBTShzb3VyY2VTaXplKTsKKyNlbmRpZgorCiAgICAg Ym9vbCBpZ25vcmVTcmMgPSBmYWxzZTsKICAgICBpZiAoaW1hZ2VDYW5kaWRhdGVzLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuIEltYWdlQ2FuZGlkYXRlKCk7CkBAIC0yNzQsMTEgKzI3NCw3IEBA IHN0YXRpYyBJbWFnZUNhbmRpZGF0ZSBwaWNrQmVzdEltYWdlQ2FuZGlkYXRlKGZsb2F0IGRldmlj ZVNjYWxlRmFjdG9yLCBWZWN0b3I8SW1hCiAgICAgcmV0dXJuIGltYWdlQ2FuZGlkYXRlc1t3aW5u ZXJdOwogfQogCi1JbWFnZUNhbmRpZGF0ZSBiZXN0Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVz KGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBjb25zdCBBdG9taWNTdHJpbmcmIHNyY0F0dHJpYnV0 ZSwgY29uc3QgQXRvbWljU3RyaW5nJiBzcmNzZXRBdHRyaWJ1dGUKLSNpZiBFTkFCTEUoUElDVFVS RV9TSVpFUykKLSAgICAsIHVuc2lnbmVkIHNvdXJjZVNpemUKLSNlbmRpZgotICAgICkKK0ltYWdl Q2FuZGlkYXRlIGJlc3RGaXRTb3VyY2VGb3JJbWFnZUF0dHJpYnV0ZXMoZmxvYXQgZGV2aWNlU2Nh bGVGYWN0b3IsIGNvbnN0IEF0b21pY1N0cmluZyYgc3JjQXR0cmlidXRlLCBjb25zdCBBdG9taWNT dHJpbmcmIHNyY3NldEF0dHJpYnV0ZSwgdW5zaWduZWQgc291cmNlU2l6ZSkKIHsKICAgICBpZiAo c3Jjc2V0QXR0cmlidXRlLmlzTnVsbCgpKSB7CiAgICAgICAgIGlmIChzcmNBdHRyaWJ1dGUuaXNO dWxsKCkpCkBAIC0yOTEsMTEgKzI4Nyw3IEBAIEltYWdlQ2FuZGlkYXRlIGJlc3RGaXRTb3VyY2VG b3JJbWFnZUF0dHJpYnV0ZXMoZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IsIGNvbnN0IEF0CiAgICAg aWYgKCFzcmNBdHRyaWJ1dGUuaXNFbXB0eSgpKQogICAgICAgICBpbWFnZUNhbmRpZGF0ZXMuYXBw ZW5kKEltYWdlQ2FuZGlkYXRlKFN0cmluZ1ZpZXcoc3JjQXR0cmlidXRlKSwgRGVzY3JpcHRvclBh cnNpbmdSZXN1bHQoKSwgSW1hZ2VDYW5kaWRhdGU6OlNyY09yaWdpbikpOwogCi0gICAgcmV0dXJu IHBpY2tCZXN0SW1hZ2VDYW5kaWRhdGUoZGV2aWNlU2NhbGVGYWN0b3IsIGltYWdlQ2FuZGlkYXRl cwotI2lmIEVOQUJMRShQSUNUVVJFX1NJWkVTKQotICAgICAgICAsIHNvdXJjZVNpemUKLSNlbmRp ZgotICAgICAgICApOworICAgIHJldHVybiBwaWNrQmVzdEltYWdlQ2FuZGlkYXRlKGRldmljZVNj YWxlRmFjdG9yLCBpbWFnZUNhbmRpZGF0ZXMsIHNvdXJjZVNpemUpOwogfQogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1M U3Jjc2V0UGFyc2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MU3Jjc2V0UGFy c2VyLmgKaW5kZXggN2I2ZWRhZmM4OWEzYjJmOGExMjU5M2ExMzA4N2Y4ZTg3ZWUxYjc4NS4uZGY5 NDg2ZGFlZDA0MDMyYjYzZmI4YmFjOGQ2ZGU5MWFkMWM0NGExMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFNyY3NldFBhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0hUTUxTcmNzZXRQYXJzZXIuaApAQCAtOTgsMTEgKzk4LDcgQEAgc3Ry dWN0IEltYWdlQ2FuZGlkYXRlIHsKICAgICBPcmlnaW5BdHRyaWJ1dGUgb3JpZ2luQXR0cmlidXRl OwogfTsKIAotSW1hZ2VDYW5kaWRhdGUgYmVzdEZpdFNvdXJjZUZvckltYWdlQXR0cmlidXRlcyhm bG9hdCBkZXZpY2VTY2FsZUZhY3RvciwgY29uc3QgQXRvbWljU3RyaW5nJiBzcmNBdHRyaWJ1dGUs IGNvbnN0IEF0b21pY1N0cmluZyYgc3Jjc2V0QXR0cmlidXRlCi0jaWYgRU5BQkxFKFBJQ1RVUkVf U0laRVMpCi0gICAgLCB1bnNpZ25lZCBzb3VyY2VTaXplCi0jZW5kaWYKLSAgICApOworSW1hZ2VD YW5kaWRhdGUgYmVzdEZpdFNvdXJjZUZvckltYWdlQXR0cmlidXRlcyhmbG9hdCBkZXZpY2VTY2Fs ZUZhY3RvciwgY29uc3QgQXRvbWljU3RyaW5nJiBzcmNBdHRyaWJ1dGUsIGNvbnN0IEF0b21pY1N0 cmluZyYgc3Jjc2V0QXR0cmlidXRlLCB1bnNpZ25lZCBzb3VyY2VTaXplKTsKIAogVmVjdG9yPElt YWdlQ2FuZGlkYXRlPiBwYXJzZUltYWdlQ2FuZGlkYXRlc0Zyb21TcmNzZXRBdHRyaWJ1dGUoU3Ry aW5nVmlldyBhdHRyaWJ1dGUpOwogCg== 237862 2014-09-09 15:13:34 -0700 2014-09-10 08:54:47 -0700 Patch bug-136654-20140909151329.patch text/plain 13227 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYxOWI4ZDU0Y2VmOWY0 ZDA5YjEyNjBjZDNkZmI0NTQ0N2Y1MjNmNy4uYjI0NTQyNDllOTE3NWNhODQ4MGZhZWM2NGJkOTc4 NWY2YWQ5ZmYwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTA5LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIHNv bWUgRU5BQkxFKFBJQ1RVUkVfU0laRVMpIHN0dWZmLCBkb24ndCBjaGFuZ2UgZnVuY3Rpb24gc2ln bmF0dXJlcyBpbnNpZGUgI2lmZGVmcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM2NjU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkaW5nIHBhcmFtZXRlcnMgaW5zaWRlIGFuICNpZmRlZiBtYWtlcyBm b3IgdW5yZWFkYWJsZSBjb2RlLCBzbyByZW1vdmUgc29tZQorICAgICAgICAjaWYgRU5BQkxFKFBJ Q1RVUkVfU0laRVMpIHJlbGF0ZWQgdG8gdGhlIHByZWxvYWQgc2Nhbm5lciBhbmQgYWx3YXlzIHBh c3MgdGhlIGFyZ3VtZW50cy4KKyAgICAgICAgUmVkdWNlZCB0aGUgYXJndW1lbnQgY291bnQgb24g c29tZSBmdW5jdGlvbnMgYnkganVzdCBwYXNzaW5nIGEgRG9jdW1lbnQmLiAKKyAgICAgICAgCisg ICAgICAgIEFsc28gZml4IGEgY291cGxlIG9mIHVzZXMgb2YgI2lmIEVOQUJMRV9QSUNUVVJFX1NJ WkVTLgorCisgICAgICAgICogaHRtbC9IVE1MSW1hZ2VFbGVtZW50Lmg6CisgICAgICAgICogaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxE b2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9j dW1lbnRQYXJzZXI6Omluc2VydCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJz ZXI6OmFwcGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OmFwcGVu ZEN1cnJlbnRJbnB1dFN0cmVhbVRvUHJlbG9hZFNjYW5uZXJBbmRTY2FuKToKKyAgICAgICAgKiBo dG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VG9r ZW5QcmVsb2FkU2Nhbm5lcjo6c2Nhbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUHJlbG9hZFNj YW5uZXI6OnNjYW4pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5o OgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxTcmNzZXRQYXJzZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6cGlja0Jlc3RJbWFnZUNhbmRpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpiZXN0 Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1M U3Jjc2V0UGFyc2VyLmg6CisKIDIwMTQtMDktMDggIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWx3YXlzIHVwZGF0ZSB0aGUgcmVmZXJyZXIgaGVhZGVy IGluIENhY2hlZFJlc291cmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJ bWFnZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCmlu ZGV4IDdjZmJmNzBlY2IyNGQ2ZDIzMWI5MmMxZjQwNzdjZWM1Mjk2MjFhYmEuLjMyNDk0OGIxYjE3 YmNlY2M4NmVlNjg3MjUyNjFhN2YwMzhiM2Q2NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElt YWdlRWxlbWVudC5oCkBAIC00OCw3ICs0OCw3IEBAIHB1YmxpYzoKIAogICAgIGludCBuYXR1cmFs V2lkdGgoKSBjb25zdDsKICAgICBpbnQgbmF0dXJhbEhlaWdodCgpIGNvbnN0OwotI2lmIEVOQUJM RV9QSUNUVVJFX1NJWkVTCisjaWYgRU5BQkxFKFBJQ1RVUkVfU0laRVMpCiAgICAgY29uc3QgQXRv bWljU3RyaW5nJiBjdXJyZW50U3JjKCkgY29uc3QgeyByZXR1cm4gbV9jdXJyZW50U3JjOyB9CiAj ZW5kaWYKIApAQCAtMTI3LDcgKzEyNyw3IEBAIHByaXZhdGU6CiAgICAgSFRNTEZvcm1FbGVtZW50 KiBtX2Zvcm07CiAgICAgQ29tcG9zaXRlT3BlcmF0b3IgbV9jb21wb3NpdGVPcGVyYXRvcjsKICAg ICBBdG9taWNTdHJpbmcgbV9iZXN0Rml0SW1hZ2VVUkw7Ci0jaWYgRU5BQkxFX1BJQ1RVUkVfU0la RVMKKyNpZiBFTkFCTEUoUElDVFVSRV9TSVpFUykKICAgICBBdG9taWNTdHJpbmcgbV9jdXJyZW50 U3JjOwogI2VuZGlmCiAgICAgQXRvbWljU3RyaW5nIG1fbG93ZXJjYXNlZFVzZW1hcDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4 IDc0ODNmMTM0ZTE2MDhlZjg0NjU3ZWUxYWY1MTc3NTBiMzYyYjFiMTAuLmUwZmI1ZmNhYjU3ODkz MDQ0ZWJjYTNjMjZkNDRjZjMyNmJmZmU3Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtMzI2LDExICszMjYsNyBAQCB2b2lk IEhUTUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcihTeW5jaHJvbm91c01vZGUgbW9kZSkK ICAgICAgICAgICAgIG1fcHJlbG9hZFNjYW5uZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEhUTUxQcmVs b2FkU2Nhbm5lcj4obV9vcHRpb25zLCBkb2N1bWVudCgpLT51cmwoKSwgZG9jdW1lbnQoKS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgICAgICAgICBtX3ByZWxvYWRTY2FubmVyLT5hcHBlbmRU b0VuZChtX2lucHV0LmN1cnJlbnQoKSk7CiAgICAgICAgIH0KLSAgICAgICAgbV9wcmVsb2FkU2Nh bm5lci0+c2NhbihtX3ByZWxvYWRlci5nZXQoKSwgZG9jdW1lbnQoKS0+YmFzZUVsZW1lbnRVUkwo KQotI2lmIEVOQUJMRShQSUNUVVJFX1NJWkVTKQotICAgICAgICAgICAgLCBkb2N1bWVudCgpLT5y ZW5kZXJWaWV3KCksIGRvY3VtZW50KCktPmZyYW1lKCkKLSNlbmRpZgotICAgICAgICApOworICAg ICAgICBtX3ByZWxvYWRTY2FubmVyLT5zY2FuKG1fcHJlbG9hZGVyLmdldCgpLCAqZG9jdW1lbnQo KSk7CiAgICAgfQogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRXcml0ZUhUTUwo Y29va2llLCBtX2lucHV0LmN1cnJlbnQoKS5jdXJyZW50TGluZSgpLnplcm9CYXNlZEludCgpKTsK QEAgLTM5MiwxMSArMzg4LDcgQEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6Omluc2VydChjb25z dCBTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSkKICAgICAgICAgICAgIG1faW5zZXJ0aW9uUHJlbG9h ZFNjYW5uZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEhUTUxQcmVsb2FkU2Nhbm5lcj4obV9vcHRpb25z LCBkb2N1bWVudCgpLT51cmwoKSwgZG9jdW1lbnQoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAg ICAgICAgIH0KICAgICAgICAgbV9pbnNlcnRpb25QcmVsb2FkU2Nhbm5lci0+YXBwZW5kVG9FbmQo c291cmNlKTsKLSAgICAgICAgbV9pbnNlcnRpb25QcmVsb2FkU2Nhbm5lci0+c2NhbihtX3ByZWxv YWRlci5nZXQoKSwgZG9jdW1lbnQoKS0+YmFzZUVsZW1lbnRVUkwoKQotI2lmIEVOQUJMRShQSUNU VVJFX1NJWkVTKQotICAgICAgICAgICAgLCBkb2N1bWVudCgpLT5yZW5kZXJWaWV3KCksIGRvY3Vt ZW50KCktPmZyYW1lKCkKLSNlbmRpZgotICAgICAgICApOworICAgICAgICBtX2luc2VydGlvblBy ZWxvYWRTY2FubmVyLT5zY2FuKG1fcHJlbG9hZGVyLmdldCgpLCAqZG9jdW1lbnQoKSk7CiAgICAg fQogCiAgICAgZW5kSWZEZWxheWVkKCk7CkBAIC00MjAsMTEgKzQxMiw3IEBAIHZvaWQgSFRNTERv Y3VtZW50UGFyc2VyOjphcHBlbmQoUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBpbnB1dFNvdXJjZSkK ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIG1fcHJlbG9hZFNjYW5uZXItPmFwcGVuZFRv RW5kKHNvdXJjZSk7CiAgICAgICAgICAgICBpZiAoaXNXYWl0aW5nRm9yU2NyaXB0cygpKQotICAg ICAgICAgICAgICAgIG1fcHJlbG9hZFNjYW5uZXItPnNjYW4obV9wcmVsb2FkZXIuZ2V0KCksIGRv Y3VtZW50KCktPmJhc2VFbGVtZW50VVJMKCkKLSNpZiBFTkFCTEUoUElDVFVSRV9TSVpFUykKLSAg ICAgICAgICAgICAgICAgICAgLCBkb2N1bWVudCgpLT5yZW5kZXJWaWV3KCksIGRvY3VtZW50KCkt PmZyYW1lKCkKLSNlbmRpZgotICAgICAgICAgICAgICAgICk7CisgICAgICAgICAgICAgICAgbV9w cmVsb2FkU2Nhbm5lci0+c2NhbihtX3ByZWxvYWRlci5nZXQoKSwgKmRvY3VtZW50KCkpOwogICAg ICAgICB9CiAgICAgfQogCkBAIC01NjIsMTEgKzU1MCw3IEBAIHZvaWQgSFRNTERvY3VtZW50UGFy c2VyOjphcHBlbmRDdXJyZW50SW5wdXRTdHJlYW1Ub1ByZWxvYWRTY2FubmVyQW5kU2NhbigpCiB7 CiAgICAgQVNTRVJUKG1fcHJlbG9hZFNjYW5uZXIpOwogICAgIG1fcHJlbG9hZFNjYW5uZXItPmFw cGVuZFRvRW5kKG1faW5wdXQuY3VycmVudCgpKTsKLSAgICBtX3ByZWxvYWRTY2FubmVyLT5zY2Fu KG1fcHJlbG9hZGVyLmdldCgpLCBkb2N1bWVudCgpLT5iYXNlRWxlbWVudFVSTCgpCi0jaWYgRU5B QkxFKFBJQ1RVUkVfU0laRVMpCi0gICAgICAgICwgZG9jdW1lbnQoKS0+cmVuZGVyVmlldygpLCBk b2N1bWVudCgpLT5mcmFtZSgpCi0jZW5kaWYKLSAgICApOworICAgIG1fcHJlbG9hZFNjYW5uZXIt PnNjYW4obV9wcmVsb2FkZXIuZ2V0KCksICpkb2N1bWVudCgpKTsKIH0KIAogdm9pZCBIVE1MRG9j dW1lbnRQYXJzZXI6Om5vdGlmeUZpbmlzaGVkKENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJj ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nh bm5lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIu Y3BwCmluZGV4IDU2NmVhNjJlMTM1ODMwZjE4YWU3MGE3OWZiYThiOWM2OTc1OTYwYjAuLjU2OTVj ZDY4MzZjYzRjZmNiMjBlNDZmN2I3ZWQ5NDQ0YmU3MWY4ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9wYXJzZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcApAQCAtOTMsMTUgKzkzLDEy IEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCi0gICAgdm9pZCBwcm9jZXNzQXR0cmlidXRlcyhj b25zdCBIVE1MVG9rZW46OkF0dHJpYnV0ZUxpc3QmIGF0dHJpYnV0ZXMKLSNpZiBFTkFCTEUoUElD VFVSRV9TSVpFUykKLSAgICAgICAgLCBSZW5kZXJWaWV3KiB2aWV3LCBGcmFtZSogZnJhbWUKLSNl bmRpZgotICAgICAgICApCisgICAgdm9pZCBwcm9jZXNzQXR0cmlidXRlcyhjb25zdCBIVE1MVG9r ZW46OkF0dHJpYnV0ZUxpc3QmIGF0dHJpYnV0ZXMsIERvY3VtZW50JiBkb2N1bWVudCkKICAgICB7 CiAgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgICAgIGlmIChtX3RhZ0lkID49 IFRhZ0lkOjpVbmtub3duKQogICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIGZvciAoSFRN TFRva2VuOjpBdHRyaWJ1dGVMaXN0Ojpjb25zdF9pdGVyYXRvciBpdGVyID0gYXR0cmlidXRlcy5i ZWdpbigpOyBpdGVyICE9IGF0dHJpYnV0ZXMuZW5kKCk7ICsraXRlcikgewogICAgICAgICAgICAg QXRvbWljU3RyaW5nIGF0dHJpYnV0ZU5hbWUoaXRlci0+bmFtZSk7CiAgICAgICAgICAgICBTdHJp bmcgYXR0cmlidXRlVmFsdWUgPSBTdHJpbmdJbXBsOjpjcmVhdGU4Qml0SWZQb3NzaWJsZShpdGVy LT52YWx1ZSk7CkBAIC0xMTAsMTEgKzEwNywxMSBAQCBwdWJsaWM6CiAKICAgICAgICAgLy8gUmVz b2x2ZSBiZXR3ZWVuIHNyYyBhbmQgc3JjU2V0IGlmIHdlIGhhdmUgdGhlbS4KICAgICAgICAgaWYg KCFtX3NyY1NldEF0dHJpYnV0ZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgIEltYWdlQ2FuZGlk YXRlIGltYWdlQ2FuZGlkYXRlID0gYmVzdEZpdFNvdXJjZUZvckltYWdlQXR0cmlidXRlcyhtX2Rl dmljZVNjYWxlRmFjdG9yLCBtX3VybFRvTG9hZCwgbV9zcmNTZXRBdHRyaWJ1dGUKKyAgICAgICAg ICAgIHVuc2lnbmVkIHNvdXJjZVNpemUgPSAwOwogI2lmIEVOQUJMRShQSUNUVVJFX1NJWkVTKQot ICAgICAgICAgICAgICAgICwgU291cmNlU2l6ZUxpc3Q6OnBhcnNlU2l6ZXNBdHRyaWJ1dGUobV9z aXplc0F0dHJpYnV0ZSwgdmlldywgZnJhbWUpCisgICAgICAgICAgICBzb3VyY2VTaXplID0gU291 cmNlU2l6ZUxpc3Q6OnBhcnNlU2l6ZXNBdHRyaWJ1dGUobV9zaXplc0F0dHJpYnV0ZSwgZG9jdW1l bnQucmVuZGVyVmlldygpLCBkb2N1bWVudC5mcmFtZSgpKTsKICNlbmRpZgotICAgICAgICAgICAg ICAgICk7CisgICAgICAgICAgICBJbWFnZUNhbmRpZGF0ZSBpbWFnZUNhbmRpZGF0ZSA9IGJlc3RG aXRTb3VyY2VGb3JJbWFnZUF0dHJpYnV0ZXMobV9kZXZpY2VTY2FsZUZhY3RvciwgbV91cmxUb0xv YWQsIG1fc3JjU2V0QXR0cmlidXRlLCBzb3VyY2VTaXplKTsKICAgICAgICAgICAgIHNldFVybFRv TG9hZChpbWFnZUNhbmRpZGF0ZS5zdHJpbmcudG9TdHJpbmcoKSwgdHJ1ZSk7CiAgICAgICAgIH0K ICAgICB9CkBAIC0yNzksMTEgKzI3Niw3IEBAIHZvaWQgVG9rZW5QcmVsb2FkU2Nhbm5lcjo6cmV3 aW5kVG8oVG9rZW5QcmVsb2FkU2Nhbm5lckNoZWNrcG9pbnQgY2hlY2twb2ludEluZGV4CiAgICAg bV9jaGVja3BvaW50cy5jbGVhcigpOwogfQogCi12b2lkIFRva2VuUHJlbG9hZFNjYW5uZXI6OnNj YW4oY29uc3QgSFRNTFRva2VuJiB0b2tlbiwgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxQcmVsb2Fk UmVxdWVzdD4+JiByZXF1ZXN0cwotI2lmIEVOQUJMRShQSUNUVVJFX1NJWkVTKQotICAgICAgICAs IFJlbmRlclZpZXcqIHZpZXcsIEZyYW1lKiBmcmFtZQotI2VuZGlmCi0gICAgICAgICkKK3ZvaWQg VG9rZW5QcmVsb2FkU2Nhbm5lcjo6c2Nhbihjb25zdCBIVE1MVG9rZW4mIHRva2VuLCBWZWN0b3I8 c3RkOjp1bmlxdWVfcHRyPFByZWxvYWRSZXF1ZXN0Pj4mIHJlcXVlc3RzLCBEb2N1bWVudCYgZG9j dW1lbnQpCiB7CiAgICAgc3dpdGNoICh0b2tlbi50eXBlKCkpIHsKICAgICBjYXNlIEhUTUxUb2tl bjo6Q2hhcmFjdGVyOgpAQCAtMzM0LDExICszMjcsNyBAQCB2b2lkIFRva2VuUHJlbG9hZFNjYW5u ZXI6OnNjYW4oY29uc3QgSFRNTFRva2VuJiB0b2tlbiwgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxQ cgogICAgICAgICB9CiAKICAgICAgICAgU3RhcnRUYWdTY2FubmVyIHNjYW5uZXIodGFnSWQsIG1f ZGV2aWNlU2NhbGVGYWN0b3IpOwotICAgICAgICBzY2FubmVyLnByb2Nlc3NBdHRyaWJ1dGVzKHRv a2VuLmF0dHJpYnV0ZXMoKQotI2lmIEVOQUJMRShQSUNUVVJFX1NJWkVTKQotICAgICAgICAgICAg LCB2aWV3LCBmcmFtZQotI2VuZGlmCi0gICAgICAgICAgICApOworICAgICAgICBzY2FubmVyLnBy b2Nlc3NBdHRyaWJ1dGVzKHRva2VuLmF0dHJpYnV0ZXMoKSwgZG9jdW1lbnQpOwogICAgICAgICBp ZiAoYXV0byByZXF1ZXN0ID0gc2Nhbm5lci5jcmVhdGVQcmVsb2FkUmVxdWVzdChtX3ByZWRpY3Rl ZEJhc2VFbGVtZW50VVJMKSkKICAgICAgICAgICAgIHJlcXVlc3RzLmFwcGVuZChXVEY6Om1vdmUo cmVxdWVzdCkpOwogICAgICAgICByZXR1cm47CkBAIC0zNzIsMTQgKzM2MSwxMiBAQCB2b2lkIEhU TUxQcmVsb2FkU2Nhbm5lcjo6YXBwZW5kVG9FbmQoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBzb3Vy Y2UpCiAgICAgbV9zb3VyY2UuYXBwZW5kKHNvdXJjZSk7CiB9CiAKLXZvaWQgSFRNTFByZWxvYWRT Y2FubmVyOjpzY2FuKEhUTUxSZXNvdXJjZVByZWxvYWRlciogcHJlbG9hZGVyLCBjb25zdCBVUkwm IHN0YXJ0aW5nQmFzZUVsZW1lbnRVUkwKLSNpZiBFTkFCTEUoUElDVFVSRV9TSVpFUykKLSAgICAg ICAgLCBSZW5kZXJWaWV3KiB2aWV3LCBGcmFtZSogZnJhbWUKLSNlbmRpZgotICAgICAgICApCit2 b2lkIEhUTUxQcmVsb2FkU2Nhbm5lcjo6c2NhbihIVE1MUmVzb3VyY2VQcmVsb2FkZXIqIHByZWxv YWRlciwgRG9jdW1lbnQmIGRvY3VtZW50KQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7 IC8vIEhUTUxUb2tlbml6ZXI6OnVwZGF0ZVN0YXRlRm9yIG9ubHkgd29ya3Mgb24gdGhlIG1haW4g dGhyZWFkLgogCisgICAgY29uc3QgVVJMJiBzdGFydGluZ0Jhc2VFbGVtZW50VVJMID0gZG9jdW1l bnQuYmFzZUVsZW1lbnRVUkwoKTsKKwogICAgIC8vIFdoZW4gd2Ugc3RhcnQgc2Nhbm5pbmcsIG91 ciBiZXN0IHByZWRpY3Rpb24gb2YgdGhlIGJhc2VFbGVtZW50VVJMIGlzIHRoZSByZWFsIG9uZSEK ICAgICBpZiAoIXN0YXJ0aW5nQmFzZUVsZW1lbnRVUkwuaXNFbXB0eSgpKQogICAgICAgICBtX3Nj YW5uZXIuc2V0UHJlZGljdGVkQmFzZUVsZW1lbnRVUkwoc3RhcnRpbmdCYXNlRWxlbWVudFVSTCk7 CkBAIC0zODksMTEgKzM3Niw3IEBAIHZvaWQgSFRNTFByZWxvYWRTY2FubmVyOjpzY2FuKEhUTUxS ZXNvdXJjZVByZWxvYWRlciogcHJlbG9hZGVyLCBjb25zdCBVUkwmIHN0YXJ0CiAgICAgd2hpbGUg KG1fdG9rZW5pemVyLT5uZXh0VG9rZW4obV9zb3VyY2UsIG1fdG9rZW4pKSB7CiAgICAgICAgIGlm IChtX3Rva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW46OlN0YXJ0VGFnKQogICAgICAgICAgICAgbV90 b2tlbml6ZXItPnVwZGF0ZVN0YXRlRm9yKEF0b21pY1N0cmluZyhtX3Rva2VuLm5hbWUoKSkpOwot ICAgICAgICBtX3NjYW5uZXIuc2NhbihtX3Rva2VuLCByZXF1ZXN0cwotI2lmIEVOQUJMRShQSUNU VVJFX1NJWkVTKQotICAgICAgICAgICAgLCB2aWV3LCBmcmFtZQotI2VuZGlmCi0gICAgICAgICAg ICApOworICAgICAgICBtX3NjYW5uZXIuc2NhbihtX3Rva2VuLCByZXF1ZXN0cywgZG9jdW1lbnQp OwogICAgICAgICBtX3Rva2VuLmNsZWFyKCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5oCmluZGV4IGI2N2E1MWEwNjJjZDAxZjAy OTUxYjNiZDEwMjhlYTA0NDZmMDRkYmIuLmQyZTNkMWNkZTgzZDU4YjQzYjM4NTU0NmYzZWMxMmE4 MjM1ZTVhZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVs b2FkU2Nhbm5lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2Fk U2Nhbm5lci5oCkBAIC00NywxMSArNDcsNyBAQCBwdWJsaWM6CiAgICAgZXhwbGljaXQgVG9rZW5Q cmVsb2FkU2Nhbm5lcihjb25zdCBVUkwmIGRvY3VtZW50VVJMLCBmbG9hdCBkZXZpY2VTY2FsZUZh Y3RvciA9IDEuMCk7CiAgICAgflRva2VuUHJlbG9hZFNjYW5uZXIoKTsKIAotICAgIHZvaWQgc2Nh bihjb25zdCBIVE1MVG9rZW4mLCBQcmVsb2FkUmVxdWVzdFN0cmVhbSYgcmVxdWVzdHMKLSNpZiBF TkFCTEVfUElDVFVSRV9TSVpFUwotICAgICAgICAsIFJlbmRlclZpZXcqLCBGcmFtZSoKLSNlbmRp ZgotICAgICAgICApOworICAgIHZvaWQgc2Nhbihjb25zdCBIVE1MVG9rZW4mLCBQcmVsb2FkUmVx dWVzdFN0cmVhbSYgcmVxdWVzdHMsIERvY3VtZW50Jik7CiAKICAgICB2b2lkIHNldFByZWRpY3Rl ZEJhc2VFbGVtZW50VVJMKGNvbnN0IFVSTCYgdXJsKSB7IG1fcHJlZGljdGVkQmFzZUVsZW1lbnRV UkwgPSB1cmw7IH0KIApAQCAtMTMxLDExICsxMjcsNyBAQCBwdWJsaWM6CiAgICAgfkhUTUxQcmVs b2FkU2Nhbm5lcigpOwogCiAgICAgdm9pZCBhcHBlbmRUb0VuZChjb25zdCBTZWdtZW50ZWRTdHJp bmcmKTsKLSAgICB2b2lkIHNjYW4oSFRNTFJlc291cmNlUHJlbG9hZGVyKiwgY29uc3QgVVJMJiBk b2N1bWVudEJhc2VFbGVtZW50VVJMCi0jaWYgRU5BQkxFX1BJQ1RVUkVfU0laRVMKLSAgICAgICAg LCBSZW5kZXJWaWV3KiwgRnJhbWUqCi0jZW5kaWYKLSAgICAgICAgKTsKKyAgICB2b2lkIHNjYW4o SFRNTFJlc291cmNlUHJlbG9hZGVyKiwgRG9jdW1lbnQmKTsKIAogcHJpdmF0ZToKICAgICBUb2tl blByZWxvYWRTY2FubmVyIG1fc2Nhbm5lcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxTcmNzZXRQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvSFRNTFNyY3NldFBhcnNlci5jcHAKaW5kZXggZjJmMWE1ZjAxYzA1ZWZhZGI1ZWVlNGFjNTAx NDdjMGUwZmM2MmRiMi4uYjVhY2VmYTVjOTZmNmEwZDc5ZTI4YjNjNTkxNjlkNzRiNjRmOWQyMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFNyY3NldFBhcnNlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFNyY3NldFBhcnNlci5jcHAK QEAgLTIyOSwxMiArMjI5LDEyIEBAIFZlY3RvcjxJbWFnZUNhbmRpZGF0ZT4gcGFyc2VJbWFnZUNh bmRpZGF0ZXNGcm9tU3Jjc2V0QXR0cmlidXRlKFN0cmluZ1ZpZXcgYXR0cmliCiAgICAgICAgIHJl dHVybiBwYXJzZUltYWdlQ2FuZGlkYXRlc0Zyb21TcmNzZXRBdHRyaWJ1dGU8VUNoYXI+KGF0dHJp YnV0ZS5jaGFyYWN0ZXJzMTYoKSwgYXR0cmlidXRlLmxlbmd0aCgpKTsKIH0KIAotc3RhdGljIElt YWdlQ2FuZGlkYXRlIHBpY2tCZXN0SW1hZ2VDYW5kaWRhdGUoZmxvYXQgZGV2aWNlU2NhbGVGYWN0 b3IsIFZlY3RvcjxJbWFnZUNhbmRpZGF0ZT4mIGltYWdlQ2FuZGlkYXRlcwotI2lmIEVOQUJMRShQ SUNUVVJFX1NJWkVTKQotICAgICwgdW5zaWduZWQgc291cmNlU2l6ZQotI2VuZGlmCi0gICAgKQor c3RhdGljIEltYWdlQ2FuZGlkYXRlIHBpY2tCZXN0SW1hZ2VDYW5kaWRhdGUoZmxvYXQgZGV2aWNl U2NhbGVGYWN0b3IsIFZlY3RvcjxJbWFnZUNhbmRpZGF0ZT4mIGltYWdlQ2FuZGlkYXRlcywgdW5z aWduZWQgc291cmNlU2l6ZSkKIHsKKyNpZiAhRU5BQkxFKFBJQ1RVUkVfU0laRVMpCisgICAgVU5V U0VEX1BBUkFNKHNvdXJjZVNpemUpOworI2VuZGlmCisKICAgICBib29sIGlnbm9yZVNyYyA9IGZh bHNlOwogICAgIGlmIChpbWFnZUNhbmRpZGF0ZXMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g SW1hZ2VDYW5kaWRhdGUoKTsKQEAgLTI3NCwxMSArMjc0LDcgQEAgc3RhdGljIEltYWdlQ2FuZGlk YXRlIHBpY2tCZXN0SW1hZ2VDYW5kaWRhdGUoZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IsIFZlY3Rv cjxJbWEKICAgICByZXR1cm4gaW1hZ2VDYW5kaWRhdGVzW3dpbm5lcl07CiB9CiAKLUltYWdlQ2Fu ZGlkYXRlIGJlc3RGaXRTb3VyY2VGb3JJbWFnZUF0dHJpYnV0ZXMoZmxvYXQgZGV2aWNlU2NhbGVG YWN0b3IsIGNvbnN0IEF0b21pY1N0cmluZyYgc3JjQXR0cmlidXRlLCBjb25zdCBBdG9taWNTdHJp bmcmIHNyY3NldEF0dHJpYnV0ZQotI2lmIEVOQUJMRShQSUNUVVJFX1NJWkVTKQotICAgICwgdW5z aWduZWQgc291cmNlU2l6ZQotI2VuZGlmCi0gICAgKQorSW1hZ2VDYW5kaWRhdGUgYmVzdEZpdFNv dXJjZUZvckltYWdlQXR0cmlidXRlcyhmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciwgY29uc3QgQXRv bWljU3RyaW5nJiBzcmNBdHRyaWJ1dGUsIGNvbnN0IEF0b21pY1N0cmluZyYgc3Jjc2V0QXR0cmli dXRlLCB1bnNpZ25lZCBzb3VyY2VTaXplKQogewogICAgIGlmIChzcmNzZXRBdHRyaWJ1dGUuaXNO dWxsKCkpIHsKICAgICAgICAgaWYgKHNyY0F0dHJpYnV0ZS5pc051bGwoKSkKQEAgLTI5MSwxMSAr Mjg3LDcgQEAgSW1hZ2VDYW5kaWRhdGUgYmVzdEZpdFNvdXJjZUZvckltYWdlQXR0cmlidXRlcyhm bG9hdCBkZXZpY2VTY2FsZUZhY3RvciwgY29uc3QgQXQKICAgICBpZiAoIXNyY0F0dHJpYnV0ZS5p c0VtcHR5KCkpCiAgICAgICAgIGltYWdlQ2FuZGlkYXRlcy5hcHBlbmQoSW1hZ2VDYW5kaWRhdGUo U3RyaW5nVmlldyhzcmNBdHRyaWJ1dGUpLCBEZXNjcmlwdG9yUGFyc2luZ1Jlc3VsdCgpLCBJbWFn ZUNhbmRpZGF0ZTo6U3JjT3JpZ2luKSk7CiAKLSAgICByZXR1cm4gcGlja0Jlc3RJbWFnZUNhbmRp ZGF0ZShkZXZpY2VTY2FsZUZhY3RvciwgaW1hZ2VDYW5kaWRhdGVzCi0jaWYgRU5BQkxFKFBJQ1RV UkVfU0laRVMpCi0gICAgICAgICwgc291cmNlU2l6ZQotI2VuZGlmCi0gICAgICAgICk7CisgICAg cmV0dXJuIHBpY2tCZXN0SW1hZ2VDYW5kaWRhdGUoZGV2aWNlU2NhbGVGYWN0b3IsIGltYWdlQ2Fu ZGlkYXRlcywgc291cmNlU2l6ZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxTcmNzZXRQYXJzZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxTcmNzZXRQYXJzZXIuaAppbmRleCA3YjZlZGFm Yzg5YTNiMmY4YTEyNTkzYTEzMDg3ZjhlODdlZTFiNzg1Li5kZjk0ODZkYWVkMDQwMzJiNjNmYjhi YWM4ZDZkZTkxYWQxYzQ0YTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNl ci9IVE1MU3Jjc2V0UGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRN TFNyY3NldFBhcnNlci5oCkBAIC05OCwxMSArOTgsNyBAQCBzdHJ1Y3QgSW1hZ2VDYW5kaWRhdGUg ewogICAgIE9yaWdpbkF0dHJpYnV0ZSBvcmlnaW5BdHRyaWJ1dGU7CiB9OwogCi1JbWFnZUNhbmRp ZGF0ZSBiZXN0Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKGZsb2F0IGRldmljZVNjYWxlRmFj dG9yLCBjb25zdCBBdG9taWNTdHJpbmcmIHNyY0F0dHJpYnV0ZSwgY29uc3QgQXRvbWljU3RyaW5n JiBzcmNzZXRBdHRyaWJ1dGUKLSNpZiBFTkFCTEUoUElDVFVSRV9TSVpFUykKLSAgICAsIHVuc2ln bmVkIHNvdXJjZVNpemUKLSNlbmRpZgotICAgICk7CitJbWFnZUNhbmRpZGF0ZSBiZXN0Rml0U291 cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBjb25zdCBBdG9t aWNTdHJpbmcmIHNyY0F0dHJpYnV0ZSwgY29uc3QgQXRvbWljU3RyaW5nJiBzcmNzZXRBdHRyaWJ1 dGUsIHVuc2lnbmVkIHNvdXJjZVNpemUpOwogCiBWZWN0b3I8SW1hZ2VDYW5kaWRhdGU+IHBhcnNl SW1hZ2VDYW5kaWRhdGVzRnJvbVNyY3NldEF0dHJpYnV0ZShTdHJpbmdWaWV3IGF0dHJpYnV0ZSk7 CiAK