102995 2012-11-21 17:22:54 -0800 Remember the CachedResourceRequest for preloads 2012-11-30 11:18:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84883 1 simonjam simonjam dglazkov japhet jochen marja tonyg webkit.review.bot oldest_to_newest 773440 0 simonjam 2012-11-21 17:22:54 -0800 Remember the CachedResourceRequest for preloads 773442 1 175554 simonjam 2012-11-21 17:24:11 -0800 Created attachment 175554 Patch 773469 2 175554 buildbot 2012-11-21 18:27:34 -0800 Comment on attachment 175554 Patch Attachment 175554 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14963146 New failing tests: fast/encoding/preload-encoding.html 774544 3 175554 webkit.review.bot 2012-11-23 07:22:39 -0800 Comment on attachment 175554 Patch Attachment 175554 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14959701 New failing tests: fast/js/bom-in-file-retains-correct-offset.html fast/regex/unicodeCaseInsensitive.html fast/dom/attribute-legacy-colors.html dom/html/level1/core/hc_attrgetvalue1.html fast/encoding/preload-encoding.html dom/html/level1/core/hc_textparseintolistofelements.html editing/style/make-text-writing-direction-inline.html 775999 4 176100 simonjam 2012-11-26 15:57:48 -0800 Created attachment 176100 Patch 778164 5 simonjam 2012-11-28 12:09:27 -0800 This is needed for Resource Timing. The initiator should be the same regardless of whether or not it's preloaded. 778772 6 marja 2012-11-29 00:32:28 -0800 Ahh. This is also needed for our use cases. Thanks for fixing this! 778776 7 marja 2012-11-29 00:34:00 -0800 ... meaning that we probably also want to notify the embedder in requestPreload; that's not done yet. 780250 8 176100 webkit.review.bot 2012-11-30 11:18:35 -0800 Comment on attachment 176100 Patch Clearing flags on attachment: 176100 Committed r136255: <http://trac.webkit.org/changeset/136255> 780251 9 webkit.review.bot 2012-11-30 11:18:38 -0800 All reviewed patches have been landed. Closing bug. 175554 2012-11-21 17:24:11 -0800 2012-11-26 15:57:45 -0800 Patch bug-102995-20121121172157.patch text/plain 7497 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTBjN2I2MmI5MDE4YTNh ZTNkMjEzYjJkNDZlMWZjNTM3Mjc5MTg0MS4uM2ExMzk2ODNmNGQ3OTBlMGY5OGQ4Y2NkOGJjMjkw ZGVmMTE0OTEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTExLTIxICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1lbWJlciB0 aGUgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IGZvciBwcmVsb2FkcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyOTk1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2l0aG91dCB0aGlzLCB0aGUgaW5pdGlhdG9y IGlzIGxvc3QuCisKKyAgICAgICAgVGVzdHM6IGh0dHAvdGVzdHMvdzNjL3dlYnBlcmYvc3VibWlz c2lvbi9yZXNvdXJjZS10aW1pbmcKKworICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6 cmVxdWVzdFJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVy Ojpsb2FkUmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6 OnByZWxvYWQpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNoZWNr Rm9yUGVuZGluZ1ByZWxvYWRzKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9h ZGVyOjpyZXF1ZXN0UHJlbG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxv YWRlcjo6aXNQcmVsb2FkZWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5oOgorICAgICAgICAoQ2FjaGVkUmVzb3VyY2VMb2FkZXIpOgorICAgICAgICAoUGVu ZGluZ1ByZWxvYWQpOgorCiAyMDEyLTExLTIwICBKYW1lcyBTaW1vbnNlbiAgPHNpbW9uamFtQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbUmVzb3VyY2UgVGltaW5nXSBQb3B1bGF0ZSBQZXJmb3Jt YW5jZVJlc291cmNlVGltaW5nIHN0cnVjdHMgd2l0aCB0aW1pbmcgZGF0YQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXgg ODNhNWExY2U2NzRjYzcyYzVmMTEwMDk2Y2IzNDhhYjA4MjVlNGQ1Zi4uMTgzODQ3ZGU3NGFkYTEx NmUwZGIyZjhjOTg2NjE2M2Y4ODkxNDU1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC00NDMsNyArNDQzLDcgQEAg Q2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhY2hlZFJlc291cmNlTG9hZGVy OjpyZXF1ZXN0UmVzb3VyY2UoQ2FjaGUKICAgICAgICAgbWVtb3J5Q2FjaGUoKS0+cmVtb3ZlKHJl c291cmNlLmdldCgpKTsKICAgICAgICAgLy8gRmFsbCB0aHJvdWdoCiAgICAgY2FzZSBMb2FkOgot ICAgICAgICByZXNvdXJjZSA9IGxvYWRSZXNvdXJjZSh0eXBlLCByZXF1ZXN0Lm11dGFibGVSZXNv dXJjZVJlcXVlc3QoKSwgcmVxdWVzdC5jaGFyc2V0KCkpOworICAgICAgICByZXNvdXJjZSA9IGxv YWRSZXNvdXJjZSh0eXBlLCByZXF1ZXN0LCByZXF1ZXN0LmNoYXJzZXQoKSk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgUmV2YWxpZGF0ZToKICAgICAgICAgcmVzb3VyY2UgPSByZXZhbGlkYXRl UmVzb3VyY2UocmVzb3VyY2UuZ2V0KCkpOwpAQCAtNDk3LDE0ICs0OTcsMTQgQEAgQ2FjaGVkUmVz b3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXZhbGlk YXRlUmVzb3VyY2UoQ2EKICAgICByZXR1cm4gbmV3UmVzb3VyY2U7CiB9CiAKLUNhY2hlZFJlc291 cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6bG9hZFJlc291 cmNlKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg Y29uc3QgU3RyaW5nJiBjaGFyc2V0KQorQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3Vy Y2U+IENhY2hlZFJlc291cmNlTG9hZGVyOjpsb2FkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OlR5 cGUgdHlwZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIGNo YXJzZXQpCiB7Ci0gICAgQVNTRVJUKCFtZW1vcnlDYWNoZSgpLT5yZXNvdXJjZUZvclVSTChyZXF1 ZXN0LnVybCgpKSk7Ci0gICAgCi0gICAgTE9HKFJlc291cmNlTG9hZGluZywgIkxvYWRpbmcgQ2Fj aGVkUmVzb3VyY2UgZm9yICclcycuIiwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5k YXRhKCkpOwotICAgIAotICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBy ZXNvdXJjZSA9IGNyZWF0ZVJlc291cmNlKHR5cGUsIHJlcXVlc3QsIGNoYXJzZXQpOwotICAgIAor ICAgIEFTU0VSVCghbWVtb3J5Q2FjaGUoKS0+cmVzb3VyY2VGb3JVUkwocmVxdWVzdC5yZXNvdXJj ZVJlcXVlc3QoKS51cmwoKSkpOworCisgICAgTE9HKFJlc291cmNlTG9hZGluZywgIkxvYWRpbmcg Q2FjaGVkUmVzb3VyY2UgZm9yICclcycuIiwgcmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS51cmwo KS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRhKCkpOworCisgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8 Q2FjaGVkUmVzb3VyY2U+IHJlc291cmNlID0gY3JlYXRlUmVzb3VyY2UodHlwZSwgcmVxdWVzdC5t dXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCksIGNoYXJzZXQpOworCiAgICAgaWYgKCFtZW1vcnlDYWNo ZSgpLT5hZGQocmVzb3VyY2UuZ2V0KCkpKQogICAgICAgICByZXNvdXJjZS0+c2V0T3duaW5nQ2Fj aGVkUmVzb3VyY2VMb2FkZXIodGhpcyk7CiAgICAgcmV0dXJuIHJlc291cmNlOwpAQCAtNzgwLDEy ICs3ODAsMTIgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cHJlbG9hZChDYWNoZWRSZXNv dXJjZTo6VHlwZSB0eXBlLCBDYWNoZWRSZXNvdXJjZVJlcXUKICAgICAgICAgaWYgKCFoYXNSZW5k ZXJpbmcgJiYgIWNhbkJsb2NrUGFyc2VyKSB7CiAgICAgICAgICAgICAvLyBEb24ndCBwcmVsb2Fk IHN1YnJlc291cmNlcyB0aGF0IGNhbid0IGJsb2NrIHRoZSBwYXJzZXIgYmVmb3JlIHdlIGhhdmUg c29tZXRoaW5nIHRvIGRyYXcuCiAgICAgICAgICAgICAvLyBUaGlzIGhlbHBzIHByZXZlbnQgcHJl bG9hZHMgZnJvbSBkZWxheWluZyBmaXJzdCBkaXNwbGF5IHdoZW4gYmFuZHdpZHRoIGlzIGxpbWl0 ZWQuCi0gICAgICAgICAgICBQZW5kaW5nUHJlbG9hZCBwZW5kaW5nUHJlbG9hZCA9IHsgdHlwZSwg cmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKSwgY2hhcnNldCB9OworICAgICAgICAgICAgUGVuZGlu Z1ByZWxvYWQgcGVuZGluZ1ByZWxvYWQgPSB7IHR5cGUsIHJlcXVlc3QsIGNoYXJzZXQgfTsKICAg ICAgICAgICAgIG1fcGVuZGluZ1ByZWxvYWRzLmFwcGVuZChwZW5kaW5nUHJlbG9hZCk7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9Ci0gICAgcmVxdWVzdFByZWxvYWQodHlw ZSwgcmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCksIGNoYXJzZXQpOworICAgIHJlcXVl c3RQcmVsb2FkKHR5cGUsIHJlcXVlc3QsIGNoYXJzZXQpOwogfQogCiB2b2lkIENhY2hlZFJlc291 cmNlTG9hZGVyOjpjaGVja0ZvclBlbmRpbmdQcmVsb2FkcygpIApAQCAtNzk1LDIyICs3OTUsMjEg QEAgdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6Y2hlY2tGb3JQZW5kaW5nUHJlbG9hZHMoKQog ICAgIHdoaWxlICghbV9wZW5kaW5nUHJlbG9hZHMuaXNFbXB0eSgpKSB7CiAgICAgICAgIFBlbmRp bmdQcmVsb2FkIHByZWxvYWQgPSBtX3BlbmRpbmdQcmVsb2Fkcy50YWtlRmlyc3QoKTsKICAgICAg ICAgLy8gRG9uJ3QgcmVxdWVzdCBwcmVsb2FkIGlmIHRoZSByZXNvdXJjZSBhbHJlYWR5IGxvYWRl ZCBub3JtYWxseSAodGhpcyB3aWxsIHJlc3VsdCBpbiBkb3VibGUgbG9hZCBpZiB0aGUgcGFnZSBp cyBiZWluZyByZWxvYWRlZCB3aXRoIGNhY2hlZCByZXN1bHRzIGlnbm9yZWQpLgotICAgICAgICBp ZiAoIWNhY2hlZFJlc291cmNlKHByZWxvYWQubV9yZXF1ZXN0LnVybCgpKSkKKyAgICAgICAgaWYg KCFjYWNoZWRSZXNvdXJjZShwcmVsb2FkLm1fcmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS51cmwo KSkpCiAgICAgICAgICAgICByZXF1ZXN0UHJlbG9hZChwcmVsb2FkLm1fdHlwZSwgcHJlbG9hZC5t X3JlcXVlc3QsIHByZWxvYWQubV9jaGFyc2V0KTsKICAgICB9CiAgICAgbV9wZW5kaW5nUHJlbG9h ZHMuY2xlYXIoKTsKIH0KIAotdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFByZWxv YWQoQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBj b25zdCBTdHJpbmcmIGNoYXJzZXQpCit2b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0 UHJlbG9hZChDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Qm IHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgY2hhcnNldCkKIHsKICAgICBTdHJpbmcgZW5jb2Rpbmc7 CiAgICAgaWYgKHR5cGUgPT0gQ2FjaGVkUmVzb3VyY2U6OlNjcmlwdCB8fCB0eXBlID09IENhY2hl ZFJlc291cmNlOjpDU1NTdHlsZVNoZWV0KQogICAgICAgICBlbmNvZGluZyA9IGNoYXJzZXQuaXNF bXB0eSgpID8gbV9kb2N1bWVudC0+Y2hhcnNldCgpIDogY2hhcnNldDsKIAotICAgIENhY2hlZFJl c291cmNlUmVxdWVzdCBjYWNoZWRSZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgZW5jb2RpbmcpOwot ICAgIGNhY2hlZFJlc291cmNlUmVxdWVzdC5zZXRGb3JQcmVsb2FkKHRydWUpOworICAgIHJlcXVl c3Quc2V0Rm9yUHJlbG9hZCh0cnVlKTsKIAotICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hl ZFJlc291cmNlPiByZXNvdXJjZSA9IHJlcXVlc3RSZXNvdXJjZSh0eXBlLCBjYWNoZWRSZXNvdXJj ZVJlcXVlc3QpOworICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiByZXNv dXJjZSA9IHJlcXVlc3RSZXNvdXJjZSh0eXBlLCByZXF1ZXN0KTsKICAgICBpZiAoIXJlc291cmNl IHx8IChtX3ByZWxvYWRzICYmIG1fcHJlbG9hZHMtPmNvbnRhaW5zKHJlc291cmNlLmdldCgpKSkp CiAgICAgICAgIHJldHVybjsKICAgICByZXNvdXJjZS0+aW5jcmVhc2VQcmVsb2FkQ291bnQoKTsK QEAgLTg0MCw3ICs4MzksNyBAQCBib29sIENhY2hlZFJlc291cmNlTG9hZGVyOjppc1ByZWxvYWRl ZChjb25zdCBTdHJpbmcmIHVybFN0cmluZykgY29uc3QKICAgICBEZXF1ZTxQZW5kaW5nUHJlbG9h ZD46OmNvbnN0X2l0ZXJhdG9yIGRlcXVlRW5kID0gbV9wZW5kaW5nUHJlbG9hZHMuZW5kKCk7CiAg ICAgZm9yIChEZXF1ZTxQZW5kaW5nUHJlbG9hZD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9wZW5k aW5nUHJlbG9hZHMuYmVnaW4oKTsgaXQgIT0gZGVxdWVFbmQ7ICsraXQpIHsKICAgICAgICAgUGVu ZGluZ1ByZWxvYWQgcGVuZGluZ1ByZWxvYWQgPSAqaXQ7Ci0gICAgICAgIGlmIChwZW5kaW5nUHJl bG9hZC5tX3JlcXVlc3QudXJsKCkgPT0gdXJsKQorICAgICAgICBpZiAocGVuZGluZ1ByZWxvYWQu bV9yZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnVybCgpID09IHVybCkKICAgICAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCmluZGV4IGM1YjIzNjUwZGVh MzFiMmUwZDFjOWRiMTJhZmU0M2MxNzgzMGY3NGIuLmUzY2Y2N2ZkNmRmOGUyOWY1M2JjYjA5Y2Uz NGNjMTA0Mjg0Y2NmNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5oCkBAIC0xNDQsOCArMTQ0LDggQEAgcHJpdmF0ZToKIAogICAg IENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiByZXF1ZXN0UmVzb3VyY2UoQ2Fj aGVkUmVzb3VyY2U6OlR5cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYpOwogICAgIENhY2hlZFJl c291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiByZXZhbGlkYXRlUmVzb3VyY2UoQ2FjaGVkUmVz b3VyY2UqKTsKLSAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gbG9hZFJl c291cmNlKENhY2hlZFJlc291cmNlOjpUeXBlLCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTdHJp bmcmIGNoYXJzZXQpOwotICAgIHZvaWQgcmVxdWVzdFByZWxvYWQoQ2FjaGVkUmVzb3VyY2U6OlR5 cGUsIFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFN0cmluZyYgY2hhcnNldCk7CisgICAgQ2FjaGVk UmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IGxvYWRSZXNvdXJjZShDYWNoZWRSZXNvdXJj ZTo6VHlwZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiBjaGFyc2V0KTsK KyAgICB2b2lkIHJlcXVlc3RQcmVsb2FkKENhY2hlZFJlc291cmNlOjpUeXBlLCBDYWNoZWRSZXNv dXJjZVJlcXVlc3QmLCBjb25zdCBTdHJpbmcmIGNoYXJzZXQpOwogCiAgICAgZW51bSBSZXZhbGlk YXRpb25Qb2xpY3kgeyBVc2UsIFJldmFsaWRhdGUsIFJlbG9hZCwgTG9hZCB9OwogICAgIFJldmFs aWRhdGlvblBvbGljeSBkZXRlcm1pbmVSZXZhbGlkYXRpb25Qb2xpY3koQ2FjaGVkUmVzb3VyY2U6 OlR5cGUsIFJlc291cmNlUmVxdWVzdCYsIGJvb2wgZm9yUHJlbG9hZCwgQ2FjaGVkUmVzb3VyY2Uq IGV4aXN0aW5nUmVzb3VyY2UsIENhY2hlZFJlc291cmNlUmVxdWVzdDo6RGVmZXJPcHRpb24pIGNv bnN0OwpAQCAtMTY5LDcgKzE2OSw3IEBAIHByaXZhdGU6CiAgICAgT3duUHRyPExpc3RIYXNoU2V0 PENhY2hlZFJlc291cmNlKj4gPiBtX3ByZWxvYWRzOwogICAgIHN0cnVjdCBQZW5kaW5nUHJlbG9h ZCB7CiAgICAgICAgIENhY2hlZFJlc291cmNlOjpUeXBlIG1fdHlwZTsKLSAgICAgICAgUmVzb3Vy Y2VSZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICAgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IG1fcmVx dWVzdDsKICAgICAgICAgU3RyaW5nIG1fY2hhcnNldDsKICAgICB9OwogICAgIERlcXVlPFBlbmRp bmdQcmVsb2FkPiBtX3BlbmRpbmdQcmVsb2FkczsK 176100 2012-11-26 15:57:48 -0800 2012-11-30 11:18:35 -0800 Patch bug-102995-20121126155526.patch text/plain 7552 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmI3YmYzMGVkODA2MDcz ZTM2ZDY1ZWZlNjk2YzM3MmQyYmU3Yzc5MS4uMmUzNGM5NmUyYmJjMzNhNTNjYzg1NDNhOTViYjdh ODE2MDgyMDVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTExLTIxICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1lbWJlciB0 aGUgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IGZvciBwcmVsb2FkcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyOTk1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2l0aG91dCB0aGlzLCB0aGUgaW5pdGlhdG9y IGlzIGxvc3QuCisKKyAgICAgICAgVGVzdHM6IGh0dHAvdGVzdHMvdzNjL3dlYnBlcmYvc3VibWlz c2lvbi9yZXNvdXJjZS10aW1pbmcKKworICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6 cmVxdWVzdFJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVy Ojpsb2FkUmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6 OnByZWxvYWQpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNoZWNr Rm9yUGVuZGluZ1ByZWxvYWRzKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9h ZGVyOjpyZXF1ZXN0UHJlbG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxv YWRlcjo6aXNQcmVsb2FkZWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5oOgorICAgICAgICAoQ2FjaGVkUmVzb3VyY2VMb2FkZXIpOgorICAgICAgICAoUGVu ZGluZ1ByZWxvYWQpOgorCiAyMDEyLTExLTI2ICBQcmF0aWsgU29sYW5raSAgPHBzb2xhbmtpQGFw cGxlLmNvbT4KIAogICAgICAgICBBZGQgUmVzb3VyY2VCdWZmZXI6OmFwcGVuZChDRkRhdGFSZWYp IHRvIGdldCBjb2RlIHRvIGNvbXBpbGUgd2l0aCBVU0UoTkVUV09SS19DRkRBVEFfQVJSQVlfQ0FM TEJBQ0spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVz b3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmNwcAppbmRleCA4M2E1YTFjZTY3NGNjNzJjNWYxMTAwOTZjYjM0OGFiMDgyNWU0 ZDVmLi4xN2U3ZGM4NDdjODBkYzk0NzU1NTMxMzhiZWVjMDM3MmY3NzFjYmZiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAK QEAgLTQ0Myw3ICs0NDMsNyBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4g Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZShDYWNoZQogICAgICAgICBtZW1v cnlDYWNoZSgpLT5yZW1vdmUocmVzb3VyY2UuZ2V0KCkpOwogICAgICAgICAvLyBGYWxsIHRocm91 Z2gKICAgICBjYXNlIExvYWQ6Ci0gICAgICAgIHJlc291cmNlID0gbG9hZFJlc291cmNlKHR5cGUs IHJlcXVlc3QubXV0YWJsZVJlc291cmNlUmVxdWVzdCgpLCByZXF1ZXN0LmNoYXJzZXQoKSk7Cisg ICAgICAgIHJlc291cmNlID0gbG9hZFJlc291cmNlKHR5cGUsIHJlcXVlc3QsIHJlcXVlc3QuY2hh cnNldCgpKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBSZXZhbGlkYXRlOgogICAgICAgICBy ZXNvdXJjZSA9IHJldmFsaWRhdGVSZXNvdXJjZShyZXNvdXJjZS5nZXQoKSk7CkBAIC00OTcsMTQg KzQ5NywxNCBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVz b3VyY2VMb2FkZXI6OnJldmFsaWRhdGVSZXNvdXJjZShDYQogICAgIHJldHVybiBuZXdSZXNvdXJj ZTsKIH0KIAotQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhY2hlZFJlc291 cmNlTG9hZGVyOjpsb2FkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIGNoYXJzZXQpCitDYWNoZWRSZXNvdXJj ZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmxvYWRSZXNvdXJj ZShDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmIHJlcXVl c3QsIGNvbnN0IFN0cmluZyYgY2hhcnNldCkKIHsKLSAgICBBU1NFUlQoIW1lbW9yeUNhY2hlKCkt PnJlc291cmNlRm9yVVJMKHJlcXVlc3QudXJsKCkpKTsKLSAgICAKLSAgICBMT0coUmVzb3VyY2VM b2FkaW5nLCAiTG9hZGluZyBDYWNoZWRSZXNvdXJjZSBmb3IgJyVzJy4iLCByZXF1ZXN0LnVybCgp LnN0cmluZygpLmxhdGluMSgpLmRhdGEoKSk7Ci0gICAgCi0gICAgQ2FjaGVkUmVzb3VyY2VIYW5k bGU8Q2FjaGVkUmVzb3VyY2U+IHJlc291cmNlID0gY3JlYXRlUmVzb3VyY2UodHlwZSwgcmVxdWVz dCwgY2hhcnNldCk7Ci0gICAgCisgICAgQVNTRVJUKCFtZW1vcnlDYWNoZSgpLT5yZXNvdXJjZUZv clVSTChyZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnVybCgpKSk7CisKKyAgICBMT0coUmVzb3Vy Y2VMb2FkaW5nLCAiTG9hZGluZyBDYWNoZWRSZXNvdXJjZSBmb3IgJyVzJy4iLCByZXF1ZXN0LnJl c291cmNlUmVxdWVzdCgpLnVybCgpLnN0cmluZygpLmxhdGluMSgpLmRhdGEoKSk7CisKKyAgICBD YWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gcmVzb3VyY2UgPSBjcmVhdGVSZXNv dXJjZSh0eXBlLCByZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3QoKSwgY2hhcnNldCk7CisK ICAgICBpZiAoIW1lbW9yeUNhY2hlKCktPmFkZChyZXNvdXJjZS5nZXQoKSkpCiAgICAgICAgIHJl c291cmNlLT5zZXRPd25pbmdDYWNoZWRSZXNvdXJjZUxvYWRlcih0aGlzKTsKICAgICByZXR1cm4g cmVzb3VyY2U7CkBAIC03ODAsMTIgKzc4MCwxMiBAQCB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVy OjpwcmVsb2FkKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUsIENhY2hlZFJlc291cmNlUmVxdQog ICAgICAgICBpZiAoIWhhc1JlbmRlcmluZyAmJiAhY2FuQmxvY2tQYXJzZXIpIHsKICAgICAgICAg ICAgIC8vIERvbid0IHByZWxvYWQgc3VicmVzb3VyY2VzIHRoYXQgY2FuJ3QgYmxvY2sgdGhlIHBh cnNlciBiZWZvcmUgd2UgaGF2ZSBzb21ldGhpbmcgdG8gZHJhdy4KICAgICAgICAgICAgIC8vIFRo aXMgaGVscHMgcHJldmVudCBwcmVsb2FkcyBmcm9tIGRlbGF5aW5nIGZpcnN0IGRpc3BsYXkgd2hl biBiYW5kd2lkdGggaXMgbGltaXRlZC4KLSAgICAgICAgICAgIFBlbmRpbmdQcmVsb2FkIHBlbmRp bmdQcmVsb2FkID0geyB0eXBlLCByZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLCBjaGFyc2V0IH07 CisgICAgICAgICAgICBQZW5kaW5nUHJlbG9hZCBwZW5kaW5nUHJlbG9hZCA9IHsgdHlwZSwgcmVx dWVzdCwgY2hhcnNldCB9OwogICAgICAgICAgICAgbV9wZW5kaW5nUHJlbG9hZHMuYXBwZW5kKHBl bmRpbmdQcmVsb2FkKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KLSAg ICByZXF1ZXN0UHJlbG9hZCh0eXBlLCByZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3QoKSwg Y2hhcnNldCk7CisgICAgcmVxdWVzdFByZWxvYWQodHlwZSwgcmVxdWVzdCwgY2hhcnNldCk7CiB9 CiAKIHZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNoZWNrRm9yUGVuZGluZ1ByZWxvYWRzKCkg CkBAIC03OTUsMjIgKzc5NSwyMiBAQCB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjpjaGVja0Zv clBlbmRpbmdQcmVsb2FkcygpCiAgICAgd2hpbGUgKCFtX3BlbmRpbmdQcmVsb2Fkcy5pc0VtcHR5 KCkpIHsKICAgICAgICAgUGVuZGluZ1ByZWxvYWQgcHJlbG9hZCA9IG1fcGVuZGluZ1ByZWxvYWRz LnRha2VGaXJzdCgpOwogICAgICAgICAvLyBEb24ndCByZXF1ZXN0IHByZWxvYWQgaWYgdGhlIHJl c291cmNlIGFscmVhZHkgbG9hZGVkIG5vcm1hbGx5ICh0aGlzIHdpbGwgcmVzdWx0IGluIGRvdWJs ZSBsb2FkIGlmIHRoZSBwYWdlIGlzIGJlaW5nIHJlbG9hZGVkIHdpdGggY2FjaGVkIHJlc3VsdHMg aWdub3JlZCkuCi0gICAgICAgIGlmICghY2FjaGVkUmVzb3VyY2UocHJlbG9hZC5tX3JlcXVlc3Qu dXJsKCkpKQorICAgICAgICBpZiAoIWNhY2hlZFJlc291cmNlKHByZWxvYWQubV9yZXF1ZXN0LnJl c291cmNlUmVxdWVzdCgpLnVybCgpKSkKICAgICAgICAgICAgIHJlcXVlc3RQcmVsb2FkKHByZWxv YWQubV90eXBlLCBwcmVsb2FkLm1fcmVxdWVzdCwgcHJlbG9hZC5tX2NoYXJzZXQpOwogICAgIH0K ICAgICBtX3BlbmRpbmdQcmVsb2Fkcy5jbGVhcigpOwogfQogCi12b2lkIENhY2hlZFJlc291cmNl TG9hZGVyOjpyZXF1ZXN0UHJlbG9hZChDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgY2hhcnNldCkKK3ZvaWQgQ2FjaGVkUmVz b3VyY2VMb2FkZXI6OnJlcXVlc3RQcmVsb2FkKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUsIENh Y2hlZFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJiBjaGFyc2V0KQogewog ICAgIFN0cmluZyBlbmNvZGluZzsKICAgICBpZiAodHlwZSA9PSBDYWNoZWRSZXNvdXJjZTo6U2Ny aXB0IHx8IHR5cGUgPT0gQ2FjaGVkUmVzb3VyY2U6OkNTU1N0eWxlU2hlZXQpCiAgICAgICAgIGVu Y29kaW5nID0gY2hhcnNldC5pc0VtcHR5KCkgPyBtX2RvY3VtZW50LT5jaGFyc2V0KCkgOiBjaGFy c2V0OwogCi0gICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IGNhY2hlZFJlc291cmNlUmVxdWVzdChy ZXF1ZXN0LCBlbmNvZGluZyk7Ci0gICAgY2FjaGVkUmVzb3VyY2VSZXF1ZXN0LnNldEZvclByZWxv YWQodHJ1ZSk7CisgICAgcmVxdWVzdC5zZXRDaGFyc2V0KGVuY29kaW5nKTsKKyAgICByZXF1ZXN0 LnNldEZvclByZWxvYWQodHJ1ZSk7CiAKLSAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRS ZXNvdXJjZT4gcmVzb3VyY2UgPSByZXF1ZXN0UmVzb3VyY2UodHlwZSwgY2FjaGVkUmVzb3VyY2VS ZXF1ZXN0KTsKKyAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gcmVzb3Vy Y2UgPSByZXF1ZXN0UmVzb3VyY2UodHlwZSwgcmVxdWVzdCk7CiAgICAgaWYgKCFyZXNvdXJjZSB8 fCAobV9wcmVsb2FkcyAmJiBtX3ByZWxvYWRzLT5jb250YWlucyhyZXNvdXJjZS5nZXQoKSkpKQog ICAgICAgICByZXR1cm47CiAgICAgcmVzb3VyY2UtPmluY3JlYXNlUHJlbG9hZENvdW50KCk7CkBA IC04NDAsNyArODQwLDcgQEAgYm9vbCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6aXNQcmVsb2FkZWQo Y29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpIGNvbnN0CiAgICAgRGVxdWU8UGVuZGluZ1ByZWxvYWQ+ Ojpjb25zdF9pdGVyYXRvciBkZXF1ZUVuZCA9IG1fcGVuZGluZ1ByZWxvYWRzLmVuZCgpOwogICAg IGZvciAoRGVxdWU8UGVuZGluZ1ByZWxvYWQ+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fcGVuZGlu Z1ByZWxvYWRzLmJlZ2luKCk7IGl0ICE9IGRlcXVlRW5kOyArK2l0KSB7CiAgICAgICAgIFBlbmRp bmdQcmVsb2FkIHBlbmRpbmdQcmVsb2FkID0gKml0OwotICAgICAgICBpZiAocGVuZGluZ1ByZWxv YWQubV9yZXF1ZXN0LnVybCgpID09IHVybCkKKyAgICAgICAgaWYgKHBlbmRpbmdQcmVsb2FkLm1f cmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS51cmwoKSA9PSB1cmwpCiAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaAppbmRleCBjNWIyMzY1MGRlYTMx YjJlMGQxYzlkYjEyYWZlNDNjMTc4MzBmNzRiLi5lM2NmNjdmZDZkZjhlMjlmNTNiY2IwOWNlMzRj YzEwNDI4NGNjZjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VMb2FkZXIuaApAQCAtMTQ0LDggKzE0NCw4IEBAIHByaXZhdGU6CiAKICAgICBD YWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gcmVxdWVzdFJlc291cmNlKENhY2hl ZFJlc291cmNlOjpUeXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmKTsKICAgICBDYWNoZWRSZXNv dXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gcmV2YWxpZGF0ZVJlc291cmNlKENhY2hlZFJlc291 cmNlKik7Ci0gICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IGxvYWRSZXNv dXJjZShDYWNoZWRSZXNvdXJjZTo6VHlwZSwgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5n JiBjaGFyc2V0KTsKLSAgICB2b2lkIHJlcXVlc3RQcmVsb2FkKENhY2hlZFJlc291cmNlOjpUeXBl LCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTdHJpbmcmIGNoYXJzZXQpOworICAgIENhY2hlZFJl c291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBsb2FkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6 OlR5cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFN0cmluZyYgY2hhcnNldCk7Cisg ICAgdm9pZCByZXF1ZXN0UHJlbG9hZChDYWNoZWRSZXNvdXJjZTo6VHlwZSwgQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiBjaGFyc2V0KTsKIAogICAgIGVudW0gUmV2YWxpZGF0 aW9uUG9saWN5IHsgVXNlLCBSZXZhbGlkYXRlLCBSZWxvYWQsIExvYWQgfTsKICAgICBSZXZhbGlk YXRpb25Qb2xpY3kgZGV0ZXJtaW5lUmV2YWxpZGF0aW9uUG9saWN5KENhY2hlZFJlc291cmNlOjpU eXBlLCBSZXNvdXJjZVJlcXVlc3QmLCBib29sIGZvclByZWxvYWQsIENhY2hlZFJlc291cmNlKiBl eGlzdGluZ1Jlc291cmNlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OkRlZmVyT3B0aW9uKSBjb25z dDsKQEAgLTE2OSw3ICsxNjksNyBAQCBwcml2YXRlOgogICAgIE93blB0cjxMaXN0SGFzaFNldDxD YWNoZWRSZXNvdXJjZSo+ID4gbV9wcmVsb2FkczsKICAgICBzdHJ1Y3QgUGVuZGluZ1ByZWxvYWQg ewogICAgICAgICBDYWNoZWRSZXNvdXJjZTo6VHlwZSBtX3R5cGU7Ci0gICAgICAgIFJlc291cmNl UmVxdWVzdCBtX3JlcXVlc3Q7CisgICAgICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCBtX3JlcXVl c3Q7CiAgICAgICAgIFN0cmluZyBtX2NoYXJzZXQ7CiAgICAgfTsKICAgICBEZXF1ZTxQZW5kaW5n UHJlbG9hZD4gbV9wZW5kaW5nUHJlbG9hZHM7Cg==