125183 2013-12-03 14:15:35 -0800 [Cocoa] Give two load delegate methods more conventional names 2013-12-03 22:48:14 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz simon.fraser oldest_to_newest 956089 0 mitz 2013-12-03 14:15:35 -0800 [Cocoa] Give two load delegate methods more conventional names 956094 1 218340 mitz 2013-12-03 14:17:44 -0800 Created attachment 218340 Rename load error delegate methods 956110 2 mitz 2013-12-03 14:29:46 -0800 Committed <http://trac.webkit.org/r160040>. 956282 3 simon.fraser 2013-12-03 22:42:17 -0800 This appears to have caused the WKBrowsingContextLoadDelegateTest.SimpleLoadFail unit test to start timing out: http://build.webkit.org/builders/Apple%20Mavericks%20Debug%20WK1%20%28Tests%29?numbuilds=100 956283 4 mitz 2013-12-03 22:44:04 -0800 (In reply to comment #3) > This appears to have caused the WKBrowsingContextLoadDelegateTest.SimpleLoadFail unit test to start timing out: > http://build.webkit.org/builders/Apple%20Mavericks%20Debug%20WK1%20%28Tests%29?numbuilds=100 I must have missed the fact that the test uses a renamed method. I’ll update it. 956285 5 mitz 2013-12-03 22:48:14 -0800 (In reply to comment #4) > (In reply to comment #3) > > This appears to have caused the WKBrowsingContextLoadDelegateTest.SimpleLoadFail unit test to start timing out: > > http://build.webkit.org/builders/Apple%20Mavericks%20Debug%20WK1%20%28Tests%29?numbuilds=100 > > I must have missed the fact that the test uses a renamed method. I’ll update it. Committed <http://trac.webkit.org/r160071>. 218340 2013-12-03 14:17:44 -0800 2013-12-03 14:18:43 -0800 Rename load error delegate methods bug-125183-20131203141744.patch text/plain 4509 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDAzNikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTEyLTAzICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBHaXZlIHR3byBsb2Fk IGRlbGVnYXRlIG1ldGhvZHMgbW9yZSBjb252ZW50aW9uYWwgbmFtZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTE4MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW06CisgICAgICAgIChkaWRGYWlsUHJvdmlzaW9u YWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpOiBVcGRhdGVkIGZvciByZW5hbWUuCisgICAgICAgIChk aWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lKTogRGl0dG8uCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dExvYWREZWxlZ2F0ZS5oOiBSZW5hbWVkCisgICAg ICAgIC1icm93c2luZ0NvbnRleHRDb250cm9sbGVyRGlkRmFpbFByb3Zpc2lvbmFsTG9hZDp3aXRo RXJyb3I6IHRvCisgICAgICAgIC1icm93c2luZ0NvbnRleHRDb250cm9sbGVyOmRpZEZhaWxQcm92 aXNpb25hbExvYWRXaXRoRXJyb3I6IGFuZAorICAgICAgICAtYnJvd3NpbmdDb250ZXh0Q29udHJv bGxlckRpZEZhaWxMb2FkOndpdGhFcnJvcjogdG8KKyAgICAgICAgLWJyb3dzaW5nQ29udGV4dENv bnRyb2xsZXI6ZGlkRmFpbExvYWRXaXRoRXJyb3I6LgorCiAyMDEzLTEyLTAzICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRGVwcmVjYXRlIFdLTm90aWZp Y2F0aW9uUHJvdmlkZXIKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCShy ZXZpc2lvbiAxNjAwMDkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL QnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMzYzLDkgKzM2 Myw5IEBAIHN0YXRpYyB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXIKICAgICAgICAg cmV0dXJuOwogCiAgICAgV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICpicm93c2luZ0NvbnRl eHQgPSAoV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopY2xpZW50SW5mbzsKLSAgICBpZiAo W2Jyb3dzaW5nQ29udGV4dC5sb2FkRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cihicm93c2luZ0NvbnRleHRDb250cm9sbGVyRGlkRmFpbFByb3Zpc2lvbmFsTG9hZDp3aXRoRXJy b3I6KV0pIHsKKyAgICBpZiAoW2Jyb3dzaW5nQ29udGV4dC5sb2FkRGVsZWdhdGUgcmVzcG9uZHNU b1NlbGVjdG9yOkBzZWxlY3Rvcihicm93c2luZ0NvbnRleHRDb250cm9sbGVyOmRpZEZhaWxQcm92 aXNpb25hbExvYWRXaXRoRXJyb3I6KV0pIHsKICAgICAgICAgUmV0YWluUHRyPE5TRXJyb3I+IG5z RXJyb3IgPSBhZG9wdE5TKGNyZWF0ZUVycm9yV2l0aFJlY292ZXJ5QXR0ZW1wdGVyKGVycm9yLCBm cmFtZSwgYnJvd3NpbmdDb250ZXh0KSk7Ci0gICAgICAgIFticm93c2luZ0NvbnRleHQubG9hZERl bGVnYXRlIGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRGYWlsUHJvdmlzaW9uYWxMb2FkOmJy b3dzaW5nQ29udGV4dCB3aXRoRXJyb3I6bnNFcnJvci5nZXQoKV07CisgICAgICAgIFticm93c2lu Z0NvbnRleHQubG9hZERlbGVnYXRlIGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXI6YnJvd3NpbmdD b250ZXh0IGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3I6bnNFcnJvci5nZXQoKV07CiAg ICAgfQogfQogCkBAIC0zOTUsOSArMzk1LDkgQEAgc3RhdGljIHZvaWQgZGlkRmFpbExvYWRXaXRo RXJyb3JGb3JGcmFtZQogICAgICAgICByZXR1cm47CiAKICAgICBXS0Jyb3dzaW5nQ29udGV4dENv bnRyb2xsZXIgKmJyb3dzaW5nQ29udGV4dCA9IChXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIg KiljbGllbnRJbmZvOwotICAgIGlmIChbYnJvd3NpbmdDb250ZXh0LmxvYWREZWxlZ2F0ZSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRGYWls TG9hZDp3aXRoRXJyb3I6KV0pIHsKKyAgICBpZiAoW2Jyb3dzaW5nQ29udGV4dC5sb2FkRGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihicm93c2luZ0NvbnRleHRDb250cm9sbGVy OmRpZEZhaWxMb2FkV2l0aEVycm9yOildKSB7CiAgICAgICAgIFJldGFpblB0cjxOU0Vycm9yPiBu c0Vycm9yID0gYWRvcHROUyhjcmVhdGVFcnJvcldpdGhSZWNvdmVyeUF0dGVtcHRlcihlcnJvciwg ZnJhbWUsIGJyb3dzaW5nQ29udGV4dCkpOwotICAgICAgICBbYnJvd3NpbmdDb250ZXh0LmxvYWRE ZWxlZ2F0ZSBicm93c2luZ0NvbnRleHRDb250cm9sbGVyRGlkRmFpbExvYWQ6YnJvd3NpbmdDb250 ZXh0IHdpdGhFcnJvcjpuc0Vycm9yLmdldCgpXTsKKyAgICAgICAgW2Jyb3dzaW5nQ29udGV4dC5s b2FkRGVsZWdhdGUgYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcjpicm93c2luZ0NvbnRleHQgZGlk RmFpbExvYWRXaXRoRXJyb3I6bnNFcnJvci5nZXQoKV07CiAgICAgfQogfQogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVn YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S0Jyb3dzaW5nQ29udGV4dExvYWREZWxlZ2F0ZS5oCShyZXZpc2lvbiAxNjAwMDkpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVn YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDggKzM3LDggQEAKIC8qIFNlbnQgaWYgYSBzZXJ2 ZXItc2lkZSByZWRpcmVjdCB3YXMgcmVjaWV2ZWQuICovCiAtICh2b2lkKWJyb3dzaW5nQ29udGV4 dENvbnRyb2xsZXJEaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWQ6KFdL QnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqKXNlbmRlcjsKIAotLyogU2VudCBpZiB0aGUgcHJv dmlvbmFsIGxvYWQgZmFpbHMuICovCi0tICh2b2lkKWJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJE aWRGYWlsUHJvdmlzaW9uYWxMb2FkOihXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKilzZW5k ZXIgd2l0aEVycm9yOihOU0Vycm9yICopZXJyb3I7CisvKiBTZW50IGlmIHRoZSBwcm92aXNpb25h bCBsb2FkIGZhaWxzLiAqLworLSAodm9pZClicm93c2luZ0NvbnRleHRDb250cm9sbGVyOihXS0Jy b3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKilzZW5kZXIgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdp dGhFcnJvcjooTlNFcnJvciAqKWVycm9yOwogCiAvKiBTZW50IHdoZW4gdGhlIGxvYWQgZ2V0cyBj b21taXR0ZWQuICovCiAtICh2b2lkKWJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRDb21taXRM b2FkOihXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKilzZW5kZXI7CkBAIC00Nyw3ICs0Nyw3 IEBACiAtICh2b2lkKWJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRGaW5pc2hMb2FkOihXS0Jy b3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKilzZW5kZXI7CiAKIC8qIFNlbnQgaWYgdGhlIGNvbW1p dGVkIGxvYWQgZmFpbHMuICovCi0tICh2b2lkKWJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJEaWRG YWlsTG9hZDooV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopc2VuZGVyIHdpdGhFcnJvcjoo TlNFcnJvciAqKWVycm9yOworLSAodm9pZClicm93c2luZ0NvbnRleHRDb250cm9sbGVyOihXS0Jy b3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKilzZW5kZXIgZGlkRmFpbExvYWRXaXRoRXJyb3I6KE5T RXJyb3IgKillcnJvcjsKIAogLSAodm9pZClicm93c2luZ0NvbnRleHRDb250cm9sbGVyRGlkU3Rh cnRQcm9ncmVzczooV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopc2VuZGVyOwogLSAodm9p ZClicm93c2luZ0NvbnRleHRDb250cm9sbGVyOihXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIg KilzZW5kZXIgZXN0aW1hdGVkUHJvZ3Jlc3NDaGFuZ2VkVG86KGRvdWJsZSllc3RpbWF0ZWRQcm9n cmVzczsK