103542 2012-11-28 11:36:30 -0800 [Chromium] Remove pluginsScriptableObject from PlatformSupport 2012-11-28 14:40:06 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pilgrim pilgrim abarth fishd haraken japhet webkit.review.bot oldest_to_newest 778115 0 pilgrim 2012-11-28 11:36:30 -0800 [Chromium] Remove pluginsScriptableObject from PlatformSupport 778117 1 176533 pilgrim 2012-11-28 11:37:20 -0800 Created attachment 176533 Patch 778130 2 176533 abarth 2012-11-28 11:45:12 -0800 Comment on attachment 176533 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176533&action=review > Source/WebCore/bindings/v8/ScriptController.cpp:525 > if (widget->isFrameView()) > return 0; in WebCore/bindings/js/ScriptController.cpp, the test is: if (!widget->isPluginView()) return 0; We should probably change this line here to: if (!widget->isPluginViewBase()) return 0; to ensure that the static_cast to PluginViewBase on like 527 is safe. > Source/WebCore/plugins/PluginViewBase.h:35 > +#else Sorry for steering you wrong on change. We probably want to use a USE(JSC) ifdef for the JSC stuff rather than assuming that !USE(V8) is JSC. 778167 3 176541 pilgrim 2012-11-28 12:10:15 -0800 Created attachment 176541 Patch 778168 4 176541 pilgrim 2012-11-28 12:10:45 -0800 Comment on attachment 176541 Patch Addressed review feedback. 778201 5 176541 abarth 2012-11-28 12:36:14 -0800 Comment on attachment 176541 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176541&action=review > Source/WebCore/bindings/v8/ScriptController.cpp:524 > - if (widget->isFrameView()) > + if (widget->isPluginViewBase()) Don't we need a ! here? 778216 6 176550 pilgrim 2012-11-28 12:42:47 -0800 Created attachment 176550 Patch 778217 7 176550 pilgrim 2012-11-28 12:43:23 -0800 Comment on attachment 176550 Patch Addressed latest feedback. 778227 8 176550 abarth 2012-11-28 12:49:19 -0800 Comment on attachment 176550 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176550&action=review > Source/WebCore/plugins/PluginViewBase.h:33 > +#if USE(V8) Technically this ifdef isn't needed since this declaration is the same for V8 and JSC, but we can leave it this way given that its only used for USE(V8). 778247 9 176550 webkit.review.bot 2012-11-28 13:04:23 -0800 Comment on attachment 176550 Patch Rejecting attachment 176550 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: nt): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 cleanup: Change some code to be cleaner, more readable and style conforming When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 154. Full output: http://queues.webkit.org/results/15018575 778301 10 176567 pilgrim 2012-11-28 13:53:08 -0800 Created attachment 176567 Patch 778302 11 176567 pilgrim 2012-11-28 13:53:33 -0800 Comment on attachment 176567 Patch Resubmitted after commit failure. 778356 12 176567 webkit.review.bot 2012-11-28 14:40:01 -0800 Comment on attachment 176567 Patch Clearing flags on attachment: 176567 Committed r136059: <http://trac.webkit.org/changeset/136059> 778357 13 webkit.review.bot 2012-11-28 14:40:06 -0800 All reviewed patches have been landed. Closing bug. 176533 2012-11-28 11:37:20 -0800 2012-11-28 12:10:12 -0800 Patch bug-103542-20121128143425.patch text/plain 5659 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNjAzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTI4ICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBwbHVnaW5zU2NyaXB0YWJsZU9iamVjdCBmcm9tIFBsYXRmb3JtU3VwcG9ydAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNTQyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9y aW5nIHNlcmllcy4gU2VlIHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIGJpbmRpbmdz L3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJv bGxlcjo6Y3JlYXRlU2NyaXB0SW5zdGFuY2VGb3JXaWRnZXQpOgorICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oOgorICAgICAgICAoUGxhdGZvcm1TdXBwb3J0KToK KyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXdCYXNlLmg6CisgICAgICAgIChQbHVnaW5WaWV3 QmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3QmFzZTo6c2NyaXB0YWJsZU9iamVj dCk6CisKIDIwMTItMTEtMjggIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBNb3ZlIGVtcHR5IGxvYWRpbmcgdG8gRG9jdW1lbnRMb2FkZXIsIHNpbXBsaWZ5IEZy YW1lTG9hZGVyOjppbml0KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAxMzYwMzApCisrKyBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcs OSArNDcsNyBAQAogI2luY2x1ZGUgIk5QVjhPYmplY3QuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAj aW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKLSNpbmNsdWRlICJucHJ1bnRpbWVfaW1wbC5oIgot I2luY2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCi0jaW5jbHVkZSAiUGxhdGZvcm1TdXBwb3J0Lmgi CisjaW5jbHVkZSAiUGx1Z2luVmlld0Jhc2UuaCIKICNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2su aCIKICNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2tGYWN0b3J5LmgiCiAjaW5jbHVkZSAiU2NyaXB0 UnVubmVyLmgiCkBAIC02Nyw2ICs2NSw4IEBACiAjaW5jbHVkZSAiVjhOUE9iamVjdC5oIgogI2lu Y2x1ZGUgIlY4UmVjdXJzaW9uU2NvcGUuaCIKICNpbmNsdWRlICJXaWRnZXQuaCIKKyNpbmNsdWRl ICJucHJ1bnRpbWVfaW1wbC5oIgorI2luY2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCiAjaW5jbHVk ZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2lu Y2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KQEAgLTUyNCw3ICs1MjQsNyBAQCBQYXNzU2NyaXB0 SW5zdGFuY2UgU2NyaXB0Q29udHJvbGxlcjo6Y3JlCiAgICAgaWYgKHdpZGdldC0+aXNGcmFtZVZp ZXcoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBOUE9iamVjdCogbnBPYmplY3QgPSBQbGF0 Zm9ybVN1cHBvcnQ6OnBsdWdpblNjcmlwdGFibGVPYmplY3Qod2lkZ2V0KTsKKyAgICBOUE9iamVj dCogbnBPYmplY3QgPSBzdGF0aWNfY2FzdDxQbHVnaW5WaWV3QmFzZSo+KHdpZGdldCktPnNjcmlw dGFibGVPYmplY3QoKTsKIAogICAgIGlmICghbnBPYmplY3QpCiAgICAgICAgIHJldHVybiAwOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1T dXBwb3J0LmgJKHJldmlzaW9uIDEzNjAzMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Nyw3ICs4Nyw2IEBA IHB1YmxpYzoKIAogICAgIC8vIFBsdWdpbiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgc3RhdGljIGJvb2wgcGx1Z2lucyhi b29sIHJlZnJlc2gsIFZlY3RvcjxQbHVnaW5JbmZvPiopOwotICAgIHN0YXRpYyBOUE9iamVjdCog cGx1Z2luU2NyaXB0YWJsZU9iamVjdChXaWRnZXQqKTsKIAogICAgIC8vIFRoZW1pbmcgLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAj aWYgT1MoV0lORE9XUykgJiYgIUVOQUJMRShERUZBVUxUX1JFTkRFUl9USEVNRSkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXdCYXNlLmgJKHJldmlzaW9uIDEzNjAzMCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaAkod29ya2luZyBjb3B5KQpA QCAtMzAsMTEgKzMwLDE1IEBACiAjaW5jbHVkZSAiV2lkZ2V0LmgiCiAjaW5jbHVkZSA8d3RmL3Rl eHQvV1RGU3RyaW5nLmg+CiAKKyNpZiBVU0UoVjgpCitzdHJ1Y3QgTlBPYmplY3Q7CisjZWxzZQog bmFtZXNwYWNlIEpTQyB7CiAgICAgY2xhc3MgRXhlY1N0YXRlOwogICAgIGNsYXNzIEpTR2xvYmFs T2JqZWN0OwogICAgIGNsYXNzIEpTT2JqZWN0OwogfQorI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIApAQCAtNDgsNyArNTIsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgUGxhdGZvcm1M YXllciogcGxhdGZvcm1MYXllcigpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICNlbmRpZgogCisjaWYg VVNFKFY4KQorICAgIHZpcnR1YWwgTlBPYmplY3QqIHNjcmlwdGFibGVPYmplY3QoKSB7IHJldHVy biAwOyB9CisjZWxzZQogICAgIHZpcnR1YWwgSlNDOjpKU09iamVjdCogc2NyaXB0T2JqZWN0KEpT Qzo6SlNHbG9iYWxPYmplY3QqKSB7IHJldHVybiAwOyB9CisjZW5kaWYKICAgICB2aXJ0dWFsIHZv aWQgc3RvcmFnZUJsb2NraW5nU3RhdGVDaGFuZ2VkKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHBy aXZhdGVCcm93c2luZ1N0YXRlQ2hhbmdlZChib29sKSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgZ2V0 Rm9ybVZhbHVlKFN0cmluZyYpIHsgcmV0dXJuIGZhbHNlOyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwkocmV2aXNpb24gMTM2MDMyKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0xMS0yOCAgTWFy ayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBS ZW1vdmUgcGx1Z2luc1NjcmlwdGFibGVPYmplY3QgZnJvbSBQbGF0Zm9ybVN1cHBvcnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzU0MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgYSByZWZh Y3RvcmluZyBzZXJpZXMuIFNlZSB0cmFja2luZyBidWcgODI5NDguCisKKyAgICAgICAgKiBzcmMv UGxhdGZvcm1TdXBwb3J0LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHNyYy9X ZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250YWluZXJJbXBs KToKKwogMjAxMi0xMS0yOCAgRXJpYyBVaHJoYW5lICA8ZXJpY3VAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtjaHJvbWl1bV0gQWRkIHVuaXQgdGVzdHMgZm9yIENocm9tZUNsaWVudEltcGw6Omdl dE5hdmlnYXRpb25Qb2xpY3kKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRm b3JtU3VwcG9ydC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv UGxhdGZvcm1TdXBwb3J0LmNwcAkocmV2aXNpb24gMTM2MDMwKQorKysgU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM1LDE0 ICsxMzUsNiBAQCBib29sIFBsYXRmb3JtU3VwcG9ydDo6cGx1Z2lucyhib29sIHJlZnJlCiAgICAg cmV0dXJuIHRydWU7ICAvLyBGSVhNRTogVGhlcmUgaXMgbm8gbmVlZCBmb3IgdGhpcyBmdW5jdGlv biB0byByZXR1cm4gYSB2YWx1ZS4KIH0KIAotTlBPYmplY3QqIFBsYXRmb3JtU3VwcG9ydDo6cGx1 Z2luU2NyaXB0YWJsZU9iamVjdChXaWRnZXQqIHdpZGdldCkKLXsKLSAgICBpZiAoIXdpZGdldCB8 fCAhd2lkZ2V0LT5pc1BsdWdpbkNvbnRhaW5lcigpKQotICAgICAgICByZXR1cm4gMDsKLQotICAg IHJldHVybiBzdGF0aWNfY2FzdDxXZWJQbHVnaW5Db250YWluZXJJbXBsKj4od2lkZ2V0KS0+c2Ny aXB0YWJsZU9iamVjdCgpOwotfQotCiAvLyBUaGVtaW5nIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKICNpZiBPUyhX SU5ET1dTKSAmJiAhRU5BQkxFKERFRkFVTFRfUkVOREVSX1RIRU1FKQpJbmRleDogU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAkocmV2 aXNpb24gMTM2MDMwKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29u dGFpbmVySW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsNyArMTUwLDcgQEAgcHVibGljOgog ICAgIHZvaWQgZGlkRmluaXNoTG9hZGluZygpOwogICAgIHZvaWQgZGlkRmFpbExvYWRpbmcoY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOwogCi0gICAgTlBPYmplY3QqIHNjcmlwdGFibGVP YmplY3QoKTsKKyAgICB2aXJ0dWFsIE5QT2JqZWN0KiBzY3JpcHRhYmxlT2JqZWN0KCkgT1ZFUlJJ REU7CiAKICAgICB2b2lkIHdpbGxEZXN0cm95UGx1Z2luTG9hZE9ic2VydmVyKFdlYlBsdWdpbkxv YWRPYnNlcnZlciopOwogCg== 176541 2012-11-28 12:10:15 -0800 2012-11-28 12:42:44 -0800 Patch bug-103542-20121128150720.patch text/plain 5754 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNjAzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTI4ICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBwbHVnaW5zU2NyaXB0YWJsZU9iamVjdCBmcm9tIFBsYXRmb3JtU3VwcG9ydAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNTQyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9y aW5nIHNlcmllcy4gU2VlIHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIGJpbmRpbmdz L3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJv bGxlcjo6Y3JlYXRlU2NyaXB0SW5zdGFuY2VGb3JXaWRnZXQpOgorICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oOgorICAgICAgICAoUGxhdGZvcm1TdXBwb3J0KToK KyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXdCYXNlLmg6CisgICAgICAgIChQbHVnaW5WaWV3 QmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3QmFzZTo6c2NyaXB0YWJsZU9iamVj dCk6CisKIDIwMTItMTEtMjggIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBNb3ZlIGVtcHR5IGxvYWRpbmcgdG8gRG9jdW1lbnRMb2FkZXIsIHNpbXBsaWZ5IEZy YW1lTG9hZGVyOjppbml0KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAxMzYwMzApCisrKyBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcs OSArNDcsNyBAQAogI2luY2x1ZGUgIk5QVjhPYmplY3QuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAj aW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKLSNpbmNsdWRlICJucHJ1bnRpbWVfaW1wbC5oIgot I2luY2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCi0jaW5jbHVkZSAiUGxhdGZvcm1TdXBwb3J0Lmgi CisjaW5jbHVkZSAiUGx1Z2luVmlld0Jhc2UuaCIKICNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2su aCIKICNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2tGYWN0b3J5LmgiCiAjaW5jbHVkZSAiU2NyaXB0 UnVubmVyLmgiCkBAIC02Nyw2ICs2NSw4IEBACiAjaW5jbHVkZSAiVjhOUE9iamVjdC5oIgogI2lu Y2x1ZGUgIlY4UmVjdXJzaW9uU2NvcGUuaCIKICNpbmNsdWRlICJXaWRnZXQuaCIKKyNpbmNsdWRl ICJucHJ1bnRpbWVfaW1wbC5oIgorI2luY2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCiAjaW5jbHVk ZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2lu Y2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KQEAgLTUyMSwxMCArNTIxLDEwIEBAIFBhc3NTY3Jp cHRJbnN0YW5jZSBTY3JpcHRDb250cm9sbGVyOjpjcmUKIHsKICAgICBBU1NFUlQod2lkZ2V0KTsK IAotICAgIGlmICh3aWRnZXQtPmlzRnJhbWVWaWV3KCkpCisgICAgaWYgKHdpZGdldC0+aXNQbHVn aW5WaWV3QmFzZSgpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIE5QT2JqZWN0KiBucE9iamVj dCA9IFBsYXRmb3JtU3VwcG9ydDo6cGx1Z2luU2NyaXB0YWJsZU9iamVjdCh3aWRnZXQpOworICAg IE5QT2JqZWN0KiBucE9iamVjdCA9IHN0YXRpY19jYXN0PFBsdWdpblZpZXdCYXNlKj4od2lkZ2V0 KS0+c2NyaXB0YWJsZU9iamVjdCgpOwogCiAgICAgaWYgKCFucE9iamVjdCkKICAgICAgICAgcmV0 dXJuIDA7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1 cHBvcnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Q bGF0Zm9ybVN1cHBvcnQuaAkocmV2aXNpb24gMTM2MDMwKQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgJKHdvcmtpbmcgY29weSkKQEAgLTg3LDcg Kzg3LDYgQEAgcHVibGljOgogCiAgICAgLy8gUGx1Z2luIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICBzdGF0aWMgYm9vbCBw bHVnaW5zKGJvb2wgcmVmcmVzaCwgVmVjdG9yPFBsdWdpbkluZm8+Kik7Ci0gICAgc3RhdGljIE5Q T2JqZWN0KiBwbHVnaW5TY3JpcHRhYmxlT2JqZWN0KFdpZGdldCopOwogCiAgICAgLy8gVGhlbWlu ZyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KICNpZiBPUyhXSU5ET1dTKSAmJiAhRU5BQkxFKERFRkFVTFRfUkVOREVSX1RIRU1FKQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3QmFzZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaAkocmV2aXNpb24gMTM2 MDMwKQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3QmFzZS5oCSh3b3JraW5n IGNvcHkpCkBAIC0zMCwxMSArMzAsMTYgQEAKICNpbmNsdWRlICJXaWRnZXQuaCIKICNpbmNsdWRl IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAorI2lmIFVTRShWOCkKK3N0cnVjdCBOUE9iamVjdDsK KyNlbmRpZgorI2lmIFVTRShKU0MpCiBuYW1lc3BhY2UgSlNDIHsKICAgICBjbGFzcyBFeGVjU3Rh dGU7CiAgICAgY2xhc3MgSlNHbG9iYWxPYmplY3Q7CiAgICAgY2xhc3MgSlNPYmplY3Q7CiB9Cisj ZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00OCw3ICs1MywxMiBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKCkgY29uc3QgeyByZXR1 cm4gMDsgfQogI2VuZGlmCiAKKyNpZiBVU0UoVjgpCisgICAgdmlydHVhbCBOUE9iamVjdCogc2Ny aXB0YWJsZU9iamVjdCgpIHsgcmV0dXJuIDA7IH0KKyNlbmRpZgorI2lmIFVTRShKU0MpCiAgICAg dmlydHVhbCBKU0M6OkpTT2JqZWN0KiBzY3JpcHRPYmplY3QoSlNDOjpKU0dsb2JhbE9iamVjdCop IHsgcmV0dXJuIDA7IH0KKyNlbmRpZgogICAgIHZpcnR1YWwgdm9pZCBzdG9yYWdlQmxvY2tpbmdT dGF0ZUNoYW5nZWQoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcHJpdmF0ZUJyb3dzaW5nU3RhdGVD aGFuZ2VkKGJvb2wpIHsgfQogICAgIHZpcnR1YWwgYm9vbCBnZXRGb3JtVmFsdWUoU3RyaW5nJikg eyByZXR1cm4gZmFsc2U7IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lv biAxMzYwMzIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTExLTI4ICBNYXJrIFBpbGdyaW0gIDxwaWxncmlt QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92ZSBwbHVnaW5zU2NyaXB0 YWJsZU9iamVjdCBmcm9tIFBsYXRmb3JtU3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9yaW5nIHNlcmllcy4gU2Vl IHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIHNyYy9QbGF0Zm9ybVN1cHBvcnQuY3Bw OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lcklt cGwuaDoKKyAgICAgICAgKFdlYlBsdWdpbkNvbnRhaW5lckltcGwpOgorCiAyMDEyLTExLTI4ICBF cmljIFVocmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBB ZGQgdW5pdCB0ZXN0cyBmb3IgQ2hyb21lQ2xpZW50SW1wbDo6Z2V0TmF2aWdhdGlvblBvbGljeQpJ bmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3Bw CShyZXZpc2lvbiAxMzYwMzApCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9y bVN1cHBvcnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzUsMTQgKzEzNSw2IEBAIGJvb2wgUGxh dGZvcm1TdXBwb3J0OjpwbHVnaW5zKGJvb2wgcmVmcmUKICAgICByZXR1cm4gdHJ1ZTsgIC8vIEZJ WE1FOiBUaGVyZSBpcyBubyBuZWVkIGZvciB0aGlzIGZ1bmN0aW9uIHRvIHJldHVybiBhIHZhbHVl LgogfQogCi1OUE9iamVjdCogUGxhdGZvcm1TdXBwb3J0OjpwbHVnaW5TY3JpcHRhYmxlT2JqZWN0 KFdpZGdldCogd2lkZ2V0KQotewotICAgIGlmICghd2lkZ2V0IHx8ICF3aWRnZXQtPmlzUGx1Z2lu Q29udGFpbmVyKCkpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgcmV0dXJuIHN0YXRpY19jYXN0 PFdlYlBsdWdpbkNvbnRhaW5lckltcGwqPih3aWRnZXQpLT5zY3JpcHRhYmxlT2JqZWN0KCk7Ci19 Ci0KIC8vIFRoZW1pbmcgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogI2lmIE9TKFdJTkRPV1MpICYmICFFTkFCTEUo REVGQVVMVF9SRU5ERVJfVEhFTUUpCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJQbHVnaW5Db250YWluZXJJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCShyZXZpc2lvbiAxMzYwMzApCisrKyBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJKHdvcmtp bmcgY29weSkKQEAgLTE1MCw3ICsxNTAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRGaW5pc2hM b2FkaW5nKCk7CiAgICAgdm9pZCBkaWRGYWlsTG9hZGluZyhjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZUVycm9yJik7CiAKLSAgICBOUE9iamVjdCogc2NyaXB0YWJsZU9iamVjdCgpOworICAgIHZpcnR1 YWwgTlBPYmplY3QqIHNjcmlwdGFibGVPYmplY3QoKSBPVkVSUklERTsKIAogICAgIHZvaWQgd2ls bERlc3Ryb3lQbHVnaW5Mb2FkT2JzZXJ2ZXIoV2ViUGx1Z2luTG9hZE9ic2VydmVyKik7CiAK 176550 2012-11-28 12:42:47 -0800 2012-11-28 13:53:04 -0800 Patch bug-103542-20121128153952.patch text/plain 5755 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNjAzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTI4ICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBwbHVnaW5zU2NyaXB0YWJsZU9iamVjdCBmcm9tIFBsYXRmb3JtU3VwcG9ydAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNTQyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9y aW5nIHNlcmllcy4gU2VlIHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIGJpbmRpbmdz L3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJv bGxlcjo6Y3JlYXRlU2NyaXB0SW5zdGFuY2VGb3JXaWRnZXQpOgorICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oOgorICAgICAgICAoUGxhdGZvcm1TdXBwb3J0KToK KyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXdCYXNlLmg6CisgICAgICAgIChQbHVnaW5WaWV3 QmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3QmFzZTo6c2NyaXB0YWJsZU9iamVj dCk6CisKIDIwMTItMTEtMjggIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBNb3ZlIGVtcHR5IGxvYWRpbmcgdG8gRG9jdW1lbnRMb2FkZXIsIHNpbXBsaWZ5IEZy YW1lTG9hZGVyOjppbml0KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAxMzYwMzApCisrKyBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcs OSArNDcsNyBAQAogI2luY2x1ZGUgIk5QVjhPYmplY3QuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAj aW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKLSNpbmNsdWRlICJucHJ1bnRpbWVfaW1wbC5oIgot I2luY2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCi0jaW5jbHVkZSAiUGxhdGZvcm1TdXBwb3J0Lmgi CisjaW5jbHVkZSAiUGx1Z2luVmlld0Jhc2UuaCIKICNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2su aCIKICNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2tGYWN0b3J5LmgiCiAjaW5jbHVkZSAiU2NyaXB0 UnVubmVyLmgiCkBAIC02Nyw2ICs2NSw4IEBACiAjaW5jbHVkZSAiVjhOUE9iamVjdC5oIgogI2lu Y2x1ZGUgIlY4UmVjdXJzaW9uU2NvcGUuaCIKICNpbmNsdWRlICJXaWRnZXQuaCIKKyNpbmNsdWRl ICJucHJ1bnRpbWVfaW1wbC5oIgorI2luY2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCiAjaW5jbHVk ZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2lu Y2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KQEAgLTUyMSwxMCArNTIxLDEwIEBAIFBhc3NTY3Jp cHRJbnN0YW5jZSBTY3JpcHRDb250cm9sbGVyOjpjcmUKIHsKICAgICBBU1NFUlQod2lkZ2V0KTsK IAotICAgIGlmICh3aWRnZXQtPmlzRnJhbWVWaWV3KCkpCisgICAgaWYgKCF3aWRnZXQtPmlzUGx1 Z2luVmlld0Jhc2UoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBOUE9iamVjdCogbnBPYmpl Y3QgPSBQbGF0Zm9ybVN1cHBvcnQ6OnBsdWdpblNjcmlwdGFibGVPYmplY3Qod2lkZ2V0KTsKKyAg ICBOUE9iamVjdCogbnBPYmplY3QgPSBzdGF0aWNfY2FzdDxQbHVnaW5WaWV3QmFzZSo+KHdpZGdl dCktPnNjcmlwdGFibGVPYmplY3QoKTsKIAogICAgIGlmICghbnBPYmplY3QpCiAgICAgICAgIHJl dHVybiAwOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1T dXBwb3J0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v UGxhdGZvcm1TdXBwb3J0LmgJKHJldmlzaW9uIDEzNjAzMCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Nyw3 ICs4Nyw2IEBAIHB1YmxpYzoKIAogICAgIC8vIFBsdWdpbiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgc3RhdGljIGJvb2wg cGx1Z2lucyhib29sIHJlZnJlc2gsIFZlY3RvcjxQbHVnaW5JbmZvPiopOwotICAgIHN0YXRpYyBO UE9iamVjdCogcGx1Z2luU2NyaXB0YWJsZU9iamVjdChXaWRnZXQqKTsKIAogICAgIC8vIFRoZW1p bmcgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiAjaWYgT1MoV0lORE9XUykgJiYgIUVOQUJMRShERUZBVUxUX1JFTkRFUl9USEVNRSkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXdCYXNlLmgJKHJldmlzaW9uIDEz NjAzMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzAsMTEgKzMwLDE2IEBACiAjaW5jbHVkZSAiV2lkZ2V0LmgiCiAjaW5jbHVk ZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKKyNpZiBVU0UoVjgpCitzdHJ1Y3QgTlBPYmplY3Q7 CisjZW5kaWYKKyNpZiBVU0UoSlNDKQogbmFtZXNwYWNlIEpTQyB7CiAgICAgY2xhc3MgRXhlY1N0 YXRlOwogICAgIGNsYXNzIEpTR2xvYmFsT2JqZWN0OwogICAgIGNsYXNzIEpTT2JqZWN0OwogfQor I2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDgsNyArNTMsMTIgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgUGxhdGZvcm1MYXllciogcGxhdGZvcm1MYXllcigpIGNvbnN0IHsgcmV0 dXJuIDA7IH0KICNlbmRpZgogCisjaWYgVVNFKFY4KQorICAgIHZpcnR1YWwgTlBPYmplY3QqIHNj cmlwdGFibGVPYmplY3QoKSB7IHJldHVybiAwOyB9CisjZW5kaWYKKyNpZiBVU0UoSlNDKQogICAg IHZpcnR1YWwgSlNDOjpKU09iamVjdCogc2NyaXB0T2JqZWN0KEpTQzo6SlNHbG9iYWxPYmplY3Qq KSB7IHJldHVybiAwOyB9CisjZW5kaWYKICAgICB2aXJ0dWFsIHZvaWQgc3RvcmFnZUJsb2NraW5n U3RhdGVDaGFuZ2VkKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHByaXZhdGVCcm93c2luZ1N0YXRl Q2hhbmdlZChib29sKSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgZ2V0Rm9ybVZhbHVlKFN0cmluZyYp IHsgcmV0dXJuIGZhbHNlOyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNp b24gMTM2MDMyKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0xMS0yOCAgTWFyayBQaWxncmltICA8cGlsZ3Jp bUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBSZW1vdmUgcGx1Z2luc1Njcmlw dGFibGVPYmplY3QgZnJvbSBQbGF0Zm9ybVN1cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzU0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgYSByZWZhY3RvcmluZyBzZXJpZXMuIFNl ZSB0cmFja2luZyBidWcgODI5NDguCisKKyAgICAgICAgKiBzcmMvUGxhdGZvcm1TdXBwb3J0LmNw cDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJ bXBsLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250YWluZXJJbXBsKToKKwogMjAxMi0xMS0yOCAg RXJpYyBVaHJoYW5lICA8ZXJpY3VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0g QWRkIHVuaXQgdGVzdHMgZm9yIENocm9tZUNsaWVudEltcGw6OmdldE5hdmlnYXRpb25Qb2xpY3kK SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNw cAkocmV2aXNpb24gMTM2MDMwKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZv cm1TdXBwb3J0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM1LDE0ICsxMzUsNiBAQCBib29sIFBs YXRmb3JtU3VwcG9ydDo6cGx1Z2lucyhib29sIHJlZnJlCiAgICAgcmV0dXJuIHRydWU7ICAvLyBG SVhNRTogVGhlcmUgaXMgbm8gbmVlZCBmb3IgdGhpcyBmdW5jdGlvbiB0byByZXR1cm4gYSB2YWx1 ZS4KIH0KIAotTlBPYmplY3QqIFBsYXRmb3JtU3VwcG9ydDo6cGx1Z2luU2NyaXB0YWJsZU9iamVj dChXaWRnZXQqIHdpZGdldCkKLXsKLSAgICBpZiAoIXdpZGdldCB8fCAhd2lkZ2V0LT5pc1BsdWdp bkNvbnRhaW5lcigpKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIHJldHVybiBzdGF0aWNfY2Fz dDxXZWJQbHVnaW5Db250YWluZXJJbXBsKj4od2lkZ2V0KS0+c2NyaXB0YWJsZU9iamVjdCgpOwot fQotCiAvLyBUaGVtaW5nIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKICNpZiBPUyhXSU5ET1dTKSAmJiAhRU5BQkxF KERFRkFVTFRfUkVOREVSX1RIRU1FKQpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAkocmV2aXNpb24gMTM2MDMwKQorKysg U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNTAsNyArMTUwLDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkRmluaXNo TG9hZGluZygpOwogICAgIHZvaWQgZGlkRmFpbExvYWRpbmcoY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VFcnJvciYpOwogCi0gICAgTlBPYmplY3QqIHNjcmlwdGFibGVPYmplY3QoKTsKKyAgICB2aXJ0 dWFsIE5QT2JqZWN0KiBzY3JpcHRhYmxlT2JqZWN0KCkgT1ZFUlJJREU7CiAKICAgICB2b2lkIHdp bGxEZXN0cm95UGx1Z2luTG9hZE9ic2VydmVyKFdlYlBsdWdpbkxvYWRPYnNlcnZlciopOwogCg== 176567 2012-11-28 13:53:08 -0800 2012-11-28 14:40:01 -0800 Patch bug-103542-20121128165012.patch text/plain 5779 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNjA1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTI4ICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBwbHVnaW5zU2NyaXB0YWJsZU9iamVjdCBmcm9tIFBsYXRmb3JtU3VwcG9ydAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNTQyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBQYXJ0IG9mIGEgcmVmYWN0b3Jpbmcg c2VyaWVzLiBTZWUgdHJhY2tpbmcgYnVnIDgyOTQ4LgorCisgICAgICAgICogYmluZGluZ3Mvdjgv U2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVy OjpjcmVhdGVTY3JpcHRJbnN0YW5jZUZvcldpZGdldCk6CisgICAgICAgICogcGxhdGZvcm0vY2hy b21pdW0vUGxhdGZvcm1TdXBwb3J0Lmg6CisgICAgICAgIChQbGF0Zm9ybVN1cHBvcnQpOgorICAg ICAgICAqIHBsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaDoKKyAgICAgICAgKFBsdWdpblZpZXdCYXNl KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXdCYXNlOjpzY3JpcHRhYmxlT2JqZWN0KToK KwogMjAxMi0xMS0yOCAgQWxleGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CiAK ICAgICAgICAgW0NTUyBSZWdpb25zXSBFbGVtZW50cyB1c2luZyB0cmFuc2Zvcm1zIGFyZSBub3Qg cmVwYWludGVkIGNvcnJlY3RseSB3aGVuIHJlbmRlcmVkIGluIGEgcmVnaW9uCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcAkocmV2aXNp b24gMTM2MDU0KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDkgKzQ3LDcgQEAKICNpbmNsdWRlICJOUFY4T2Jq ZWN0LmgiCiAjaW5jbHVkZSAiTm9kZS5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCi0j aW5jbHVkZSAibnBydW50aW1lX2ltcGwuaCIKLSNpbmNsdWRlICJucHJ1bnRpbWVfcHJpdi5oIgot I2luY2x1ZGUgIlBsYXRmb3JtU3VwcG9ydC5oIgorI2luY2x1ZGUgIlBsdWdpblZpZXdCYXNlLmgi CiAjaW5jbHVkZSAiU2NyaXB0Q2FsbFN0YWNrLmgiCiAjaW5jbHVkZSAiU2NyaXB0Q2FsbFN0YWNr RmFjdG9yeS5oIgogI2luY2x1ZGUgIlNjcmlwdFJ1bm5lci5oIgpAQCAtNjcsNiArNjUsOCBAQAog I2luY2x1ZGUgIlY4TlBPYmplY3QuaCIKICNpbmNsdWRlICJWOFJlY3Vyc2lvblNjb3BlLmgiCiAj aW5jbHVkZSAiV2lkZ2V0LmgiCisjaW5jbHVkZSAibnBydW50aW1lX2ltcGwuaCIKKyNpbmNsdWRl ICJucHJ1bnRpbWVfcHJpdi5oIgogI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgogI2luY2x1 ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvU3RyaW5nRXh0cmFzLmg+CkBA IC01MjEsMTAgKzUyMSwxMCBAQCBQYXNzU2NyaXB0SW5zdGFuY2UgU2NyaXB0Q29udHJvbGxlcjo6 Y3JlCiB7CiAgICAgQVNTRVJUKHdpZGdldCk7CiAKLSAgICBpZiAod2lkZ2V0LT5pc0ZyYW1lVmll dygpKQorICAgIGlmICghd2lkZ2V0LT5pc1BsdWdpblZpZXdCYXNlKCkpCiAgICAgICAgIHJldHVy biAwOwogCi0gICAgTlBPYmplY3QqIG5wT2JqZWN0ID0gUGxhdGZvcm1TdXBwb3J0OjpwbHVnaW5T Y3JpcHRhYmxlT2JqZWN0KHdpZGdldCk7CisgICAgTlBPYmplY3QqIG5wT2JqZWN0ID0gc3RhdGlj X2Nhc3Q8UGx1Z2luVmlld0Jhc2UqPih3aWRnZXQpLT5zY3JpcHRhYmxlT2JqZWN0KCk7CiAKICAg ICBpZiAoIW5wT2JqZWN0KQogICAgICAgICByZXR1cm4gMDsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCShyZXZpc2lvbiAx MzYwNTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBv cnQuaAkod29ya2luZyBjb3B5KQpAQCAtODcsNyArODcsNiBAQCBwdWJsaWM6CiAKICAgICAvLyBQ bHVnaW4gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogICAgIHN0YXRpYyBib29sIHBsdWdpbnMoYm9vbCByZWZyZXNoLCBWZWN0b3I8 UGx1Z2luSW5mbz4qKTsKLSAgICBzdGF0aWMgTlBPYmplY3QqIHBsdWdpblNjcmlwdGFibGVPYmpl Y3QoV2lkZ2V0Kik7CiAKICAgICAvLyBUaGVtaW5nIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogI2lmIE9TKFdJTkRPV1MpICYmICFF TkFCTEUoREVGQVVMVF9SRU5ERVJfVEhFTUUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5z L1BsdWdpblZpZXdCYXNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5WaWV3QmFzZS5oCShyZXZpc2lvbiAxMzYwNTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbHVn aW5zL1BsdWdpblZpZXdCYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDExICszMCwxNiBAQAog I2luY2x1ZGUgIldpZGdldC5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCisj aWYgVVNFKFY4KQorc3RydWN0IE5QT2JqZWN0OworI2VuZGlmCisjaWYgVVNFKEpTQykKIG5hbWVz cGFjZSBKU0MgewogICAgIGNsYXNzIEV4ZWNTdGF0ZTsKICAgICBjbGFzcyBKU0dsb2JhbE9iamVj dDsKICAgICBjbGFzcyBKU09iamVjdDsKIH0KKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKQEAgLTQ4LDcgKzUzLDEyIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFBsYXRmb3JtTGF5ZXIq IHBsYXRmb3JtTGF5ZXIoKSBjb25zdCB7IHJldHVybiAwOyB9CiAjZW5kaWYKIAorI2lmIFVTRShW OCkKKyAgICB2aXJ0dWFsIE5QT2JqZWN0KiBzY3JpcHRhYmxlT2JqZWN0KCkgeyByZXR1cm4gMDsg fQorI2VuZGlmCisjaWYgVVNFKEpTQykKICAgICB2aXJ0dWFsIEpTQzo6SlNPYmplY3QqIHNjcmlw dE9iamVjdChKU0M6OkpTR2xvYmFsT2JqZWN0KikgeyByZXR1cm4gMDsgfQorI2VuZGlmCiAgICAg dmlydHVhbCB2b2lkIHN0b3JhZ2VCbG9ja2luZ1N0YXRlQ2hhbmdlZCgpIHsgfQogICAgIHZpcnR1 YWwgdm9pZCBwcml2YXRlQnJvd3NpbmdTdGF0ZUNoYW5nZWQoYm9vbCkgeyB9CiAgICAgdmlydHVh bCBib29sIGdldEZvcm1WYWx1ZShTdHJpbmcmKSB7IHJldHVybiBmYWxzZTsgfQpJbmRleDogU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNjA1NCkKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTIt MTEtMjggIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtD aHJvbWl1bV0gUmVtb3ZlIHBsdWdpbnNTY3JpcHRhYmxlT2JqZWN0IGZyb20gUGxhdGZvcm1TdXBw b3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM1 NDIKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFBhcnQgb2Yg YSByZWZhY3RvcmluZyBzZXJpZXMuIFNlZSB0cmFja2luZyBidWcgODI5NDguCisKKyAgICAgICAg KiBzcmMvUGxhdGZvcm1TdXBwb3J0LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAq IHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250YWlu ZXJJbXBsKToKKwogMjAxMi0xMS0yOCAgRXJpYyBVaHJoYW5lICA8ZXJpY3VAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtjaHJvbWl1bV0gQWRkIHVuaXQgdGVzdHMgZm9yIENocm9tZUNsaWVudElt cGw6OmdldE5hdmlnYXRpb25Qb2xpY3kKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1BsYXRmb3JtU3VwcG9ydC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAkocmV2aXNpb24gMTM2MDU0KQorKysgU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTM1LDE0ICsxMzUsNiBAQCBib29sIFBsYXRmb3JtU3VwcG9ydDo6cGx1Z2lucyhib29sIHJlZnJl CiAgICAgcmV0dXJuIHRydWU7ICAvLyBGSVhNRTogVGhlcmUgaXMgbm8gbmVlZCBmb3IgdGhpcyBm dW5jdGlvbiB0byByZXR1cm4gYSB2YWx1ZS4KIH0KIAotTlBPYmplY3QqIFBsYXRmb3JtU3VwcG9y dDo6cGx1Z2luU2NyaXB0YWJsZU9iamVjdChXaWRnZXQqIHdpZGdldCkKLXsKLSAgICBpZiAoIXdp ZGdldCB8fCAhd2lkZ2V0LT5pc1BsdWdpbkNvbnRhaW5lcigpKQotICAgICAgICByZXR1cm4gMDsK LQotICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJQbHVnaW5Db250YWluZXJJbXBsKj4od2lkZ2V0 KS0+c2NyaXB0YWJsZU9iamVjdCgpOwotfQotCiAvLyBUaGVtaW5nIC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKICNp ZiBPUyhXSU5ET1dTKSAmJiAhRU5BQkxFKERFRkFVTFRfUkVOREVSX1RIRU1FKQpJbmRleDogU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwu aAkocmV2aXNpb24gMTM2MDU0KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1 Z2luQ29udGFpbmVySW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsNyArMTUwLDcgQEAgcHVi bGljOgogICAgIHZvaWQgZGlkRmluaXNoTG9hZGluZygpOwogICAgIHZvaWQgZGlkRmFpbExvYWRp bmcoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOwogCi0gICAgTlBPYmplY3QqIHNjcmlw dGFibGVPYmplY3QoKTsKKyAgICB2aXJ0dWFsIE5QT2JqZWN0KiBzY3JpcHRhYmxlT2JqZWN0KCkg T1ZFUlJJREU7CiAKICAgICB2b2lkIHdpbGxEZXN0cm95UGx1Z2luTG9hZE9ic2VydmVyKFdlYlBs dWdpbkxvYWRPYnNlcnZlciopOwogCg==