106714 2013-01-11 15:45:49 -0800 Clean up WebVTTNodeType code 2013-01-14 12:19:29 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106679 1 esprehn esprehn allan.jensen cmarcelo dgorbik macpherson menard mjs ojan.autocc rniwa tony webkit.review.bot oldest_to_newest 805700 0 esprehn 2013-01-11 15:45:49 -0800 Clean up WebVTTNodeType code 805704 1 182439 esprehn 2013-01-11 15:53:40 -0800 Created attachment 182439 Patch 805727 2 182439 tony 2013-01-11 16:15:14 -0800 Comment on attachment 182439 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182439&action=review > Source/WebCore/css/StyleResolver.cpp:657 > + if (m_element->webVTTNodeType()) Nit: I would probably explicitly say != WebVTTNodeTypeNone or when declaring the enum, set WebVTTNodeTypeNone = 0. > Source/WebCore/dom/Element.cpp:2318 > + return ensureElementRareData()->setWebVTTNodeType(type); Nit: return not needed. > Source/WebCore/dom/NodeRareData.h:401 > + unsigned m_webVTTNodeType : 2; Nit: In RenderStyle, we normally add an end-of-line comment with the enum name so it's easier to verify that we've allocated enough space. 805786 3 182453 esprehn 2013-01-11 17:39:59 -0800 Created attachment 182453 Patch 805839 4 rniwa 2013-01-11 23:32:23 -0800 Thanks for the refactoring! 806514 5 182453 webkit.review.bot 2013-01-14 12:19:25 -0800 Comment on attachment 182453 Patch Clearing flags on attachment: 182453 Committed r139639: <http://trac.webkit.org/changeset/139639> 806515 6 webkit.review.bot 2013-01-14 12:19:29 -0800 All reviewed patches have been landed. Closing bug. 182439 2013-01-11 15:53:40 -0800 2013-01-11 17:39:57 -0800 Patch bug-106714-20130111155042.patch text/plain 9751 esprehn U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODBlZGU4MmRhNmYyODc4 MDM0MDI0ZTVmMGVjY2FjMjNlNGFiMmMxMy4uMmFjZTU4ODcwYWRjZDJiMGRkYWU4ZjZiZDQ2ZWM0 M2ZlNzI3Y2U5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAxLTExICBFbGxp b3R0IFNwcmVobiAgPGVzcHJlaG5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIENsZWFuIHVwIFdl YlZUVE5vZGVUeXBlIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNjcxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoZXJlJ3Mgbm8gcmVhc29uIGZvciBzbyBtYW55IG1ldGhvZHMganVzdCB0byBj b21wYXJlIHNvbWUgZW51bXMuCisgICAgICAgIFRoZSBleGlzdGluZyBjb2RlIGNhbiBhbHNvIGJl IHNpbXBsaWZpZWQgcXVpdGUgYSBiaXQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0IHJl ZmFjdG9yaW5nLgorCisgICAgICAgICogY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTZWxlY3RvckNoZWNrZXI6OmNoZWNrT25lKToKKyAgICAgICAgKiBjc3MvU3R5 bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpjb2xsZWN0 TWF0Y2hpbmdSdWxlcyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpjYW5TaGFy ZVN0eWxlV2l0aEVsZW1lbnQpOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkVsZW1lbnQ6OndlYlZUVE5vZGVUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkVs ZW1lbnQ6OnNldFdlYlZUVE5vZGVUeXBlKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgorICAg ICAgICAoRWxlbWVudCk6CisgICAgICAgICogZG9tL0VsZW1lbnRSYXJlRGF0YS5oOgorICAgICAg ICAoV2ViQ29yZTo6RWxlbWVudFJhcmVEYXRhOjpzZXRXZWJWVFROb2RlVHlwZSk6CisgICAgICAg IChXZWJDb3JlOjpFbGVtZW50UmFyZURhdGE6OndlYlZUVE5vZGVUeXBlKToKKyAgICAgICAgKEVs ZW1lbnRSYXJlRGF0YSk6CisgICAgICAgICogZG9tL05vZGVSYXJlRGF0YS5oOgorICAgICAgICAo V2ViQ29yZTo6Tm9kZVJhcmVEYXRhOjpOb2RlUmFyZURhdGEpOgorICAgICAgICAoTm9kZVJhcmVE YXRhKToKKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFjay5oOgorICAgICAgICAqIGh0bWwv dHJhY2svVGV4dFRyYWNrQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZTo6 bWFya0Z1dHVyZUFuZFBhc3ROb2Rlcyk6CisKIDIwMTMtMDEtMTEgIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHIxMzkwNDQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVj a2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCmluZGV4IDJi MjZjNjgwNWJiNzNiZjQ5M2Y0Mjk1N2FkNGJlYzQyNTcwODEwZDQuLjJlODc0ZjRmY2Q5MzAwMDlj OTc4Y2M2YTllNDNmZWIyNTFiODQ2OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T ZWxlY3RvckNoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNr ZXIuY3BwCkBAIC05NDEsOSArOTQxLDcgQEAgYm9vbCBTZWxlY3RvckNoZWNrZXI6OmNoZWNrT25l KGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTaWIKICAgICAg ICAgICAgIHJldHVybiBlbGVtZW50LT5pc091dE9mUmFuZ2UoKTsKICNpZiBFTkFCTEUoVklERU9f VFJBQ0spCiAgICAgICAgIGNhc2UgQ1NTU2VsZWN0b3I6OlBzZXVkb0Z1dHVyZUN1ZToKLSAgICAg ICAgICAgIGlmIChlbGVtZW50LT5pc1dlYlZUVEZ1dHVyZU5vZGUoKSkKLSAgICAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJl dHVybiBlbGVtZW50LT53ZWJWVFROb2RlVHlwZSgpID09IFdlYlZUVE5vZGVUeXBlRnV0dXJlOwog I2VuZGlmCiAKICAgICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvSG9yaXpvbnRhbDoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCA4MTQxYmY5YzdlNDIxOTdlMTM0ZDQw NTVmNGYzNjJlZGY3M2NjMDg2Li43MjVlOTdkNGE2Nzc4ODRmYWJkZThmYzRiYmMwNzYzNGUwMWE3 ZDE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC02NTQsNyArNjU0LDcg QEAgdm9pZCBTdHlsZVJlc29sdmVyOjpjb2xsZWN0TWF0Y2hpbmdSdWxlcyhSdWxlU2V0KiBydWxl cywgaW50JiBmaXJzdFJ1bGVJbmRleCwgaW4KICAgICB9CiAKICNpZiBFTkFCTEUoVklERU9fVFJB Q0spCi0gICAgaWYgKG1fZWxlbWVudC0+aXNXZWJWVFROb2RlKCkpCisgICAgaWYgKG1fZWxlbWVu dC0+d2ViVlRUTm9kZVR5cGUoKSkKICAgICAgICAgY29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0 KHJ1bGVzLT5jdWVQc2V1ZG9SdWxlcygpLCBmaXJzdFJ1bGVJbmRleCwgbGFzdFJ1bGVJbmRleCwg b3B0aW9ucyk7CiAjZW5kaWYKICAgICAvLyBDaGVjayB3aGV0aGVyIG90aGVyIHR5cGVzIG9mIHJ1 bGVzIGFyZSBhcHBsaWNhYmxlIGluIHRoZSBjdXJyZW50IHRyZWUgc2NvcGUuIENyaXRlcmlhIGZv ciB0aGlzOgpAQCAtMTI0MSwxMCArMTI0MSw3IEBAIGJvb2wgU3R5bGVSZXNvbHZlcjo6Y2FuU2hh cmVTdHlsZVdpdGhFbGVtZW50KFN0eWxlZEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0CiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogI2lmIEVOQUJMRShWSURFT19UUkFDSykKLSAgICBpZiAoZWxlbWVu dC0+aXNXZWJWVFROb2RlKCkgJiYgbV9lbGVtZW50LT5pc1dlYlZUVE5vZGUoKSAmJiBlbGVtZW50 LT5pc1dlYlZUVEZ1dHVyZU5vZGUoKSAhPSBtX2VsZW1lbnQtPmlzV2ViVlRURnV0dXJlTm9kZSgp KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgLy8gRGVueSBzaGFyaW5nIHN0eWxlcyBiZXR3 ZWVuIFdlYlZUVCBub2RlcyBhbmQgbm9uLVdlYlZUVCBub2Rlcy4KLSAgICBpZiAoZWxlbWVudC0+ aXNXZWJWVFROb2RlKCkgIT0gbV9lbGVtZW50LT5pc1dlYlZUVE5vZGUoKSkKKyAgICBpZiAoZWxl bWVudC0+d2ViVlRUTm9kZVR5cGUoKSAhPSBtX2VsZW1lbnQtPndlYlZUVE5vZGVUeXBlKCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXgg YTMxMTM2ODdhNjdjMzg0ZWE0NTBiY2M2YzA0ZjZkMGMwY2UxZTcwNC4uNTU2M2ZmODlhOWY3MmFk NDU0ZGQzYTRjOTE2MTJjOGExZTIyMTY2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMjMw OCwyNCArMjMwOCwxNCBAQCBib29sIEVsZW1lbnQ6OmNoaWxkU2hvdWxkQ3JlYXRlUmVuZGVyZXIo Y29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmIGNoaWxkQ29udGV4dAogI2VuZGlmCiAKICNpZiBF TkFCTEUoVklERU9fVFJBQ0spCi1ib29sIEVsZW1lbnQ6OmlzV2ViVlRUTm9kZSgpIGNvbnN0CitX ZWJWVFROb2RlVHlwZSBFbGVtZW50Ojp3ZWJWVFROb2RlVHlwZSgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIGhhc1JhcmVEYXRhKCkgJiYgZWxlbWVudFJhcmVEYXRhKCktPmlzV2ViVlRUTm9kZSgpOwor ICAgIHJldHVybiBoYXNSYXJlRGF0YSgpID8gZWxlbWVudFJhcmVEYXRhKCktPndlYlZUVE5vZGVU eXBlKCkgOiBXZWJWVFROb2RlVHlwZU5vbmU7CiB9CiAKLXZvaWQgRWxlbWVudDo6c2V0SXNXZWJW VFROb2RlKCkKK3ZvaWQgRWxlbWVudDo6c2V0V2ViVlRUTm9kZVR5cGUoV2ViVlRUTm9kZVR5cGUg dHlwZSkKIHsKLSAgICBlbnN1cmVFbGVtZW50UmFyZURhdGEoKS0+c2V0SXNXZWJWVFROb2RlKCk7 Ci19Ci0KLWJvb2wgRWxlbWVudDo6aXNXZWJWVFRGdXR1cmVOb2RlKCkgY29uc3QKLXsKLSAgICBy ZXR1cm4gaGFzUmFyZURhdGEoKSAmJiBlbGVtZW50UmFyZURhdGEoKS0+aXNXZWJWVFRGdXR1cmVO b2RlKCk7Ci19Ci0KLXZvaWQgRWxlbWVudDo6c2V0SXNXZWJWVFRGdXR1cmVOb2RlKCkKLXsKLSAg ICBlbnN1cmVFbGVtZW50UmFyZURhdGEoKS0+c2V0SXNXZWJWVFRGdXR1cmVOb2RlKCk7CisgICAg cmV0dXJuIGVuc3VyZUVsZW1lbnRSYXJlRGF0YSgpLT5zZXRXZWJWVFROb2RlVHlwZSh0eXBlKTsK IH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIv U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAppbmRleCBlNjNkOTExMzhkZTEwZDY0M2I3ODhj YjFlMGQzMTNkOTY3YzkyNWVkLi5iOTY3MzY5OWNjN2NlY2E2YWQxMGQyNGNhYjhlZDdjMTI3MDBl MmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKQEAgLTMxLDYgKzMxLDkgQEAKICNpbmNsdWRlICJGcmFn bWVudFNjcmlwdGluZ1Blcm1pc3Npb24uaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNs dWRlICJTY3JvbGxUeXBlcy5oIgorI2lmIEVOQUJMRShWSURFT19UUkFDSykKKyNpbmNsdWRlICJU ZXh0VHJhY2suaCIKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTQ0NywxMiAr NDUwLDEwIEBAIHB1YmxpYzoKICNlbmRpZgogCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQotICAg IGJvb2wgaXNXZWJWVFROb2RlKCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRJc1dlYlZUVE5vZGUoKTsK LSAgICBib29sIGlzV2ViVlRURnV0dXJlTm9kZSgpIGNvbnN0OwotICAgIHZvaWQgc2V0SXNXZWJW VFRGdXR1cmVOb2RlKCk7CisgICAgV2ViVlRUTm9kZVR5cGUgd2ViVlRUTm9kZVR5cGUoKSBjb25z dDsKKyAgICB2b2lkIHNldFdlYlZUVE5vZGVUeXBlKFdlYlZUVE5vZGVUeXBlKTsKICNlbmRpZgot ICAgIAorCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQogICAgIGVudW0gewogICAgICAgICBB TExPV19LRVlCT0FSRF9JTlBVVCA9IDEgPDwgMCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9FbGVtZW50UmFyZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50UmFyZURh dGEuaAppbmRleCAyNjgzMDFjNGYxMTQ5YWEwZTg2OGNlOThjYTY5MjYyOTNjYjczYjcyLi41Y2Jj OGM1YzlkNTY2NmI5Zjk4M2U2NmRlMGFlMjM2MzgyY2E1YjgxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudFJhcmVEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Vs ZW1lbnRSYXJlRGF0YS5oCkBAIC01NSwxMSArNTUsMTAgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 SXNJbkNhbnZhc1N1YnRyZWUoYm9vbCB2YWx1ZSkgeyBtX2lzSW5DYW52YXNTdWJ0cmVlID0gdmFs dWU7IH0KIAogI2lmIEVOQUJMRShWSURFT19UUkFDSykKLSAgICB1c2luZyBOb2RlUmFyZURhdGE6 OmlzV2ViVlRUTm9kZTsKLSAgICB1c2luZyBOb2RlUmFyZURhdGE6OnNldElzV2ViVlRUTm9kZTsK LSAgICB1c2luZyBOb2RlUmFyZURhdGE6OmlzV2ViVlRURnV0dXJlTm9kZTsKLSAgICB1c2luZyBO b2RlUmFyZURhdGE6OnNldElzV2ViVlRURnV0dXJlTm9kZTsKKyAgICB2b2lkIHNldFdlYlZUVE5v ZGVUeXBlKFdlYlZUVE5vZGVUeXBlIHR5cGUpIHsgbV93ZWJWVFROb2RlVHlwZSA9IHR5cGU7IH0K KyAgICBXZWJWVFROb2RlVHlwZSB3ZWJWVFROb2RlVHlwZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRp Y19jYXN0PFdlYlZUVE5vZGVUeXBlPihtX3dlYlZUVE5vZGVUeXBlKTsgfQogI2VuZGlmCisKICNp ZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgYm9vbCBjb250YWluc0Z1bGxTY3JlZW5FbGVt ZW50KCkgeyByZXR1cm4gbV9jb250YWluc0Z1bGxTY3JlZW5FbGVtZW50OyB9CiAgICAgdm9pZCBz ZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50KGJvb2wgdmFsdWUpIHsgbV9jb250YWluc0Z1bGxT Y3JlZW5FbGVtZW50ID0gdmFsdWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9O b2RlUmFyZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmFyZURhdGEuaAppbmRleCAy YTE0Zjg1YzQ0ZjZiMGQ3ZTEyY2Q4ZGZkZmVlMDU4ODE5YzQxNTkxLi41OWUzY2U3ZmUzNjUwYjE3 ZDIzMzQ1NmI0NmY5NmI0ODMzZjJlNWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v Tm9kZVJhcmVEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGVSYXJlRGF0YS5oCkBA IC0yNzIsNyArMjcyLDcgQEAgcHVibGljOgogICAgICAgICAsIG1fY2hpbGRyZW5BZmZlY3RlZEJ5 Rm9yd2FyZFBvc2l0aW9uYWxSdWxlcyhmYWxzZSkKICAgICAgICAgLCBtX2NoaWxkcmVuQWZmZWN0 ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKGZhbHNlKQogI2lmIEVOQUJMRShWSURFT19UUkFD SykKLSAgICAgICAgLCBtX1dlYlZUVE5vZGVUeXBlKFRleHRUcmFjazo6V2ViVlRUTm9kZVR5cGVO b25lKQorICAgICAgICAsIG1fd2ViVlRUTm9kZVR5cGUoV2ViVlRUTm9kZVR5cGVOb25lKQogI2Vu ZGlmCiAgICAgewogICAgIH0KQEAgLTM3MSwxMiArMzcxLDYgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CiAKIHBy b3RlY3RlZDoKLSNpZiBFTkFCTEUoVklERU9fVFJBQ0spCi0gICAgYm9vbCBpc1dlYlZUVE5vZGUo KSB7IHJldHVybiBzdGF0aWNfY2FzdDxUZXh0VHJhY2s6OldlYlZUVE5vZGVUeXBlPihtX1dlYlZU VE5vZGVUeXBlKSAhPSBUZXh0VHJhY2s6OldlYlZUVE5vZGVUeXBlTm9uZTsgfQotICAgIHZvaWQg c2V0SXNXZWJWVFROb2RlKCkgeyBtX1dlYlZUVE5vZGVUeXBlID0gVGV4dFRyYWNrOjpXZWJWVFRO b2RlVHlwZVBhc3Q7IH0KLSAgICBib29sIGlzV2ViVlRURnV0dXJlTm9kZSgpIHsgcmV0dXJuIHN0 YXRpY19jYXN0PFRleHRUcmFjazo6V2ViVlRUTm9kZVR5cGU+KG1fV2ViVlRUTm9kZVR5cGUpID09 IFRleHRUcmFjazo6V2ViVlRUTm9kZVR5cGVGdXR1cmU7IH0KLSAgICB2b2lkIHNldElzV2ViVlRU RnV0dXJlTm9kZSgpIHsgbV9XZWJWVFROb2RlVHlwZSA9IFRleHRUcmFjazo6V2ViVlRUTm9kZVR5 cGVGdXR1cmU7IH0KLSNlbmRpZgogICAgIHNob3J0IG1fdGFiSW5kZXg7CiAgICAgdW5zaWduZWQg c2hvcnQgbV9jaGlsZEluZGV4OwogICAgIHVuc2lnbmVkIG1fdGFiSW5kZXhXYXNTZXRFeHBsaWNp dGx5IDogMTsKQEAgLTQwNCw3ICszOTgsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdW5zaWduZWQgbV9j aGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzIDogMTsKICAgICB1bnNpZ25l ZCBtX2NoaWxkcmVuQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzIDogMTsKICNpZiBF TkFCTEUoVklERU9fVFJBQ0spCi0gICAgdW5zaWduZWQgbV9XZWJWVFROb2RlVHlwZSA6IDI7Cisg ICAgdW5zaWduZWQgbV93ZWJWVFROb2RlVHlwZSA6IDI7CiAjZW5kaWYKIAogcHJpdmF0ZToKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmggYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5oCmluZGV4IDA4NGIxZjUzMzFmZjQ1ZGQyNzYw YWJiNDU2NjU2YWUxMDIyMmNiMGUuLjJkMjVlYmEwNTkxYTcyYjlmYmJlZDQ5ZDI0ZGI5MThiMmIw MzU5MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmgK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2suaApAQCAtNTMsNiArNTMs MTAgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB0ZXh0VHJhY2tSZW1vdmVDdWUoVGV4dFRy YWNrKiwgUGFzc1JlZlB0cjxUZXh0VHJhY2tDdWU+KSA9IDA7CiB9OwogCitlbnVtIFdlYlZUVE5v ZGVUeXBlIHsKKyAgICBXZWJWVFROb2RlVHlwZU5vbmUsIFdlYlZUVE5vZGVUeXBlRnV0dXJlLCBX ZWJWVFROb2RlVHlwZVBhc3QKK307CisKIGNsYXNzIFRleHRUcmFjayA6IHB1YmxpYyBUcmFja0Jh c2UgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFRleHRUcmFjaz4gY3JlYXRlKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFRleHRUcmFja0NsaWVudCogY2xpZW50LCBj b25zdCBBdG9taWNTdHJpbmcmIGtpbmQsIGNvbnN0IEF0b21pY1N0cmluZyYgbGFiZWwsIGNvbnN0 IEF0b21pY1N0cmluZyYgbGFuZ3VhZ2UpCkBAIC0xMDcsOCArMTExLDYgQEAgcHVibGljOgogCiAg ICAgZW51bSBUZXh0VHJhY2tUeXBlIHsgVHJhY2tFbGVtZW50LCBBZGRUcmFjaywgSW5CYW5kIH07 CiAgICAgVGV4dFRyYWNrVHlwZSB0cmFja1R5cGUoKSBjb25zdCB7IHJldHVybiBtX3RyYWNrVHlw ZTsgfQotICAgIAotICAgIGVudW0gV2ViVlRUTm9kZVR5cGUge1dlYlZUVE5vZGVUeXBlTm9uZSwg V2ViVlRUTm9kZVR5cGVGdXR1cmUsIFdlYlZUVE5vZGVUeXBlUGFzdH07CiAKICAgICBpbnQgdHJh Y2tJbmRleCgpOwogICAgIHZvaWQgaW52YWxpZGF0ZVRyYWNrSW5kZXgoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAppbmRleCBhNWM4ZjAwNzdmNzc4MmE1NzA5 MGQ1MTI2MjZmZjgyZjhlMjc5ODI1Li41ZDM4NzliYjk3MzUzYTFmNjUxODFlYWU1OWJjZDFmNWU5 MjkzNmUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1 ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwCkBA IC02NzcsMTMgKzY3Nyw5IEBAIHZvaWQgVGV4dFRyYWNrQ3VlOjptYXJrRnV0dXJlQW5kUGFzdE5v ZGVzKEVsZW1lbnQqIHJvb3QsIGRvdWJsZSBwcmV2aW91c1RpbWVzdGFtCiAgICAgICAgICAgICBp ZiAoY3VycmVudFRpbWVzdGFtcCA+IG1vdmllVGltZSkKICAgICAgICAgICAgICAgICBpc1Bhc3RO b2RlID0gZmFsc2U7CiAgICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgIGlmIChjaGlsZC0+aXNF bGVtZW50Tm9kZSgpKSB7Ci0gICAgICAgICAgICBpZiAoIWlzUGFzdE5vZGUpCi0gICAgICAgICAg ICAgICAgdG9FbGVtZW50KGNoaWxkKS0+c2V0SXNXZWJWVFRGdXR1cmVOb2RlKCk7Ci0gICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgdG9FbGVtZW50KGNoaWxkKS0+c2V0SXNXZWJWVFRO b2RlKCk7Ci0gICAgICAgIH0KKworICAgICAgICBpZiAoY2hpbGQtPmlzRWxlbWVudE5vZGUoKSkK KyAgICAgICAgICAgIHRvRWxlbWVudChjaGlsZCktPnNldFdlYlZUVE5vZGVUeXBlKGlzUGFzdE5v ZGUgPyBXZWJWVFROb2RlVHlwZVBhc3QgOiBXZWJWVFROb2RlVHlwZUZ1dHVyZSk7CiAgICAgfQog fQogCg== 182453 2013-01-11 17:39:59 -0800 2013-01-14 12:19:24 -0800 Patch bug-106714-20130111173701.patch text/plain 9795 esprehn U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQyNWVjMTU2ZmQzMjE2 NTAwZDlhZjcxYTM5OTMyNjA0YjQ5OWFiMS4uYmQzNzAyNmM5M2FkMzA4NGJhNjU3NDRiMGMxNDdj ZWZhMTdkNDViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAxLTExICBFbGxp b3R0IFNwcmVobiAgPGVzcHJlaG5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIENsZWFuIHVwIFdl YlZUVE5vZGVUeXBlIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNjcxNAorCisgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCisKKyAg ICAgICAgVGhlcmUncyBubyByZWFzb24gZm9yIHNvIG1hbnkgbWV0aG9kcyBqdXN0IHRvIGNvbXBh cmUgc29tZSBlbnVtcy4KKyAgICAgICAgVGhlIGV4aXN0aW5nIGNvZGUgY2FuIGFsc28gYmUgc2lt cGxpZmllZCBxdWl0ZSBhIGJpdC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGp1c3QgcmVmYWN0 b3JpbmcuCisKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tPbmUpOgorICAgICAgICAqIGNzcy9TdHlsZVJl c29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmNvbGxlY3RNYXRj aGluZ1J1bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmNhblNoYXJlU3R5 bGVXaXRoRWxlbWVudCk6CisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RWxlbWVudDo6d2ViVlRUTm9kZVR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVu dDo6c2V0V2ViVlRUTm9kZVR5cGUpOgorICAgICAgICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAg IChFbGVtZW50KToKKyAgICAgICAgKiBkb20vRWxlbWVudFJhcmVEYXRhLmg6CisgICAgICAgIChX ZWJDb3JlOjpFbGVtZW50UmFyZURhdGE6OnNldFdlYlZUVE5vZGVUeXBlKToKKyAgICAgICAgKFdl YkNvcmU6OkVsZW1lbnRSYXJlRGF0YTo6d2ViVlRUTm9kZVR5cGUpOgorICAgICAgICAoRWxlbWVu dFJhcmVEYXRhKToKKyAgICAgICAgKiBkb20vTm9kZVJhcmVEYXRhLmg6CisgICAgICAgIChXZWJD b3JlOjpOb2RlUmFyZURhdGE6Ok5vZGVSYXJlRGF0YSk6CisgICAgICAgIChOb2RlUmFyZURhdGEp OgorICAgICAgICAqIGh0bWwvdHJhY2svVGV4dFRyYWNrLmg6CisgICAgICAgICogaHRtbC90cmFj ay9UZXh0VHJhY2tDdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrQ3VlOjptYXJr RnV0dXJlQW5kUGFzdE5vZGVzKToKKwogMjAxMy0wMS0xMSAgSm9zaHVhIEJlbGwgIDxqc2JlbGxA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIEluZGV4ZWREQjogSURCVHJhbnNhY3Rpb24gc2hvdWxk IG1hbmFnZSBsaWZldGltZSBvZiBJREJSZXF1ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JD aGVja2VyLmNwcAppbmRleCAyYjI2YzY4MDViYjczYmY0OTNmNDI5NTdhZDRiZWM0MjU3MDgxMGQ0 Li4yZTg3NGY0ZmNkOTMwMDA5Yzk3OGNjNmE5ZTQzZmViMjUxYjg0NjlmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcApAQCAtOTQxLDkgKzk0MSw3IEBAIGJvb2wgU2VsZWN0 b3JDaGVja2VyOjpjaGVja09uZShjb25zdCBTZWxlY3RvckNoZWNraW5nQ29udGV4dCYgY29udGV4 dCwgY29uc3QgU2liCiAgICAgICAgICAgICByZXR1cm4gZWxlbWVudC0+aXNPdXRPZlJhbmdlKCk7 CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgICAgICBjYXNlIENTU1NlbGVjdG9yOjpQc2V1 ZG9GdXR1cmVDdWU6Ci0gICAgICAgICAgICBpZiAoZWxlbWVudC0+aXNXZWJWVFRGdXR1cmVOb2Rl KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgICAgICByZXR1cm4gZWxlbWVudC0+d2ViVlRUTm9kZVR5cGUoKSA9PSBXZWJW VFROb2RlVHlwZUZ1dHVyZTsKICNlbmRpZgogCiAgICAgICAgIGNhc2UgQ1NTU2VsZWN0b3I6OlBz ZXVkb0hvcml6b250YWw6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNv bHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggODE0 MWJmOWM3ZTQyMTk3ZTEzNGQ0MDU1ZjRmMzYyZWRmNzNjYzA4Ni4uNzI1ZTk3ZDRhNjc3ODg0ZmFi ZGU4ZmM0YmJjMDc2MzRlMDFhN2QxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNw cApAQCAtNjU0LDcgKzY1NCw3IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6Y29sbGVjdE1hdGNoaW5n UnVsZXMoUnVsZVNldCogcnVsZXMsIGludCYgZmlyc3RSdWxlSW5kZXgsIGluCiAgICAgfQogCiAj aWYgRU5BQkxFKFZJREVPX1RSQUNLKQotICAgIGlmIChtX2VsZW1lbnQtPmlzV2ViVlRUTm9kZSgp KQorICAgIGlmIChtX2VsZW1lbnQtPndlYlZUVE5vZGVUeXBlKCkpCiAgICAgICAgIGNvbGxlY3RN YXRjaGluZ1J1bGVzRm9yTGlzdChydWxlcy0+Y3VlUHNldWRvUnVsZXMoKSwgZmlyc3RSdWxlSW5k ZXgsIGxhc3RSdWxlSW5kZXgsIG9wdGlvbnMpOwogI2VuZGlmCiAgICAgLy8gQ2hlY2sgd2hldGhl ciBvdGhlciB0eXBlcyBvZiBydWxlcyBhcmUgYXBwbGljYWJsZSBpbiB0aGUgY3VycmVudCB0cmVl IHNjb3BlLiBDcml0ZXJpYSBmb3IgdGhpczoKQEAgLTEyNDEsMTAgKzEyNDEsNyBAQCBib29sIFN0 eWxlUmVzb2x2ZXI6OmNhblNoYXJlU3R5bGVXaXRoRWxlbWVudChTdHlsZWRFbGVtZW50KiBlbGVt ZW50KSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICNpZiBFTkFCTEUoVklERU9fVFJB Q0spCi0gICAgaWYgKGVsZW1lbnQtPmlzV2ViVlRUTm9kZSgpICYmIG1fZWxlbWVudC0+aXNXZWJW VFROb2RlKCkgJiYgZWxlbWVudC0+aXNXZWJWVFRGdXR1cmVOb2RlKCkgIT0gbV9lbGVtZW50LT5p c1dlYlZUVEZ1dHVyZU5vZGUoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIC8vIERlbnkg c2hhcmluZyBzdHlsZXMgYmV0d2VlbiBXZWJWVFQgbm9kZXMgYW5kIG5vbi1XZWJWVFQgbm9kZXMu Ci0gICAgaWYgKGVsZW1lbnQtPmlzV2ViVlRUTm9kZSgpICE9IG1fZWxlbWVudC0+aXNXZWJWVFRO b2RlKCkpCisgICAgaWYgKGVsZW1lbnQtPndlYlZUVE5vZGVUeXBlKCkgIT0gbV9lbGVtZW50LT53 ZWJWVFROb2RlVHlwZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCmluZGV4IGEzMTEzNjg3YTY3YzM4NGVhNDUwYmNjNmMwNGY2ZDBjMGNlMWU3 MDQuLmI4NDlkOGE1MmVkNDAyYjgxYjk0ZTdkMDRlMDc3ZTJiMjM4MTYzMjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKQEAgLTIzMDgsMjQgKzIzMDgsMTQgQEAgYm9vbCBFbGVtZW50OjpjaGlsZFNo b3VsZENyZWF0ZVJlbmRlcmVyKGNvbnN0IE5vZGVSZW5kZXJpbmdDb250ZXh0JiBjaGlsZENvbnRl eHQKICNlbmRpZgogCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQotYm9vbCBFbGVtZW50Ojppc1dl YlZUVE5vZGUoKSBjb25zdAorV2ViVlRUTm9kZVR5cGUgRWxlbWVudDo6d2ViVlRUTm9kZVR5cGUo KSBjb25zdAogewotICAgIHJldHVybiBoYXNSYXJlRGF0YSgpICYmIGVsZW1lbnRSYXJlRGF0YSgp LT5pc1dlYlZUVE5vZGUoKTsKKyAgICByZXR1cm4gaGFzUmFyZURhdGEoKSA/IGVsZW1lbnRSYXJl RGF0YSgpLT53ZWJWVFROb2RlVHlwZSgpIDogV2ViVlRUTm9kZVR5cGVOb25lOwogfQogCi12b2lk IEVsZW1lbnQ6OnNldElzV2ViVlRUTm9kZSgpCit2b2lkIEVsZW1lbnQ6OnNldFdlYlZUVE5vZGVU eXBlKFdlYlZUVE5vZGVUeXBlIHR5cGUpCiB7Ci0gICAgZW5zdXJlRWxlbWVudFJhcmVEYXRhKCkt PnNldElzV2ViVlRUTm9kZSgpOwotfQotCi1ib29sIEVsZW1lbnQ6OmlzV2ViVlRURnV0dXJlTm9k ZSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGhhc1JhcmVEYXRhKCkgJiYgZWxlbWVudFJhcmVEYXRh KCktPmlzV2ViVlRURnV0dXJlTm9kZSgpOwotfQotCi12b2lkIEVsZW1lbnQ6OnNldElzV2ViVlRU RnV0dXJlTm9kZSgpCi17Ci0gICAgZW5zdXJlRWxlbWVudFJhcmVEYXRhKCktPnNldElzV2ViVlRU RnV0dXJlTm9kZSgpOworICAgIGVuc3VyZUVsZW1lbnRSYXJlRGF0YSgpLT5zZXRXZWJWVFROb2Rl VHlwZSh0eXBlKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAppbmRleCBlNjNkOTExMzhk ZTEwZDY0M2I3ODhjYjFlMGQzMTNkOTY3YzkyNWVkLi5iOTY3MzY5OWNjN2NlY2E2YWQxMGQyNGNh YjhlZDdjMTI3MDBlMmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKQEAgLTMxLDYgKzMxLDkgQEAKICNp bmNsdWRlICJGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24uaCIKICNpbmNsdWRlICJIVE1MTmFt ZXMuaCIKICNpbmNsdWRlICJTY3JvbGxUeXBlcy5oIgorI2lmIEVOQUJMRShWSURFT19UUkFDSykK KyNpbmNsdWRlICJUZXh0VHJhY2suaCIKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK QEAgLTQ0NywxMiArNDUwLDEwIEBAIHB1YmxpYzoKICNlbmRpZgogCiAjaWYgRU5BQkxFKFZJREVP X1RSQUNLKQotICAgIGJvb2wgaXNXZWJWVFROb2RlKCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRJc1dl YlZUVE5vZGUoKTsKLSAgICBib29sIGlzV2ViVlRURnV0dXJlTm9kZSgpIGNvbnN0OwotICAgIHZv aWQgc2V0SXNXZWJWVFRGdXR1cmVOb2RlKCk7CisgICAgV2ViVlRUTm9kZVR5cGUgd2ViVlRUTm9k ZVR5cGUoKSBjb25zdDsKKyAgICB2b2lkIHNldFdlYlZUVE5vZGVUeXBlKFdlYlZUVE5vZGVUeXBl KTsKICNlbmRpZgotICAgIAorCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQogICAgIGVudW0g ewogICAgICAgICBBTExPV19LRVlCT0FSRF9JTlBVVCA9IDEgPDwgMCwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50UmFyZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9F bGVtZW50UmFyZURhdGEuaAppbmRleCAyNjgzMDFjNGYxMTQ5YWEwZTg2OGNlOThjYTY5MjYyOTNj YjczYjcyLi41Y2JjOGM1YzlkNTY2NmI5Zjk4M2U2NmRlMGFlMjM2MzgyY2E1YjgxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudFJhcmVEYXRhLmgKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnRSYXJlRGF0YS5oCkBAIC01NSwxMSArNTUsMTAgQEAgcHVibGljOgog ICAgIHZvaWQgc2V0SXNJbkNhbnZhc1N1YnRyZWUoYm9vbCB2YWx1ZSkgeyBtX2lzSW5DYW52YXNT dWJ0cmVlID0gdmFsdWU7IH0KIAogI2lmIEVOQUJMRShWSURFT19UUkFDSykKLSAgICB1c2luZyBO b2RlUmFyZURhdGE6OmlzV2ViVlRUTm9kZTsKLSAgICB1c2luZyBOb2RlUmFyZURhdGE6OnNldElz V2ViVlRUTm9kZTsKLSAgICB1c2luZyBOb2RlUmFyZURhdGE6OmlzV2ViVlRURnV0dXJlTm9kZTsK LSAgICB1c2luZyBOb2RlUmFyZURhdGE6OnNldElzV2ViVlRURnV0dXJlTm9kZTsKKyAgICB2b2lk IHNldFdlYlZUVE5vZGVUeXBlKFdlYlZUVE5vZGVUeXBlIHR5cGUpIHsgbV93ZWJWVFROb2RlVHlw ZSA9IHR5cGU7IH0KKyAgICBXZWJWVFROb2RlVHlwZSB3ZWJWVFROb2RlVHlwZSgpIGNvbnN0IHsg cmV0dXJuIHN0YXRpY19jYXN0PFdlYlZUVE5vZGVUeXBlPihtX3dlYlZUVE5vZGVUeXBlKTsgfQog I2VuZGlmCisKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgYm9vbCBjb250YWluc0Z1 bGxTY3JlZW5FbGVtZW50KCkgeyByZXR1cm4gbV9jb250YWluc0Z1bGxTY3JlZW5FbGVtZW50OyB9 CiAgICAgdm9pZCBzZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50KGJvb2wgdmFsdWUpIHsgbV9j b250YWluc0Z1bGxTY3JlZW5FbGVtZW50ID0gdmFsdWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Ob2RlUmFyZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmFyZURh dGEuaAppbmRleCAyYTE0Zjg1YzQ0ZjZiMGQ3ZTEyY2Q4ZGZkZmVlMDU4ODE5YzQxNTkxLi5kZmVj OTJlNjdhM2UzMjBiNTkwZmVmZjg3ZWQ4Njc3MjFjMDk3MDg4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vTm9kZVJhcmVEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGVS YXJlRGF0YS5oCkBAIC0yNzIsNyArMjcyLDcgQEAgcHVibGljOgogICAgICAgICAsIG1fY2hpbGRy ZW5BZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxSdWxlcyhmYWxzZSkKICAgICAgICAgLCBtX2No aWxkcmVuQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKGZhbHNlKQogI2lmIEVOQUJM RShWSURFT19UUkFDSykKLSAgICAgICAgLCBtX1dlYlZUVE5vZGVUeXBlKFRleHRUcmFjazo6V2Vi VlRUTm9kZVR5cGVOb25lKQorICAgICAgICAsIG1fd2ViVlRUTm9kZVR5cGUoV2ViVlRUTm9kZVR5 cGVOb25lKQogI2VuZGlmCiAgICAgewogICAgIH0KQEAgLTM3MSwxMiArMzcxLDYgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKikg Y29uc3Q7CiAKIHByb3RlY3RlZDoKLSNpZiBFTkFCTEUoVklERU9fVFJBQ0spCi0gICAgYm9vbCBp c1dlYlZUVE5vZGUoKSB7IHJldHVybiBzdGF0aWNfY2FzdDxUZXh0VHJhY2s6OldlYlZUVE5vZGVU eXBlPihtX1dlYlZUVE5vZGVUeXBlKSAhPSBUZXh0VHJhY2s6OldlYlZUVE5vZGVUeXBlTm9uZTsg fQotICAgIHZvaWQgc2V0SXNXZWJWVFROb2RlKCkgeyBtX1dlYlZUVE5vZGVUeXBlID0gVGV4dFRy YWNrOjpXZWJWVFROb2RlVHlwZVBhc3Q7IH0KLSAgICBib29sIGlzV2ViVlRURnV0dXJlTm9kZSgp IHsgcmV0dXJuIHN0YXRpY19jYXN0PFRleHRUcmFjazo6V2ViVlRUTm9kZVR5cGU+KG1fV2ViVlRU Tm9kZVR5cGUpID09IFRleHRUcmFjazo6V2ViVlRUTm9kZVR5cGVGdXR1cmU7IH0KLSAgICB2b2lk IHNldElzV2ViVlRURnV0dXJlTm9kZSgpIHsgbV9XZWJWVFROb2RlVHlwZSA9IFRleHRUcmFjazo6 V2ViVlRUTm9kZVR5cGVGdXR1cmU7IH0KLSNlbmRpZgogICAgIHNob3J0IG1fdGFiSW5kZXg7CiAg ICAgdW5zaWduZWQgc2hvcnQgbV9jaGlsZEluZGV4OwogICAgIHVuc2lnbmVkIG1fdGFiSW5kZXhX YXNTZXRFeHBsaWNpdGx5IDogMTsKQEAgLTQwNCw3ICszOTgsNyBAQCBwcm90ZWN0ZWQ6CiAgICAg dW5zaWduZWQgbV9jaGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzIDogMTsK ICAgICB1bnNpZ25lZCBtX2NoaWxkcmVuQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVz IDogMTsKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCi0gICAgdW5zaWduZWQgbV9XZWJWVFROb2Rl VHlwZSA6IDI7CisgICAgdW5zaWduZWQgbV93ZWJWVFROb2RlVHlwZSA6IDI7IC8vIFdlYlZUVE5v ZGVUeXBlCiAjZW5kaWYKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svVGV4dFRyYWNrLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFj ay5oCmluZGV4IDA4NGIxZjUzMzFmZjQ1ZGQyNzYwYWJiNDU2NjU2YWUxMDIyMmNiMGUuLjY2M2Qw NDkzN2U1NGRhM2E4ZjUwMzk0MTRlNGM2MWI0ZGQzNWEyNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9UZXh0VHJhY2suaApAQCAtNTMsNiArNTMsMTIgQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCB0ZXh0VHJhY2tSZW1vdmVDdWUoVGV4dFRyYWNrKiwgUGFzc1JlZlB0cjxUZXh0VHJhY2tD dWU+KSA9IDA7CiB9OwogCitlbnVtIFdlYlZUVE5vZGVUeXBlIHsKKyAgICBXZWJWVFROb2RlVHlw ZU5vbmUgPSAwLAorICAgIFdlYlZUVE5vZGVUeXBlRnV0dXJlLAorICAgIFdlYlZUVE5vZGVUeXBl UGFzdAorfTsKKwogY2xhc3MgVGV4dFRyYWNrIDogcHVibGljIFRyYWNrQmFzZSB7CiBwdWJsaWM6 CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8VGV4dFRyYWNrPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogY29udGV4dCwgVGV4dFRyYWNrQ2xpZW50KiBjbGllbnQsIGNvbnN0IEF0b21pY1N0 cmluZyYga2luZCwgY29uc3QgQXRvbWljU3RyaW5nJiBsYWJlbCwgY29uc3QgQXRvbWljU3RyaW5n JiBsYW5ndWFnZSkKQEAgLTEwNyw4ICsxMTMsNiBAQCBwdWJsaWM6CiAKICAgICBlbnVtIFRleHRU cmFja1R5cGUgeyBUcmFja0VsZW1lbnQsIEFkZFRyYWNrLCBJbkJhbmQgfTsKICAgICBUZXh0VHJh Y2tUeXBlIHRyYWNrVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHJhY2tUeXBlOyB9Ci0gICAgCi0g ICAgZW51bSBXZWJWVFROb2RlVHlwZSB7V2ViVlRUTm9kZVR5cGVOb25lLCBXZWJWVFROb2RlVHlw ZUZ1dHVyZSwgV2ViVlRUTm9kZVR5cGVQYXN0fTsKIAogICAgIGludCB0cmFja0luZGV4KCk7CiAg ICAgdm9pZCBpbnZhbGlkYXRlVHJhY2tJbmRleCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFj ay9UZXh0VHJhY2tDdWUuY3BwCmluZGV4IGE1YzhmMDA3N2Y3NzgyYTU3MDkwZDUxMjYyNmZmODJm OGUyNzk4MjUuLjVkMzg3OWJiOTczNTNhMWY2NTE4MWVhZTU5YmNkMWY1ZTkyOTM2ZTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAKQEAgLTY3NywxMyArNjc3 LDkgQEAgdm9pZCBUZXh0VHJhY2tDdWU6Om1hcmtGdXR1cmVBbmRQYXN0Tm9kZXMoRWxlbWVudCog cm9vdCwgZG91YmxlIHByZXZpb3VzVGltZXN0YW0KICAgICAgICAgICAgIGlmIChjdXJyZW50VGlt ZXN0YW1wID4gbW92aWVUaW1lKQogICAgICAgICAgICAgICAgIGlzUGFzdE5vZGUgPSBmYWxzZTsK ICAgICAgICAgfQotICAgICAgICAKLSAgICAgICAgaWYgKGNoaWxkLT5pc0VsZW1lbnROb2RlKCkp IHsKLSAgICAgICAgICAgIGlmICghaXNQYXN0Tm9kZSkKLSAgICAgICAgICAgICAgICB0b0VsZW1l bnQoY2hpbGQpLT5zZXRJc1dlYlZUVEZ1dHVyZU5vZGUoKTsKLSAgICAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgICAgICB0b0VsZW1lbnQoY2hpbGQpLT5zZXRJc1dlYlZUVE5vZGUoKTsKLSAgICAg ICAgfQorCisgICAgICAgIGlmIChjaGlsZC0+aXNFbGVtZW50Tm9kZSgpKQorICAgICAgICAgICAg dG9FbGVtZW50KGNoaWxkKS0+c2V0V2ViVlRUTm9kZVR5cGUoaXNQYXN0Tm9kZSA/IFdlYlZUVE5v ZGVUeXBlUGFzdCA6IFdlYlZUVE5vZGVUeXBlRnV0dXJlKTsKICAgICB9CiB9CiAK