139817 2014-12-19 09:34:40 -0800 [Win] Add accessor for serializing HTTP loads 2014-12-19 10:58:57 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham bfulgham oldest_to_newest 1057038 0 bfulgham 2014-12-19 09:34:40 -0800 Add a test helper method so that we can tell WebKit to serialize HTTP loads. This is used for Mac (and other) platform testing, but is missing on Windows. 1057040 1 243553 bfulgham 2014-12-19 09:42:57 -0800 Created attachment 243553 Patch 1057041 2 243553 bfulgham 2014-12-19 09:43:40 -0800 Comment on attachment 243553 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243553&action=review > Tools/DumpRenderTree/win/TestRunnerWin.cpp:-70 > - This is being done in our reset method. No need to call in destructor. 1057069 3 243553 mark.lam 2014-12-19 10:47:16 -0800 Comment on attachment 243553 Patch rs=me 1057070 4 bfulgham 2014-12-19 10:48:06 -0800 (In reply to comment #2) > Comment on attachment 243553 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=243553&action=review > > > Tools/DumpRenderTree/win/TestRunnerWin.cpp:-70 > > - > > This is being done in our reset method. No need to call in destructor. Note: This is being done in DumpRenderTree.cpp::resetWebViewToConsistentStateBeforeTesting. There is no need to also call it in the destructor. I'm removing code in the destructor to make the Windows runs behave more consistently like the Mac versions. 1057079 5 bfulgham 2014-12-19 10:58:57 -0800 Committed r177579: <http://trac.webkit.org/changeset/177579> 243553 2014-12-19 09:42:57 -0800 2014-12-19 10:47:16 -0800 Patch bug-139817-20141219094851.patch text/plain 5272 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzU3NCkKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTEyLTE5 ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEFk ZCBhY2Nlc3NvciBmb3Igc2VyaWFsaXppbmcgSFRUUCBsb2Fkcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTgxNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogSW50ZXJmYWNlcy9JV2ViVmlld1ByaXZh dGUuaWRsOiBBZGQgbmV3IG1ldGhvZC4KKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAg KFdlYlZpZXc6OnNldExvYWRSZXNvdXJjZXNTZXJpYWxseSk6IFByb3ZpZGUgaW1wbGVtZW50YXRp b24uCisgICAgICAgICogV2ViVmlldy5oOgorCiAyMDE0LTEyLTE4ICBwZWF2b0BvdXRsb29rLmNv bSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gQ29tcGlsZSBlcnJv ciBpbiBjb2RlIGZvciBjcmVhdGluZyBHTCBjb250ZXh0LgpJbmRleDogU291cmNlL1dlYktpdC93 aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5j cHAJKHJldmlzaW9uIDE3NzU0MSkKKysrIFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiRE9NQ29yZUNsYXNzZXMu aCIKICNpbmNsdWRlICJGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmgiCiAjaW5jbHVkZSAiTWFy c2hhbGxpbmdIZWxwZXJzLmgiCisjaW5jbHVkZSAiUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgiCiAj aW5jbHVkZSAiU29mdExpbmtpbmcuaCIKICNpbmNsdWRlICJTdWJmcmFtZUxvYWRlci5oIgogI2lu Y2x1ZGUgIlRleHRJdGVyYXRvci5oIgpAQCAtNzA0OCwzICs3MDQ5LDkgQEAgSFJFU1VMVCBTVERN RVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpzZWxlYwogICAgIHJldHVybiBTX09LOwogfQogCitIUkVT VUxUIFdlYlZpZXc6OnNldExvYWRSZXNvdXJjZXNTZXJpYWxseShCT09MIHNlcmlhbGl6ZSkKK3sK KyAgICBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OmluaXRpYWxpemUoKTsKKyAgICByZXNvdXJjZUxv YWRTY2hlZHVsZXIoKS0+c2V0U2VyaWFsTG9hZGluZ0VuYWJsZWQoc2VyaWFsaXplKTsKKyAgICBy ZXR1cm4gU19PSzsKK30KSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmgJKHJldmlzaW9uIDE3NzU0MSkKKysr IFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMTAxOSw2ICsx MDE5LDggQEAgcHJpdmF0ZToKICAgICBib29sIG1fc2hvdWxkSW52ZXJ0Q29sb3JzOwogICAgIHZv aWQgc2V0U2hvdWxkSW52ZXJ0Q29sb3JzKGJvb2wpOwogCisgICAgSFJFU1VMVCBTVERNRVRIT0RD QUxMVFlQRSBzZXRMb2FkUmVzb3VyY2VzU2VyaWFsbHkoQk9PTCk7CisKIHByb3RlY3RlZDoKICAg ICBzdGF0aWMgYm9vbCByZWdpc3RlcldlYlZpZXdXaW5kb3dDbGFzcygpOwogICAgIHN0YXRpYyBM UkVTVUxUIENBTExCQUNLIFdlYlZpZXdXbmRQcm9jKEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBX UEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0lu dGVyZmFjZXMvSVdlYlZpZXdQcml2YXRlLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3dpbi9JbnRlcmZhY2VzL0lXZWJWaWV3UHJpdmF0ZS5pZGwJKHJldmlzaW9uIDE3NzU0MSkKKysr IFNvdXJjZS9XZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYlZpZXdQcml2YXRlLmlkbAkod29ya2lu ZyBjb3B5KQpAQCAtMjkwLDQgKzI5MCw3IEBAIGludGVyZmFjZSBJV2ViVmlld1ByaXZhdGUgOiBJ VW5rbm93bgogICAgIEhSRVNVTFQgZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2VGb3JUZXN0aW5n KFtpbl0gVUlOVCBsb2NhdGlvbiwgW2luXSBVSU5UIGxlbmd0aCwgW291dCwgcmV0dmFsXSBSRUNU KiByZXN1bHRSZWN0KTsKIAogICAgIEhSRVNVTFQgc2VsZWN0ZWRSYW5nZUZvclRlc3RpbmcoW291 dF0gVUlOVCogbG9jYXRpb24sIFtvdXRdIFVJTlQqIGxlbmd0aCk7CisKKyAgICAvLyBTUEkgZm9y IER1bXBSZW5kZXJUcmVlCisgICAgSFJFU1VMVCBzZXRMb2FkUmVzb3VyY2VzU2VyaWFsbHkoW2lu XSBCT09MIHNlcmlhbGl6ZSk7CiB9CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNzc1NzQpCisrKyBUb29scy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxNC0xMi0xOSAgQnJlbnQgRnVsZ2hh bSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBBZGQgYWNjZXNzb3IgZm9y IHNlcmlhbGl6aW5nIEhUVFAgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzOTgxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcDog UmVzZXQgc2VyaWFsaXplZCBIVFRQIGxvYWRzIGluIG91ciByZXNldCBtZXRob2QuCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvd2luL1Rlc3RSdW5uZXJXaW4uY3BwOiBQcm92aWRlIGltcGxlbWVu dGF0aW9uIGZvciBzZXJpYWxpemluZyBIVFRQLiBBbHNvCisgICAgICAgIHJlbW92ZSBzb21lIHJl ZHVuZGFudCBjb2RlIGZyb20gdGhlIGRlc3RydWN0b3IuCisKIDIwMTQtMTItMTkgIENzYWJhIE9z enRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxNzc1 MzUpOiBJdCBicm9rZSB0aGUgR1RLIHBlcmZvcm1hbmNlIGJvdApJbmRleDogVG9vbHMvRHVtcFJl bmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1w UmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCShyZXZpc2lvbiAxNzc1NDIpCisrKyBU b29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC04ODQsNiArODg0LDggQEAgc3RhdGljIHZvaWQgcmVzZXRXZWJWaWV3VG9Db25zaXN0ZW50 U3RhdAogICAgIGlmIChTVUNDRUVERUQod2ViVmlldy0+cHJlZmVyZW5jZXMoJnByZWZlcmVuY2Vz KSkpCiAgICAgICAgIHJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMocHJlZmVyZW5jZXMu Z2V0KCkpOwogCisgICAgVGVzdFJ1bm5lcjo6c2V0U2VyaWFsaXplSFRUUExvYWRzKGZhbHNlKTsK KwogICAgIGlmIChnVGVzdFJ1bm5lcikgewogICAgICAgICBKU0dsb2JhbENvbnRleHRSZWYgY29u dGV4dCA9IGZyYW1lLT5nbG9iYWxDb250ZXh0KCk7CiAgICAgICAgIFdlYkNvcmVUZXN0U3VwcG9y dDo6cmVzZXRJbnRlcm5hbHNPYmplY3QoY29udGV4dCk7CkluZGV4OiBUb29scy9EdW1wUmVuZGVy VHJlZS93aW4vVGVzdFJ1bm5lcldpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRl clRyZWUvd2luL1Rlc3RSdW5uZXJXaW4uY3BwCShyZXZpc2lvbiAxNzc1NDIpCisrKyBUb29scy9E dW1wUmVuZGVyVHJlZS93aW4vVGVzdFJ1bm5lcldpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYz LDExICs2Myw2IEBAIFRlc3RSdW5uZXI6On5UZXN0UnVubmVyKCkKICAgICAgICAgcmV0dXJuOwog CiAgICAgLy8gcmVzZXQgd2Vidmlldy1yZWxhdGVkIHN0YXRlcyBiYWNrIHRvIGRlZmF1bHQgdmFs dWVzIGluIHByZXBhcmF0aW9uIGZvciBuZXh0IHRlc3QKLQotICAgIENPTVB0cjxJV2ViVmlld1By aXZhdGU+IHZpZXdQcml2YXRlOwotICAgIGlmIChTVUNDRUVERUQod2ViVmlldy0+UXVlcnlJbnRl cmZhY2UoJnZpZXdQcml2YXRlKSkpCi0gICAgICAgIHZpZXdQcml2YXRlLT5zZXRUYWJLZXlDeWNs ZXNUaHJvdWdoRWxlbWVudHMoVFJVRSk7Ci0KICAgICBDT01QdHI8SVdlYlZpZXdFZGl0aW5nPiB2 aWV3RWRpdGluZzsKICAgICBpZiAoRkFJTEVEKHdlYlZpZXctPlF1ZXJ5SW50ZXJmYWNlKCZ2aWV3 RWRpdGluZykpKQogICAgICAgICByZXR1cm47CkBAIC0xMjEyLDEwICsxMjA3LDE3IEBAIHZvaWQg VGVzdFJ1bm5lcjo6YWJvcnRNb2RhbCgpCiAgICAgLy8gTm90aGluZyB0byBkbwogfQogCi12b2lk IFRlc3RSdW5uZXI6OnNldFNlcmlhbGl6ZUhUVFBMb2Fkcyhib29sKQordm9pZCBUZXN0UnVubmVy OjpzZXRTZXJpYWxpemVIVFRQTG9hZHMoYm9vbCBzZXJpYWxpemVMb2FkcykKIHsKLSAgICAvLyBG SVhNRTogSW1wbGVtZW50LgotICAgIHByaW50ZigiRVJST1I6IFRlc3RSdW5uZXI6OnNldFNlcmlh bGl6ZUhUVFBMb2FkcygpIG5vdCBpbXBsZW1lbnRlZFxuIik7CisgICAgQ09NUHRyPElXZWJWaWV3 PiB3ZWJWaWV3OworICAgIGlmIChGQUlMRUQoZnJhbWUtPndlYlZpZXcoJndlYlZpZXcpKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgQ09NUHRyPElXZWJWaWV3UHJpdmF0ZT4gdmlld1ByaXZhdGU7 CisgICAgaWYgKEZBSUxFRCh3ZWJWaWV3LT5RdWVyeUludGVyZmFjZSgmdmlld1ByaXZhdGUpKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgdmlld1ByaXZhdGUtPnNldExvYWRSZXNvdXJjZXNTZXJp YWxseShzZXJpYWxpemVMb2Fkcyk7CiB9CiAKIHZvaWQgVGVzdFJ1bm5lcjo6c2V0VGV4dERpcmVj dGlvbihKU1N0cmluZ1JlZiBkaXJlY3Rpb24pCg==