36151 2010-03-15 20:52:51 -0700 webkit-patch rollout should error out on conflicts 2010-03-15 21:15:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned eric evan oldest_to_newest 199972 0 abarth 2010-03-15 20:52:51 -0700 webkit-patch rollout should error out on conflicts 199974 1 50757 abarth 2010-03-15 20:54:13 -0700 Created attachment 50757 Patch 199981 2 50757 eric 2010-03-15 21:13:31 -0700 Comment on attachment 50757 Patch Sad about copy/paste, but looks good. 199982 3 50757 eric 2010-03-15 21:13:43 -0700 Comment on attachment 50757 Patch Where's the testing? 199984 4 abarth 2010-03-15 21:15:27 -0700 Committed r56032: <http://trac.webkit.org/changeset/56032> 50757 2010-03-15 20:54:13 -0700 2010-03-15 21:13:43 -0700 Patch bug-36151-20100315205411.patch text/plain 3348 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyMjU0YTg4Li4wZGUyN2Q4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMt MTUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB3ZWJraXQtcGF0Y2ggcm9sbG91dCBzaG91bGQg ZXJyb3Igb3V0IG9uIGNvbmZsaWN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzYxNTEKKworICAgICAgICBJbnN0ZWFkIG9mIGJsaW5kaW5nbHkgcGxv d2luZyBhaGVhZCwgd2Ugbm93IHRocm93IGFuIGV4Y2VwdGlvbiBpZiB0aGVyZQorICAgICAgICBh cmUgY29uZmxpY3RzIGFmdGVyIGFwcGx5aW5nIGEgcmV2ZXJzZSBkaWZmLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9zY20ucHk6CisKIDIwMTAtMDMtMTUgIENocmlzIEZsZWl6YWNoICA8 Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGxheW91dCB0ZXN0IGZp eC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc2NtLnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zY20ucHkKaW5kZXggM2YyMzczZS4uODZlYjBhZCAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zY20ucHkKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zY20ucHkKQEAgLTIxMCw2ICsyMTAsOSBAQCBjbGFz cyBTQ006CiAgICAgZGVmIGNoYW5nZWRfZmlsZXMoc2VsZik6CiAgICAgICAgIHJhaXNlIE5vdElt cGxlbWVudGVkRXJyb3IsICJzdWJjbGFzc2VzIG11c3QgaW1wbGVtZW50IgogCisgICAgZGVmIGNv bmZsaWN0ZWRfZmlsZXMoc2VsZik6CisgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3Is ICJzdWJjbGFzc2VzIG11c3QgaW1wbGVtZW50IgorCiAgICAgZGVmIGRpc3BsYXlfbmFtZShzZWxm KToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBp bXBsZW1lbnQiCiAKQEAgLTMzNCw2ICszMzcsMTMgQEAgY2xhc3MgU1ZOKFNDTSk6CiAgICAgICAg ICAgICBzdGF0dXNfcmVnZXhwID0gIl4oP1A8c3RhdHVzPltBQ0RNUl0pLns1fSAoP1A8ZmlsZW5h bWU+LispJCIKICAgICAgICAgcmV0dXJuIHNlbGYucnVuX3N0YXR1c19hbmRfZXh0cmFjdF9maWxl bmFtZXMoc2VsZi5zdGF0dXNfY29tbWFuZCgpLCBzdGF0dXNfcmVnZXhwKQogCisgICAgZGVmIGNv bmZsaWN0ZWRfZmlsZXMoc2VsZik6CisgICAgICAgIGlmIHNlbGYuc3ZuX3ZlcnNpb24oKSA+ICIx LjYiOgorICAgICAgICAgICAgc3RhdHVzX3JlZ2V4cCA9ICJeKD9QPHN0YXR1cz5bQ10pLns2fSAo P1A8ZmlsZW5hbWU+LispJCIKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHN0YXR1c19yZWdl eHAgPSAiXig/UDxzdGF0dXM+W0NdKS57NX0gKD9QPGZpbGVuYW1lPi4rKSQiCisgICAgICAgIHJl dHVybiBzZWxmLnJ1bl9zdGF0dXNfYW5kX2V4dHJhY3RfZmlsZW5hbWVzKHNlbGYuc3RhdHVzX2Nv bW1hbmQoKSwgc3RhdHVzX3JlZ2V4cCkKKwogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYgc3Vw cG9ydHNfbG9jYWxfY29tbWl0cygpOgogICAgICAgICByZXR1cm4gRmFsc2UKQEAgLTQzMiw3ICs0 NDIsMTIgQEAgY2xhc3MgR2l0KFNDTSk6CiAgICAgICAgIHN0YXR1c19jb21tYW5kID0gWydnaXQn LCAnZGlmZicsICctcicsICctLW5hbWUtc3RhdHVzJywgJy1DJywgJy1NJywgJ0hFQUQnXQogICAg ICAgICBzdGF0dXNfcmVnZXhwID0gJ14oP1A8c3RhdHVzPltBRE1dKVx0KD9QPGZpbGVuYW1lPi4r KSQnCiAgICAgICAgIHJldHVybiBzZWxmLnJ1bl9zdGF0dXNfYW5kX2V4dHJhY3RfZmlsZW5hbWVz KHN0YXR1c19jb21tYW5kLCBzdGF0dXNfcmVnZXhwKQotICAgIAorCisgICAgZGVmIGNvbmZsaWN0 ZWRfZmlsZXMoc2VsZik6CisgICAgICAgIHN0YXR1c19jb21tYW5kID0gWydnaXQnLCAnZGlmZics ICctLW5hbWUtc3RhdHVzJywgJy1DJywgJy1NJywgJy0tZGlmZi1maWx0ZXI9VSddCisgICAgICAg IHN0YXR1c19yZWdleHAgPSAnXig/UDxzdGF0dXM+W1VdKVx0KD9QPGZpbGVuYW1lPi4rKSQnCisg ICAgICAgIHJldHVybiBzZWxmLnJ1bl9zdGF0dXNfYW5kX2V4dHJhY3RfZmlsZW5hbWVzKHN0YXR1 c19jb21tYW5kLCBzdGF0dXNfcmVnZXhwKQorCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBz dXBwb3J0c19sb2NhbF9jb21taXRzKCk6CiAgICAgICAgIHJldHVybiBUcnVlCkBAIC00NTksNyAr NDc0LDYgQEAgY2xhc3MgR2l0KFNDTSk6CiAgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvciht ZXNzYWdlPSdGYWlsZWQgdG8gZmluZCBnaXQgY29tbWl0IGZvciByZXZpc2lvbiAlcywgZ2l0IHN2 biBsb2cgb3V0cHV0OiAiJXMiJyAlIChyZXZpc2lvbiwgZ2l0X2NvbW1pdCkpCiAKICAgICAgICAg IyBJIHRoaW5rIHRoaXMgd2lsbCBhbHdheXMgZmFpbCBkdWUgdG8gQ2hhbmdlTG9ncy4KLSAgICAg ICAgIyBGSVhNRTogV2UgbmVlZCB0byBkZXRlYyBzcGVjaWZpYyBmYWlsdXJlIGNvbmRpdGlvbnMg YW5kIGhhbmRsZSB0aGVtLgogICAgICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdyZXZlcnQnLCAn LS1uby1jb21taXQnLCBnaXRfY29tbWl0XSwgZXJyb3JfaGFuZGxlcj1FeGVjdXRpdmUuaWdub3Jl X2Vycm9yKQogCiAgICAgICAgICMgRml4IGFueSBDaGFuZ2VMb2dzIGlmIG5lY2Vzc2FyeS4KQEAg LTQ2Nyw2ICs0ODEsMTAgQEAgY2xhc3MgR2l0KFNDTSk6CiAgICAgICAgIGlmIGxlbihjaGFuZ2Vs b2dfcGF0aHMpOgogICAgICAgICAgICAgcnVuX2NvbW1hbmQoW3NlbGYuc2NyaXB0X3BhdGgoJ3Jl c29sdmUtQ2hhbmdlTG9ncycpXSArIGNoYW5nZWxvZ19wYXRocykKIAorICAgICAgICBjb25mbGlj dHMgPSBzZWxmLmNvbmZsaWN0ZWRfZmlsZXMoKQorICAgICAgICBpZiBsZW4oY29uZmxpY3RzKToK KyAgICAgICAgICAgIHJhaXNlIFNjcmlwdEVycm9yKG1lc3NhZ2U9IkZhaWxlZCB0byBhcHBseSBy ZXZlcnNlIGRpZmYgZm9yIHJldmlzaW9uICVzIGJlY2F1c2Ugb2YgdGhlIGZvbGxvd2luZyBjb25m bGljdHM6XG4lcyIgJSAocmV2aXNpb24sICJcbiIuam9pbihjb25mbGljdHMpKSkKKwogICAgIGRl ZiByZXZlcnRfZmlsZXMoc2VsZiwgZmlsZV9wYXRocyk6CiAgICAgICAgIHJ1bl9jb21tYW5kKFsn Z2l0JywgJ2NoZWNrb3V0JywgJ0hFQUQnXSArIGZpbGVfcGF0aHMpCiAK