131706 2014-04-15 15:07:33 -0700 PDFPlugin style fixes 2014-04-16 10:56:01 -0700 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton commit-queue mitz simon.fraser oldest_to_newest 1000983 0 thorton 2014-04-15 15:07:33 -0700 While working on getting the style checker to check Objective-C source files, I ran through all of the errors in PDFPlugin.mm and fixed the ones that were broken in the style-checker there, and the ones that were broken in PDFPlugin here. No reason to throw away good style fixes, so let's land them. 1000984 1 229407 thorton 2014-04-15 15:08:39 -0700 Created attachment 229407 patch 1000988 2 commit-queue 2014-04-15 15:10:41 -0700 Attachment 229407 did not pass style-queue: ERROR: Source/WebKit2/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1001218 3 thorton 2014-04-16 10:56:01 -0700 http://trac.webkit.org/changeset/167357 229407 2014-04-15 15:08:39 -0700 2014-04-16 10:36:26 -0700 patch pdfplugin-style.diff text/plain 12952 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiYTYxOWRlLi44MmUyMzBjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE0LTA0LTE1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgor CisgICAgICAgIEZpeCBzb21lIHN0eWxlIGNoZWNrZXIgY29tcGxhaW50cyBpbiBQREZQbHVnaW4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tOgorICAgICAgICAoLVtXS1BERlBsdWdpbkFj Y2Vzc2liaWxpdHlPYmplY3QgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOl0pOgorICAgICAg ICAoLVtXS1BERlBsdWdpbkFjY2Vzc2liaWxpdHlPYmplY3QgYWNjZXNzaWJpbGl0eUF0dHJpYnV0 ZVZhbHVlOmZvclBhcmFtZXRlcjpdKToKKyAgICAgICAgKC1bV0tQREZQbHVnaW5BY2Nlc3NpYmls aXR5T2JqZWN0IGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVOYW1lc10pOgorICAgICAgICAoV2ViS2l0 OjpQREZQbHVnaW46OmF0dGVtcHRUb1VubG9ja1BERik6CisgICAgICAgIChXZWJLaXQ6OlBERlBs dWdpbjo6dXBkYXRlUGFnZUFuZERldmljZVNjYWxlRmFjdG9ycyk6CisgICAgICAgIChXZWJLaXQ6 OlBERlBsdWdpbjo6aXNFZGl0aW5nQ29tbWFuZEVuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpQ REZQbHVnaW46Om5leHRNYXRjaEZvclN0cmluZyk6CisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdp bjo6aGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6bGl2ZURh dGEpOgorCiAyMDE0LTA0LTE1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFtpT1MgV0syXSBQYWdlcyBvZnRlbiBibGFuayBvbiBmaXJzdCBsb2FkIGlm IHBhZ2UgbG9hZGVkIGJ5IHR5cGluZyB0aGUgVVJMCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCmluZGV4IDFlNTAxMTYuLmMxZWFhY2Yg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1 Z2luLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1 Z2luLm1tCkBAIC0xMTIsMTYgKzExMiwxNSBAQCBzdGF0aWMgY29uc3QgY2hhciogYW5ub3RhdGlv blN0eWxlID0KIC8vIHdpbGwganVtcCB0byB0aGUgbmV4dCBvciBwcmV2aW91cyBwYWdlLCB0byBt YXRjaCBQREZLaXQgYmVoYXZpb3IuCiBzdGF0aWMgY29uc3QgaW50IGRlZmF1bHRTY3JvbGxNYWdu aXR1ZGVUaHJlc2hvbGRGb3JQYWdlRmxpcCA9IDIwOwogCi1AaW50ZXJmYWNlIFdLUERGUGx1Z2lu QWNjZXNzaWJpbGl0eU9iamVjdCA6IE5TT2JqZWN0Ci17CitAaW50ZXJmYWNlIFdLUERGUGx1Z2lu QWNjZXNzaWJpbGl0eU9iamVjdCA6IE5TT2JqZWN0IHsKICAgICBQREZMYXllckNvbnRyb2xsZXIg Kl9wZGZMYXllckNvbnRyb2xsZXI7CiAgICAgTlNPYmplY3QgKl9wYXJlbnQ7CiAgICAgV2ViS2l0 OjpQREZQbHVnaW4qIF9wZGZQbHVnaW47CiB9CiAKLUBwcm9wZXJ0eShhc3NpZ24pIFBERkxheWVy Q29udHJvbGxlciAqcGRmTGF5ZXJDb250cm9sbGVyOwotQHByb3BlcnR5KGFzc2lnbikgTlNPYmpl Y3QgKnBhcmVudDsKLUBwcm9wZXJ0eShhc3NpZ24pIFdlYktpdDo6UERGUGx1Z2luKiBwZGZQbHVn aW47CitAcHJvcGVydHkgKGFzc2lnbikgUERGTGF5ZXJDb250cm9sbGVyICpwZGZMYXllckNvbnRy b2xsZXI7CitAcHJvcGVydHkgKGFzc2lnbikgTlNPYmplY3QgKnBhcmVudDsKK0Bwcm9wZXJ0eSAo YXNzaWduKSBXZWJLaXQ6OlBERlBsdWdpbiogcGRmUGx1Z2luOwogCiAtIChpZClpbml0V2l0aFBE RlBsdWdpbjooV2ViS2l0OjpQREZQbHVnaW4gKilwbHVnaW47CiAKQEAgLTEyOSw5ICsxMjgsOSBA QCBzdGF0aWMgY29uc3QgaW50IGRlZmF1bHRTY3JvbGxNYWduaXR1ZGVUaHJlc2hvbGRGb3JQYWdl RmxpcCA9IDIwOwogCiBAaW1wbGVtZW50YXRpb24gV0tQREZQbHVnaW5BY2Nlc3NpYmlsaXR5T2Jq ZWN0CiAKLUBzeW50aGVzaXplIHBkZkxheWVyQ29udHJvbGxlciA9IF9wZGZMYXllckNvbnRyb2xs ZXI7Ci1Ac3ludGhlc2l6ZSBwYXJlbnQgPSBfcGFyZW50OwotQHN5bnRoZXNpemUgcGRmUGx1Z2lu ID0gX3BkZlBsdWdpbjsKK0BzeW50aGVzaXplIHBkZkxheWVyQ29udHJvbGxlcj1fcGRmTGF5ZXJD b250cm9sbGVyOworQHN5bnRoZXNpemUgcGFyZW50PV9wYXJlbnQ7CitAc3ludGhlc2l6ZSBwZGZQ bHVnaW49X3BkZlBsdWdpbjsKIAogLSAoaWQpaW5pdFdpdGhQREZQbHVnaW46KFdlYktpdDo6UERG UGx1Z2luICopcGx1Z2luCiB7CkBAIC0xNTIsMzEgKzE1MSwzMSBAQCBzdGF0aWMgY29uc3QgaW50 IGRlZmF1bHRTY3JvbGxNYWduaXR1ZGVUaHJlc2hvbGRGb3JQYWdlRmxpcCA9IDIwOwogewogICAg IGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlQYXJlbnRBdHRy aWJ1dGVdKQogICAgICAgICByZXR1cm4gX3BhcmVudDsKLSAgICBlbHNlIGlmIChbYXR0cmlidXRl IGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlWYWx1ZUF0dHJpYnV0ZV0pCisgICAgaWYg KFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eVZhbHVlQXR0cmlidXRl XSkKICAgICAgICAgcmV0dXJuIFtfcGRmTGF5ZXJDb250cm9sbGVyIGFjY2Vzc2liaWxpdHlWYWx1 ZUF0dHJpYnV0ZV07Ci0gICAgZWxzZSBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNB Y2Nlc3NpYmlsaXR5U2VsZWN0ZWRUZXh0QXR0cmlidXRlXSkKKyAgICBpZiAoW2F0dHJpYnV0ZSBp c0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5U2VsZWN0ZWRUZXh0QXR0cmlidXRlXSkKICAg ICAgICAgcmV0dXJuIFtfcGRmTGF5ZXJDb250cm9sbGVyIGFjY2Vzc2liaWxpdHlTZWxlY3RlZFRl eHRBdHRyaWJ1dGVdOwotICAgIGVsc2UgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5T QWNjZXNzaWJpbGl0eVNlbGVjdGVkVGV4dFJhbmdlQXR0cmlidXRlXSkKKyAgICBpZiAoW2F0dHJp YnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5U2VsZWN0ZWRUZXh0UmFuZ2VBdHRy aWJ1dGVdKQogICAgICAgICByZXR1cm4gW19wZGZMYXllckNvbnRyb2xsZXIgYWNjZXNzaWJpbGl0 eVNlbGVjdGVkVGV4dFJhbmdlQXR0cmlidXRlXTsKLSAgICBlbHNlIGlmIChbYXR0cmlidXRlIGlz RXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlOdW1iZXJPZkNoYXJhY3RlcnNBdHRyaWJ1dGVd KQorICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlOdW1i ZXJPZkNoYXJhY3RlcnNBdHRyaWJ1dGVdKQogICAgICAgICByZXR1cm4gW19wZGZMYXllckNvbnRy b2xsZXIgYWNjZXNzaWJpbGl0eU51bWJlck9mQ2hhcmFjdGVyc0F0dHJpYnV0ZV07Ci0gICAgZWxz ZSBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5VmlzaWJsZUNo YXJhY3RlclJhbmdlQXR0cmlidXRlXSkKKyAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJp bmc6TlNBY2Nlc3NpYmlsaXR5VmlzaWJsZUNoYXJhY3RlclJhbmdlQXR0cmlidXRlXSkKICAgICAg ICAgcmV0dXJuIFtfcGRmTGF5ZXJDb250cm9sbGVyIGFjY2Vzc2liaWxpdHlWaXNpYmxlQ2hhcmFj dGVyUmFuZ2VBdHRyaWJ1dGVdOwotICAgIGVsc2UgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3Ry aW5nOk5TQWNjZXNzaWJpbGl0eVRvcExldmVsVUlFbGVtZW50QXR0cmlidXRlXSkKKyAgICBpZiAo W2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5VG9wTGV2ZWxVSUVsZW1l bnRBdHRyaWJ1dGVdKQogICAgICAgICByZXR1cm4gW19wYXJlbnQgYWNjZXNzaWJpbGl0eUF0dHJp YnV0ZVZhbHVlOk5TQWNjZXNzaWJpbGl0eVRvcExldmVsVUlFbGVtZW50QXR0cmlidXRlXTsKLSAg ICBlbHNlIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlSb2xl QXR0cmlidXRlXSkKKyAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3Np YmlsaXR5Um9sZUF0dHJpYnV0ZV0pCiAgICAgICAgIHJldHVybiBbX3BkZkxheWVyQ29udHJvbGxl ciBhY2Nlc3NpYmlsaXR5Um9sZUF0dHJpYnV0ZV07Ci0gICAgZWxzZSBpZiAoW2F0dHJpYnV0ZSBp c0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5Um9sZURlc2NyaXB0aW9uQXR0cmlidXRlXSkK KyAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5Um9sZURl c2NyaXB0aW9uQXR0cmlidXRlXSkKICAgICAgICAgcmV0dXJuIFtfcGRmTGF5ZXJDb250cm9sbGVy IGFjY2Vzc2liaWxpdHlSb2xlRGVzY3JpcHRpb25BdHRyaWJ1dGVdOwotICAgIGVsc2UgaWYgKFth dHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eVdpbmRvd0F0dHJpYnV0ZV0p CisgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eVdpbmRv d0F0dHJpYnV0ZV0pCiAgICAgICAgIHJldHVybiBbX3BhcmVudCBhY2Nlc3NpYmlsaXR5QXR0cmli dXRlVmFsdWU6TlNBY2Nlc3NpYmlsaXR5V2luZG93QXR0cmlidXRlXTsKLSAgICBlbHNlIGlmIChb YXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlTaXplQXR0cmlidXRlXSkK KyAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5U2l6ZUF0 dHJpYnV0ZV0pCiAgICAgICAgIHJldHVybiBbTlNWYWx1ZSB2YWx1ZVdpdGhTaXplOl9wZGZQbHVn aW4tPmJvdW5kc09uU2NyZWVuKCkuc2l6ZSgpXTsKLSAgICBlbHNlIGlmIChbYXR0cmlidXRlIGlz RXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlGb2N1c2VkQXR0cmlidXRlXSkKKyAgICBpZiAo W2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5Rm9jdXNlZEF0dHJpYnV0 ZV0pCiAgICAgICAgIHJldHVybiBbX3BhcmVudCBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6 TlNBY2Nlc3NpYmlsaXR5Rm9jdXNlZEF0dHJpYnV0ZV07Ci0gICAgZWxzZSBpZiAoW2F0dHJpYnV0 ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5RW5hYmxlZEF0dHJpYnV0ZV0pCisgICAg aWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eUVuYWJsZWRBdHRy aWJ1dGVdKQogICAgICAgICByZXR1cm4gW19wYXJlbnQgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZh bHVlOk5TQWNjZXNzaWJpbGl0eUVuYWJsZWRBdHRyaWJ1dGVdOwotICAgIGVsc2UgaWYgKFthdHRy aWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eVBvc2l0aW9uQXR0cmlidXRlXSkK KyAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5UG9zaXRp b25BdHRyaWJ1dGVdKQogICAgICAgICByZXR1cm4gW05TVmFsdWUgdmFsdWVXaXRoUG9pbnQ6X3Bk ZlBsdWdpbi0+Ym91bmRzT25TY3JlZW4oKS5sb2NhdGlvbigpXTsKIAogICAgIHJldHVybiAwOwpA QCAtMTg3LDEyICsxODYsMTQgQEAgc3RhdGljIGNvbnN0IGludCBkZWZhdWx0U2Nyb2xsTWFnbml0 dWRlVGhyZXNob2xkRm9yUGFnZUZsaXAgPSAyMDsKICAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFs VG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5Qm91bmRzRm9yUmFuZ2VQYXJhbWV0ZXJpemVkQXR0cmli dXRlXSkgewogICAgICAgICBOU1JlY3QgYm91bmRzSW5QREZWaWV3Q29vcmRpbmF0ZXMgPSBbW19w ZGZMYXllckNvbnRyb2xsZXIgYWNjZXNzaWJpbGl0eUJvdW5kc0ZvclJhbmdlQXR0cmlidXRlRm9y UGFyYW1ldGVyOnBhcmFtZXRlcl0gcmVjdFZhbHVlXTsKICAgICAgICAgTlNSZWN0IGJvdW5kc0lu U2NyZWVuQ29vcmRpbmF0ZXMgPSBfcGRmUGx1Z2luLT5jb252ZXJ0RnJvbVBERlZpZXdUb1NjcmVl bihib3VuZHNJblBERlZpZXdDb29yZGluYXRlcyk7Ci0gICAgICAgIHJldHVybiBbTlNWYWx1ZSB2 YWx1ZVdpdGhSZWN0OmJvdW5kc0luU2NyZWVuQ29vcmRpbmF0ZXNdOzsKLSAgICB9IGVsc2UgaWYg KFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eUxpbmVGb3JJbmRleFBh cmFtZXRlcml6ZWRBdHRyaWJ1dGVdKQorICAgICAgICByZXR1cm4gW05TVmFsdWUgdmFsdWVXaXRo UmVjdDpib3VuZHNJblNjcmVlbkNvb3JkaW5hdGVzXTsKKyAgICB9CisKKyAgICBpZiAoW2F0dHJp YnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5TGluZUZvckluZGV4UGFyYW1ldGVy aXplZEF0dHJpYnV0ZV0pCiAgICAgICAgIHJldHVybiBbX3BkZkxheWVyQ29udHJvbGxlciBhY2Nl c3NpYmlsaXR5TGluZUZvckluZGV4QXR0cmlidXRlRm9yUGFyYW1ldGVyOnBhcmFtZXRlcl07Ci0g ICAgZWxzZSBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5UmFu Z2VGb3JMaW5lUGFyYW1ldGVyaXplZEF0dHJpYnV0ZV0pCisgICAgaWYgKFthdHRyaWJ1dGUgaXNF cXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eVJhbmdlRm9yTGluZVBhcmFtZXRlcml6ZWRBdHRy aWJ1dGVdKQogICAgICAgICByZXR1cm4gW19wZGZMYXllckNvbnRyb2xsZXIgYWNjZXNzaWJpbGl0 eVJhbmdlRm9yTGluZUF0dHJpYnV0ZUZvclBhcmFtZXRlcjpwYXJhbWV0ZXJdOwotICAgIGVsc2Ug aWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eVN0cmluZ0ZvclJh bmdlUGFyYW1ldGVyaXplZEF0dHJpYnV0ZV0pCisgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRv U3RyaW5nOk5TQWNjZXNzaWJpbGl0eVN0cmluZ0ZvclJhbmdlUGFyYW1ldGVyaXplZEF0dHJpYnV0 ZV0pCiAgICAgICAgIHJldHVybiBbX3BkZkxheWVyQ29udHJvbGxlciBhY2Nlc3NpYmlsaXR5U3Ry aW5nRm9yUmFuZ2VBdHRyaWJ1dGVGb3JQYXJhbWV0ZXI6cGFyYW1ldGVyXTsKIAogICAgIHJldHVy biAwOwpAQCAtMjA3LDggKzIwOCw4IEBAIHN0YXRpYyBjb25zdCBpbnQgZGVmYXVsdFNjcm9sbE1h Z25pdHVkZVRocmVzaG9sZEZvclBhZ2VGbGlwID0gMjA7CiB7CiAgICAgc3RhdGljIE5TQXJyYXkg KmF0dHJpYnV0ZU5hbWVzID0gMDsKIAotICAgIGlmICghYXR0cmlidXRlTmFtZXMpCi0gICAgICAg IGF0dHJpYnV0ZU5hbWVzID0gW1tOU0FycmF5IGFycmF5V2l0aE9iamVjdHM6TlNBY2Nlc3NpYmls aXR5VmFsdWVBdHRyaWJ1dGUsCisgICAgaWYgKCFhdHRyaWJ1dGVOYW1lcykgeworICAgICAgICBh dHRyaWJ1dGVOYW1lcyA9IEBbTlNBY2Nlc3NpYmlsaXR5VmFsdWVBdHRyaWJ1dGUsCiAgICAgICAg ICAgICBOU0FjY2Vzc2liaWxpdHlTZWxlY3RlZFRleHRBdHRyaWJ1dGUsCiAgICAgICAgICAgICBO U0FjY2Vzc2liaWxpdHlTZWxlY3RlZFRleHRSYW5nZUF0dHJpYnV0ZSwKICAgICAgICAgICAgIE5T QWNjZXNzaWJpbGl0eU51bWJlck9mQ2hhcmFjdGVyc0F0dHJpYnV0ZSwKQEAgLTIyMSw4ICsyMjIs OSBAQCBzdGF0aWMgY29uc3QgaW50IGRlZmF1bHRTY3JvbGxNYWduaXR1ZGVUaHJlc2hvbGRGb3JQ YWdlRmxpcCA9IDIwOwogICAgICAgICAgICAgTlNBY2Nlc3NpYmlsaXR5U2l6ZUF0dHJpYnV0ZSwK ICAgICAgICAgICAgIE5TQWNjZXNzaWJpbGl0eUZvY3VzZWRBdHRyaWJ1dGUsCiAgICAgICAgICAg ICBOU0FjY2Vzc2liaWxpdHlFbmFibGVkQXR0cmlidXRlLAotICAgICAgICAgICAgTlNBY2Nlc3Np YmlsaXR5UG9zaXRpb25BdHRyaWJ1dGUsCi0gICAgICAgICAgICBuaWxdIHJldGFpbl07CisgICAg ICAgICAgICBOU0FjY2Vzc2liaWxpdHlQb3NpdGlvbkF0dHJpYnV0ZV07CisgICAgICAgIFthdHRy aWJ1dGVOYW1lcyByZXRhaW5dOworICAgIH0KIAogICAgIHJldHVybiBhdHRyaWJ1dGVOYW1lczsK IH0KQEAgLTI3MSw4ICsyNzMsNyBAQCBzdGF0aWMgY29uc3QgaW50IGRlZmF1bHRTY3JvbGxNYWdu aXR1ZGVUaHJlc2hvbGRGb3JQYWdlRmxpcCA9IDIwOwogQGVuZAogCiAKLUBpbnRlcmZhY2UgV0tQ REZQbHVnaW5TY3JvbGxiYXJMYXllciA6IENBTGF5ZXIKLXsKK0BpbnRlcmZhY2UgV0tQREZQbHVn aW5TY3JvbGxiYXJMYXllciA6IENBTGF5ZXIgewogICAgIFdlYktpdDo6UERGUGx1Z2luKiBfcGRm UGx1Z2luOwogfQogCkBAIC0yODIsNyArMjgzLDcgQEAgc3RhdGljIGNvbnN0IGludCBkZWZhdWx0 U2Nyb2xsTWFnbml0dWRlVGhyZXNob2xkRm9yUGFnZUZsaXAgPSAyMDsKIAogQGltcGxlbWVudGF0 aW9uIFdLUERGUGx1Z2luU2Nyb2xsYmFyTGF5ZXIKIAotQHN5bnRoZXNpemUgcGRmUGx1Z2luID0g X3BkZlBsdWdpbjsKK0BzeW50aGVzaXplIHBkZlBsdWdpbj1fcGRmUGx1Z2luOwogCiAtIChpZClp bml0V2l0aFBERlBsdWdpbjooV2ViS2l0OjpQREZQbHVnaW4gKilwbHVnaW4KIHsKQEAgLTMwNiwx MiArMzA3LDExIEBAIHN0YXRpYyBjb25zdCBpbnQgZGVmYXVsdFNjcm9sbE1hZ25pdHVkZVRocmVz aG9sZEZvclBhZ2VGbGlwID0gMjA7CiAKIEBlbmQKIAotQGludGVyZmFjZSBXS1BERkxheWVyQ29u dHJvbGxlckRlbGVnYXRlIDogTlNPYmplY3Q8UERGTGF5ZXJDb250cm9sbGVyRGVsZWdhdGU+Ci17 CitAaW50ZXJmYWNlIFdLUERGTGF5ZXJDb250cm9sbGVyRGVsZWdhdGUgOiBOU09iamVjdDxQREZM YXllckNvbnRyb2xsZXJEZWxlZ2F0ZT4gewogICAgIFdlYktpdDo6UERGUGx1Z2luKiBfcGRmUGx1 Z2luOwogfQogCi1AcHJvcGVydHkoYXNzaWduKSBXZWJLaXQ6OlBERlBsdWdpbiogcGRmUGx1Z2lu OworQHByb3BlcnR5IChhc3NpZ24pIFdlYktpdDo6UERGUGx1Z2luKiBwZGZQbHVnaW47CiAKIEBl bmQKIApAQCAtMTAwNSw3ICsxMDA1LDcgQEAgdm9pZCBQREZQbHVnaW46OmNyZWF0ZVBhc3N3b3Jk RW50cnlGb3JtKCkKIAogdm9pZCBQREZQbHVnaW46OmF0dGVtcHRUb1VubG9ja1BERihjb25zdCBT dHJpbmcmIHBhc3N3b3JkKQogewotICAgIFttX3BkZkxheWVyQ29udHJvbGxlciBhdHRlbXB0VG9V bmxvY2tXaXRoUGFzc3dvcmQ6cGFzc3dvcmRdOworICAgIFttX3BkZkxheWVyQ29udHJvbGxlci5n ZXQoKSBhdHRlbXB0VG9VbmxvY2tXaXRoUGFzc3dvcmQ6cGFzc3dvcmRdOwogCiAgICAgaWYgKCFb cGRmRG9jdW1lbnQoKSBpc0xvY2tlZF0pIHsKICAgICAgICAgbV9wYXNzd29yZEZpZWxkID0gbnVs bHB0cjsKQEAgLTEwMjEsNyArMTAyMSw3IEBAIHZvaWQgUERGUGx1Z2luOjp1cGRhdGVQYWdlQW5k RGV2aWNlU2NhbGVGYWN0b3JzKCkKICAgICBpZiAoIWhhbmRsZXNQYWdlU2NhbGVGYWN0b3IoKSkK ICAgICAgICAgbmV3U2NhbGVGYWN0b3IgKj0gd2ViRnJhbWUoKS0+cGFnZSgpLT5wYWdlU2NhbGVG YWN0b3IoKTsKIAotICAgIFttX3BkZkxheWVyQ29udHJvbGxlciBzZXREZXZpY2VTY2FsZUZhY3Rv cjpuZXdTY2FsZUZhY3Rvcl07CisgICAgW21fcGRmTGF5ZXJDb250cm9sbGVyLmdldCgpIHNldERl dmljZVNjYWxlRmFjdG9yOm5ld1NjYWxlRmFjdG9yXTsKIH0KIAogdm9pZCBQREZQbHVnaW46OmNv bnRlbnRzU2NhbGVGYWN0b3JDaGFuZ2VkKGZsb2F0KQpAQCAtMTUwNSw3ICsxNTA1LDcgQEAgYm9v bCBQREZQbHVnaW46OmlzRWRpdGluZ0NvbW1hbmRFbmFibGVkKGNvbnN0IFN0cmluZyYgY29tbWFu ZE5hbWUpCiB7CiAgICAgaWYgKGNvbW1hbmROYW1lID09ICJjb3B5IiB8fCBjb21tYW5kTmFtZSA9 PSAidGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uIikKICAgICAgICAgcmV0dXJuIFttX3BkZkxh eWVyQ29udHJvbGxlciBjdXJyZW50U2VsZWN0aW9uXTsKLSAgICAgICAgCisKICAgICBpZiAoY29t bWFuZE5hbWUgPT0gInNlbGVjdEFsbCIpCiAgICAgICAgIHJldHVybiB0cnVlOwogCkBAIC0xNzIy LDcgKzE3MjIsNyBAQCBQREZTZWxlY3Rpb24gKlBERlBsdWdpbjo6bmV4dE1hdGNoRm9yU3RyaW5n KGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBCT09MIHNlYXJjaEZvcgogCiAgICAgUERGU2VsZWN0aW9u ICpzZWxlY3Rpb25Gb3JJbml0aWFsU2VhcmNoID0gW2luaXRpYWxTZWxlY3Rpb24gY29weV07CiAg ICAgaWYgKHN0YXJ0SW5TZWxlY3Rpb24pIHsKLSAgICAgICAgLy8gSW5pdGlhbGx5IHdlIHdhbnQg dG8gaW5jbHVkZSB0aGUgc2VsZWN0ZWQgdGV4dCBpbiB0aGUgc2VhcmNoLiAgU28gd2UgbXVzdCBt b2RpZnkgdGhlIHN0YXJ0aW5nIHNlYXJjaAorICAgICAgICAvLyBJbml0aWFsbHkgd2Ugd2FudCB0 byBpbmNsdWRlIHRoZSBzZWxlY3RlZCB0ZXh0IGluIHRoZSBzZWFyY2guIFNvIHdlIG11c3QgbW9k aWZ5IHRoZSBzdGFydGluZyBzZWFyY2gKICAgICAgICAgLy8gc2VsZWN0aW9uIHRvIGZpdCBQREZE b2N1bWVudCdzIHNlYXJjaCByZXF1aXJlbWVudHM6IHNlbGVjdGlvbiBtdXN0IGhhdmUgYSBsZW5n dGggPj0gMSwgYmVnaW4gYmVmb3JlCiAgICAgICAgIC8vIHRoZSBjdXJyZW50IHNlbGVjdGlvbiAo aWYgc2VhcmNoaW5nIGZvcndhcmRzKSBvciBhZnRlciAoaWYgc2VhcmNoaW5nIGJhY2t3YXJkcyku CiAgICAgICAgIGludCBpbml0aWFsU2VsZWN0aW9uTGVuZ3RoID0gW1tpbml0aWFsU2VsZWN0aW9u IHN0cmluZ10gbGVuZ3RoXTsKQEAgLTE3NDEsMTAgKzE3NDEsMTAgQEAgUERGU2VsZWN0aW9uICpQ REZQbHVnaW46Om5leHRNYXRjaEZvclN0cmluZyhjb25zdCBTdHJpbmcmIHRhcmdldCwgQk9PTCBz ZWFyY2hGb3IKICAgICAvLyBJZiB3ZSBmaXJzdCBzZWFyY2hlZCBpbiB0aGUgc2VsZWN0aW9uLCBh bmQgd2UgZm91bmQgdGhlIHNlbGVjdGlvbiwgc2VhcmNoIGFnYWluIGZyb20ganVzdCBwYXN0IHRo ZSBzZWxlY3Rpb24uCiAgICAgaWYgKHN0YXJ0SW5TZWxlY3Rpb24gJiYgW2ZvdW5kU2VsZWN0aW9u IGlzRXF1YWw6aW5pdGlhbFNlbGVjdGlvbl0pCiAgICAgICAgIGZvdW5kU2VsZWN0aW9uID0gW2Rv Y3VtZW50IGZpbmRTdHJpbmc6dGFyZ2V0IGZyb21TZWxlY3Rpb246aW5pdGlhbFNlbGVjdGlvbiB3 aXRoT3B0aW9uczpvcHRpb25zXTsKLSAgICAgICAgCisKICAgICBpZiAoIWZvdW5kU2VsZWN0aW9u ICYmIHdyYXBTZWFyY2gpCiAgICAgICAgIGZvdW5kU2VsZWN0aW9uID0gW2RvY3VtZW50IGZpbmRT dHJpbmc6dGFyZ2V0IGZyb21TZWxlY3Rpb246bmlsIHdpdGhPcHRpb25zOm9wdGlvbnNdOwotICAg ICAgICAKKwogICAgIHJldHVybiBmb3VuZFNlbGVjdGlvbjsKIH0KIApAQCAtMTgzNSwxMCArMTgz NSwxMCBAQCBib29sIFBERlBsdWdpbjo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBXZWJXaGVlbEV2 ZW50JiBldmVudCkKICAgICAgICAgcmV0dXJuIFNjcm9sbGFibGVBcmVhOjpoYW5kbGVXaGVlbEV2 ZW50KHBsYXRmb3JtKGV2ZW50KSk7CiAKICAgICBOU1VJbnRlZ2VyIGN1cnJlbnRQYWdlSW5kZXgg PSBbbV9wZGZMYXllckNvbnRyb2xsZXIgY3VycmVudFBhZ2VJbmRleF07Ci0gICAgYm9vbCBpbkZp cnN0UGFnZSA9IGN1cnJlbnRQYWdlSW5kZXggPT0gMDsKKyAgICBib29sIGluRmlyc3RQYWdlID0g IWN1cnJlbnRQYWdlSW5kZXg7CiAgICAgYm9vbCBpbkxhc3RQYWdlID0gW21fcGRmTGF5ZXJDb250 cm9sbGVyIGxhc3RQYWdlSW5kZXhdID09IGN1cnJlbnRQYWdlSW5kZXg7CiAKLSAgICBib29sIGF0 U2Nyb2xsVG9wID0gc2Nyb2xsUG9zaXRpb24oKS55KCkgPT0gMDsKKyAgICBib29sIGF0U2Nyb2xs VG9wID0gIXNjcm9sbFBvc2l0aW9uKCkueSgpOwogICAgIGJvb2wgYXRTY3JvbGxCb3R0b20gPSBz Y3JvbGxQb3NpdGlvbigpLnkoKSA9PSBtYXhpbXVtU2Nyb2xsUG9zaXRpb24oKS55KCk7CiAKICAg ICBib29sIGluTW9tZW50dW1TY3JvbGwgPSBldmVudC5tb21lbnR1bVBoYXNlKCkgIT0gV2ViV2hl ZWxFdmVudDo6UGhhc2VOb25lOwpAQCAtMTg1Myw3ICsxODUzLDkgQEAgYm9vbCBQREZQbHVnaW46 OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgV2ViV2hlZWxFdmVudCYgZXZlbnQpCiAgICAgICAgIGlm IChldmVudC5kZWx0YSgpLmhlaWdodCgpIDw9IC1zY3JvbGxNYWduaXR1ZGVUaHJlc2hvbGRGb3JQ YWdlRmxpcCAmJiAhaW5Nb21lbnR1bVNjcm9sbCkKICAgICAgICAgICAgIFttX3BkZkxheWVyQ29u dHJvbGxlciBnb3RvTmV4dFBhZ2VdOwogICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9IGVsc2Ug aWYgKGF0U2Nyb2xsVG9wICYmICFpbkZpcnN0UGFnZSAmJiBldmVudC5kZWx0YSgpLmhlaWdodCgp ID4gMCkgeworICAgIH0KKworICAgIGlmIChhdFNjcm9sbFRvcCAmJiAhaW5GaXJzdFBhZ2UgJiYg ZXZlbnQuZGVsdGEoKS5oZWlnaHQoKSA+IDApIHsKICAgICAgICAgaWYgKGV2ZW50LmRlbHRhKCku aGVpZ2h0KCkgPj0gc2Nyb2xsTWFnbml0dWRlVGhyZXNob2xkRm9yUGFnZUZsaXAgJiYgIWluTW9t ZW50dW1TY3JvbGwpIHsKICAgICAgICAgICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKICAgICAg ICAgICAgIFttX3BkZkxheWVyQ29udHJvbGxlciBnb3RvUHJldmlvdXNQYWdlXTsKQEAgLTE4NzUs OCArMTg3Nyw4IEBAIE5TRGF0YSAqUERGUGx1Z2luOjpsaXZlRGF0YSgpIGNvbnN0CiAgICAgLy8g dW50b3VjaGVkIGJ5IHRoZSB1c2VyLCBzbyB0aGF0IFBERnMgd2hpY2ggUERGS2l0IGNhbid0IGRp c3BsYXkgd2lsbCBzdGlsbCBiZSBkb3dubG9hZGFibGUuCiAgICAgaWYgKG1fcGRmRG9jdW1lbnRX YXNNdXRhdGVkKQogICAgICAgICByZXR1cm4gW21fcGRmRG9jdW1lbnQgZGF0YVJlcHJlc2VudGF0 aW9uXTsKLSAgICBlbHNlCi0gICAgICAgIHJldHVybiByYXdEYXRhKCk7CisgICAgCisgICAgcmV0 dXJuIHJhd0RhdGEoKTsKIH0KIAogTlNPYmplY3QgKlBERlBsdWdpbjo6YWNjZXNzaWJpbGl0eU9i amVjdCgpIGNvbnN0Cg==