118998 2013-07-22 17:50:16 -0700 Plug-in unavailability indicator should not be displayed if a blocked plugin's indicator is clipped 2013-07-22 18:40:27 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca commit-queue esprehn+autocc glenn gordon_sheridan japhet kondapallykalyan sfalken oldest_to_newest 910888 0 thorton 2013-07-22 17:50:16 -0700 We don't want to display the indicator if it's clipped and the indicator is for a blocked plug-in, because clients can do their own thing in that case (via DidBlockInsecurePluginVersion). <rdar://problem/14511268> 910890 1 207300 thorton 2013-07-22 17:58:45 -0700 Created attachment 207300 patch 910892 2 commit-queue 2013-07-22 18:00:15 -0700 Attachment 207300 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.exp.in', u'Source/WebCore/html/HTMLEmbedElement.cpp', u'Source/WebCore/html/HTMLObjectElement.cpp', u'Source/WebCore/html/HTMLPlugInElement.cpp', u'Source/WebCore/html/HTMLPlugInImageElement.cpp', u'Source/WebCore/loader/SubframeLoader.cpp', u'Source/WebCore/page/FrameView.cpp', u'Source/WebCore/rendering/RenderEmbeddedObject.cpp', u'Source/WebCore/rendering/RenderEmbeddedObject.h', u'Source/WebKit2/WebProcess/WebPage/WebPage.cpp']" exit_code: 1 Source/WebCore/rendering/RenderEmbeddedObject.h:52: The parameter name "hidden" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 910893 3 thorton 2013-07-22 18:40:27 -0700 http://trac.webkit.org/changeset/153017 207300 2013-07-22 17:58:45 -0700 2013-07-22 17:59:34 -0700 patch hidden.diff text/plain 12928 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MjgxZWFjLi4wYzE0ZGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTEg QEAKIDIwMTMtMDctMjIgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgUGx1Zy1pbiB1bmF2YWlsYWJpbGl0eSBpbmRpY2F0b3Igc2hvdWxkIG5vdCBiZSBk aXNwbGF5ZWQgaWYgYSBibG9ja2VkIHBsdWdpbidzIGluZGljYXRvciBpcyBjbGlwcGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg5OTgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE0NTExMjY4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgKiBodG1sL0hUTUxFbWJlZEVsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVtYmVkRWxlbWVudDo6dXBkYXRlV2lkZ2V0KToKKyAg ICAgICAgKiBodG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxPYmplY3RFbGVtZW50Ojp1cGRhdGVXaWRnZXQpOgorICAgICAgICAqIGh0bWwvSFRNTFBsdWdJ bkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQ6OmRlZmF1 bHRFdmVudEhhbmRsZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQ6OnN1 cHBvcnRzRm9jdXMpOgorICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp1cGRhdGVXaWRnZXRJ Zk5lY2Vzc2FyeSk6CisgICAgICAgICogbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlN1YmZyYW1lTG9hZGVyOjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KToKKyAg ICAgICAgKFdlYkNvcmU6OlN1YmZyYW1lTG9hZGVyOjpsb2FkUGx1Z2luKToKKyAgICAgICAgKiBw YWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVdp ZGdldCk6CisgICAgICAgIFJlbmFtZSBzaG93c1VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yIHRv IGlzUGx1Z2luVW5hdmFpbGFibGUsIHNpbmNlIGJlaW5nIHVuYXZhaWxhYmxlCisgICAgICAgIGFu ZCBhY3R1YWxseSBzaG93aW5nIHRoZSBpbmRpY2F0b3IgYXJlIHR3byB0b3RhbGx5IGRpZmZlcmVu dCB0aGluZ3MuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogRXhwb3NlIHNldFVuYXZhaWxh YmxlUGx1Z2luSW5kaWNhdG9ySXNIaWRkZW4uCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy RW1iZWRkZWRPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmpl Y3Q6OlJlbmRlckVtYmVkZGVkT2JqZWN0KToKKyAgICAgICAgUmVuYW1lIG1fc2hvd3NVbmF2YWls YWJsZVBsdWdpbkluZGljYXRvciB0byBtX2lzUGx1Z2luVW5hdmFpbGFibGUuCisgICAgICAgIEFk ZCBtX2lzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JIaWRkZW4sIGRlZmF1bHRpbmcgdG8gZmFs c2UuCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0OjpzZXRQbHVnaW5V bmF2YWlsYWJpbGl0eVJlYXNvbldpdGhEZXNjcmlwdGlvbik6CisgICAgICAgIFNldCBtX2lzUGx1 Z2luVW5hdmFpbGFibGUgd2hlbiB3ZSBnZXQgYW4gdW5hdmFpbGFiaWxpdHkgcmVhc29uLgorCisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFpbnQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OnNldFVuYXZhaWxhYmxlUGx1Z2luSW5kaWNh dG9ySXNIaWRkZW4pOiBBZGRlZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRl ZE9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OmlzUGx1 Z2luVW5hdmFpbGFibGUpOiBBZGRlZC4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRk ZWRPYmplY3Q6OnNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IpOgorICAgICAgICBSZXB1 cnBvc2UgInNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IiIHRvIGFjdHVhbGx5IHJlcHJl c2VudCB3aGV0aGVyCisgICAgICAgIHRoZSBpbmRpY2F0b3IgaXMgZGlzcGxheWVkIChpLmUuIHRo ZSBwbHVnaW4gaXMgdW5hdmFpbGFibGUsIGFuZCB0aGUKKyAgICAgICAgaW5kaWNhdG9yIGlzIG5v dCBoaWRkZW4pLgorCisyMDEzLTA3LTIyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBw bGUuY29tPgorCiAgICAgICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0Ojppc1JlcGxhY2VtZW50T2Jz Y3VyZWQgc2hvdWxkIGluY2x1ZGUgdGhlIGFycm93IGluIGl0cyBhcmVhLW9mLWludGVyZXN0CiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg5OTUKICAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE0NTE2NDIxPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCBj YWFmNzlhLi4wZmI0MmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtNjY5LDYgKzY2OSw3IEBA IF9fWk43V2ViQ29yZTIwRGlzcGxheVNsZWVwRGlzYWJsZXJEMUV2CiBfX1pON1dlYkNvcmUyME5v ZGVSZW5kZXJpbmdDb250ZXh0QzFFUE5TXzROb2RlRQogX19aTjdXZWJDb3JlMjBOb2RlUmVuZGVy aW5nQ29udGV4dEQxRXYKIF9fWk43V2ViQ29yZTIwUmVuZGVyRW1iZWRkZWRPYmplY3QyOXNldFBs dWdpblVuYXZhaWxhYmlsaXR5UmVhc29uRU5TMF8yNlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29u RQorX19aTjdXZWJDb3JlMjBSZW5kZXJFbWJlZGRlZE9iamVjdDM3c2V0VW5hdmFpbGFibGVQbHVn aW5JbmRpY2F0b3JJc0hpZGRlbkViCiBfX1pON1dlYkNvcmUyMFJlbmRlckVtYmVkZGVkT2JqZWN0 NDRzZXRQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbldpdGhEZXNjcmlwdGlvbkVOUzBfMjZQbHVn aW5VbmF2YWlsYWJpbGl0eVJlYXNvbkVSS04zV1RGNlN0cmluZ0UKIF9fWk5LN1dlYkNvcmUyMFJl bmRlckVtYmVkZGVkT2JqZWN0MjFpc1JlcGxhY2VtZW50T2JzY3VyZWRFdgogX19aTjdXZWJDb3Jl MjBSZXNvdXJjZUhhbmRsZUNsaWVudDE2ZGlkUmVjZWl2ZUJ1ZmZlckVQTlNfMTRSZXNvdXJjZUhh bmRsZUVOM1dURjEwUGFzc1JlZlB0cklOU18xMlNoYXJlZEJ1ZmZlckVFRWkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwCmluZGV4IGVkMTJiMWYuLjc5ZjFhNDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcApAQCAtMTI1LDcgKzEyNSw3IEBA IHZvaWQgSFRNTEVtYmVkRWxlbWVudDo6cGFyYW1ldGVyc0ZvclBsdWdpbihWZWN0b3I8U3RyaW5n PiYgcGFyYW1OYW1lcywgVmVjdG9yPFN0CiAvLyBtb3ZlZCBkb3duIGludG8gSFRNTFBsdWdpbklt YWdlRWxlbWVudC5jcHAKIHZvaWQgSFRNTEVtYmVkRWxlbWVudDo6dXBkYXRlV2lkZ2V0KFBsdWdp bkNyZWF0aW9uT3B0aW9uIHBsdWdpbkNyZWF0aW9uT3B0aW9uKQogewotICAgIEFTU0VSVCghcmVu ZGVyRW1iZWRkZWRPYmplY3QoKS0+c2hvd3NVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcigpKTsK KyAgICBBU1NFUlQoIXJlbmRlckVtYmVkZGVkT2JqZWN0KCktPmlzUGx1Z2luVW5hdmFpbGFibGUo KSk7CiAgICAgQVNTRVJUKG5lZWRzV2lkZ2V0VXBkYXRlKCkpOwogICAgIHNldE5lZWRzV2lkZ2V0 VXBkYXRlKGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT2Jq ZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNw cAppbmRleCBhOTMxOTJhLi45NWM3OTUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxPYmplY3RFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmpl Y3RFbGVtZW50LmNwcApAQCAtMjc2LDcgKzI3Niw3IEBAIGJvb2wgSFRNTE9iamVjdEVsZW1lbnQ6 Omhhc1ZhbGlkQ2xhc3NJZCgpCiAvLyBtb3ZlZCBkb3duIGludG8gSFRNTFBsdWdpbkltYWdlRWxl bWVudC5jcHAKIHZvaWQgSFRNTE9iamVjdEVsZW1lbnQ6OnVwZGF0ZVdpZGdldChQbHVnaW5DcmVh dGlvbk9wdGlvbiBwbHVnaW5DcmVhdGlvbk9wdGlvbikKIHsKLSAgICBBU1NFUlQoIXJlbmRlckVt YmVkZGVkT2JqZWN0KCktPnNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoKSk7CisgICAg QVNTRVJUKCFyZW5kZXJFbWJlZGRlZE9iamVjdCgpLT5pc1BsdWdpblVuYXZhaWxhYmxlKCkpOwog ICAgIEFTU0VSVChuZWVkc1dpZGdldFVwZGF0ZSgpKTsKICAgICBzZXROZWVkc1dpZGdldFVwZGF0 ZShmYWxzZSk7CiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIEFTU0VSVCBpc0ZpbmlzaGVkUGFy c2luZ0NoaWxkcmVuKCkgaW5zdGVhZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTFBsdWdJbkVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxl bWVudC5jcHAKaW5kZXggZjU1NTliNS4uZGY5M2IzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MUGx1Z0luRWxlbWVudC5jcHAKQEAgLTIwMCw3ICsyMDAsNyBAQCB2b2lkIEhUTUxQbHVnSW5F bGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKIAogICAgIFJlbmRlck9i amVjdCogciA9IHJlbmRlcmVyKCk7CiAgICAgaWYgKHIgJiYgci0+aXNFbWJlZGRlZE9iamVjdCgp KSB7Ci0gICAgICAgIGlmICh0b1JlbmRlckVtYmVkZGVkT2JqZWN0KHIpLT5zaG93c1VuYXZhaWxh YmxlUGx1Z2luSW5kaWNhdG9yKCkpIHsKKyAgICAgICAgaWYgKHRvUmVuZGVyRW1iZWRkZWRPYmpl Y3QociktPmlzUGx1Z2luVW5hdmFpbGFibGUoKSkgewogICAgICAgICAgICAgdG9SZW5kZXJFbWJl ZGRlZE9iamVjdChyKS0+aGFuZGxlVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JFdmVudChldmVu dCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTI1MSw3ICsyNTEsNyBAQCBi b29sIEhUTUxQbHVnSW5FbGVtZW50OjpzdXBwb3J0c0ZvY3VzKCkgY29uc3QKIAogICAgIGlmICh1 c2VGYWxsYmFja0NvbnRlbnQoKSB8fCAhcmVuZGVyZXIoKSB8fCAhcmVuZGVyZXIoKS0+aXNFbWJl ZGRlZE9iamVjdCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJuICF0b1JlbmRl ckVtYmVkZGVkT2JqZWN0KHJlbmRlcmVyKCkpLT5zaG93c1VuYXZhaWxhYmxlUGx1Z2luSW5kaWNh dG9yKCk7CisgICAgcmV0dXJuICF0b1JlbmRlckVtYmVkZGVkT2JqZWN0KHJlbmRlcmVyKCkpLT5p c1BsdWdpblVuYXZhaWxhYmxlKCk7CiB9CiAKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQ SSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCmlu ZGV4IDNmZWYyYWMuLmY4NWNiZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TFBsdWdJbkltYWdlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1 Z0luSW1hZ2VFbGVtZW50LmNwcApAQCAtMjY4LDcgKzI2OCw3IEBAIHZvaWQgSFRNTFBsdWdJbklt YWdlRWxlbWVudDo6dXBkYXRlV2lkZ2V0SWZOZWNlc3NhcnkoKQogICAgIGlmICghbmVlZHNXaWRn ZXRVcGRhdGUoKSB8fCB1c2VGYWxsYmFja0NvbnRlbnQoKSB8fCBpc0ltYWdlVHlwZSgpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBpZiAoIXJlbmRlckVtYmVkZGVkT2JqZWN0KCkgfHwgcmVuZGVy RW1iZWRkZWRPYmplY3QoKS0+c2hvd3NVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcigpKQorICAg IGlmICghcmVuZGVyRW1iZWRkZWRPYmplY3QoKSB8fCByZW5kZXJFbWJlZGRlZE9iamVjdCgpLT5p c1BsdWdpblVuYXZhaWxhYmxlKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIHVwZGF0ZVdpZGdl dChDcmVhdGVPbmx5Tm9uTmV0c2NhcGVQbHVnaW5zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3Vi ZnJhbWVMb2FkZXIuY3BwCmluZGV4IGI5MGVjY2EuLmY5ZGQzODkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcApAQCAtMzI0LDcgKzMyNCw3IEBAIFBhc3NSZWZQdHI8 V2lkZ2V0PiBTdWJmcmFtZUxvYWRlcjo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRT aXplJiBzaXplLCBICiAgICAgaWYgKCF3aWRnZXQpIHsKICAgICAgICAgUmVuZGVyRW1iZWRkZWRP YmplY3QqIHJlbmRlcmVyID0gZWxlbWVudC0+cmVuZGVyRW1iZWRkZWRPYmplY3QoKTsKIAotICAg ICAgICBpZiAoIXJlbmRlcmVyLT5zaG93c1VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yKCkpCisg ICAgICAgIGlmICghcmVuZGVyZXItPmlzUGx1Z2luVW5hdmFpbGFibGUoKSkKICAgICAgICAgICAg IHJlbmRlcmVyLT5zZXRQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbihSZW5kZXJFbWJlZGRlZE9i amVjdDo6UGx1Z2luTWlzc2luZyk7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KQEAgLTQ1Niw3 ICs0NTYsNyBAQCBib29sIFN1YmZyYW1lTG9hZGVyOjpsb2FkUGx1Z2luKEhUTUxQbHVnSW5JbWFn ZUVsZW1lbnQqIHBsdWdpbkVsZW1lbnQsIGNvbnN0IEtVUgogICAgICAgICBwbHVnaW5FbGVtZW50 LCB1cmwsIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCBtaW1lVHlwZSwgbG9hZE1hbnVhbGx5KTsK IAogICAgIGlmICghd2lkZ2V0KSB7Ci0gICAgICAgIGlmICghcmVuZGVyZXItPnNob3dzVW5hdmFp bGFibGVQbHVnaW5JbmRpY2F0b3IoKSkKKyAgICAgICAgaWYgKCFyZW5kZXJlci0+aXNQbHVnaW5V bmF2YWlsYWJsZSgpKQogICAgICAgICAgICAgcmVuZGVyZXItPnNldFBsdWdpblVuYXZhaWxhYmls aXR5UmVhc29uKFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5NaXNzaW5nKTsKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBjMmMz NTcwLi4zNDA4MTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yNjYyLDcgKzI2 NjIsNyBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlV2lkZ2V0KFJlbmRlck9iamVjdCogb2JqZWN0 KQogICAgIGlmIChvYmplY3QtPmlzRW1iZWRkZWRPYmplY3QoKSkgewogICAgICAgICBSZW5kZXJF bWJlZGRlZE9iamVjdCogZW1iZWRkZWRPYmplY3QgPSBzdGF0aWNfY2FzdDxSZW5kZXJFbWJlZGRl ZE9iamVjdCo+KG9iamVjdCk7CiAgICAgICAgIC8vIE5vIG5lZWQgdG8gdXBkYXRlIGlmIGl0J3Mg YWxyZWFkeSBjcmFzaGVkIG9yIGtub3duIHRvIGJlIG1pc3NpbmcuCi0gICAgICAgIGlmIChlbWJl ZGRlZE9iamVjdC0+c2hvd3NVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcigpKQorICAgICAgICBp ZiAoZW1iZWRkZWRPYmplY3QtPmlzUGx1Z2luVW5hdmFpbGFibGUoKSkKICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICBpZiAob2JqZWN0LT5pc1NuYXBzaG90dGVkUGx1Z0luKCkpIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3BwCmlu ZGV4IDg3MzAyM2IuLjgwNDFiMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcApAQCAtOTUsNyArOTUsOCBAQCBzdGF0aWMgY29uc3Qg Q29sb3ImIHJlcGxhY2VtZW50VGV4dENvbG9yKCkKIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpSZW5k ZXJFbWJlZGRlZE9iamVjdChFbGVtZW50KiBlbGVtZW50KQogICAgIDogUmVuZGVyUGFydChlbGVt ZW50KQogICAgICwgbV9oYXNGYWxsYmFja0NvbnRlbnQoZmFsc2UpCi0gICAgLCBtX3Nob3dzVW5h dmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoZmFsc2UpCisgICAgLCBtX2lzUGx1Z2luVW5hdmFpbGFi bGUoZmFsc2UpCisgICAgLCBtX2lzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JIaWRkZW4oZmFs c2UpCiAgICAgLCBtX3VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkKGZhbHNlKQog ICAgICwgbV9tb3VzZURvd25XYXNJblVuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yKGZhbHNlKQog ewpAQCAtMTU0LDggKzE1NSw4IEBAIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnNldFBsdWdp blVuYXZhaWxhYmlsaXR5UmVhc29uKFBsdWdpblVuYXZhaWxhYmlsaXR5UmVhCiAKIHZvaWQgUmVu ZGVyRW1iZWRkZWRPYmplY3Q6OnNldFBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uV2l0aERlc2Ny aXB0aW9uKFBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uIHBsdWdpblVuYXZhaWxhYmlsaXR5UmVh c29uLCBjb25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uKQogewotICAgIEFTU0VSVCghbV9zaG93c1Vu YXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yKTsKLSAgICBtX3Nob3dzVW5hdmFpbGFibGVQbHVnaW5J bmRpY2F0b3IgPSB0cnVlOworICAgIEFTU0VSVCghbV9pc1BsdWdpblVuYXZhaWxhYmxlKTsKKyAg ICBtX2lzUGx1Z2luVW5hdmFpbGFibGUgPSB0cnVlOwogICAgIG1fcGx1Z2luVW5hdmFpbGFiaWxp dHlSZWFzb24gPSBwbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbjsKIAogICAgIGlmIChkZXNjcmlw dGlvbi5pc0VtcHR5KCkpCkBAIC0xNjQsMTEgKzE2NSw2IEBAIHZvaWQgUmVuZGVyRW1iZWRkZWRP YmplY3Q6OnNldFBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uV2l0aERlc2NyaXB0aW9uKFBsdWdp blVuCiAgICAgICAgIG1fdW5hdmFpbGFibGVQbHVnaW5SZXBsYWNlbWVudFRleHQgPSBkZXNjcmlw dGlvbjsKIH0KIAotYm9vbCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2hvd3NVbmF2YWlsYWJsZVBs dWdpbkluZGljYXRvcigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fc2hvd3NVbmF2YWlsYWJsZVBs dWdpbkluZGljYXRvcjsKLX0KLQogdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2V0VW5hdmFp bGFibGVQbHVnaW5JbmRpY2F0b3JJc1ByZXNzZWQoYm9vbCBwcmVzc2VkKQogewogICAgIGlmICht X3VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkID09IHByZXNzZWQpCkBAIC0yMjcs NyArMjIzLDcgQEAgdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFpbnQoUGFpbnRJbmZvJiBw YWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE8KICAgICBpZiAoRnJhbWUqIGZyYW1l ID0gdGhpcy0+ZnJhbWUoKSkKICAgICAgICAgcGFnZSA9IGZyYW1lLT5wYWdlKCk7CiAKLSAgICBp ZiAoc2hvd3NVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcigpKSB7CisgICAgaWYgKGlzUGx1Z2lu VW5hdmFpbGFibGUoKSkgewogICAgICAgICBpZiAocGFnZSAmJiBwYWludEluZm8ucGhhc2UgPT0g UGFpbnRQaGFzZUZvcmVncm91bmQpCiAgICAgICAgICAgICBwYWdlLT5hZGRSZWxldmFudFVucGFp bnRlZE9iamVjdCh0aGlzLCB2aXN1YWxPdmVyZmxvd1JlY3QoKSk7CiAgICAgICAgIFJlbmRlclJl cGxhY2VkOjpwYWludChwYWludEluZm8sIHBhaW50T2Zmc2V0KTsKQEAgLTI3NSw2ICsyNzEsMTMg QEAgdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFpbnRSZXBsYWNlZChQYWludEluZm8mIHBh aW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQKICAgICBjb250ZXh0LT5kcmF3QmlkaVRleHQoZm9u dCwgcnVuLCBGbG9hdFBvaW50KGxhYmVsWCwgbGFiZWxZKSk7CiB9CiAKK3ZvaWQgUmVuZGVyRW1i ZWRkZWRPYmplY3Q6OnNldFVuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9ySXNIaWRkZW4oYm9vbCBo aWRkZW4pCit7CisgICAgbV9pc1VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9ySGlkZGVuID0gaGlk ZGVuOworCisgICAgcmVwYWludCgpOworfQorCiBzdGF0aWMgdm9pZCBhZGRSZXBsYWNlbWVudEFy cm93UGF0aChQYXRoJiBwYXRoLCBjb25zdCBGbG9hdFJlY3QmIGluc2lkZVJlY3QpCiB7CiAgICAg RmxvYXRSZWN0IGluc2lkZVJlY3RXaXRoTWFyZ2luKGluc2lkZVJlY3QpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaAppbmRleCA4ZmY3ZjU4Li44 Y2I5N2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRk ZWRPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRP YmplY3QuaApAQCAtNDUsNyArNDUsMTEgQEAgcHVibGljOgogICAgIH07CiAgICAgdm9pZCBzZXRQ bHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbihQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbik7CiAg ICAgdm9pZCBzZXRQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbldpdGhEZXNjcmlwdGlvbihQbHVn aW5VbmF2YWlsYWJpbGl0eVJlYXNvbiwgY29uc3QgU3RyaW5nJiBkZXNjcmlwdGlvbik7Ci0gICAg Ym9vbCBzaG93c1VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yKCkgY29uc3Q7CisKKyAgICBib29s IGlzUGx1Z2luVW5hdmFpbGFibGUoKSBjb25zdCB7IHJldHVybiBtX2lzUGx1Z2luVW5hdmFpbGFi bGU7IH0KKyAgICBib29sIHNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoKSBjb25zdCB7 IHJldHVybiBpc1BsdWdpblVuYXZhaWxhYmxlKCkgJiYgIW1faXNVbmF2YWlsYWJsZVBsdWdpbklu ZGljYXRvckhpZGRlbjsgfQorCisgICAgdm9pZCBzZXRVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRv cklzSGlkZGVuKGJvb2wgaGlkZGVuKTsKIAogICAgIC8vIEZJWE1FOiBUaGlzIGJlbG9uZ3Mgb24g SFRNTE9iamVjdEVsZW1lbnQuCiAgICAgYm9vbCBoYXNGYWxsYmFja0NvbnRlbnQoKSBjb25zdCB7 IHJldHVybiBtX2hhc0ZhbGxiYWNrQ29udGVudDsgfQpAQCAtMTAzLDcgKzEwNyw4IEBAIHByaXZh dGU6CiAKICAgICBib29sIG1faGFzRmFsbGJhY2tDb250ZW50OyAvLyBGSVhNRTogVGhpcyBiZWxv bmdzIG9uIEhUTUxPYmplY3RFbGVtZW50LgogCi0gICAgYm9vbCBtX3Nob3dzVW5hdmFpbGFibGVQ bHVnaW5JbmRpY2F0b3I7CisgICAgYm9vbCBtX2lzUGx1Z2luVW5hdmFpbGFibGU7CisgICAgYm9v bCBtX2lzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JIaWRkZW47CiAgICAgUGx1Z2luVW5hdmFp bGFiaWxpdHlSZWFzb24gbV9wbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbjsKICAgICBTdHJpbmcg bV91bmF2YWlsYWJsZVBsdWdpblJlcGxhY2VtZW50VGV4dDsKICAgICBib29sIG1fdW5hdmFpbGFi bGVQbHVnaW5JbmRpY2F0b3JJc1ByZXNzZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZWQzZWFjMC4uNzAzY2RiNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNTU4LDYgKzU1OCw3 IEBAIFBhc3NSZWZQdHI8UGx1Z2luPiBXZWJQYWdlOjpjcmVhdGVQbHVnaW4oV2ViRnJhbWUqIGZy YW1lLCBIVE1MUGx1Z0luRWxlbWVudCogcGx1CiAgICAgICAgICAgICBSZW5kZXJFbWJlZGRlZE9i amVjdCogcmVuZGVyT2JqZWN0ID0gdG9SZW5kZXJFbWJlZGRlZE9iamVjdChwbHVnaW5FbGVtZW50 LT5yZW5kZXJlcigpKTsKICAgICAgICAgICAgIHJlbmRlck9iamVjdC0+c2V0UGx1Z2luVW5hdmFp bGFiaWxpdHlSZWFzb25XaXRoRGVzY3JpcHRpb24oUmVuZGVyRW1iZWRkZWRPYmplY3Q6Okluc2Vj dXJlUGx1Z2luVmVyc2lvbiwgdW5hdmFpbGFiaWxpdHlEZXNjcmlwdGlvbik7CiAgICAgICAgICAg ICByZXBsYWNlbWVudE9ic2N1cmVkID0gcmVuZGVyT2JqZWN0LT5pc1JlcGxhY2VtZW50T2JzY3Vy ZWQoKTsKKyAgICAgICAgICAgIHJlbmRlck9iamVjdC0+c2V0VW5hdmFpbGFibGVQbHVnaW5JbmRp Y2F0b3JJc0hpZGRlbihyZXBsYWNlbWVudE9ic2N1cmVkKTsKICAgICAgICAgfQogCiAgICAgICAg IHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQmxvY2tJbnNlY3VyZVBsdWdpblZlcnNp b24ocGFyYW1ldGVycy5taW1lVHlwZSwgcGFyYW1ldGVycy51cmwuc3RyaW5nKCksIGZyYW1lVVJM U3RyaW5nLCBwYWdlVVJMU3RyaW5nLCByZXBsYWNlbWVudE9ic2N1cmVkKSk7Cg==