56296 2011-03-14 01:47:25 -0700 Clean up includes/forward declarations in IconDatabaseBase 2011-03-14 14:13:08 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 52451 1 beidson beidson tonyg webkit.review.bot oldest_to_newest 366892 0 beidson 2011-03-14 01:47:25 -0700 Clean up includes/forward declarations in IconDatabaseBase It'd be great to get rid of the "PlatformString.h" include. 366893 1 85657 beidson 2011-03-14 01:49:51 -0700 Created attachment 85657 Patch v1 366894 2 webkit.review.bot 2011-03-14 01:51:03 -0700 Attachment 85657 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/loader/icon/IconDatabaseBase.h:33: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 367031 3 85686 beidson 2011-03-14 10:01:45 -0700 Created attachment 85686 Patch v2 - Left out the WebKit pieces 367032 4 beidson 2011-03-14 10:02:28 -0700 Ignore the "Left out the WebKit pieces" in the patch title - autocomplete, damn you! 367037 5 85686 sam 2011-03-14 10:06:02 -0700 Comment on attachment 85686 Patch v2 - Left out the WebKit pieces View in context: https://bugs.webkit.org/attachment.cgi?id=85686&action=review > Source/WebCore/loader/icon/IconDatabase.h:31 > +#include "PlatformString.h" This should be <wtf/text/WTFString.h> > Source/WebCore/loader/icon/IconDatabaseBase.h:34 > +namespace WTF { > +class String; > +} This should use <wtf/Forward.h> > Source/WebCore/loader/icon/IconDatabaseBase.h:97 > + virtual WTF::String databasePath() const; If you use forward.h, the WTF is not necessary. 367040 6 85688 beidson 2011-03-14 10:15:41 -0700 Created attachment 85688 Patch v3 367221 7 beidson 2011-03-14 14:13:08 -0700 http://trac.webkit.org/projects/webkit/changeset/81034 85657 2011-03-14 01:49:51 -0700 2011-03-14 10:01:45 -0700 Patch v1 patch.txt text/plain 4893 beidson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxMDA3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDMtMTQgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NjI5NgorICAgICAgICBDbGVhbiB1cCBpbmNsdWRlcy9mb3J3YXJkIGRlY2xhcmF0aW9ucyBp biBJY29uRGF0YWJhc2VCYXNlLgorCisgICAgICAgIEdldCByaWQgb2YgdGhlICJQbGF0Zm9ybVN0 cmluZy5oIiBpbmNsdWRlIGFuZCByZXBsYWNlIGl0IHdpdGggYSBmb3J3YXJkIGRlY2xhcmF0aW9u LgorCisgICAgICAgIFRoaXMnbGwgbWFrZSBpdCBlYXNpZXIgdG8gdXNlIGluIGV4dGVybmFsIGZy YW1ld29ya3MgKGxpa2UgV2ViS2l0MikuCisKKyAgICAgICAgKiBsb2FkZXIvaWNvbi9JY29uRGF0 YWJhc2UuaDoKKyAgICAgICAgKiBsb2FkZXIvaWNvbi9JY29uRGF0YWJhc2VCYXNlLmg6CisgICAg ICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2VCYXNlOjpyZXRhaW5JY29uRm9yUGFnZVVSTCk6Cisg ICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2VCYXNlOjpyZWxlYXNlSWNvbkZvclBhZ2VVUkwp OgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFzZTo6aWNvbkZvclBhZ2VVUkwpOgor ICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFzZTo6c2V0SWNvblVSTEZvclBhZ2VVUkwp OgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFzZTo6c2V0SWNvbkRhdGFGb3JJY29u VVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUJhc2U6Omljb25EYXRhS25vd25G b3JJY29uVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUJhc2U6OmxvYWREZWNp c2lvbkZvckljb25VUkwpOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFzZTo6aW1w b3J0SWNvblVSTEZvclBhZ2VVUkwpOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFz ZTo6aW1wb3J0SWNvbkRhdGFGb3JJY29uVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRh YmFzZUJhc2U6Om9wZW4pOgorCiAyMDExLTAzLTE0ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogU291 cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmgJKHJldmlzaW9uIDgxMDA0KQor KysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI4LDYgKzI4LDcgQEAKICNkZWZpbmUgSWNvbkRhdGFiYXNlX2gKIAogI2luY2x1ZGUg Ikljb25EYXRhYmFzZUJhc2UuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1 ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvSGFz aFNldC5oPgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlQmFz ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFz ZUJhc2UuaAkocmV2aXNpb24gODEwMDQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9J Y29uRGF0YWJhc2VCYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDkgKzI2LDEyIEBACiAjaWZu ZGVmIEljb25EYXRhYmFzZUJhc2VfaAogI2RlZmluZSBJY29uRGF0YWJhc2VCYXNlX2gKIAotI2lu Y2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCi0KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4K KyNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgorCituYW1lc3BhY2UgV1RGIHsKKyAgICBjbGFz cyBTdHJpbmc7Cit9CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsgCiAKQEAgLTM2LDYgKzM5LDcgQEAg Y2xhc3MgRG9jdW1lbnRMb2FkZXI7CiBjbGFzcyBJY29uRGF0YWJhc2VDbGllbnQ7CiBjbGFzcyBJ bWFnZTsKIGNsYXNzIEludFNpemU7CitjbGFzcyBTaGFyZWRCdWZmZXI7CiAKIGVudW0gSWNvbkxv YWREZWNpc2lvbiB7CiAgICAgSWNvbkxvYWRZZXMsCkBAIC01NiwxNiArNjAsMTYgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgYm9vbCBpc0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQog ICAgIHZpcnR1YWwgSW1hZ2UqIGRlZmF1bHRJY29uKGNvbnN0IEludFNpemUmKSB7IHJldHVybiAw OyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgcmV0YWluSWNvbkZvclBhZ2VVUkwoY29uc3QgU3RyaW5n JikgeyB9Ci0gICAgdmlydHVhbCB2b2lkIHJlbGVhc2VJY29uRm9yUGFnZVVSTChjb25zdCBTdHJp bmcmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgcmV0YWluSWNvbkZvclBhZ2VVUkwoY29uc3QgV1RG OjpTdHJpbmcmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgcmVsZWFzZUljb25Gb3JQYWdlVVJMKGNv bnN0IFdURjo6U3RyaW5nJikgeyB9CiAKLSAgICB2aXJ0dWFsIEltYWdlKiBpY29uRm9yUGFnZVVS TChjb25zdCBTdHJpbmcmLCBjb25zdCBJbnRTaXplJikgeyByZXR1cm4gMDsgfQotICAgIHZpcnR1 YWwgU3RyaW5nIGljb25VUkxGb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYpOwotICAgIHZpcnR1YWwg dm9pZCBzZXRJY29uVVJMRm9yUGFnZVVSTChjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKSB7 IH0KLQotICAgIHZpcnR1YWwgdm9pZCBzZXRJY29uRGF0YUZvckljb25VUkwoUGFzc1JlZlB0cjxT aGFyZWRCdWZmZXI+LCBjb25zdCBTdHJpbmcmKSB7IH0KLSAgICB2aXJ0dWFsIGJvb2wgaWNvbkRh dGFLbm93bkZvckljb25VUkwoY29uc3QgU3RyaW5nJikgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2 aXJ0dWFsIEljb25Mb2FkRGVjaXNpb24gbG9hZERlY2lzaW9uRm9ySWNvblVSTChjb25zdCBTdHJp bmcmLCBEb2N1bWVudExvYWRlciopIHsgcmV0dXJuIEljb25Mb2FkTm87IH0KKyAgICB2aXJ0dWFs IEltYWdlKiBpY29uRm9yUGFnZVVSTChjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IEludFNpemUm KSB7IHJldHVybiAwOyB9CisgICAgdmlydHVhbCBXVEY6OlN0cmluZyBpY29uVVJMRm9yUGFnZVVS TChjb25zdCBXVEY6OlN0cmluZyYpOworICAgIHZpcnR1YWwgdm9pZCBzZXRJY29uVVJMRm9yUGFn ZVVSTChjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJikgeyB9CisKKyAgICB2 aXJ0dWFsIHZvaWQgc2V0SWNvbkRhdGFGb3JJY29uVVJMKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVy PiwgY29uc3QgV1RGOjpTdHJpbmcmKSB7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaWNvbkRhdGFLbm93 bkZvckljb25VUkwoY29uc3QgV1RGOjpTdHJpbmcmKSB7IHJldHVybiBmYWxzZTsgfQorICAgIHZp cnR1YWwgSWNvbkxvYWREZWNpc2lvbiBsb2FkRGVjaXNpb25Gb3JJY29uVVJMKGNvbnN0IFdURjo6 U3RyaW5nJiwgRG9jdW1lbnRMb2FkZXIqKSB7IHJldHVybiBJY29uTG9hZE5vOyB9CiAKICAgICAv LyBTdXBwb3J0IGZvciBXZWJDb3JlU3RhdGlzdGljcyBpbiBXZWJLaXQKICAgICB2aXJ0dWFsIHNp emVfdCBwYWdlVVJMTWFwcGluZ0NvdW50KCkgeyByZXR1cm4gMDsgfQpAQCAtNzMsMTEgKzc3LDEx IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHNpemVfdCBpY29uUmVjb3JkQ291bnQoKSB7IHJldHVy biAwOyB9CiAgICAgdmlydHVhbCBzaXplX3QgaWNvblJlY29yZENvdW50V2l0aERhdGEoKSB7IHJl dHVybiAwOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgaW1wb3J0SWNvblVSTEZvclBhZ2VVUkwoY29u c3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJikgeyB9Ci0gICAgdmlydHVhbCB2b2lkIGltcG9ydElj b25EYXRhRm9ySWNvblVSTChQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4sIGNvbnN0IFN0cmluZyYp IHsgfQorICAgIHZpcnR1YWwgdm9pZCBpbXBvcnRJY29uVVJMRm9yUGFnZVVSTChjb25zdCBXVEY6 OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJikgeyB9CisgICAgdmlydHVhbCB2b2lkIGltcG9y dEljb25EYXRhRm9ySWNvblVSTChQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4sIGNvbnN0IFdURjo6 U3RyaW5nJikgeyB9CiAgICAgdmlydHVhbCBib29sIHNob3VsZFN0b3BUaHJlYWRBY3Rpdml0eSgp IGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAotICAgIHZpcnR1YWwgYm9vbCBvcGVuKGNvbnN0IFN0 cmluZyYpIHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIG9wZW4oY29uc3QgV1RG OjpTdHJpbmcmKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBjbG9zZSgpIHsg fQogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVBbGxJY29ucygpIHsgfQogCkBAIC04NSw3ICs4OSw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q2xpZW50KEljb25EYXRhYmFzZUNsaWVu dCopIHsgfQogICAgIAogICAgIHZpcnR1YWwgYm9vbCBpc09wZW4oKSBjb25zdCB7IHJldHVybiBm YWxzZTsgfQotICAgIHZpcnR1YWwgU3RyaW5nIGRhdGFiYXNlUGF0aCgpIGNvbnN0OworICAgIHZp cnR1YWwgV1RGOjpTdHJpbmcgZGF0YWJhc2VQYXRoKCkgY29uc3Q7CiAKIH07CiAK 85686 2011-03-14 10:01:45 -0700 2011-03-14 10:15:41 -0700 Patch v2 - Left out the WebKit pieces patch.txt text/plain 5314 beidson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxMDI4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDMtMTQgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NjI5NgorICAgICAgICBDbGVhbiB1cCBJY29uRGF0YWJhc2VCYXNlIGhlYWRlci4KKworICAg ICAgICAtR2V0IHJpZCBvZiB0aGUgIlBsYXRmb3JtU3RyaW5nLmgiIGluY2x1ZGUgYW5kIHJlcGxh Y2UgaXQgd2l0aCBhIGZvcndhcmQgZGVjbGFyYXRpb24uCisgICAgICAgIC1Hcm91cCBtZXRob2Rz IGJ5IHdoaWNoIGFyZSB1c2VkIGluIFdlYkNvcmUgZGlyZWN0bHkgYW5kIHdoaWNoIGFyZSB1c2Vk IGluIFdlYktpdCBwb3J0cy4KKworICAgICAgICBUaGlzJ2xsIG1ha2UgaXQgZWFzaWVyIHRvIHVz ZSBpbiBleHRlcm5hbCBmcmFtZXdvcmtzIChsaWtlIFdlYktpdDIpLgorCisgICAgICAgICogbG9h ZGVyL2ljb24vSWNvbkRhdGFiYXNlLmg6CisgICAgICAgICogbG9hZGVyL2ljb24vSWNvbkRhdGFi YXNlQmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFzZTo6cmV0YWluSWNv bkZvclBhZ2VVUkwpOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFzZTo6cmVsZWFz ZUljb25Gb3JQYWdlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUJhc2U6Omlj b25Gb3JQYWdlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUJhc2U6OnNldElj b25VUkxGb3JQYWdlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUJhc2U6OnNl dEljb25EYXRhRm9ySWNvblVSTCk6CisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2VCYXNl OjppY29uRGF0YUtub3duRm9ySWNvblVSTCk6CisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJh c2VCYXNlOjpsb2FkRGVjaXNpb25Gb3JJY29uVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25E YXRhYmFzZUJhc2U6OmltcG9ydEljb25VUkxGb3JQYWdlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6 Okljb25EYXRhYmFzZUJhc2U6OmltcG9ydEljb25EYXRhRm9ySWNvblVSTCk6CisgICAgICAgIChX ZWJDb3JlOjpJY29uRGF0YWJhc2VCYXNlOjpvcGVuKToKKwogMjAxMS0wMy0xMiAgUGF2ZWwgUG9k aXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZ dXJ5IFNlbWlraGF0c2t5LgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRh dGFiYXNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRh dGFiYXNlLmgJKHJldmlzaW9uIDgxMDI4KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24v SWNvbkRhdGFiYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKICNkZWZpbmUg SWNvbkRhdGFiYXNlX2gKIAogI2luY2x1ZGUgIkljb25EYXRhYmFzZUJhc2UuaCIKKyNpbmNsdWRl ICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSA8d3RmL0hh c2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgpJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlQmFzZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZUJhc2UuaAkocmV2aXNpb24gODEwMjgpCisrKyBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2VCYXNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI2LDkgKzI2LDEyIEBACiAjaWZuZGVmIEljb25EYXRhYmFzZUJhc2VfaAogI2RlZmlu ZSBJY29uRGF0YWJhc2VCYXNlX2gKIAotI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCi0KICNp bmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KKyNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgor CituYW1lc3BhY2UgV1RGIHsKK2NsYXNzIFN0cmluZzsKK30KIAogbmFtZXNwYWNlIFdlYkNvcmUg eyAKIApAQCAtMzYsNiArMzksNyBAQCBjbGFzcyBEb2N1bWVudExvYWRlcjsKIGNsYXNzIEljb25E YXRhYmFzZUNsaWVudDsKIGNsYXNzIEltYWdlOwogY2xhc3MgSW50U2l6ZTsKK2NsYXNzIFNoYXJl ZEJ1ZmZlcjsKIAogZW51bSBJY29uTG9hZERlY2lzaW9uIHsKICAgICBJY29uTG9hZFllcywKQEAg LTUyLDMyICs1NiwzNyBAQCBwcm90ZWN0ZWQ6CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+SWNvbkRh dGFiYXNlQmFzZSgpIHsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNldEVuYWJsZWQoYm9vbCkgeyB9 CisgICAgLy8gVXNlZCBpbnRlcm5hbGx5IGJ5IFdlYkNvcmUKICAgICB2aXJ0dWFsIGJvb2wgaXNF bmFibGVkKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICAKKyAgICB2aXJ0dWFsIEltYWdl KiBpY29uRm9yUGFnZVVSTChjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IEludFNpemUmKSB7IHJl dHVybiAwOyB9CiAgICAgdmlydHVhbCBJbWFnZSogZGVmYXVsdEljb24oY29uc3QgSW50U2l6ZSYp IHsgcmV0dXJuIDA7IH0KKyAgICAKKyAgICB2aXJ0dWFsIHZvaWQgcmV0YWluSWNvbkZvclBhZ2VV UkwoY29uc3QgV1RGOjpTdHJpbmcmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgcmVsZWFzZUljb25G b3JQYWdlVVJMKGNvbnN0IFdURjo6U3RyaW5nJikgeyB9CisKKyAgICB2aXJ0dWFsIFdURjo6U3Ry aW5nIGljb25VUkxGb3JQYWdlVVJMKGNvbnN0IFdURjo6U3RyaW5nJik7CisgICAgdmlydHVhbCBi b29sIGljb25EYXRhS25vd25Gb3JJY29uVVJMKGNvbnN0IFdURjo6U3RyaW5nJikgeyByZXR1cm4g ZmFsc2U7IH0KKyAgICB2aXJ0dWFsIEljb25Mb2FkRGVjaXNpb24gbG9hZERlY2lzaW9uRm9ySWNv blVSTChjb25zdCBXVEY6OlN0cmluZyYsIERvY3VtZW50TG9hZGVyKikgeyByZXR1cm4gSWNvbkxv YWRObzsgfQorICAgIAorICAgIHZpcnR1YWwgdm9pZCBzZXRJY29uVVJMRm9yUGFnZVVSTChjb25z dCBXVEY6OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJikgeyB9CisgICAgdmlydHVhbCB2b2lk IHNldEljb25EYXRhRm9ySWNvblVSTChQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4sIGNvbnN0IFdU Rjo6U3RyaW5nJikgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgcmV0YWluSWNvbkZvclBhZ2VVUkwo Y29uc3QgU3RyaW5nJikgeyB9Ci0gICAgdmlydHVhbCB2b2lkIHJlbGVhc2VJY29uRm9yUGFnZVVS TChjb25zdCBTdHJpbmcmKSB7IH0KKyAgICAvLyBVc2VkIHdpdGhpbiBvbmUgb3IgbW9yZSBXZWJL aXQgcG9ydHMuCisgICAgLy8gV2Ugc2hvdWxkIHRyeSB0byByZW1vdmUgdGhlc2UgZGVwZW5kZW5j aWVzIGZyb20gdGhlIEljb25EYXRhYmFzZUJhc2UgY2xhc3MuCiAKLSAgICB2aXJ0dWFsIEltYWdl KiBpY29uRm9yUGFnZVVSTChjb25zdCBTdHJpbmcmLCBjb25zdCBJbnRTaXplJikgeyByZXR1cm4g MDsgfQotICAgIHZpcnR1YWwgU3RyaW5nIGljb25VUkxGb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYp OwotICAgIHZpcnR1YWwgdm9pZCBzZXRJY29uVVJMRm9yUGFnZVVSTChjb25zdCBTdHJpbmcmLCBj b25zdCBTdHJpbmcmKSB7IH0KLQotICAgIHZpcnR1YWwgdm9pZCBzZXRJY29uRGF0YUZvckljb25V UkwoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCBjb25zdCBTdHJpbmcmKSB7IH0KLSAgICB2aXJ0 dWFsIGJvb2wgaWNvbkRhdGFLbm93bkZvckljb25VUkwoY29uc3QgU3RyaW5nJikgeyByZXR1cm4g ZmFsc2U7IH0KLSAgICB2aXJ0dWFsIEljb25Mb2FkRGVjaXNpb24gbG9hZERlY2lzaW9uRm9ySWNv blVSTChjb25zdCBTdHJpbmcmLCBEb2N1bWVudExvYWRlciopIHsgcmV0dXJuIEljb25Mb2FkTm87 IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0RW5hYmxlZChib29sKSB7IH0KIAotICAgIC8vIFN1cHBv cnQgZm9yIFdlYkNvcmVTdGF0aXN0aWNzIGluIFdlYktpdAogICAgIHZpcnR1YWwgc2l6ZV90IHBh Z2VVUkxNYXBwaW5nQ291bnQoKSB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBzaXplX3QgcmV0 YWluZWRQYWdlVVJMQ291bnQoKSB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBzaXplX3QgaWNv blJlY29yZENvdW50KCkgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgc2l6ZV90IGljb25SZWNv cmRDb3VudFdpdGhEYXRhKCkgeyByZXR1cm4gMDsgfQogCi0gICAgdmlydHVhbCB2b2lkIGltcG9y dEljb25VUkxGb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpIHsgfQotICAg IHZpcnR1YWwgdm9pZCBpbXBvcnRJY29uRGF0YUZvckljb25VUkwoUGFzc1JlZlB0cjxTaGFyZWRC dWZmZXI+LCBjb25zdCBTdHJpbmcmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgaW1wb3J0SWNvblVS TEZvclBhZ2VVUkwoY29uc3QgV1RGOjpTdHJpbmcmLCBjb25zdCBXVEY6OlN0cmluZyYpIHsgfQor ICAgIHZpcnR1YWwgdm9pZCBpbXBvcnRJY29uRGF0YUZvckljb25VUkwoUGFzc1JlZlB0cjxTaGFy ZWRCdWZmZXI+LCBjb25zdCBXVEY6OlN0cmluZyYpIHsgfQogICAgIHZpcnR1YWwgYm9vbCBzaG91 bGRTdG9wVGhyZWFkQWN0aXZpdHkoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKLSAgICB2aXJ0 dWFsIGJvb2wgb3Blbihjb25zdCBTdHJpbmcmKSB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1 YWwgYm9vbCBvcGVuKGNvbnN0IFdURjo6U3RyaW5nJikgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2 aXJ0dWFsIHZvaWQgY2xvc2UoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlQWxsSWNvbnMo KSB7IH0KIApAQCAtODUsNyArOTQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldENs aWVudChJY29uRGF0YWJhc2VDbGllbnQqKSB7IH0KICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNP cGVuKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIFN0cmluZyBkYXRhYmFz ZVBhdGgoKSBjb25zdDsKKyAgICB2aXJ0dWFsIFdURjo6U3RyaW5nIGRhdGFiYXNlUGF0aCgpIGNv bnN0OwogCiB9OwogCg== 85688 2011-03-14 10:15:41 -0700 2011-03-14 10:17:01 -0700 Patch v3 patch.txt text/plain 4028 beidson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxMDI4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDMtMTQgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NjI5NgorICAgICAgICBDbGVhbiB1cCBJY29uRGF0YWJhc2VCYXNlIGhlYWRlci4KKworICAg ICAgICAtR2V0IHJpZCBvZiB0aGUgIlBsYXRmb3JtU3RyaW5nLmgiIGluY2x1ZGUgYW5kIHJlcGxh Y2UgaXQgd2l0aCBhIGZvcndhcmQgZGVjbGFyYXRpb24uCisgICAgICAgIC1Hcm91cCBtZXRob2Rz IGJ5IHdoaWNoIGFyZSB1c2VkIGluIFdlYkNvcmUgZGlyZWN0bHkgYW5kIHdoaWNoIGFyZSB1c2Vk IGluIFdlYktpdCBwb3J0cy4KKworICAgICAgICBUaGlzJ2xsIG1ha2UgaXQgZWFzaWVyIHRvIHVz ZSBpbiBleHRlcm5hbCBmcmFtZXdvcmtzIChsaWtlIFdlYktpdDIpLgorCisgICAgICAgICogbG9h ZGVyL2ljb24vSWNvbkRhdGFiYXNlLmg6CisgICAgICAgICogbG9hZGVyL2ljb24vSWNvbkRhdGFi YXNlQmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFzZTo6cmV0YWluSWNv bkZvclBhZ2VVUkwpOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlQmFzZTo6cmVsZWFz ZUljb25Gb3JQYWdlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUJhc2U6Omlj b25Gb3JQYWdlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUJhc2U6OnNldElj b25VUkxGb3JQYWdlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUJhc2U6OnNl dEljb25EYXRhRm9ySWNvblVSTCk6CisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2VCYXNl OjppY29uRGF0YUtub3duRm9ySWNvblVSTCk6CisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJh c2VCYXNlOjpsb2FkRGVjaXNpb25Gb3JJY29uVVJMKToKKyAgICAgICAgKFdlYkNvcmU6Okljb25E YXRhYmFzZUJhc2U6OmltcG9ydEljb25VUkxGb3JQYWdlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6 Okljb25EYXRhYmFzZUJhc2U6OmltcG9ydEljb25EYXRhRm9ySWNvblVSTCk6CisgICAgICAgIChX ZWJDb3JlOjpJY29uRGF0YWJhc2VCYXNlOjpvcGVuKToKKwogMjAxMS0wMy0xMiAgUGF2ZWwgUG9k aXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZ dXJ5IFNlbWlraGF0c2t5LgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRh dGFiYXNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRh dGFiYXNlLmgJKHJldmlzaW9uIDgxMDI4KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24v SWNvbkRhdGFiYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRl IDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CiAjaW5jbHVkZSA8 d3RmL3RleHQvU3RyaW5nSGFzaC5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgog CiAjaWYgRU5BQkxFKElDT05EQVRBQkFTRSkKICNpbmNsdWRlICJTUUxpdGVEYXRhYmFzZS5oIgpJ bmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlQmFzZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZUJhc2UuaAko cmV2aXNpb24gODEwMjgpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJh c2VCYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDkgKzI2LDEwIEBACiAjaWZuZGVmIEljb25E YXRhYmFzZUJhc2VfaAogI2RlZmluZSBJY29uRGF0YWJhc2VCYXNlX2gKIAotI2luY2x1ZGUgIlBs YXRmb3JtU3RyaW5nLmgiCi0KKyNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0 Zi9Ob25jb3B5YWJsZS5oPgorI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CisKIAogbmFtZXNw YWNlIFdlYkNvcmUgeyAKIApAQCAtMzYsNiArMzcsNyBAQCBjbGFzcyBEb2N1bWVudExvYWRlcjsK IGNsYXNzIEljb25EYXRhYmFzZUNsaWVudDsKIGNsYXNzIEltYWdlOwogY2xhc3MgSW50U2l6ZTsK K2NsYXNzIFNoYXJlZEJ1ZmZlcjsKIAogZW51bSBJY29uTG9hZERlY2lzaW9uIHsKICAgICBJY29u TG9hZFllcywKQEAgLTUyLDIyICs1NCwyNyBAQCBwcm90ZWN0ZWQ6CiBwdWJsaWM6CiAgICAgdmly dHVhbCB+SWNvbkRhdGFiYXNlQmFzZSgpIHsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNldEVuYWJs ZWQoYm9vbCkgeyB9CisgICAgLy8gVXNlZCBpbnRlcm5hbGx5IGJ5IFdlYkNvcmUKICAgICB2aXJ0 dWFsIGJvb2wgaXNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICAKKyAgICB2 aXJ0dWFsIEltYWdlKiBpY29uRm9yUGFnZVVSTChjb25zdCBTdHJpbmcmLCBjb25zdCBJbnRTaXpl JikgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgSW1hZ2UqIGRlZmF1bHRJY29uKGNvbnN0IElu dFNpemUmKSB7IHJldHVybiAwOyB9Ci0KKyAgICAKICAgICB2aXJ0dWFsIHZvaWQgcmV0YWluSWNv bkZvclBhZ2VVUkwoY29uc3QgU3RyaW5nJikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlbGVhc2VJ Y29uRm9yUGFnZVVSTChjb25zdCBTdHJpbmcmKSB7IH0KIAotICAgIHZpcnR1YWwgSW1hZ2UqIGlj b25Gb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYsIGNvbnN0IEludFNpemUmKSB7IHJldHVybiAwOyB9 CiAgICAgdmlydHVhbCBTdHJpbmcgaWNvblVSTEZvclBhZ2VVUkwoY29uc3QgU3RyaW5nJik7Ci0g ICAgdmlydHVhbCB2b2lkIHNldEljb25VUkxGb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYsIGNvbnN0 IFN0cmluZyYpIHsgfQotCi0gICAgdmlydHVhbCB2b2lkIHNldEljb25EYXRhRm9ySWNvblVSTChQ YXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4sIGNvbnN0IFN0cmluZyYpIHsgfQogICAgIHZpcnR1YWwg Ym9vbCBpY29uRGF0YUtub3duRm9ySWNvblVSTChjb25zdCBTdHJpbmcmKSB7IHJldHVybiBmYWxz ZTsgfQogICAgIHZpcnR1YWwgSWNvbkxvYWREZWNpc2lvbiBsb2FkRGVjaXNpb25Gb3JJY29uVVJM KGNvbnN0IFN0cmluZyYsIERvY3VtZW50TG9hZGVyKikgeyByZXR1cm4gSWNvbkxvYWRObzsgfQor ICAgIAorICAgIHZpcnR1YWwgdm9pZCBzZXRJY29uVVJMRm9yUGFnZVVSTChjb25zdCBTdHJpbmcm LCBjb25zdCBTdHJpbmcmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0SWNvbkRhdGFGb3JJY29u VVJMKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiwgY29uc3QgU3RyaW5nJikgeyB9CisKKyAgICAv LyBVc2VkIHdpdGhpbiBvbmUgb3IgbW9yZSBXZWJLaXQgcG9ydHMuCisgICAgLy8gV2Ugc2hvdWxk IHRyeSB0byByZW1vdmUgdGhlc2UgZGVwZW5kZW5jaWVzIGZyb20gdGhlIEljb25EYXRhYmFzZUJh c2UgY2xhc3MuCisKKyAgICB2aXJ0dWFsIHZvaWQgc2V0RW5hYmxlZChib29sKSB7IH0KIAotICAg IC8vIFN1cHBvcnQgZm9yIFdlYkNvcmVTdGF0aXN0aWNzIGluIFdlYktpdAogICAgIHZpcnR1YWwg c2l6ZV90IHBhZ2VVUkxNYXBwaW5nQ291bnQoKSB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBz aXplX3QgcmV0YWluZWRQYWdlVVJMQ291bnQoKSB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBz aXplX3QgaWNvblJlY29yZENvdW50KCkgeyByZXR1cm4gMDsgfQo=