57664 2011-04-01 14:51:51 -0700 Stop preload scanning CSS when it's impossible to have another @import. 2011-04-05 03:50:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simonjam simonjam abarth commit-queue eric koivisto tonyg webkit.review.bot oldest_to_newest 378101 0 simonjam 2011-04-01 14:51:51 -0700 Stop preload scanning CSS when it's impossible to have another @import. 378105 1 87920 simonjam 2011-04-01 14:57:14 -0700 Created attachment 87920 Patch 378109 2 87920 abarth 2011-04-01 15:07:04 -0700 Comment on attachment 87920 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87920&action=review > Source/WebCore/html/parser/CSSPreloadScanner.cpp:68 > + if (isHTMLSpace(c)) > + { } Woah. That's how we usually do that. I'd have a separate if clause that just has a break in it. > Source/WebCore/html/parser/CSSPreloadScanner.cpp:90 > else if (c == '*') > - ; > + { } I'd also fix all of these. :) 378119 3 simonjam 2011-04-01 15:23:15 -0700 webkit-patch upload complained. This is the way it told me to do it. I think it's referring to #4 under Braces in the style guide. I'll defer to your judgement though. 378136 4 abarth 2011-04-01 15:35:26 -0700 { } is preferred to ; but we should avoid both if we can. 378142 5 87920 abarth 2011-04-01 15:39:19 -0700 Comment on attachment 87920 Patch As for the actual change, this looks great! 379112 6 88139 simonjam 2011-04-04 15:06:25 -0700 Created attachment 88139 Patch for landing 379399 7 commit-queue 2011-04-05 02:26:18 -0700 The commit-queue encountered the following flaky tests while processing attachment 88139: fast/workers/storage/use-same-database-in-page-and-workers.html bug 50995 (author: dumi@chromium.org) The commit-queue is continuing to process your patch. 379401 8 88139 commit-queue 2011-04-05 02:28:15 -0700 Comment on attachment 88139 Patch for landing Clearing flags on attachment: 88139 Committed r82916: <http://trac.webkit.org/changeset/82916> 379402 9 commit-queue 2011-04-05 02:28:20 -0700 All reviewed patches have been landed. Closing bug. 379429 10 webkit.review.bot 2011-04-05 03:50:45 -0700 http://trac.webkit.org/changeset/82916 might have broken GTK Linux 32-bit Debug 87920 2011-04-01 14:57:14 -0700 2011-04-04 15:06:22 -0700 Patch bug-57664-20110401145713.patch text/plain 7311 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogODI2ODUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiYzgwOTk2ZTBkNmEwZmU2YzZlYTIy MDkzNWViYzQ3MDQ5MzU3NTM4Li5kMzgzODEyYzA4OTQ1YjEyN2JlODJiNDU1ODYyNzEyMTQxNDJh ZTgxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMDEgIEphbWVzIFNpbW9uc2VuICA8 c2ltb25qYW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFN0b3AgcHJlbG9hZCBzY2FubmluZyBDU1Mgd2hlbiBpdCZhcG9zO3Mg aW1wb3NzaWJsZSB0byBoYXZlIGFub3RoZXIgQGltcG9ydC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NjY0CisKKyAgICAgICAgKiBmYXN0L3ByZWxv YWRlci9zdHlsZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9wcmVsb2FkZXIvc3R5bGUu aHRtbDogVXBkYXRlZCB0byB0ZXN0IGludmFsaWQgQGltcG9ydCBzdGF0ZW1lbnRzLgorCiAyMDEx LTA0LTAxICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNhYmxl IGluc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Zy1pbmxpbmVkLXNjcmlwdHMuaHRtbApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9wcmVsb2FkZXIvc3R5bGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZmFzdC9wcmVsb2FkZXIvc3R5bGUtZXhwZWN0ZWQudHh0CmluZGV4IDE0NWRmMGVjYWZk NjZjODVhODljZTg3MTYwNmFkNWI0MGU0MTFmMTIuLmZmNWYyNWI1M2I0YTY2NmU3NjU1ZDQxZGYw YzEwYTI4MGE0OWMzNmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvcHJlbG9hZGVyL3N0 eWxlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3ByZWxvYWRlci9zdHlsZS1l eHBlY3RlZC50eHQKQEAgLTIsNiArMiwxOCBAQCBzdHlsZTEuY3NzIGhhcyBNSU1FIHR5cGUgdGV4 dC9jc3MKIFRoaXMgdGVzdCByZXF1aXJlcyBEdW1wUmVuZGVyVHJlZSB0byBzZWUgdGhlIGxvZyBv ZiB3aGF0IHJlc291cmNlcyBhcmUgbG9hZGVkLgogCiA8c3R5bGU+CitAY2hhcnNldCAiYXNjaWki OworLyogKi8KIEBpbXBvcnQgInJlc291cmNlcy9zdHlsZTEuY3NzIjsKK2VtIHsKKyAgICBAaW1w b3J0ICJyZXNvdXJjZXMvZmFpbC5jc3MiOworfQorQGltcG9ydCAicmVzb3VyY2VzL2ZhaWwuY3Nz IjsKKzwvc3R5bGU+Cis8c3R5bGU+CitAbWVkaWEgcHJpbnQgeworICAgIEBpbXBvcnQgInJlc291 cmNlcy9mYWlsLmNzcyI7Cit9CitAaW1wb3J0ICJyZXNvdXJjZXMvZmFpbC5jc3MiOwogPC9zdHls ZT4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9wcmVsb2FkZXIvc3R5bGUuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvcHJlbG9hZGVyL3N0eWxlLmh0bWwKaW5kZXggNmRhZjU5NzVhMWJh YjgzOWJkNzA4YjJiNTBjYzVkZGFmZjYzZTc3MC4uM2YwYWExODM4OWUwYzY4M2NhMTZhMGI4ODdl MjBkMzgxYmM1OTc0YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9wcmVsb2FkZXIvc3R5 bGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3ByZWxvYWRlci9zdHlsZS5odG1sCkBAIC05 LDUgKzksMTcgQEAgVGhpcyB0ZXN0IHJlcXVpcmVzIER1bXBSZW5kZXJUcmVlIHRvIHNlZSB0aGUg bG9nIG9mIHdoYXQgcmVzb3VyY2VzIGFyZSBsb2FkZWQuCiA8c2NyaXB0IHNyYz1yZXNvdXJjZXMv bm9uLWV4aXN0YW50LmpzPjwvc2NyaXB0PgogPHNjcmlwdD5kb2N1bWVudC53cml0ZSgiPHBsYWlu dGV4dD4iKTs8L3NjcmlwdD4KIDxzdHlsZT4KK0BjaGFyc2V0ICJhc2NpaSI7CisvKiAqLwogQGlt cG9ydCAicmVzb3VyY2VzL3N0eWxlMS5jc3MiOworZW0geworICAgIEBpbXBvcnQgInJlc291cmNl cy9mYWlsLmNzcyI7Cit9CitAaW1wb3J0ICJyZXNvdXJjZXMvZmFpbC5jc3MiOworPC9zdHlsZT4K KzxzdHlsZT4KK0BtZWRpYSBwcmludCB7CisgICAgQGltcG9ydCAicmVzb3VyY2VzL2ZhaWwuY3Nz IjsKK30KK0BpbXBvcnQgInJlc291cmNlcy9mYWlsLmNzcyI7CiA8L3N0eWxlPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGZmZTQxZjI5YmQwZjc0OGNlYjlhZjQyNGM0MDE3Y2JkZmEzOTFmOTkuLjk2Y2NlZDhkMGRi ZTNlZTNlNGQ2NmVjOWI2ZDc4MmRkYmEyMDRkOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBA QAorMjAxMS0wNC0wMSAgSmFtZXMgU2ltb25zZW4gIDxzaW1vbmphbUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCBwcmVs b2FkIHNjYW5uaW5nIENTUyB3aGVuIGl0JmFwb3M7cyBpbXBvc3NpYmxlIHRvIGhhdmUgYW5vdGhl ciBAaW1wb3J0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTc2NjQKKworICAgICAgICBAaW1wb3J0IHN0YXRlbWVudHMgYXJlIG9ubHkgYWxsb3dlZCBh dCB0aGUgYmVnaW5uaW5nIG9mIGEgQ1NTIGZpbGUuCisgICAgICAgIE9ubHkgY29tbWVudHMgb3Ig QGNoYXJzZXQgY2FuIHByZWNlZGUgdGhlbS4gQWZ0ZXIgc2VlaW5nIGFueXRoaW5nIGVsc2UsCisg ICAgICAgIGFib3J0IGVhcmx5IHNvIHRoYXQgd2U6CisgICAgICAgIC0gZG9uJ3QgaGF2ZSB0byBw YXJzZSB0aGUgcmVzdCBvZiB0aGUgQ1NTLgorICAgICAgICAtIGRvbid0IHByZWxvYWQgc29tZXRo aW5nIHRoYXQgdGhlIHJlZ3VsYXIgcGFyc2VyIHdvbid0IGxvYWQuCisKKyAgICAgICAgKiBodG1s L3BhcnNlci9DU1NQcmVsb2FkU2Nhbm5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmVs b2FkU2Nhbm5lcjo6c2Nhbik6IFRlcm1pbmF0ZSBlYXJseSBpZiB3ZSdyZSBkb25lIHdpdGggQGlt cG9ydHMuCisgICAgICAgIChXZWJDb3JlOjpDU1NQcmVsb2FkU2Nhbm5lcjo6dG9rZW5pemUpOiBU ZXJtaW5hdGUgZWFybHkgaWYgd2Ugc2VlIGEge30gb3IgYW55IHN0eWxlIHJ1bGUuCisgICAgICAg IChXZWJDb3JlOjpDU1NQcmVsb2FkU2Nhbm5lcjo6ZW1pdFJ1bGUpOiBPbmx5IEBjaGFyc2V0IG9y IEBpbXBvcnQgaXMgYWxsb3dlZCB0byBwcmVjZWRlIEBpbXBvcnQuCisgICAgICAgICogaHRtbC9w YXJzZXIvQ1NTUHJlbG9hZFNjYW5uZXIuaDogQWRkIERvbmVQYXJzaW5nSW1wb3J0UnVsZXMgc3Rh dGUuCisKIDIwMTEtMDMtMjMgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0NTU1ByZWxvYWRTY2FubmVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL0NTU1ByZWxvYWRTY2FubmVyLmNwcAppbmRleCAyMzM2NGY5YTgw YTJiMDk4NjQzMmNlMGEzNTU0NzZjMjE3MmRiZGRkLi41YzZjMDRjNjk2NmZlMDU2MDA5ZjE4NzNl OWRiODNhMmI5ODNkNmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9D U1NQcmVsb2FkU2Nhbm5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ1NT UHJlbG9hZFNjYW5uZXIuY3BwCkBAIC01NCw3ICs1NCw3IEBAIHZvaWQgQ1NTUHJlbG9hZFNjYW5u ZXI6OnNjYW4oY29uc3QgSFRNTFRva2VuJiB0b2tlbiwgYm9vbCBzY2FubmluZ0JvZHkpCiAgICAg bV9zY2FubmluZ0JvZHkgPSBzY2FubmluZ0JvZHk7CiAKICAgICBjb25zdCBIVE1MVG9rZW46OkRh dGFWZWN0b3ImIGNoYXJhY3RlcnMgPSB0b2tlbi5jaGFyYWN0ZXJzKCk7Ci0gICAgZm9yIChIVE1M VG9rZW46OkRhdGFWZWN0b3I6OmNvbnN0X2l0ZXJhdG9yIGl0ZXIgPSBjaGFyYWN0ZXJzLmJlZ2lu KCk7IGl0ZXIgIT0gY2hhcmFjdGVycy5lbmQoKTsgKytpdGVyKQorICAgIGZvciAoSFRNTFRva2Vu OjpEYXRhVmVjdG9yOjpjb25zdF9pdGVyYXRvciBpdGVyID0gY2hhcmFjdGVycy5iZWdpbigpOyBp dGVyICE9IGNoYXJhY3RlcnMuZW5kKCkgJiYgbV9zdGF0ZSAhPSBEb25lUGFyc2luZ0ltcG9ydFJ1 bGVzOyArK2l0ZXIpCiAgICAgICAgIHRva2VuaXplKCppdGVyKTsKIH0KIApAQCAtNjQsMTAgKzY0 LDE0IEBAIGlubGluZSB2b2lkIENTU1ByZWxvYWRTY2FubmVyOjp0b2tlbml6ZShVQ2hhciBjKQog ICAgIC8vIFNlYXJjaGluZyBmb3Igb3RoZXIgdHlwZXMgb2YgcmVzb3VyY2VzIGlzIHByb2JhYmx5 IGxvdyBwYXlvZmYuCiAgICAgc3dpdGNoIChtX3N0YXRlKSB7CiAgICAgY2FzZSBJbml0aWFsOgot ICAgICAgICBpZiAoYyA9PSAnQCcpCisgICAgICAgIGlmIChpc0hUTUxTcGFjZShjKSkKKyAgICAg ICAgICAgIHsgfQorICAgICAgICBlbHNlIGlmIChjID09ICdAJykKICAgICAgICAgICAgIG1fc3Rh dGUgPSBSdWxlU3RhcnQ7CiAgICAgICAgIGVsc2UgaWYgKGMgPT0gJy8nKQogICAgICAgICAgICAg bV9zdGF0ZSA9IE1heWJlQ29tbWVudDsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbV9zdGF0 ZSA9IERvbmVQYXJzaW5nSW1wb3J0UnVsZXM7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWF5 YmVDb21tZW50OgogICAgICAgICBpZiAoYyA9PSAnKicpCkBAIC04Myw3ICs4Nyw3IEBAIGlubGlu ZSB2b2lkIENTU1ByZWxvYWRTY2FubmVyOjp0b2tlbml6ZShVQ2hhciBjKQogICAgICAgICBpZiAo YyA9PSAnLycpCiAgICAgICAgICAgICBtX3N0YXRlID0gSW5pdGlhbDsKICAgICAgICAgZWxzZSBp ZiAoYyA9PSAnKicpCi0gICAgICAgICAgICA7CisgICAgICAgICAgICB7IH0KICAgICAgICAgZWxz ZQogICAgICAgICAgICAgbV9zdGF0ZSA9IENvbW1lbnQ7CiAgICAgICAgIGJyZWFrOwpAQCAtMTA2 LDkgKzExMCwxMSBAQCBpbmxpbmUgdm9pZCBDU1NQcmVsb2FkU2Nhbm5lcjo6dG9rZW5pemUoVUNo YXIgYykKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBZnRlclJ1bGU6CiAgICAgICAgIGlmIChp c0hUTUxTcGFjZShjKSkKLSAgICAgICAgICAgIDsKKyAgICAgICAgICAgIHsgfQogICAgICAgICBl bHNlIGlmIChjID09ICc7JykKICAgICAgICAgICAgIG1fc3RhdGUgPSBJbml0aWFsOworICAgICAg ICBlbHNlIGlmIChjID09ICd7JykKKyAgICAgICAgICAgIG1fc3RhdGUgPSBEb25lUGFyc2luZ0lt cG9ydFJ1bGVzOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIG1fc3RhdGUgPSBSdWxlVmFs dWU7CiAgICAgICAgICAgICBtX3J1bGVWYWx1ZS5hcHBlbmQoYyk7CkBAIC0xMTcsMjMgKzEyMywy NiBAQCBpbmxpbmUgdm9pZCBDU1NQcmVsb2FkU2Nhbm5lcjo6dG9rZW5pemUoVUNoYXIgYykKICAg ICBjYXNlIFJ1bGVWYWx1ZToKICAgICAgICAgaWYgKGlzSFRNTFNwYWNlKGMpKQogICAgICAgICAg ICAgbV9zdGF0ZSA9IEFmdGVyUnVsZVZhbHVlOwotICAgICAgICBlbHNlIGlmIChjID09ICc7Jykg eworICAgICAgICBlbHNlIGlmIChjID09ICc7JykKICAgICAgICAgICAgIGVtaXRSdWxlKCk7Ci0g ICAgICAgICAgICBtX3N0YXRlID0gSW5pdGlhbDsKLSAgICAgICAgfSBlbHNlIAorICAgICAgICBl bHNlCiAgICAgICAgICAgICBtX3J1bGVWYWx1ZS5hcHBlbmQoYyk7CiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgQWZ0ZXJSdWxlVmFsdWU6CiAgICAgICAgIGlmIChpc0hUTUxTcGFjZShjKSkKLSAg ICAgICAgICAgIDsKLSAgICAgICAgZWxzZSBpZiAoYyA9PSAnOycpIHsKKyAgICAgICAgICAgIHsg fQorICAgICAgICBlbHNlIGlmIChjID09ICc7JykKICAgICAgICAgICAgIGVtaXRSdWxlKCk7Ci0g ICAgICAgICAgICBtX3N0YXRlID0gSW5pdGlhbDsKLSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ZWxzZSBpZiAoYyA9PSAneycpCisgICAgICAgICAgICBtX3N0YXRlID0gRG9uZVBhcnNpbmdJbXBv cnRSdWxlczsKKyAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogbWVkaWEgcnVs ZXMKICAgICAgICAgICAgIG1fc3RhdGUgPSBJbml0aWFsOwogICAgICAgICB9CiAgICAgICAgIGJy ZWFrOworICAgIGNhc2UgRG9uZVBhcnNpbmdJbXBvcnRSdWxlczoKKyAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIApAQCAtMTg3LDcgKzE5Niwx MSBAQCB2b2lkIENTU1ByZWxvYWRTY2FubmVyOjplbWl0UnVsZSgpCiAgICAgICAgIFN0cmluZyB2 YWx1ZSA9IHBhcnNlQ1NTU3RyaW5nT3JVUkwobV9ydWxlVmFsdWUuZGF0YSgpLCBtX3J1bGVWYWx1 ZS5zaXplKCkpOwogICAgICAgICBpZiAoIXZhbHVlLmlzRW1wdHkoKSkKICAgICAgICAgICAgIG1f ZG9jdW1lbnQtPmNhY2hlZFJlc291cmNlTG9hZGVyKCktPnByZWxvYWQoQ2FjaGVkUmVzb3VyY2U6 OkNTU1N0eWxlU2hlZXQsIHZhbHVlLCBTdHJpbmcoKSwgbV9zY2FubmluZ0JvZHkpOwotICAgIH0K KyAgICAgICAgbV9zdGF0ZSA9IEluaXRpYWw7CisgICAgfSBlbHNlIGlmIChlcXVhbElnbm9yaW5n Q2FzZSgiY2hhcnNldCIsIG1fcnVsZS5kYXRhKCksIG1fcnVsZS5zaXplKCkpKQorICAgICAgICBt X3N0YXRlID0gSW5pdGlhbDsKKyAgICBlbHNlCisgICAgICAgIG1fc3RhdGUgPSBEb25lUGFyc2lu Z0ltcG9ydFJ1bGVzOwogICAgIG1fcnVsZS5jbGVhcigpOwogICAgIG1fcnVsZVZhbHVlLmNsZWFy KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9DU1NQcmVsb2Fk U2Nhbm5lci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ1NTUHJlbG9hZFNjYW5uZXIu aAppbmRleCBmYWU5NWExNGU4YmU5YjQ1YTAwY2FhZjY2YmQzZDJlNmExZTE1MTVlLi5lNDVmYTJk YmJlZDljMzk4NTYxYTkyZGVmMWNlMTRmOTY4MjM2MjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9DU1NQcmVsb2FkU2Nhbm5lci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL0NTU1ByZWxvYWRTY2FubmVyLmgKQEAgLTUzLDcgKzUzLDggQEAgcHJpdmF0 ZToKICAgICAgICAgUnVsZSwKICAgICAgICAgQWZ0ZXJSdWxlLAogICAgICAgICBSdWxlVmFsdWUs Ci0gICAgICAgIEFmdGVyUnVsZVZhbHVlCisgICAgICAgIEFmdGVyUnVsZVZhbHVlLAorICAgICAg ICBEb25lUGFyc2luZ0ltcG9ydFJ1bGVzLAogICAgIH07CiAKICAgICBpbmxpbmUgdm9pZCB0b2tl bml6ZShVQ2hhciBjKTsK 88139 2011-04-04 15:06:25 -0700 2011-04-05 02:28:15 -0700 Patch for landing bug-57664-20110404150624.patch text/plain 7374 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3NDFkNDFhMGQ4NTQ3MzM5NWFlYzNh NzkxNmFjMWNkOWIzZTUxOTBjLi4xZDA5YTgyZGU2NjRiZTkzZmJkZmJjMTMxYzI2NGM1Y2Q2NTE0 NTJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMDQgIEphbWVzIFNpbW9uc2VuICA8 c2ltb25qYW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGgu CisKKyAgICAgICAgU3RvcCBwcmVsb2FkIHNjYW5uaW5nIENTUyB3aGVuIGl0JmFwb3M7cyBpbXBv c3NpYmxlIHRvIGhhdmUgYW5vdGhlciBAaW1wb3J0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc2NjQKKworICAgICAgICAqIGZhc3QvcHJlbG9hZGVy L3N0eWxlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L3ByZWxvYWRlci9zdHlsZS5odG1s OiBVcGRhdGVkIHRvIHRlc3QgaW52YWxpZCBAaW1wb3J0IHN0YXRlbWVudHMuCisKIDIwMTEtMDQt MDQgIENoYW5nIFNodSAgPGNzaHVAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcHJlbG9hZGVyL3N0eWxl LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvcHJlbG9hZGVyL3N0eWxlLWV4cGVjdGVk LnR4dAppbmRleCAxNDVkZjBlY2FmZDY2Yzg1YTg5Y2U4NzE2MDZhZDViNDBlNDExZjEyLi5mZjVm MjViNTNiNGE2NjZlNzY1NWQ0MWRmMGMxMGEyODBhNDljMzZmIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9mYXN0L3ByZWxvYWRlci9zdHlsZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9wcmVsb2FkZXIvc3R5bGUtZXhwZWN0ZWQudHh0CkBAIC0yLDYgKzIsMTggQEAgc3R5bGUx LmNzcyBoYXMgTUlNRSB0eXBlIHRleHQvY3NzCiBUaGlzIHRlc3QgcmVxdWlyZXMgRHVtcFJlbmRl clRyZWUgdG8gc2VlIHRoZSBsb2cgb2Ygd2hhdCByZXNvdXJjZXMgYXJlIGxvYWRlZC4KIAogPHN0 eWxlPgorQGNoYXJzZXQgImFzY2lpIjsKKy8qICovCiBAaW1wb3J0ICJyZXNvdXJjZXMvc3R5bGUx LmNzcyI7CitlbSB7CisgICAgQGltcG9ydCAicmVzb3VyY2VzL2ZhaWwuY3NzIjsKK30KK0BpbXBv cnQgInJlc291cmNlcy9mYWlsLmNzcyI7Cis8L3N0eWxlPgorPHN0eWxlPgorQG1lZGlhIHByaW50 IHsKKyAgICBAaW1wb3J0ICJyZXNvdXJjZXMvZmFpbC5jc3MiOworfQorQGltcG9ydCAicmVzb3Vy Y2VzL2ZhaWwuY3NzIjsKIDwvc3R5bGU+CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv cHJlbG9hZGVyL3N0eWxlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3ByZWxvYWRlci9zdHlsZS5o dG1sCmluZGV4IDZkYWY1OTc1YTFiYWI4MzliZDcwOGIyYjUwY2M1ZGRhZmY2M2U3NzAuLjNmMGFh MTgzODllMGM2ODNjYTE2YTBiODg3ZTIwZDM4MWJjNTk3NGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2Zhc3QvcHJlbG9hZGVyL3N0eWxlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9wcmVs b2FkZXIvc3R5bGUuaHRtbApAQCAtOSw1ICs5LDE3IEBAIFRoaXMgdGVzdCByZXF1aXJlcyBEdW1w UmVuZGVyVHJlZSB0byBzZWUgdGhlIGxvZyBvZiB3aGF0IHJlc291cmNlcyBhcmUgbG9hZGVkLgog PHNjcmlwdCBzcmM9cmVzb3VyY2VzL25vbi1leGlzdGFudC5qcz48L3NjcmlwdD4KIDxzY3JpcHQ+ ZG9jdW1lbnQud3JpdGUoIjxwbGFpbnRleHQ+Iik7PC9zY3JpcHQ+CiA8c3R5bGU+CitAY2hhcnNl dCAiYXNjaWkiOworLyogKi8KIEBpbXBvcnQgInJlc291cmNlcy9zdHlsZTEuY3NzIjsKK2VtIHsK KyAgICBAaW1wb3J0ICJyZXNvdXJjZXMvZmFpbC5jc3MiOworfQorQGltcG9ydCAicmVzb3VyY2Vz L2ZhaWwuY3NzIjsKKzwvc3R5bGU+Cis8c3R5bGU+CitAbWVkaWEgcHJpbnQgeworICAgIEBpbXBv cnQgInJlc291cmNlcy9mYWlsLmNzcyI7Cit9CitAaW1wb3J0ICJyZXNvdXJjZXMvZmFpbC5jc3Mi OwogPC9zdHlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3OTNhMmFhZGUzOGZjOWRjNDkzZTkwYmFiMmUzYzlj MzMwMDc0ZWMwLi5jNDE2OGMyNTIzYjY0ZmNmZDEyNjYyYWI2ZDA2YzAwZTQxY2IzZWQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMDQgIEphbWVzIFNpbW9uc2VuICA8c2lt b25qYW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCisK KyAgICAgICAgU3RvcCBwcmVsb2FkIHNjYW5uaW5nIENTUyB3aGVuIGl0JmFwb3M7cyBpbXBvc3Np YmxlIHRvIGhhdmUgYW5vdGhlciBAaW1wb3J0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc2NjQKKworICAgICAgICBAaW1wb3J0IHN0YXRlbWVudHMg YXJlIG9ubHkgYWxsb3dlZCBhdCB0aGUgYmVnaW5uaW5nIG9mIGEgQ1NTIGZpbGUuCisgICAgICAg IE9ubHkgY29tbWVudHMgb3IgQGNoYXJzZXQgY2FuIHByZWNlZGUgdGhlbS4gQWZ0ZXIgc2VlaW5n IGFueXRoaW5nIGVsc2UsCisgICAgICAgIGFib3J0IGVhcmx5IHNvIHRoYXQgd2U6CisgICAgICAg IC0gZG9uJ3QgaGF2ZSB0byBwYXJzZSB0aGUgcmVzdCBvZiB0aGUgQ1NTLgorICAgICAgICAtIGRv bid0IHByZWxvYWQgc29tZXRoaW5nIHRoYXQgdGhlIHJlZ3VsYXIgcGFyc2VyIHdvbid0IGxvYWQu CisKKyAgICAgICAgKiBodG1sL3BhcnNlci9DU1NQcmVsb2FkU2Nhbm5lci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDU1NQcmVsb2FkU2Nhbm5lcjo6c2Nhbik6IFRlcm1pbmF0ZSBlYXJseSBpZiB3 ZSdyZSBkb25lIHdpdGggQGltcG9ydHMuCisgICAgICAgIChXZWJDb3JlOjpDU1NQcmVsb2FkU2Nh bm5lcjo6dG9rZW5pemUpOiBUZXJtaW5hdGUgZWFybHkgaWYgd2Ugc2VlIGEge30gb3IgYW55IHN0 eWxlIHJ1bGUuCisgICAgICAgIChXZWJDb3JlOjpDU1NQcmVsb2FkU2Nhbm5lcjo6ZW1pdFJ1bGUp OiBPbmx5IEBjaGFyc2V0IG9yIEBpbXBvcnQgYXJlIGFsbG93ZWQgdG8gcHJlY2VkZSBAaW1wb3J0 LgorICAgICAgICAqIGh0bWwvcGFyc2VyL0NTU1ByZWxvYWRTY2FubmVyLmg6IEFkZCBEb25lUGFy c2luZ0ltcG9ydFJ1bGVzIHN0YXRlLgorCiAyMDExLTA0LTAxICBPbGl2ZXIgSHVudCAgPG9saXZl ckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9DU1NQcmVsb2FkU2Nhbm5lci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9DU1NQcmVsb2FkU2Nhbm5lci5jcHAKaW5kZXgg MjMzNjRmOWE4MGEyYjA5ODY0MzJjZTBhMzU1NDc2YzIxNzJkYmRkZC4uM2MyM2I5ZmExZTllMTMy NTUzMzgwMzVjNzc1MzRkYzY5MTk1ZjBlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvQ1NTUHJlbG9hZFNjYW5uZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0NTU1ByZWxvYWRTY2FubmVyLmNwcApAQCAtNTQsNyArNTQsNyBAQCB2b2lkIENTU1By ZWxvYWRTY2FubmVyOjpzY2FuKGNvbnN0IEhUTUxUb2tlbiYgdG9rZW4sIGJvb2wgc2Nhbm5pbmdC b2R5KQogICAgIG1fc2Nhbm5pbmdCb2R5ID0gc2Nhbm5pbmdCb2R5OwogCiAgICAgY29uc3QgSFRN TFRva2VuOjpEYXRhVmVjdG9yJiBjaGFyYWN0ZXJzID0gdG9rZW4uY2hhcmFjdGVycygpOwotICAg IGZvciAoSFRNTFRva2VuOjpEYXRhVmVjdG9yOjpjb25zdF9pdGVyYXRvciBpdGVyID0gY2hhcmFj dGVycy5iZWdpbigpOyBpdGVyICE9IGNoYXJhY3RlcnMuZW5kKCk7ICsraXRlcikKKyAgICBmb3Ig KEhUTUxUb2tlbjo6RGF0YVZlY3Rvcjo6Y29uc3RfaXRlcmF0b3IgaXRlciA9IGNoYXJhY3RlcnMu YmVnaW4oKTsgaXRlciAhPSBjaGFyYWN0ZXJzLmVuZCgpICYmIG1fc3RhdGUgIT0gRG9uZVBhcnNp bmdJbXBvcnRSdWxlczsgKytpdGVyKQogICAgICAgICB0b2tlbml6ZSgqaXRlcik7CiB9CiAKQEAg LTY0LDEwICs2NCwxNCBAQCBpbmxpbmUgdm9pZCBDU1NQcmVsb2FkU2Nhbm5lcjo6dG9rZW5pemUo VUNoYXIgYykKICAgICAvLyBTZWFyY2hpbmcgZm9yIG90aGVyIHR5cGVzIG9mIHJlc291cmNlcyBp cyBwcm9iYWJseSBsb3cgcGF5b2ZmLgogICAgIHN3aXRjaCAobV9zdGF0ZSkgewogICAgIGNhc2Ug SW5pdGlhbDoKKyAgICAgICAgaWYgKGlzSFRNTFNwYWNlKGMpKQorICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIGlmIChjID09ICdAJykKICAgICAgICAgICAgIG1fc3RhdGUgPSBSdWxlU3RhcnQ7 CiAgICAgICAgIGVsc2UgaWYgKGMgPT0gJy8nKQogICAgICAgICAgICAgbV9zdGF0ZSA9IE1heWJl Q29tbWVudDsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbV9zdGF0ZSA9IERvbmVQYXJzaW5n SW1wb3J0UnVsZXM7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWF5YmVDb21tZW50OgogICAg ICAgICBpZiAoYyA9PSAnKicpCkBAIC04MCwxMCArODQsMTAgQEAgaW5saW5lIHZvaWQgQ1NTUHJl bG9hZFNjYW5uZXI6OnRva2VuaXplKFVDaGFyIGMpCiAgICAgICAgICAgICBtX3N0YXRlID0gTWF5 YmVDb21tZW50RW5kOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1heWJlQ29tbWVudEVuZDoK KyAgICAgICAgaWYgKGMgPT0gJyonKQorICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGlmIChj ID09ICcvJykKICAgICAgICAgICAgIG1fc3RhdGUgPSBJbml0aWFsOwotICAgICAgICBlbHNlIGlm IChjID09ICcqJykKLSAgICAgICAgICAgIDsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9z dGF0ZSA9IENvbW1lbnQ7CiAgICAgICAgIGJyZWFrOwpAQCAtMTA2LDkgKzExMCwxMSBAQCBpbmxp bmUgdm9pZCBDU1NQcmVsb2FkU2Nhbm5lcjo6dG9rZW5pemUoVUNoYXIgYykKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBBZnRlclJ1bGU6CiAgICAgICAgIGlmIChpc0hUTUxTcGFjZShjKSkKLSAg ICAgICAgICAgIDsKLSAgICAgICAgZWxzZSBpZiAoYyA9PSAnOycpCisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgaWYgKGMgPT0gJzsnKQogICAgICAgICAgICAgbV9zdGF0ZSA9IEluaXRpYWw7 CisgICAgICAgIGVsc2UgaWYgKGMgPT0gJ3snKQorICAgICAgICAgICAgbV9zdGF0ZSA9IERvbmVQ YXJzaW5nSW1wb3J0UnVsZXM7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgbV9zdGF0ZSA9 IFJ1bGVWYWx1ZTsKICAgICAgICAgICAgIG1fcnVsZVZhbHVlLmFwcGVuZChjKTsKQEAgLTExNywy MyArMTIzLDI2IEBAIGlubGluZSB2b2lkIENTU1ByZWxvYWRTY2FubmVyOjp0b2tlbml6ZShVQ2hh ciBjKQogICAgIGNhc2UgUnVsZVZhbHVlOgogICAgICAgICBpZiAoaXNIVE1MU3BhY2UoYykpCiAg ICAgICAgICAgICBtX3N0YXRlID0gQWZ0ZXJSdWxlVmFsdWU7Ci0gICAgICAgIGVsc2UgaWYgKGMg PT0gJzsnKSB7CisgICAgICAgIGVsc2UgaWYgKGMgPT0gJzsnKQogICAgICAgICAgICAgZW1pdFJ1 bGUoKTsKLSAgICAgICAgICAgIG1fc3RhdGUgPSBJbml0aWFsOwotICAgICAgICB9IGVsc2UgCisg ICAgICAgIGVsc2UKICAgICAgICAgICAgIG1fcnVsZVZhbHVlLmFwcGVuZChjKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBBZnRlclJ1bGVWYWx1ZToKICAgICAgICAgaWYgKGlzSFRNTFNwYWNl KGMpKQotICAgICAgICAgICAgOwotICAgICAgICBlbHNlIGlmIChjID09ICc7JykgeworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGlmIChjID09ICc7JykKICAgICAgICAgICAgIGVtaXRSdWxl KCk7Ci0gICAgICAgICAgICBtX3N0YXRlID0gSW5pdGlhbDsKLSAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgZWxzZSBpZiAoYyA9PSAneycpCisgICAgICAgICAgICBtX3N0YXRlID0gRG9uZVBhcnNp bmdJbXBvcnRSdWxlczsKKyAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogbWVk aWEgcnVsZXMKICAgICAgICAgICAgIG1fc3RhdGUgPSBJbml0aWFsOwogICAgICAgICB9CiAgICAg ICAgIGJyZWFrOworICAgIGNhc2UgRG9uZVBhcnNpbmdJbXBvcnRSdWxlczoKKyAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIApAQCAtMTg3LDcg KzE5NiwxMSBAQCB2b2lkIENTU1ByZWxvYWRTY2FubmVyOjplbWl0UnVsZSgpCiAgICAgICAgIFN0 cmluZyB2YWx1ZSA9IHBhcnNlQ1NTU3RyaW5nT3JVUkwobV9ydWxlVmFsdWUuZGF0YSgpLCBtX3J1 bGVWYWx1ZS5zaXplKCkpOwogICAgICAgICBpZiAoIXZhbHVlLmlzRW1wdHkoKSkKICAgICAgICAg ICAgIG1fZG9jdW1lbnQtPmNhY2hlZFJlc291cmNlTG9hZGVyKCktPnByZWxvYWQoQ2FjaGVkUmVz b3VyY2U6OkNTU1N0eWxlU2hlZXQsIHZhbHVlLCBTdHJpbmcoKSwgbV9zY2FubmluZ0JvZHkpOwot ICAgIH0KKyAgICAgICAgbV9zdGF0ZSA9IEluaXRpYWw7CisgICAgfSBlbHNlIGlmIChlcXVhbEln bm9yaW5nQ2FzZSgiY2hhcnNldCIsIG1fcnVsZS5kYXRhKCksIG1fcnVsZS5zaXplKCkpKQorICAg ICAgICBtX3N0YXRlID0gSW5pdGlhbDsKKyAgICBlbHNlCisgICAgICAgIG1fc3RhdGUgPSBEb25l UGFyc2luZ0ltcG9ydFJ1bGVzOwogICAgIG1fcnVsZS5jbGVhcigpOwogICAgIG1fcnVsZVZhbHVl LmNsZWFyKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9DU1NQ cmVsb2FkU2Nhbm5lci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ1NTUHJlbG9hZFNj YW5uZXIuaAppbmRleCBmYWU5NWExNGU4YmU5YjQ1YTAwY2FhZjY2YmQzZDJlNmExZTE1MTVlLi5l NDVmYTJkYmJlZDljMzk4NTYxYTkyZGVmMWNlMTRmOTY4MjM2MjFhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9DU1NQcmVsb2FkU2Nhbm5lci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL0NTU1ByZWxvYWRTY2FubmVyLmgKQEAgLTUzLDcgKzUzLDggQEAg cHJpdmF0ZToKICAgICAgICAgUnVsZSwKICAgICAgICAgQWZ0ZXJSdWxlLAogICAgICAgICBSdWxl VmFsdWUsCi0gICAgICAgIEFmdGVyUnVsZVZhbHVlCisgICAgICAgIEFmdGVyUnVsZVZhbHVlLAor ICAgICAgICBEb25lUGFyc2luZ0ltcG9ydFJ1bGVzLAogICAgIH07CiAKICAgICBpbmxpbmUgdm9p ZCB0b2tlbml6ZShVQ2hhciBjKTsK