63026 2011-06-20 16:35:05 -0700 Wire in checkIfRunInsecureContent to the chromium WebKit API 2011-06-21 15:50:13 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cevans cevans abarth fishd webkit.review.bot oldest_to_newest 424068 0 cevans 2011-06-20 16:35:05 -0700 As per $SUMMARY 424070 1 97887 cevans 2011-06-20 16:37:50 -0700 Created attachment 97887 Patch 424072 2 webkit.review.bot 2011-06-20 16:40:40 -0700 Attachment 97887 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/public/WebFrame.h:633: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/chromium/src/WebFrameImpl.h:225: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 424074 3 97887 fishd 2011-06-20 16:43:55 -0700 Comment on attachment 97887 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97887&action=review > Source/WebKit/chromium/public/WebFrame.h:633 > + virtual bool checkIfRunInsecureContent(const WebURL& url) const = 0; nit: you might want to find a better section of WebFrame.h to put this in. You've appended to the section that has methods used for testing. nit: the name of this function is a mouthful. it is generally better to use names that are real phrases. i'm lacking for advice. i suspect it is nice to make this method symmetric with didRunInsecureContent, which probably explains the current name. still, it feels like a tongue twister :-) 424085 4 cevans 2011-06-20 16:54:25 -0700 I'll move the function to a better place and re-upload. "checkIfRunInsecureContent" is actually symmetric with the public function in WebCore::FrameLoader, is that ok? 424103 5 97892 cevans 2011-06-20 17:11:19 -0700 Created attachment 97892 Patch Move function definitions to somewhere slightly more suitable. 424106 6 webkit.review.bot 2011-06-20 17:14:05 -0700 Attachment 97892 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/public/WebFrame.h:277: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/chromium/src/WebFrameImpl.h:118: The parameter name "url" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 424556 7 fishd 2011-06-21 10:49:53 -0700 (In reply to comment #4) > I'll move the function to a better place and re-upload. > "checkIfRunInsecureContent" is actually symmetric with the public function in WebCore::FrameLoader, is that ok? I think that one is questionably named too. I still don't have much of a better suggestion. checkIfWouldBeInsecureToRunContent(url) /sigh/ 424558 8 97892 fishd 2011-06-21 10:50:42 -0700 Comment on attachment 97892 Patch R=me w/ style fixes. 424680 9 98044 cevans 2011-06-21 12:46:11 -0700 Created attachment 98044 Patch Fix style nits for commit. 424686 10 98046 cevans 2011-06-21 12:52:39 -0700 Created attachment 98046 Patch Put reviewer into ChangeLog; using commit-queue. 424727 11 98046 webkit.review.bot 2011-06-21 13:54:52 -0700 Comment on attachment 98046 Patch Clearing flags on attachment: 98046 Committed r89376: <http://trac.webkit.org/changeset/89376> 424728 12 webkit.review.bot 2011-06-21 13:54:57 -0700 All reviewed patches have been landed. Closing bug. 424736 13 abarth 2011-06-21 14:01:35 -0700 > nit: you might want to find a better section of WebFrame.h to put this in. You've > appended to the section that has methods used for testing. This patch represents a dangerous pattern of dumping APIs onto WebFrame. If left unchecked, this design pressure will cause WebFrame to grow into a monster class, like WebCore::Frame used to be. We're planning to move the mixed-content related functions off of FrameLoader for this reason and unto an object called MixedContentChecker (or something snazzier). I'm not sure what the best thing to do for the Chromium WebKit API is in this case, but it's easy for this stuff to accumulate on 3-line context diff at a time. 424819 14 fishd 2011-06-21 15:50:13 -0700 (In reply to comment #13) > > nit: you might want to find a better section of WebFrame.h to put this in. You've > > appended to the section that has methods used for testing. > > This patch represents a dangerous pattern of dumping APIs onto WebFrame. If left unchecked, this design pressure will cause WebFrame to grow into a monster class, like WebCore::Frame used to be. > > We're planning to move the mixed-content related functions off of FrameLoader for this reason and unto an object called MixedContentChecker (or something snazzier). > > I'm not sure what the best thing to do for the Chromium WebKit API is in this case, but it's easy for this stuff to accumulate on 3-line context diff at a time. Absolutely agreed. This is why there is some effort to section off WebFrame, grouping like methods, etc. John has also been cleaving off bits and pieces of these interfaces in accordance with better refactoring and modularity on the Chromium side. I support doing more of that! :-) 97887 2011-06-20 16:37:50 -0700 2011-06-20 17:11:19 -0700 Patch 63026_1.diff text/plain 2661 cevans SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2 aXNpb24gODkyMzIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTIxLDYgKzE5MjEsMTIgQEAKICAgICByZXR1cm4gV2Vi U3RyaW5nKG1fZnJhbWUtPmxheWVyVHJlZUFzVGV4dChzaG93RGVidWdJbmZvKSk7CiB9CiAKK2Jv b2wgV2ViRnJhbWVJbXBsOjpjaGVja0lmUnVuSW5zZWN1cmVDb250ZW50KGNvbnN0IFdlYlVSTCYg dXJsKSBjb25zdAoreworICAgIEZyYW1lTG9hZGVyKiBmcmFtZUxvYWRlciA9IG1fZnJhbWUtPmxv YWRlcigpOworICAgIHJldHVybiBmcmFtZUxvYWRlci0+Y2hlY2tJZlJ1bkluc2VjdXJlQ29udGVu dChtX2ZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCB1cmwpOworfQorCiAvLyBX ZWJGcmFtZUltcGwgcHVibGljIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogCiBQYXNzUmVmUHRyPFdlYkZyYW1lSW1wbD4gV2ViRnJhbWVJ bXBsOjpjcmVhdGUoV2ViRnJhbWVDbGllbnQqIGNsaWVudCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCShyZXZpc2lvbiA4OTIzMikKKysrIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMjIs NiArMjIyLDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIHRp bWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYlN0cmluZyYg ZWxlbWVudElkKTsKICAgICB2aXJ0dWFsIFdlYlN0cmluZyBsYXllclRyZWVBc1RleHQoYm9vbCBz aG93RGVidWdJbmZvID0gZmFsc2UpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBjaGVja0lmUnVu SW5zZWN1cmVDb250ZW50KGNvbnN0IFdlYlVSTCYgdXJsKSBjb25zdDsKIAogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFdlYkZyYW1lSW1wbD4gY3JlYXRlKFdlYkZyYW1lQ2xpZW50KiBjbGllbnQpOwog ICAgIHZpcnR1YWwgfldlYkZyYW1lSW1wbCgpOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cJKHJldmlzaW9uIDg5MzExKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wNi0yMCAgQ2hyaXMgRXZhbnMg IDxjZXZhbnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdpcmUgaW4gY2hlY2tJZlJ1bkluc2VjdXJlQ29udGVudCB0byB0aGUg Y2hyb21pdW0gV2ViS2l0IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjMwMjYKKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZS5oOgorICAgICAg ICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6 OmNoZWNrSWZSdW5JbnNlY3VyZUNvbnRlbnQpOiBhZGQgaW4gYmFzaWMgcGx1bWJpbmcuCisgICAg ICAgICogc3JjL1dlYkZyYW1lSW1wbC5oOgorCiAyMDExLTA2LTIwICBTY290dCBCeWVyICA8c2Nv dHRieWVyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJ bmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCShyZXZpc2lvbiA4 OTIzMikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgJKHdvcmtp bmcgY29weSkKQEAgLTYyOCw2ICs2MjgsMTAgQEAKICAgICAvLyB0ZXh0IGZvcm0uIFRoaXMgaXMg dXNlZCBvbmx5IGJ5IGxheW91dCB0ZXN0cy4KICAgICB2aXJ0dWFsIFdlYlN0cmluZyBsYXllclRy ZWVBc1RleHQoYm9vbCBzaG93RGVidWdJbmZvID0gZmFsc2UpIGNvbnN0ID0gMDsKIAorICAgIC8v IENoZWNrIGlmIHRoZSBzY3JpcHRpbmcgVVJMIHJlcHJlc2VudHMgYSBtaXhlZCBjb250ZW50IGNv bmRpdGlvbiByZWxhdGl2ZQorICAgIC8vIHRvIHRoaXMgZnJhbWUuCisgICAgdmlydHVhbCBib29s IGNoZWNrSWZSdW5JbnNlY3VyZUNvbnRlbnQoY29uc3QgV2ViVVJMJiB1cmwpIGNvbnN0ID0gMDsK KwogcHJvdGVjdGVkOgogICAgIH5XZWJGcmFtZSgpIHsgfQogfTsK 97892 2011-06-20 17:11:19 -0700 2011-06-21 12:46:11 -0700 Patch 63026_2.diff text/plain 2638 cevans SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2 aXNpb24gODkyMzIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NDcsNiArODQ3LDEyIEBACiAjZW5kaWYKIH0KIAorYm9v bCBXZWJGcmFtZUltcGw6OmNoZWNrSWZSdW5JbnNlY3VyZUNvbnRlbnQoY29uc3QgV2ViVVJMJiB1 cmwpIGNvbnN0Cit7CisgICAgRnJhbWVMb2FkZXIqIGZyYW1lTG9hZGVyID0gbV9mcmFtZS0+bG9h ZGVyKCk7CisgICAgcmV0dXJuIGZyYW1lTG9hZGVyLT5jaGVja0lmUnVuSW5zZWN1cmVDb250ZW50 KG1fZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIHVybCk7Cit9CisKICNpZiBV U0UoVjgpCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV2ViRnJhbWVJbXBsOjpleGVjdXRlU2NyaXB0 QW5kUmV0dXJuVmFsdWUoCiAgICAgY29uc3QgV2ViU2NyaXB0U291cmNlJiBzb3VyY2UpCkluZGV4 OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAkocmV2aXNpb24gODky MzIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTE1LDYgKzExNSw3IEBACiAgICAgdmlydHVhbCB2b2lkIHNldElzb2xhdGVk V29ybGRTZWN1cml0eU9yaWdpbihpbnQgd29ybGRJRCwgY29uc3QgV2ViU2VjdXJpdHlPcmlnaW4m KTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBXZWJDb25zb2xl TWVzc2FnZSYpOwogICAgIHZpcnR1YWwgdm9pZCBjb2xsZWN0R2FyYmFnZSgpOworICAgIHZpcnR1 YWwgYm9vbCBjaGVja0lmUnVuSW5zZWN1cmVDb250ZW50KGNvbnN0IFdlYlVSTCYgdXJsKSBjb25z dDsKICNpZiBXRUJLSVRfVVNJTkdfVjgKICAgICB2aXJ0dWFsIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBleGVjdXRlU2NyaXB0QW5kUmV0dXJuVmFsdWUoCiAgICAgICAgIGNvbnN0IFdlYlNjcmlwdFNv dXJjZSYpOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MzExKQor KysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxNSBAQAorMjAxMS0wNi0yMCAgQ2hyaXMgRXZhbnMgIDxjZXZhbnNAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpcmUg aW4gY2hlY2tJZlJ1bkluc2VjdXJlQ29udGVudCB0byB0aGUgY2hyb21pdW0gV2ViS2l0IEFQSQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMwMjYKKwor ICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZS5oOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OmNoZWNrSWZSdW5JbnNlY3VyZUNv bnRlbnQpOiBhZGQgaW4gYmFzaWMgcGx1bWJpbmcuCisgICAgICAgICogc3JjL1dlYkZyYW1lSW1w bC5oOgorCiAyMDExLTA2LTIwICBTY290dCBCeWVyICA8c2NvdHRieWVyQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCShyZXZpc2lvbiA4OTIzMikKKysrIFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3Miw2ICsy NzIsMTAgQEAKICAgICAvLyBDYWxscyB3aW5kb3cuZ2MoKSBpZiBpdCBpcyBkZWZpbmVkLgogICAg IHZpcnR1YWwgdm9pZCBjb2xsZWN0R2FyYmFnZSgpID0gMDsKIAorICAgIC8vIENoZWNrIGlmIHRo ZSBzY3JpcHRpbmcgVVJMIHJlcHJlc2VudHMgYSBtaXhlZCBjb250ZW50IGNvbmRpdGlvbiByZWxh dGl2ZQorICAgIC8vIHRvIHRoaXMgZnJhbWUuCisgICAgdmlydHVhbCBib29sIGNoZWNrSWZSdW5J bnNlY3VyZUNvbnRlbnQoY29uc3QgV2ViVVJMJiB1cmwpIGNvbnN0ID0gMDsKKwogI2lmIFdFQktJ VF9VU0lOR19WOAogICAgIC8vIEV4ZWN1dGVzIHNjcmlwdCBpbiB0aGUgY29udGV4dCBvZiB0aGUg Y3VycmVudCBwYWdlIGFuZCByZXR1cm5zIHRoZSB2YWx1ZQogICAgIC8vIHRoYXQgdGhlIHNjcmlw dCBldmFsdWF0ZWQgdG8uCg== 98044 2011-06-21 12:46:11 -0700 2011-06-21 12:52:39 -0700 Patch 63026_3.diff text/plain 2627 cevans SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2 aXNpb24gODkzMzQpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NDgsNiArODQ4LDEyIEBACiAjZW5kaWYKIH0KIAorYm9v bCBXZWJGcmFtZUltcGw6OmNoZWNrSWZSdW5JbnNlY3VyZUNvbnRlbnQoY29uc3QgV2ViVVJMJiB1 cmwpIGNvbnN0Cit7CisgICAgRnJhbWVMb2FkZXIqIGZyYW1lTG9hZGVyID0gbV9mcmFtZS0+bG9h ZGVyKCk7CisgICAgcmV0dXJuIGZyYW1lTG9hZGVyLT5jaGVja0lmUnVuSW5zZWN1cmVDb250ZW50 KG1fZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIHVybCk7Cit9CisKICNpZiBV U0UoVjgpCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV2ViRnJhbWVJbXBsOjpleGVjdXRlU2NyaXB0 QW5kUmV0dXJuVmFsdWUoY29uc3QgV2ViU2NyaXB0U291cmNlJiBzb3VyY2UpCiB7CkluZGV4OiBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAkocmV2aXNpb24gODkzMzQp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAkod29ya2luZyBj b3B5KQpAQCAtMTE1LDYgKzExNSw3IEBACiAgICAgdmlydHVhbCB2b2lkIHNldElzb2xhdGVkV29y bGRTZWN1cml0eU9yaWdpbihpbnQgd29ybGRJRCwgY29uc3QgV2ViU2VjdXJpdHlPcmlnaW4mKTsK ICAgICB2aXJ0dWFsIHZvaWQgYWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBXZWJDb25zb2xlTWVz c2FnZSYpOwogICAgIHZpcnR1YWwgdm9pZCBjb2xsZWN0R2FyYmFnZSgpOworICAgIHZpcnR1YWwg Ym9vbCBjaGVja0lmUnVuSW5zZWN1cmVDb250ZW50KGNvbnN0IFdlYlVSTCYpIGNvbnN0OwogI2lm IFdFQktJVF9VU0lOR19WOAogICAgIHZpcnR1YWwgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGV4ZWN1 dGVTY3JpcHRBbmRSZXR1cm5WYWx1ZSgKICAgICAgICAgY29uc3QgV2ViU2NyaXB0U291cmNlJik7 CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gODkzMzQpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1 IEBACisyMDExLTA2LTIwICBDaHJpcyBFdmFucyAgPGNldmFuc0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2lyZSBpbiBjaGVj a0lmUnVuSW5zZWN1cmVDb250ZW50IHRvIHRoZSBjaHJvbWl1bSBXZWJLaXQgQVBJCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzAyNgorCisgICAgICAg ICogcHVibGljL1dlYkZyYW1lLmg6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6Y2hlY2tJZlJ1bkluc2VjdXJlQ29udGVudCk6 IGFkZCBpbiBiYXNpYyBwbHVtYmluZy4KKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmg6CisK IDIwMTEtMDYtMjAgIFNjb3R0IEJ5ZXIgIDxzY290dGJ5ZXJAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJGcmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkZyYW1lLmgJKHJldmlzaW9uIDg5MzM0KQorKysgU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMjcyLDYgKzI3MiwxMCBA QAogICAgIC8vIENhbGxzIHdpbmRvdy5nYygpIGlmIGl0IGlzIGRlZmluZWQuCiAgICAgdmlydHVh bCB2b2lkIGNvbGxlY3RHYXJiYWdlKCkgPSAwOwogCisgICAgLy8gQ2hlY2sgaWYgdGhlIHNjcmlw dGluZyBVUkwgcmVwcmVzZW50cyBhIG1peGVkIGNvbnRlbnQgY29uZGl0aW9uIHJlbGF0aXZlCisg ICAgLy8gdG8gdGhpcyBmcmFtZS4KKyAgICB2aXJ0dWFsIGJvb2wgY2hlY2tJZlJ1bkluc2VjdXJl Q29udGVudChjb25zdCBXZWJVUkwmKSBjb25zdCA9IDA7CisKICNpZiBXRUJLSVRfVVNJTkdfVjgK ICAgICAvLyBFeGVjdXRlcyBzY3JpcHQgaW4gdGhlIGNvbnRleHQgb2YgdGhlIGN1cnJlbnQgcGFn ZSBhbmQgcmV0dXJucyB0aGUgdmFsdWUKICAgICAvLyB0aGF0IHRoZSBzY3JpcHQgZXZhbHVhdGVk IHRvLgo= 98046 2011-06-21 12:52:39 -0700 2011-06-21 13:54:52 -0700 Patch 63026_4.diff text/plain 2625 cevans SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2 aXNpb24gODkzMzQpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NDgsNiArODQ4LDEyIEBACiAjZW5kaWYKIH0KIAorYm9v bCBXZWJGcmFtZUltcGw6OmNoZWNrSWZSdW5JbnNlY3VyZUNvbnRlbnQoY29uc3QgV2ViVVJMJiB1 cmwpIGNvbnN0Cit7CisgICAgRnJhbWVMb2FkZXIqIGZyYW1lTG9hZGVyID0gbV9mcmFtZS0+bG9h ZGVyKCk7CisgICAgcmV0dXJuIGZyYW1lTG9hZGVyLT5jaGVja0lmUnVuSW5zZWN1cmVDb250ZW50 KG1fZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIHVybCk7Cit9CisKICNpZiBV U0UoVjgpCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV2ViRnJhbWVJbXBsOjpleGVjdXRlU2NyaXB0 QW5kUmV0dXJuVmFsdWUoY29uc3QgV2ViU2NyaXB0U291cmNlJiBzb3VyY2UpCiB7CkluZGV4OiBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAkocmV2aXNpb24gODkzMzQp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAkod29ya2luZyBj b3B5KQpAQCAtMTE1LDYgKzExNSw3IEBACiAgICAgdmlydHVhbCB2b2lkIHNldElzb2xhdGVkV29y bGRTZWN1cml0eU9yaWdpbihpbnQgd29ybGRJRCwgY29uc3QgV2ViU2VjdXJpdHlPcmlnaW4mKTsK ICAgICB2aXJ0dWFsIHZvaWQgYWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBXZWJDb25zb2xlTWVz c2FnZSYpOwogICAgIHZpcnR1YWwgdm9pZCBjb2xsZWN0R2FyYmFnZSgpOworICAgIHZpcnR1YWwg Ym9vbCBjaGVja0lmUnVuSW5zZWN1cmVDb250ZW50KGNvbnN0IFdlYlVSTCYpIGNvbnN0OwogI2lm IFdFQktJVF9VU0lOR19WOAogICAgIHZpcnR1YWwgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGV4ZWN1 dGVTY3JpcHRBbmRSZXR1cm5WYWx1ZSgKICAgICAgICAgY29uc3QgV2ViU2NyaXB0U291cmNlJik7 CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gODkzMzQpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1 IEBACisyMDExLTA2LTIwICBDaHJpcyBFdmFucyAgPGNldmFuc0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgorCisgICAgICAgIFdpcmUgaW4gY2hlY2tJ ZlJ1bkluc2VjdXJlQ29udGVudCB0byB0aGUgY2hyb21pdW0gV2ViS2l0IEFQSQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMwMjYKKworICAgICAgICAq IHB1YmxpYy9XZWJGcmFtZS5oOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OmNoZWNrSWZSdW5JbnNlY3VyZUNvbnRlbnQpOiBh ZGQgaW4gYmFzaWMgcGx1bWJpbmcuCisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5oOgorCiAy MDExLTA2LTIwICBTY290dCBCeWVyICA8c2NvdHRieWVyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJGcmFtZS5oCShyZXZpc2lvbiA4OTMzNCkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3Miw2ICsyNzIsMTAgQEAK ICAgICAvLyBDYWxscyB3aW5kb3cuZ2MoKSBpZiBpdCBpcyBkZWZpbmVkLgogICAgIHZpcnR1YWwg dm9pZCBjb2xsZWN0R2FyYmFnZSgpID0gMDsKIAorICAgIC8vIENoZWNrIGlmIHRoZSBzY3JpcHRp bmcgVVJMIHJlcHJlc2VudHMgYSBtaXhlZCBjb250ZW50IGNvbmRpdGlvbiByZWxhdGl2ZQorICAg IC8vIHRvIHRoaXMgZnJhbWUuCisgICAgdmlydHVhbCBib29sIGNoZWNrSWZSdW5JbnNlY3VyZUNv bnRlbnQoY29uc3QgV2ViVVJMJikgY29uc3QgPSAwOworCiAjaWYgV0VCS0lUX1VTSU5HX1Y4CiAg ICAgLy8gRXhlY3V0ZXMgc2NyaXB0IGluIHRoZSBjb250ZXh0IG9mIHRoZSBjdXJyZW50IHBhZ2Ug YW5kIHJldHVybnMgdGhlIHZhbHVlCiAgICAgLy8gdGhhdCB0aGUgc2NyaXB0IGV2YWx1YXRlZCB0 by4K