51000 2010-12-13 18:55:53 -0800 Re land Purpose after bad merge 2010-12-13 19:21:46 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 gavinp webkit-unassigned abarth ap japhet webkit.review.bot oldest_to_newest 321613 0 gavinp 2010-12-13 18:55:53 -0800 https://bugs.webkit.org/show_bug.cgi?id=47802 didn't land all that well, as a bad merge the next day https://bugs.webkit.org/show_bug.cgi?id=27165 blew away this change. This patch just re-lands that change, along with an inconsequential test fix that abarth missed in 47802. 321616 1 76484 gavinp 2010-12-13 18:59:58 -0800 Created attachment 76484 Patch 321623 2 76484 webkit.review.bot 2010-12-13 19:21:41 -0800 Comment on attachment 76484 Patch Clearing flags on attachment: 76484 Committed r73996: <http://trac.webkit.org/changeset/73996> 321624 3 webkit.review.bot 2010-12-13 19:21:46 -0800 All reviewed patches have been landed. Closing bug. 76484 2010-12-13 18:59:58 -0800 2010-12-13 19:21:41 -0800 Patch bug-51000-20101213215957.patch text/plain 2390 gavinp ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmNmI5MzBmODBmOTcyMjA5ZThiNzhhNmExZmVmNDljYmNhN2ZiM2UxLi5hNjFjNzNj NzA5MmNmNmVjMzFmNjVmZWI5Yzg4YzUyYzA2OTE5YmZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTAtMTItMTMgIEdhdmluIFBldGVycyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmUgbGFuZCBQdXJwb3Nl IGFmdGVyIGJhZCBtZXJnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTEwMDAKKworICAgICAgICAqIGh0dHAvdGVzdHMvbWlzYy9yZXNvdXJjZXMvcHJl ZmV0Y2gtcHVycG9zZS5waHA6CisKIDIwMTAtMTItMTMgIEpvaG4gS25vdHRlbmJlbHQgIDxqa25v dHRlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU3RldmUgQmxvY2suCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21pc2MvcmVzb3VyY2VzL3ByZWZldGNo LXB1cnBvc2UucGhwIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9taXNjL3Jlc291cmNlcy9wcmVm ZXRjaC1wdXJwb3NlLnBocAppbmRleCBjYWQzMzIwNmY2OWI4YjFiMWExMTgzMzYzNzJhZTkyODhm ODYzMTFlLi5hMzFlOGU1MmZiYTIyZWM3OTI3MmVjYTBkNWQwNzY3MzVmM2VjNmI4IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21pc2MvcmVzb3VyY2VzL3ByZWZldGNoLXB1cnBv c2UucGhwCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWlzYy9yZXNvdXJjZXMvcHJlZmV0 Y2gtcHVycG9zZS5waHAKQEAgLTEsNCArMSw0IEBACi08P3BocCBzZXRjb29raWUoIlB1cnBvc2Ui LCAkX1NFUlZFUlsiSFRUUF9YX1BVUlBPU0UiXSk7Cis8P3BocCBzZXRjb29raWUoIlB1cnBvc2Ui LCAkX1NFUlZFUlsiSFRUUF9QVVJQT1NFIl0pOwogCiBpZiAoaXNzZXQoJF9DT09LSUVbJ1B1cnBv c2UnXSkpIHsKICAgICBzZXRjb29raWUoIlB1cnBvc2UiLCAiIiwgdGltZSgpIC0gMzYwMCk7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDI2 MDRhODg5NDRkMzQyOTYzZjA4YmFlMGU2NzMzNDRiNWQ1ODdjY2IuLmVlZWZlYzQ5YzcyYjY4ZDlk NjE2ODBjNGNjYTUyYWYwODg0ODI3OTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMTItMTMgIEdhdmlu IFBldGVycyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmUgbGFuZCBQdXJwb3NlIGFmdGVyIGJhZCBtZXJnZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTEwMDAKKwor ICAgICAgICAqIGxvYWRlci9sb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TG9hZGVyOjps b2FkKToKKwogMjAxMC0xMi0xMyAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAg ICAgICAgV2luZG93cyBidWlsZCBmaXggYWZ0ZXIgcjczOTE0CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2xvYWRlci9sb2FkZXIuY3BwIGIvV2ViQ29yZS9sb2FkZXIvbG9hZGVyLmNwcAppbmRleCBjZjUx ZDlhNDIxYTJiZjM0MzMwZTA2ZDYwMDkzZDE3NWJmOGJmMDcwLi5iM2RjNzkwNjJlYTMxNDkzMTU3 OTQwZWNlMTA3ZTg5ZDc0YzMzYTRiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9sb2FkZXIu Y3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL2xvYWRlci5jcHAKQEAgLTEzMSw3ICsxMzEsNyBAQCBQ YXNzUmVmUHRyPExvYWRlcj4gTG9hZGVyOjpsb2FkKENhY2hlZFJlc291cmNlTG9hZGVyKiBjYWNo ZWRSZXNvdXJjZUxvYWRlciwgQ2FjaAogICAgIAogI2lmIEVOQUJMRShMSU5LX1BSRUZFVENIKQog ICAgIGlmIChyZXNvdXJjZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpMaW5rUHJlZmV0Y2gp Ci0gICAgICAgIHJlc291cmNlUmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGQoIlgtUHVycG9zZSIs ICJwcmVmZXRjaCIpOworICAgICAgICByZXNvdXJjZVJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxk KCJQdXJwb3NlIiwgInByZWZldGNoIik7CiAjZW5kaWYKIAogICAgIFJlZlB0cjxTdWJyZXNvdXJj ZUxvYWRlcj4gbG9hZGVyID0gcmVzb3VyY2VMb2FkU2NoZWR1bGVyKCktPnNjaGVkdWxlU3VicmVz b3VyY2VMb2FkKGNhY2hlZFJlc291cmNlTG9hZGVyLT5kb2N1bWVudCgpLT5mcmFtZSgpLAo=