138473 2014-11-06 13:21:51 -0800 Don't send identifierForInitialRequest callback method for request with DoNotSendCallbacks option. 2014-11-06 14:51:32 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified iOS 8.1 RESOLVED FIXED P2 Normal --- 1 yongjun_zhang yongjun_zhang ap buildbot commit-queue ddkilzer japhet mitz psolanki rniwa oldest_to_newest 1046890 0 yongjun_zhang 2014-11-06 13:21:51 -0800 In iOS, identifierForInitialRequest callback method is always called for any request, even the request has opted out with DoNotSendCallbacks. 1046891 1 yongjun_zhang 2014-11-06 13:23:00 -0800 <rdar://problem/14125129> 1046896 2 241129 yongjun_zhang 2014-11-06 13:44:55 -0800 Created attachment 241129 Remove iOS specific lines in ResourceLoader.cpp since they are not needed any more. 1046897 3 commit-queue 2014-11-06 13:46:31 -0800 Attachment 241129 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:3: Line contains tab character. [whitespace/tab] [5] ERROR: Source/WebCore/ChangeLog:4: Line contains tab character. [whitespace/tab] [5] ERROR: Source/WebCore/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] ERROR: Source/WebCore/ChangeLog:7: Line contains tab character. [whitespace/tab] [5] ERROR: Source/WebCore/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] ERROR: Source/WebCore/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] ERROR: Source/WebCore/ChangeLog:15: Line contains tab character. [whitespace/tab] [5] ERROR: Source/WebCore/ChangeLog:16: Line contains tab character. [whitespace/tab] [5] Total errors found: 8 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1046898 4 241129 psolanki 2014-11-06 13:48:08 -0800 Comment on attachment 241129 Remove iOS specific lines in ResourceLoader.cpp since they are not needed any more. View in context: https://bugs.webkit.org/attachment.cgi?id=241129&action=review > Source/WebCore/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=138473 Add the radar number here. > Source/WebCore/loader/ResourceLoader.cpp:273 > + Do we still need this? 1046899 5 241130 yongjun_zhang 2014-11-06 13:51:09 -0800 Created attachment 241130 Fix style issue. 1046901 6 yongjun_zhang 2014-11-06 13:56:11 -0800 (In reply to comment #4) > Comment on attachment 241129 [details] > Remove iOS specific lines in ResourceLoader.cpp since they are not needed > any more. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241129&action=review > > > Source/WebCore/ChangeLog:4 > > + https://bugs.webkit.org/show_bug.cgi?id=138473 > > Add the radar number here. > > > Source/WebCore/loader/ResourceLoader.cpp:273 > > + > > Do we still need this? I think so. There is still WebKit1 clients using identifierForInitialRequest callback and they could stop the resource loading in the callback. 1046916 7 241130 commit-queue 2014-11-06 14:51:28 -0800 Comment on attachment 241130 Fix style issue. Clearing flags on attachment: 241130 Committed r175718: <http://trac.webkit.org/changeset/175718> 1046917 8 commit-queue 2014-11-06 14:51:32 -0800 All reviewed patches have been landed. Closing bug. 241129 2014-11-06 13:44:55 -0800 2014-11-06 13:49:39 -0800 Remove iOS specific lines in ResourceLoader.cpp since they are not needed any more. cors_xhr.patch text/plain 4066 yongjun_zhang Y29tbWl0IDE3NWZlYTkxODE1Njg4MzJiNjM1YzEyYjJkMjJkOGRkODhhMGZlMDUKQXV0aG9yOiBZ b25nanVuIFpoYW5nIDx5b25nanVuX3poYW5nQGFwcGxlLmNvbT4KRGF0ZTogICBUaHUgTm92IDYg MTI6Mjg6NTQgMjAxNCAtMDgwMAoKICAgIERvbid0IHNlbmQgaWRlbnRpZmllckZvckluaXRpYWxS ZXF1ZXN0IGNhbGxiYWNrIGZvciByZXF1ZXN0IHdpdGggRG9Ob3RTZW5kQ2FsbGJhY2tzIG9wdGlv bi4KICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg0NzMKICAg IAogICAgVGhlIGlPUyBzcGVjaWZpYyBjb2RlIHRoYXQgc2V0cyB1cCBhIHZhbGlkIG1faWRlbnRp ZmllciBpcyBub3QgbmVlZGVkIGFueSBtb3JlLCBzaW5jZSB0aGlzCiAgICB3aWxsIGJlIGRvbmUg bGF0ZXIgaW4gUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdC4gVGhpcyBhbHNvIG1hdGNo ZXMgdGhlIGJlaGF2aW9yIHRoYXQKICAgIHdlIGRvbid0IGNhbGwgYXNzaWduSWRlbnRpZmllclRv SW5pdGlhbFJlcXVlc3QgY2FsbGJhY2sgbWV0aG9kIGlmIHRoZSByZXFldXN0IGhhcwogICAgRG9O b3RTZW5kQ2FsbGJhY2tzIG9wdGlvbi4KICAgIAogICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCiAgICAKICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKICAgIChXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KTogUmVtb3ZlIGlPUyBzcGVjaWZpYyBibG9j ayBmb3Igc2V0dGluZyB1cCBhIHZhbGlkCiAgICAgCW1faWRlbnRpZmllci4gSW4gaU9TLCBhbHNv IG1ha2Ugc3VyZSB3ZSBzdGlsbCBiYWlsIG91dCBpZiB0aGUgcmVzb3VyY2UgbG9hZGVyIHdhcyBz dG9wcGVkCiAgICAJaW4gYXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QgY2FsbGJhY2sg YnkgYSBjbGllbnQuCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDZkZTEzM2MuLmM3MDY4MDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMCBAQAorMjAxNC0xMS0wNiAgWW9uZ2p1biBaaGFuZyAgPHlvbmdqdW5femhh bmdAYXBwbGUuY29tPgorCisJCURvbid0IHNlbmQgaWRlbnRpZmllckZvckluaXRpYWxSZXF1ZXN0 IGNhbGxiYWNrIG1ldGhvZCBmb3IgcmVxdWVzdCB3aXRoIERvTm90U2VuZENhbGxiYWNrcyBvcHRp b24uCisJCWh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg0NzMKKwor CQlUaGUgaU9TIHNwZWNpZmljIGNvZGUgdGhhdCBzZXRzIHVwIGEgdmFsaWQgbV9pZGVudGlmaWVy IGlzIG5vdCBuZWVkZWQgYW55IG1vcmUsIHNpbmNlIHRoaXMKKwkJd2lsbCBiZSBkb25lIGxhdGVy IGluIFJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3QuIFRoaXMgYWxzbyBtYXRjaGVzIHRo ZSBiZWhhdmlvciBvZiBvcGVuCisJCXNvdXJjZSB0aGF0IHdlIGRvbid0IGNhbGwgYXNzaWduSWRl bnRpZmllclRvSW5pdGlhbFJlcXVlc3QgY2FsbGJhY2sgbWV0aG9kIGlmIHRoZSByZXFldXN0IGhh cworCQlEb05vdFNlbmRDYWxsYmFja3Mgb3B0aW9uLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcDogCisg ICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KTogUmVtb3Zl IGlPUyBzcGVjaWZpYyBibG9jayBmb3Igc2V0dGluZyB1cCBhIHZhbGlkCisJCSAJbV9pZGVudGlm aWVyLiBJbiBpT1MsIGFsc28gbWFrZSBzdXJlIHdlIHN0aWxsIGJhaWwgb3V0IGlmIHRoZSByZXNv dXJjZSBsb2FkZXIgd2FzIHN0b3BwZWQKKwkJCWluIGFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxS ZXF1ZXN0IGNhbGxiYWNrIGJ5IGEgY2xpZW50LgorCiAyMDE0LTExLTA2ICBNaWNoYWVsIFNhYm9m ZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNzQ5ODUtMTc0 OTg2KTogU2l0ZSBkaXNwbGF5IGRpc2FwcGVhcnMgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZGVyLmNwcAppbmRleCA0M2I5YzNmLi4yNTc4ZTkyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRlci5jcHAKQEAgLTI1NCwyMCArMjU0LDYgQEAgdm9pZCBSZXNvdXJj ZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg UmVzb3VyY2VSZXMKIAogICAgIEFTU0VSVCghbV9yZWFjaGVkVGVybWluYWxTdGF0ZSk7CiAgICAg Ci0jaWYgUExBVEZPUk0oSU9TKQotICAgIC8vIEVuc3VyZSBhbiBpZGVudGlmaWVyIGlzIGFsd2F5 cyBzZXQuIFRoaXMgZW5zdXJlcyB0aGF0IHRoaXMgYXNzZXRpb24gaXMgbm90IGhpdDoKLSAgICAv LyA8cmRhcjovL3Byb2JsZW0vMTEwNTk3OTQ+IEFTU0VSVElPTiBGQUlMRUQ6ICFIYXNoVHJhbnNs YXRvcjo6ZXF1YWwoS2V5VHJhaXRzOjplbXB0eVZhbHVlKCksIGtleSkgaW4gV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UgbG9hZGluZyB0 aGUgYXR0YWNoZWQgd2ViIGFyY2hpdmUKLSAgICAvLyBUaGlzIGlzIG5vdCBuZWVkZWQgaW4gV2Vi S2l0MiwgYXMgaXQgZG9lc24ndCB1c2UgbV9pZGVudGlmaWVyIGluIFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpjYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlCi0gICAgaWYgKCFtX2lk ZW50aWZpZXIpIHsKLSAgICAgICAgbV9pZGVudGlmaWVyID0gbV9mcmFtZS0+cGFnZSgpLT5wcm9n cmVzcygpLmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXIoKTsKLSAgICAgICAgZnJhbWVMb2FkZXIoKS0+ bm90aWZpZXIoKS5hc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdChtX2lkZW50aWZpZXIs IGRvY3VtZW50TG9hZGVyKCksIHJlcXVlc3QpOwotCi0gICAgICAgIC8vIElmIHRoaXMgUmVzb3Vy Y2VMb2FkZXIgd2FzIHN0b3BwZWQgYXMgYSByZXN1bHQgb2YgYXNzaWduSWRlbnRpZmllclRvSW5p dGlhbFJlcXVlc3QsIGJhaWwgb3V0Ci0gICAgICAgIGlmIChtX3JlYWNoZWRUZXJtaW5hbFN0YXRl KQotICAgICAgICAgICAgcmV0dXJuOwotICAgIH0KLSNlbmRpZgotCiAgICAgLy8gV2UgbmVlZCBh IHJlc291cmNlIGlkZW50aWZpZXIgZm9yIGFsbCByZXF1ZXN0cywgZXZlbiBpZiBGcmFtZUxvYWRl ciBpcyBuZXZlciBnb2luZyB0byBzZWUgaXQgKHN1Y2ggYXMgd2l0aCBDT1JTIHByZWZsaWdodCBy ZXF1ZXN0cykuCiAgICAgYm9vbCBjcmVhdGVkUmVzb3VyY2VJZGVudGlmaWVyID0gZmFsc2U7CiAg ICAgaWYgKCFtX2lkZW50aWZpZXIpIHsKQEAgLTI3OSw2ICsyNjUsMTIgQEAgdm9pZCBSZXNvdXJj ZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg UmVzb3VyY2VSZXMKICAgICAgICAgaWYgKGNyZWF0ZWRSZXNvdXJjZUlkZW50aWZpZXIpCiAgICAg ICAgICAgICBmcmFtZUxvYWRlcigpLT5ub3RpZmllcigpLmFzc2lnbklkZW50aWZpZXJUb0luaXRp YWxSZXF1ZXN0KG1faWRlbnRpZmllciwgZG9jdW1lbnRMb2FkZXIoKSwgcmVxdWVzdCk7CiAKKyNp ZiBQTEFURk9STShJT1MpCisgICAgICAgIC8vIElmIHRoaXMgUmVzb3VyY2VMb2FkZXIgd2FzIHN0 b3BwZWQgYXMgYSByZXN1bHQgb2YgYXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QsIGJh aWwgb3V0CisgICAgICAgIGlmIChtX3JlYWNoZWRUZXJtaW5hbFN0YXRlKQorICAgICAgICAgICAg cmV0dXJuOworI2VuZGlmCisKICAgICAgICAgZnJhbWVMb2FkZXIoKS0+bm90aWZpZXIoKS53aWxs U2VuZFJlcXVlc3QodGhpcywgcmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSk7CiAgICAgfQogI2lm IEVOQUJMRShJTlNQRUNUT1IpCg== 241130 2014-11-06 13:51:09 -0800 2014-11-06 14:51:28 -0800 Fix style issue. cors_xhr.patch text/plain 4109 yongjun_zhang Y29tbWl0IDM0ZWYwYTBmNTM5NTAzNWNjOWM1NWMzY2NkZjViZDhhZTg4ZmY3MjAKQXV0aG9yOiBZ b25nanVuIFpoYW5nIDx5b25nanVuX3poYW5nQGFwcGxlLmNvbT4KRGF0ZTogICBUaHUgTm92IDYg MTI6Mjg6NTQgMjAxNCAtMDgwMAoKICAgIERvbid0IHNlbmQgaWRlbnRpZmllckZvckluaXRpYWxS ZXF1ZXN0IGNhbGxiYWNrIGZvciByZXF1ZXN0IHdpdGggRG9Ob3RTZW5kQ2FsbGJhY2tzIG9wdGlv bi4KICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg0NzMKICAg IAogICAgVGhlIGlPUyBzcGVjaWZpYyBjb2RlIHRoYXQgc2V0cyB1cCBhIHZhbGlkIG1faWRlbnRp ZmllciBpcyBub3QgbmVlZGVkIGFueSBtb3JlLCBzaW5jZSB0aGlzCiAgICB3aWxsIGJlIGRvbmUg bGF0ZXIgaW4gUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdC4gVGhpcyBhbHNvIG1hdGNo ZXMgdGhlIGJlaGF2aW9yIHRoYXQKICAgIHdlIGRvbid0IGNhbGwgYXNzaWduSWRlbnRpZmllclRv SW5pdGlhbFJlcXVlc3QgY2FsbGJhY2sgbWV0aG9kIGlmIHRoZSByZXFldXN0IGhhcwogICAgRG9O b3RTZW5kQ2FsbGJhY2tzIG9wdGlvbi4KICAgIAogICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCiAgICAKICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKICAgIChXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KTogUmVtb3ZlIGlPUyBzcGVjaWZpYyBibG9j ayBmb3Igc2V0dGluZyB1cCBhIHZhbGlkCiAgICAgICAgbV9pZGVudGlmaWVyLiBJbiBpT1MsIGFs c28gbWFrZSBzdXJlIHdlIHN0aWxsIGJhaWwgb3V0IGlmIHRoZSByZXNvdXJjZSBsb2FkZXIgd2Fz IHN0b3BwZWQKICAgICAgICBpbiBhc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdCBjYWxs YmFjayBieSBhIGNsaWVudC4KCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmRlMTMzYy4uYWExZTBkNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTExLTA2ICBZb25nanVuIFpoYW5nICA8eW9uZ2p1 bl96aGFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3Qgc2VuZCBpZGVudGlmaWVyRm9ySW5p dGlhbFJlcXVlc3QgY2FsbGJhY2sgbWV0aG9kIGZvciByZXF1ZXN0IHdpdGggRG9Ob3RTZW5kQ2Fs bGJhY2tzIG9wdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzODQ3MworCisgICAgICAgIFRoZSBpT1Mgc3BlY2lmaWMgY29kZSB0aGF0IHNldHMg dXAgYSB2YWxpZCBtX2lkZW50aWZpZXIgaXMgbm90IG5lZWRlZCBhbnkgbW9yZSwgc2luY2UgdGhp cworICAgICAgICB3aWxsIGJlIGRvbmUgbGF0ZXIgaW4gUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5k UmVxdWVzdC4gVGhpcyBhbHNvIG1hdGNoZXMgdGhlIGJlaGF2aW9yIHRoYXQKKyAgICAgICAgd2Ug ZG9uJ3QgY2FsbCBhc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdCBjYWxsYmFjayBtZXRo b2QgaWYgdGhlIHJlcWV1c3QgaGFzCisgICAgICAgIERvTm90U2VuZENhbGxiYWNrcyBvcHRpb24u CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2Fk ZXIvUmVzb3VyY2VMb2FkZXIuY3BwOiAKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVy Ojp3aWxsU2VuZFJlcXVlc3QpOiBSZW1vdmUgaU9TIHNwZWNpZmljIGJsb2NrIGZvciBzZXR0aW5n IHVwIGEgdmFsaWQKKyAgICAgICAgICAgIG1faWRlbnRpZmllci4gSW4gaU9TLCBhbHNvIG1ha2Ug c3VyZSB3ZSBzdGlsbCBiYWlsIG91dCBpZiB0aGUgcmVzb3VyY2UgbG9hZGVyIHdhcyBzdG9wcGVk CisgICAgICAgICAgICBpbiBhc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdCBjYWxsYmFj ayBieSBhIGNsaWVudC4KKwogMjAxNC0xMS0wNiAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTc0OTg1LTE3NDk4Nik6IFNpdGUgZGlz cGxheSBkaXNhcHBlYXJzIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAK aW5kZXggNDNiOWMzZi4uMjU3OGU5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VM b2FkZXIuY3BwCkBAIC0yNTQsMjAgKzI1NCw2IEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OndpbGxT ZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzCiAK ICAgICBBU1NFUlQoIW1fcmVhY2hlZFRlcm1pbmFsU3RhdGUpOwogICAgIAotI2lmIFBMQVRGT1JN KElPUykKLSAgICAvLyBFbnN1cmUgYW4gaWRlbnRpZmllciBpcyBhbHdheXMgc2V0LiBUaGlzIGVu c3VyZXMgdGhhdCB0aGlzIGFzc2V0aW9uIGlzIG5vdCBoaXQ6Ci0gICAgLy8gPHJkYXI6Ly9wcm9i bGVtLzExMDU5Nzk0PiBBU1NFUlRJT04gRkFJTEVEOiAhSGFzaFRyYW5zbGF0b3I6OmVxdWFsKEtl eVRyYWl0czo6ZW1wdHlWYWx1ZSgpLCBrZXkpIGluIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjYW5B dXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlIGxvYWRpbmcgdGhlIGF0dGFjaGVkIHdl YiBhcmNoaXZlCi0gICAgLy8gVGhpcyBpcyBub3QgbmVlZGVkIGluIFdlYktpdDIsIGFzIGl0IGRv ZXNuJ3QgdXNlIG1faWRlbnRpZmllciBpbiBXZWJGcmFtZUxvYWRlckNsaWVudDo6Y2FuQXV0aGVu dGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZQotICAgIGlmICghbV9pZGVudGlmaWVyKSB7Ci0g ICAgICAgIG1faWRlbnRpZmllciA9IG1fZnJhbWUtPnBhZ2UoKS0+cHJvZ3Jlc3MoKS5jcmVhdGVV bmlxdWVJZGVudGlmaWVyKCk7Ci0gICAgICAgIGZyYW1lTG9hZGVyKCktPm5vdGlmaWVyKCkuYXNz aWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QobV9pZGVudGlmaWVyLCBkb2N1bWVudExvYWRl cigpLCByZXF1ZXN0KTsKLQotICAgICAgICAvLyBJZiB0aGlzIFJlc291cmNlTG9hZGVyIHdhcyBz dG9wcGVkIGFzIGEgcmVzdWx0IG9mIGFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0LCBi YWlsIG91dAotICAgICAgICBpZiAobV9yZWFjaGVkVGVybWluYWxTdGF0ZSkKLSAgICAgICAgICAg IHJldHVybjsKLSAgICB9Ci0jZW5kaWYKLQogICAgIC8vIFdlIG5lZWQgYSByZXNvdXJjZSBpZGVu dGlmaWVyIGZvciBhbGwgcmVxdWVzdHMsIGV2ZW4gaWYgRnJhbWVMb2FkZXIgaXMgbmV2ZXIgZ29p bmcgdG8gc2VlIGl0IChzdWNoIGFzIHdpdGggQ09SUyBwcmVmbGlnaHQgcmVxdWVzdHMpLgogICAg IGJvb2wgY3JlYXRlZFJlc291cmNlSWRlbnRpZmllciA9IGZhbHNlOwogICAgIGlmICghbV9pZGVu dGlmaWVyKSB7CkBAIC0yNzksNiArMjY1LDEyIEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OndpbGxT ZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzCiAg ICAgICAgIGlmIChjcmVhdGVkUmVzb3VyY2VJZGVudGlmaWVyKQogICAgICAgICAgICAgZnJhbWVM b2FkZXIoKS0+bm90aWZpZXIoKS5hc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdChtX2lk ZW50aWZpZXIsIGRvY3VtZW50TG9hZGVyKCksIHJlcXVlc3QpOwogCisjaWYgUExBVEZPUk0oSU9T KQorICAgICAgICAvLyBJZiB0aGlzIFJlc291cmNlTG9hZGVyIHdhcyBzdG9wcGVkIGFzIGEgcmVz dWx0IG9mIGFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0LCBiYWlsIG91dAorICAgICAg ICBpZiAobV9yZWFjaGVkVGVybWluYWxTdGF0ZSkKKyAgICAgICAgICAgIHJldHVybjsKKyNlbmRp ZgorCiAgICAgICAgIGZyYW1lTG9hZGVyKCktPm5vdGlmaWVyKCkud2lsbFNlbmRSZXF1ZXN0KHRo aXMsIHJlcXVlc3QsIHJlZGlyZWN0UmVzcG9uc2UpOwogICAgIH0KICNpZiBFTkFCTEUoSU5TUEVD VE9SKQo=