112932 2013-03-21 10:58:33 -0700 [Mac] Consolidate bits of willSendRequest implementation 2013-03-21 11:22:01 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 860467 0 ap 2013-03-21 10:58:33 -0700 Parts are in Objective-C delegate, and other parts are in ResourceHandle class for no good reason. 860469 1 194292 ap 2013-03-21 11:03:25 -0700 Created attachment 194292 proposed patch 860485 2 ap 2013-03-21 11:22:01 -0700 Committed <http://trac.webkit.org/changeset/146488>. 194292 2013-03-21 11:03:25 -0700 2013-03-21 11:05:18 -0700 proposed patch MoveWillSendRequest.txt text/plain 4658 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NjQ4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAzLTIxICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIENvbnNvbGlkYXRl IGJpdHMgb2Ygd2lsbFNlbmRSZXF1ZXN0IGltcGxlbWVudGF0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI5MzIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlZCBzb21lIGxvZ2ljIGZyb20gV2Vi Q29yZVJlc291cmNlSGFuZGxlQXNEZWxlZ2F0ZSB0byBSZXNvdXJjZUhhbmRsZSBmb3IgY2xhcml0 eS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OndpbGxTZW5kUmVxdWVzdCk6Cisg ICAgICAgICgtW1dlYkNvcmVSZXNvdXJjZUhhbmRsZUFzRGVsZWdhdGUgY29ubmVjdGlvbjp3aWxs U2VuZFJlcXVlc3Q6cmVkaXJlY3RSZXNwb25zZTpdKToKKwogMjAxMy0wMy0yMSAgRG9taW5pYyBN YXp6b25pICA8ZG1henpvbmlAZ29vZ2xlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgV2ViIFNw ZWVjaCBTeW50aGVzaXMgZm9yIENocm9taXVtCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQkocmV2aXNp b24gMTQ2Mzg2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3Vy Y2VIYW5kbGVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQwNSw2ICs0MDUsMjcgQEAgdm9pZCBS ZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1Mb2FkUmVzb3VyYwogCiB2b2lkIFJlc291cmNlSGFuZGxl Ojp3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogeworICAgIEFTU0VSVCghcmVkaXJlY3RSZXNw b25zZS5pc051bGwoKSk7CisKKyAgICBpZiAocmVkaXJlY3RSZXNwb25zZS5odHRwU3RhdHVzQ29k ZSgpID09IDMwNykgeworICAgICAgICBTdHJpbmcgbGFzdEhUVFBNZXRob2QgPSBkLT5tX2xhc3RI VFRQTWV0aG9kOworICAgICAgICBpZiAoIWVxdWFsSWdub3JpbmdDYXNlKGxhc3RIVFRQTWV0aG9k LCByZXF1ZXN0Lmh0dHBNZXRob2QoKSkpIHsKKyAgICAgICAgICAgIHJlcXVlc3Quc2V0SFRUUE1l dGhvZChsYXN0SFRUUE1ldGhvZCk7CisgICAgCisgICAgICAgICAgICBGb3JtRGF0YSogYm9keSA9 IGQtPm1fZmlyc3RSZXF1ZXN0Lmh0dHBCb2R5KCk7CisgICAgICAgICAgICBpZiAoIWVxdWFsSWdu b3JpbmdDYXNlKGxhc3RIVFRQTWV0aG9kLCAiR0VUIikgJiYgYm9keSAmJiAhYm9keS0+aXNFbXB0 eSgpKQorICAgICAgICAgICAgICAgIHJlcXVlc3Quc2V0SFRUUEJvZHkoYm9keSk7CisKKyAgICAg ICAgICAgIFN0cmluZyBvcmlnaW5hbENvbnRlbnRUeXBlID0gZC0+bV9maXJzdFJlcXVlc3QuaHR0 cENvbnRlbnRUeXBlKCk7CisgICAgICAgICAgICBpZiAoIW9yaWdpbmFsQ29udGVudFR5cGUuaXNF bXB0eSgpKQorICAgICAgICAgICAgICAgIHJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkKCJDb250 ZW50LVR5cGUiLCBvcmlnaW5hbENvbnRlbnRUeXBlKTsKKyAgICAgICAgfQorICAgIH0KKworICAg IC8vIFNob3VsZCBub3Qgc2V0IFJlZmVyZXIgYWZ0ZXIgYSByZWRpcmVjdCBmcm9tIGEgc2VjdXJl IHJlc291cmNlIHRvIG5vbi1zZWN1cmUgb25lLgorICAgIGlmICghcmVxdWVzdC51cmwoKS5wcm90 b2NvbElzKCJodHRwcyIpICYmIHByb3RvY29sSXMocmVxdWVzdC5odHRwUmVmZXJyZXIoKSwgImh0 dHBzIikgJiYgZC0+bV9jb250ZXh0LT5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJl ZGlyZWN0KCkpCisgICAgICAgIHJlcXVlc3QuY2xlYXJIVFRQUmVmZXJyZXIoKTsKKwogICAgIGNv bnN0IEtVUkwmIHVybCA9IHJlcXVlc3QudXJsKCk7CiAgICAgZC0+bV91c2VyID0gdXJsLnVzZXIo KTsKICAgICBkLT5tX3Bhc3MgPSB1cmwucGFzcygpOwpAQCAtNjA1LDEzICs2MjYsMTAgQEAgLSAo TlNVUkxSZXF1ZXN0ICopY29ubmVjdGlvbjooTlNVUkxDb25uZQogewogICAgIFVOVVNFRF9QQVJB TShjb25uZWN0aW9uKTsKIAotICAgIC8vIHRoZSB3aWxsU2VuZFJlcXVlc3QgY2FsbCBtYXkgY2Fu Y2VsIHRoaXMgbG9hZCwgaW4gd2hpY2ggY2FzZSBzZWxmIGNvdWxkIGJlIGRlYWxsb2NhdGVkCi0g ICAgUmV0YWluUHRyPFdlYkNvcmVSZXNvdXJjZUhhbmRsZUFzRGVsZWdhdGU+IHByb3RlY3Qoc2Vs Zik7Ci0KICAgICBpZiAoIW1faGFuZGxlIHx8ICFtX2hhbmRsZS0+Y2xpZW50KCkpCiAgICAgICAg IHJldHVybiBuaWw7CiAgICAgCi0gICAgLy8gU2VlIDxyZGFyOi8vcHJvYmxlbS81MzgwNjk3PiAu ICBUaGlzIGlzIGEgd29ya2Fyb3VuZCBmb3IgYSBiZWhhdmlvciBjaGFuZ2UgaW4gQ0ZOZXR3b3Jr IHdoZXJlIHdpbGxTZW5kUmVxdWVzdCBnZXRzIGNhbGxlZCBtb3JlIG9mdGVuLgorICAgIC8vIFNl ZSA8cmRhcjovL3Byb2JsZW0vNTM4MDY5Nz4uIFRoaXMgaXMgYSB3b3JrYXJvdW5kIGZvciBhIGJl aGF2aW9yIGNoYW5nZSBpbiBDRk5ldHdvcmsgd2hlcmUgd2lsbFNlbmRSZXF1ZXN0IGdldHMgY2Fs bGVkIG1vcmUgb2Z0ZW4uCiAgICAgaWYgKCFyZWRpcmVjdFJlc3BvbnNlKQogICAgICAgICByZXR1 cm4gbmV3UmVxdWVzdDsKIApAQCAtNjIyLDMwICs2NDAsOCBAQCAtIChOU1VSTFJlcXVlc3QgKilj b25uZWN0aW9uOihOU1VSTENvbm5lCiAgICAgICAgIExPRyhOZXR3b3JrLCAiSGFuZGxlICVwIGRl bGVnYXRlIGNvbm5lY3Rpb246JXAgd2lsbFNlbmRSZXF1ZXN0OiVAIHJlZGlyZWN0UmVzcG9uc2U6 bm9uLUhUVFAiLCBtX2hhbmRsZSwgY29ubmVjdGlvbiwgW25ld1JlcXVlc3QgZGVzY3JpcHRpb25d KTsgCiAjZW5kaWYKIAotICAgIGlmIChbcmVkaXJlY3RSZXNwb25zZSBpc0tpbmRPZkNsYXNzOltO U0hUVFBVUkxSZXNwb25zZSBjbGFzc11dICYmIFsoTlNIVFRQVVJMUmVzcG9uc2UgKilyZWRpcmVj dFJlc3BvbnNlIHN0YXR1c0NvZGVdID09IDMwNykgewotICAgICAgICBTdHJpbmcgbGFzdEhUVFBN ZXRob2QgPSBtX2hhbmRsZS0+bGFzdEhUVFBNZXRob2QoKTsKLSAgICAgICAgaWYgKCFlcXVhbEln bm9yaW5nQ2FzZShsYXN0SFRUUE1ldGhvZCwgU3RyaW5nKFtuZXdSZXF1ZXN0IEhUVFBNZXRob2Rd KSkpIHsKLSAgICAgICAgICAgIE5TTXV0YWJsZVVSTFJlcXVlc3QgKm11dGFibGVSZXF1ZXN0ID0g W25ld1JlcXVlc3QgbXV0YWJsZUNvcHldOwotICAgICAgICAgICAgW211dGFibGVSZXF1ZXN0IHNl dEhUVFBNZXRob2Q6bGFzdEhUVFBNZXRob2RdOwotICAgIAotICAgICAgICAgICAgRm9ybURhdGEq IGJvZHkgPSBtX2hhbmRsZS0+Zmlyc3RSZXF1ZXN0KCkuaHR0cEJvZHkoKTsKLSAgICAgICAgICAg IGlmICghZXF1YWxJZ25vcmluZ0Nhc2UobGFzdEhUVFBNZXRob2QsICJHRVQiKSAmJiBib2R5ICYm ICFib2R5LT5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgV2ViQ29yZTo6c2V0SFRUUEJvZHko bXV0YWJsZVJlcXVlc3QsIGJvZHkpOwotCi0gICAgICAgICAgICBTdHJpbmcgb3JpZ2luYWxDb250 ZW50VHlwZSA9IG1faGFuZGxlLT5maXJzdFJlcXVlc3QoKS5odHRwQ29udGVudFR5cGUoKTsKLSAg ICAgICAgICAgIGlmICghb3JpZ2luYWxDb250ZW50VHlwZS5pc0VtcHR5KCkpCi0gICAgICAgICAg ICAgICAgW211dGFibGVSZXF1ZXN0IHNldFZhbHVlOm9yaWdpbmFsQ29udGVudFR5cGUgZm9ySFRU UEhlYWRlckZpZWxkOkAiQ29udGVudC1UeXBlIl07Ci0KLSAgICAgICAgICAgIG5ld1JlcXVlc3Qg PSBbbXV0YWJsZVJlcXVlc3QgYXV0b3JlbGVhc2VdOwotICAgICAgICB9Ci0gICAgfQotCiAgICAg UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QgPSBuZXdSZXF1ZXN0OwogCi0gICAgLy8gU2hvdWxkIG5v dCBzZXQgUmVmZXJlciBhZnRlciBhIHJlZGlyZWN0IGZyb20gYSBzZWN1cmUgcmVzb3VyY2UgdG8g bm9uLXNlY3VyZSBvbmUuCi0gICAgaWYgKCFyZXF1ZXN0LnVybCgpLnByb3RvY29sSXMoImh0dHBz IikgJiYgcHJvdG9jb2xJcyhyZXF1ZXN0Lmh0dHBSZWZlcnJlcigpLCAiaHR0cHMiKSAmJiBtX2hh bmRsZS0+Y29udGV4dCgpLT5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0 KCkpCi0gICAgICAgIHJlcXVlc3QuY2xlYXJIVFRQUmVmZXJyZXIoKTsKLQogICAgIG1faGFuZGxl LT53aWxsU2VuZFJlcXVlc3QocmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSk7CiAKICAgICByZXR1 cm4gcmVxdWVzdC5uc1VSTFJlcXVlc3QoVXBkYXRlSFRUUEJvZHkpOwo=