75645 2012-01-05 12:56:33 -0800 WebPlugins can't add items to context menus. 2012-01-10 15:02:13 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 bbudge webkit-unassigned fishd webkit.review.bot oldest_to_newest 530562 0 bbudge 2012-01-05 12:56:33 -0800 It would improve the user experience if there was a way for plugins to add items to context menus. In particular, the PDF viewer needs to allow users to rotate the page 90 degrees in certain cases, and it is awkward to keep adding icons for each operation. 531673 1 121555 bbudge 2012-01-07 10:53:20 -0800 Created attachment 121555 Proposed Patch This change adds the concept of rotation to media. The motivation is to allow the PDF viewer to add context menu commands to the existing page commands to support rotation of the pages. 531674 2 bbudge 2012-01-07 10:54:37 -0800 I need to upload another patch. There is an extraneous 'merge_custom_items' field that should be removed. 531675 3 webkit.review.bot 2012-01-07 10:55:07 -0800 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 531678 4 121556 bbudge 2012-01-07 11:53:01 -0800 Created attachment 121556 Proposed Patch 531679 5 121557 bbudge 2012-01-07 11:56:37 -0800 Created attachment 121557 Proposed Patch 532213 6 121557 fishd 2012-01-09 08:37:49 -0800 Comment on attachment 121557 Proposed Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121557&action=review > Source/WebKit/chromium/public/WebMediaPlayerAction.h:43 > + Rotate90CW, When we spoke about this design in person, I hadn't considered the fact that this enum would also grow. This one is very specifically about the media player. That's problematic since the media player doesn't support rotation. Same goes for WebView::performMediaPlayerAction. It doesn't seem correct to graft plugin-related command handling onto that. Since it seems OK to refer to plugins as media, maybe the answer is to just use more generic names for WebMediaPlayerAction and performMediaPlayerAction? WebMediaAction and performMediaAction? 532227 7 bbudge 2012-01-09 09:02:28 -0800 In a previous version of this patch, I added a plugin specific enum and action. It requires all of that to be plumbed through on the Chromium side though. If it's OK with you, I will attempt to make the existing ones more generic as you suggest. 532265 8 fishd 2012-01-09 10:13:32 -0800 (In reply to comment #7) > In a previous version of this patch, I added a plugin specific enum and action. It requires all of that to be plumbed through on the Chromium side though. If it's OK with you, I will attempt to make the existing ones more generic as you suggest. With the plugin specific enum, was there no entry point back into WebKit to handle the commands when they are selected? 532279 9 bbudge 2012-01-09 10:28:44 -0800 I had to add a method, performPluginAction, to WebView.h. So I am going to modify this patch, adding a new enum. If I understand you correctly, we should leave media player stuff alone. I think it makes the most sense to add a WebPluginAction struct, and a performPluginAction method, as this is all about plugins. This will require some extra code on the Chromium side but it's trivial, and the clarity on the WebKit side makes it worth it. (In reply to comment #8) > (In reply to comment #7) > > In a previous version of this patch, I added a plugin specific enum and action. It requires all of that to be plumbed through on the Chromium side though. If it's OK with you, I will attempt to make the existing ones more generic as you suggest. > > With the plugin specific enum, was there no entry point back into WebKit to handle the commands when they are selected? 532362 10 fishd 2012-01-09 11:28:26 -0800 OK 532475 11 121719 bbudge 2012-01-09 13:23:37 -0800 Created attachment 121719 Proposed Patch 533403 12 121719 webkit.review.bot 2012-01-10 15:02:09 -0800 Comment on attachment 121719 Proposed Patch Clearing flags on attachment: 121719 Committed r104634: <http://trac.webkit.org/changeset/104634> 533404 13 webkit.review.bot 2012-01-10 15:02:13 -0800 All reviewed patches have been landed. Closing bug. 121555 2012-01-07 10:53:20 -0800 2012-01-07 11:53:01 -0800 Proposed Patch aaa.txt text/plain 9904 bbudge SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDQzODgpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIz IEBACisyMDEyLTAxLTA3ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KKworICAg ICAgICBBZGQgdGhlIGNvbmNlcHQgb2Ygcm90YXRlIHZpZXcgY2FwYWJpbGl0eSB0byBXZWJQbHVn aW4uaCBhbmQgV2ViQ29udGV4dE1lbnVEYXRhLCBzbworICAgICAgICBwbHVnaW5zIGNhbiBwcmVz ZW50IHJvdGF0ZSBpdGVtcyBpbiBjb250ZXh0IG1lbnUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTY0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oOgor ICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudURhdGE6OldlYkNvbnRleHRNZW51RGF0YSk6 CisgICAgICAgICogcHVibGljL1dlYk1lZGlhUGxheWVyQWN0aW9uLmg6CisgICAgICAgICogcHVi bGljL1dlYlBsdWdpbi5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW46OmNhblJvdGF0ZVZp ZXcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW46OnJvdGF0ZVZpZXcpOgorICAgICAgICAq IHNyYy9Db250ZXh0TWVudUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDb250ZXh0 TWVudUNsaWVudEltcGw6OmdldEN1c3RvbU1lbnVGcm9tRGVmYXVsdEl0ZW1zKToKKyAgICAgICAg KiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cGVy Zm9ybU1lZGlhUGxheWVyQWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnBl cmZvcm1DdXN0b21Db250ZXh0TWVudUFjdGlvbik6CisKIDIwMTItMDEtMDYgIFcuIEphbWVzIE1h Y0xlYW4gIDx3am1hY2xlYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gQ3Vs bCBvY2NsdWRlZCB0aWxlcyBpbiB0aWxlZCBsYXllcnMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCShyZXZpc2lvbiAxMDQx NTEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb250ZXh0TWVudURhdGEu aAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw MDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAw OSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zIGFyZQpAQCAtMTAyLDYgKzEwMiw3IEBAIHN0cnVjdCBXZWJDb250ZXh0 TWVudURhdGEgewogICAgICAgICBNZWRpYUhhc1ZpZGVvID0gMHg0MCwKICAgICAgICAgTWVkaWFD b250cm9sUm9vdEVsZW1lbnQgPSAweDgwLAogICAgICAgICBNZWRpYUNhblByaW50ID0gMHgxMDAs CisgICAgICAgIE1lZGlhQ2FuUm90YXRlID0gMHgyMDAsCiAgICAgfTsKIAogICAgIC8vIEV4dHJh IGF0dHJpYnV0ZXMgZGVzY3JpYmluZyBtZWRpYSBlbGVtZW50cy4KQEAgLTE2MSw2ICsxNjIsOCBA QCBzdHJ1Y3QgV2ViQ29udGV4dE1lbnVEYXRhIHsKIAogICAgIC8vIEN1c3RvbSBjb250ZXh0IG1l bnUgaXRlbXMgcHJvdmlkZWQgYnkgdGhlIFdlYkNvcmUgaW50ZXJuYWxzLgogICAgIFdlYlZlY3Rv cjxXZWJNZW51SXRlbUluZm8+IGN1c3RvbUl0ZW1zOworICAgIC8vIFdoZXRoZXIgY3VzdG9tIGl0 ZW1zIHNob3VsZCBiZSBtZXJnZWQgd2l0aCBwYWdlIGl0ZW1zLgorICAgIGJvb2wgbWVyZ2VDdXN0 b21JdGVtczsKIAogICAgIC8vIFRoZSBub2RlIHRoYXQgd2FzIGNsaWNrZWQuCiAgICAgV2ViTm9k ZSBub2RlOwpAQCAtMTc1LDcgKzE3OCw4IEBAIHN0cnVjdCBXZWJDb250ZXh0TWVudURhdGEgewog ICAgICAgICAsIHdyaXRpbmdEaXJlY3Rpb25EZWZhdWx0KENoZWNrYWJsZU1lbnVJdGVtRGlzYWJs ZWQpCiAgICAgICAgICwgd3JpdGluZ0RpcmVjdGlvbkxlZnRUb1JpZ2h0KENoZWNrYWJsZU1lbnVJ dGVtRW5hYmxlZCkKICAgICAgICAgLCB3cml0aW5nRGlyZWN0aW9uUmlnaHRUb0xlZnQoQ2hlY2th YmxlTWVudUl0ZW1FbmFibGVkKQotICAgICAgICAsIGVkaXRGbGFncygwKSB7IH0KKyAgICAgICAg LCBlZGl0RmxhZ3MoMCkKKyAgICAgICAgLCBtZXJnZUN1c3RvbUl0ZW1zKGZhbHNlKSB7IH0KIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViTWVkaWFQbGF5ZXJBY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllckFjdGlvbi5oCShyZXZpc2lvbiAxMDQxNTEp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllckFjdGlvbi5o CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAw OSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA5 LCAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0zOSw3ICszOSw5IEBAIHN0cnVjdCBXZWJNZWRpYVBsYXll ckFjdGlvbiB7CiAgICAgICAgIFBsYXksCiAgICAgICAgIE11dGUsCiAgICAgICAgIExvb3AsCi0g ICAgICAgIENvbnRyb2xzCisgICAgICAgIENvbnRyb2xzLAorICAgICAgICBSb3RhdGU5MENXLAor ICAgICAgICBSb3RhdGU5MENDVwogICAgIH07CiAKICAgICBUeXBlIHR5cGU7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW4uaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW4uaAkocmV2aXNpb24gMTA0MTUxKQor KysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgJKHdvcmtpbmcgY29w eSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTIgR29vZ2xl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cyBhcmUKQEAgLTEyNSw2ICsxMjUsMTYgQEAgcHVibGljOgogICAgIC8vIFRlbGxzIHRoZSBwbHVn aW4gdGhhdCB0aGUgdXNlciBoYXMgc3RvcHBlZCB0aGUgZmluZCBvcGVyYXRpb24uCiAgICAgdmly dHVhbCB2b2lkIHN0b3BGaW5kKCkgeyB9CiAKKyAgICAvLyBWaWV3IHJvdGF0aW9uIHR5cGVzLgor ICAgIGVudW0gUm90YXRpb25UeXBlIHsKKyAgICAgICAgUm90YXRpb25UeXBlUm90YXRlOTBDVywK KyAgICAgICAgUm90YXRpb25UeXBlUm90YXRlOTBDQ1cKKyAgICB9OworICAgIC8vIFdoZXRoZXIg dGhlIHBsdWdpbiBjYW4gcm90YXRlIHRoZSB2aWV3IG9mIGl0cyBjb250ZW50LgorICAgIHZpcnR1 YWwgYm9vbCBjYW5Sb3RhdGVWaWV3KCkgeyByZXR1cm4gZmFsc2U7IH0KKyAgICAvLyBSb3RhdGVz IHRoZSBwbHVnaW4ncyB2aWV3IG9mIGl0cyBjb250ZW50LgorICAgIHZpcnR1YWwgdm9pZCByb3Rh dGVWaWV3KFJvdGF0aW9uVHlwZSB0eXBlKSB7IH0KKwogcHJvdGVjdGVkOgogICAgIH5XZWJQbHVn aW4oKSB7IH0KIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVu dUNsaWVudEltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L0NvbnRleHRNZW51Q2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDEwNDE1MSkKKysrIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL0NvbnRleHRNZW51Q2xpZW50SW1wbC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTIgR29vZ2xl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cyBhcmUKQEAgLTIzNCw2ICsyMzQsMTAgQEAgUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4 dE1lbnVDbGllbgogICAgICAgICAgICAgICAgIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqIHBsdWdp bkVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Kj4oci5pbm5lck5v blNoYXJlZE5vZGUoKSk7CiAgICAgICAgICAgICAgICAgZGF0YS5zcmNVUkwgPSBwbHVnaW5FbGVt ZW50LT5kb2N1bWVudCgpLT5jb21wbGV0ZVVSTChwbHVnaW5FbGVtZW50LT51cmwoKSk7CiAgICAg ICAgICAgICAgICAgZGF0YS5tZWRpYUZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6TWVkaWFD YW5TYXZlOworCisgICAgICAgICAgICAgICAgLy8gQWRkIGNvbnRleHQgbWVudSBjb21tYW5kcyB0 aGF0IGFyZSBzdXBwb3J0ZWQgYnkgdGhlIHBsdWdpbi4KKyAgICAgICAgICAgICAgICBpZiAocGx1 Z2luLT5wbHVnaW4oKS0+Y2FuUm90YXRlVmlldygpKQorICAgICAgICAgICAgICAgICAgICBkYXRh Lm1lZGlhRmxhZ3MgfD0gV2ViQ29udGV4dE1lbnVEYXRhOjpNZWRpYUNhblJvdGF0ZTsKICAgICAg ICAgICAgIH0KICAgICAgICAgfQogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJldmlzaW9uIDEwNDE1MSkKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUg QEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtOTUsNiAr OTUsNyBAQAogI2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgogI2luY2x1ZGUgIlJlbmRlckxh eWVyQ29tcG9zaXRvci5oIgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKKyNpbmNsdWRlICJSZW5k ZXJXaWRnZXQuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIlNjaGVt ZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiU2Nyb2xsQW5pbWF0b3IuaCIKQEAgLTIxNzMsMjkgKzIx NzQsNDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6cGVyZm9ybU1lZGlhUGxheWVyQWN0aQogewogICAg IEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gaGl0VGVzdFJlc3VsdEZvcldpbmRvd1Bvcyhsb2NhdGlv bik7CiAgICAgUmVmUHRyPE5vZGU+IG5vZGUgPSByZXN1bHQuaW5uZXJOb25TaGFyZWROb2RlKCk7 Ci0gICAgaWYgKCFub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9UYWcpICYmICFub2Rl LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6YXVkaW9UYWcpKQotICAgICAgcmV0dXJuOwotCi0gICAg UmVmUHRyPEhUTUxNZWRpYUVsZW1lbnQ+IG1lZGlhRWxlbWVudCA9Ci0gICAgICAgIHN0YXRpY19w b2ludGVyX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudD4obm9kZSk7Ci0gICAgc3dpdGNoIChhY3Rpb24u dHlwZSkgewotICAgIGNhc2UgV2ViTWVkaWFQbGF5ZXJBY3Rpb246OlBsYXk6Ci0gICAgICAgIGlm IChhY3Rpb24uZW5hYmxlKQotICAgICAgICAgICAgbWVkaWFFbGVtZW50LT5wbGF5KCk7Ci0gICAg ICAgIGVsc2UKLSAgICAgICAgICAgIG1lZGlhRWxlbWVudC0+cGF1c2UoKTsKLSAgICAgICAgYnJl YWs7Ci0gICAgY2FzZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6TXV0ZToKLSAgICAgICAgbWVkaWFF bGVtZW50LT5zZXRNdXRlZChhY3Rpb24uZW5hYmxlKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2Fz ZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6TG9vcDoKLSAgICAgICAgbWVkaWFFbGVtZW50LT5zZXRM b29wKGFjdGlvbi5lbmFibGUpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIFdlYk1lZGlhUGxh eWVyQWN0aW9uOjpDb250cm9sczoKLSAgICAgICAgbWVkaWFFbGVtZW50LT5zZXRDb250cm9scyhh Y3Rpb24uZW5hYmxlKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjp2 aWRlb1RhZykgfHwgbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmF1ZGlvVGFnKSkgeworICAg ICAgICBSZWZQdHI8SFRNTE1lZGlhRWxlbWVudD4gbWVkaWFFbGVtZW50ID0KKyAgICAgICAgICAg IHN0YXRpY19wb2ludGVyX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudD4obm9kZSk7CisgICAgICAgIHN3 aXRjaCAoYWN0aW9uLnR5cGUpIHsKKyAgICAgICAgY2FzZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6 UGxheToKKyAgICAgICAgICAgIGlmIChhY3Rpb24uZW5hYmxlKQorICAgICAgICAgICAgICAgIG1l ZGlhRWxlbWVudC0+cGxheSgpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIG1l ZGlhRWxlbWVudC0+cGF1c2UoKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdl Yk1lZGlhUGxheWVyQWN0aW9uOjpNdXRlOgorICAgICAgICAgICAgbWVkaWFFbGVtZW50LT5zZXRN dXRlZChhY3Rpb24uZW5hYmxlKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdl Yk1lZGlhUGxheWVyQWN0aW9uOjpMb29wOgorICAgICAgICAgICAgbWVkaWFFbGVtZW50LT5zZXRM b29wKGFjdGlvbi5lbmFibGUpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV2Vi TWVkaWFQbGF5ZXJBY3Rpb246OkNvbnRyb2xzOgorICAgICAgICAgICAgbWVkaWFFbGVtZW50LT5z ZXRDb250cm9scyhhY3Rpb24uZW5hYmxlKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBk ZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIH0KKyAg ICB9IGVsc2UgaWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpvYmplY3RUYWcpCisgICAg ICAgICAgICAgICB8fCBub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6ZW1iZWRUYWcpKSB7Cisg ICAgICAgIFJlbmRlck9iamVjdCogb2JqZWN0ID0gbm9kZS0+cmVuZGVyZXIoKTsKKyAgICAgICAg aWYgKG9iamVjdCAmJiBvYmplY3QtPmlzV2lkZ2V0KCkpIHsKKyAgICAgICAgICAgIFdpZGdldCog d2lkZ2V0ID0gdG9SZW5kZXJXaWRnZXQob2JqZWN0KS0+d2lkZ2V0KCk7CisgICAgICAgICAgICBp ZiAod2lkZ2V0ICYmIHdpZGdldC0+aXNQbHVnaW5Db250YWluZXIoKSkgeworICAgICAgICAgICAg ICAgIFdlYlBsdWdpbkNvbnRhaW5lckltcGwqIHBsdWdpbiA9IHN0YXRpY19jYXN0PFdlYlBsdWdp bkNvbnRhaW5lckltcGwqPih3aWRnZXQpOworICAgICAgICAgICAgICAgIHN3aXRjaCAoYWN0aW9u LnR5cGUpIHsKKyAgICAgICAgICAgICAgICBjYXNlIFdlYk1lZGlhUGxheWVyQWN0aW9uOjpSb3Rh dGU5MENXOgorICAgICAgICAgICAgICAgICAgICBwbHVnaW4tPnBsdWdpbigpLT5yb3RhdGVWaWV3 KFdlYlBsdWdpbjo6Um90YXRpb25UeXBlUm90YXRlOTBDVyk7CisgICAgICAgICAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgICAgICAgIGNhc2UgV2ViTWVkaWFQbGF5ZXJBY3Rpb246OlJvdGF0 ZTkwQ0NXOgorICAgICAgICAgICAgICAgICAgICBwbHVnaW4tPnBsdWdpbigpLT5yb3RhdGVWaWV3 KFdlYlBsdWdpbjo6Um90YXRpb25UeXBlUm90YXRlOTBDQ1cpOworICAgICAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KICAgICB9CiB9CiAKQEAgLTI1MDQsOSArMjUyMywxMyBAQCB2b2lkIFdlYlZpZXdJ bXBsOjpwZXJmb3JtQ3VzdG9tQ29udGV4dE1lCiAgICAgQ29udGV4dE1lbnUqIG1lbnUgPSBtX3Bh Z2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLT5jb250ZXh0TWVudSgpOwogICAgIGlmICghbWVu dSkKICAgICAgICAgcmV0dXJuOwotICAgIENvbnRleHRNZW51SXRlbSogaXRlbSA9IG1lbnUtPml0 ZW1XaXRoQWN0aW9uKHN0YXRpY19jYXN0PENvbnRleHRNZW51QWN0aW9uPihDb250ZXh0TWVudUl0 ZW1CYXNlQ3VzdG9tVGFnICsgYWN0aW9uKSk7Ci0gICAgaWYgKGl0ZW0pCi0gICAgICAgIG1fcGFn ZS0+Y29udGV4dE1lbnVDb250cm9sbGVyKCktPmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKGl0ZW0p OworICAgIENvbnRleHRNZW51SXRlbSogaXRlbSA9IG1lbnUtPml0ZW1XaXRoQWN0aW9uKHN0YXRp Y19jYXN0PENvbnRleHRNZW51QWN0aW9uPihhY3Rpb24gKyBDb250ZXh0TWVudUl0ZW1CYXNlQ3Vz dG9tVGFnKSk7CisgICAgaWYgKGl0ZW0pIHsKKyAgICAgICAgaWYgKGl0ZW0tPmFjdGlvbigpID49 IENvbnRleHRNZW51SXRlbUxhc3RDdXN0b21UYWcgLSAxMCkKKyAgICAgICAgICAgIG1fY29udGV4 dE1lbnVDbGllbnRJbXBsLmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKGl0ZW0sIG1lbnUpOworICAg ICAgICBlbHNlCisgICAgICAgICAgICBtX3BhZ2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLT5j b250ZXh0TWVudUl0ZW1TZWxlY3RlZChpdGVtKTsKKyAgICB9CiAgICAgbV9wYWdlLT5jb250ZXh0 TWVudUNvbnRyb2xsZXIoKS0+Y2xlYXJDb250ZXh0TWVudSgpOwogfQogCg== 121556 2012-01-07 11:53:01 -0800 2012-01-07 11:56:37 -0800 Proposed Patch aaa.txt text/plain 8972 bbudge SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDQzODgpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIz IEBACisyMDEyLTAxLTA3ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KKworICAg ICAgICBBZGQgdGhlIGNvbmNlcHQgb2Ygcm90YXRlIHZpZXcgY2FwYWJpbGl0eSB0byBXZWJQbHVn aW4uaCBhbmQgV2ViQ29udGV4dE1lbnVEYXRhLCBzbworICAgICAgICBwbHVnaW5zIGNhbiBwcmVz ZW50IHJvdGF0ZSBpdGVtcyBpbiBjb250ZXh0IG1lbnUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTY0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oOgor ICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudURhdGE6OldlYkNvbnRleHRNZW51RGF0YSk6 CisgICAgICAgICogcHVibGljL1dlYk1lZGlhUGxheWVyQWN0aW9uLmg6CisgICAgICAgICogcHVi bGljL1dlYlBsdWdpbi5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW46OmNhblJvdGF0ZVZp ZXcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW46OnJvdGF0ZVZpZXcpOgorICAgICAgICAq IHNyYy9Db250ZXh0TWVudUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDb250ZXh0 TWVudUNsaWVudEltcGw6OmdldEN1c3RvbU1lbnVGcm9tRGVmYXVsdEl0ZW1zKToKKyAgICAgICAg KiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cGVy Zm9ybU1lZGlhUGxheWVyQWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnBl cmZvcm1DdXN0b21Db250ZXh0TWVudUFjdGlvbik6CisKIDIwMTItMDEtMDYgIFcuIEphbWVzIE1h Y0xlYW4gIDx3am1hY2xlYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gQ3Vs bCBvY2NsdWRlZCB0aWxlcyBpbiB0aWxlZCBsYXllcnMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCShyZXZpc2lvbiAxMDQx NTEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb250ZXh0TWVudURhdGEu aAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw MDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAw OSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zIGFyZQpAQCAtMTAyLDYgKzEwMiw3IEBAIHN0cnVjdCBXZWJDb250ZXh0 TWVudURhdGEgewogICAgICAgICBNZWRpYUhhc1ZpZGVvID0gMHg0MCwKICAgICAgICAgTWVkaWFD b250cm9sUm9vdEVsZW1lbnQgPSAweDgwLAogICAgICAgICBNZWRpYUNhblByaW50ID0gMHgxMDAs CisgICAgICAgIE1lZGlhQ2FuUm90YXRlID0gMHgyMDAsCiAgICAgfTsKIAogICAgIC8vIEV4dHJh IGF0dHJpYnV0ZXMgZGVzY3JpYmluZyBtZWRpYSBlbGVtZW50cy4KSW5kZXg6IFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyQWN0aW9uLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXJBY3Rpb24uaAkocmV2 aXNpb24gMTA0MTUxKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQ bGF5ZXJBY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5 cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly aWdodCAoQykgMjAwOSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMzksNyArMzksOSBAQCBzdHJ1Y3Qg V2ViTWVkaWFQbGF5ZXJBY3Rpb24gewogICAgICAgICBQbGF5LAogICAgICAgICBNdXRlLAogICAg ICAgICBMb29wLAotICAgICAgICBDb250cm9scworICAgICAgICBDb250cm9scywKKyAgICAgICAg Um90YXRlOTBDVywKKyAgICAgICAgUm90YXRlOTBDQ1cKICAgICB9OwogCiAgICAgVHlwZSB0eXBl OwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgJKHJldmlz aW9uIDEwNDE1MSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbi5o CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAw OSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA5 LCAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0xMjUsNiArMTI1LDE2IEBAIHB1YmxpYzoKICAgICAvLyBU ZWxscyB0aGUgcGx1Z2luIHRoYXQgdGhlIHVzZXIgaGFzIHN0b3BwZWQgdGhlIGZpbmQgb3BlcmF0 aW9uLgogICAgIHZpcnR1YWwgdm9pZCBzdG9wRmluZCgpIHsgfQogCisgICAgLy8gVmlldyByb3Rh dGlvbiB0eXBlcy4KKyAgICBlbnVtIFJvdGF0aW9uVHlwZSB7CisgICAgICAgIFJvdGF0aW9uVHlw ZVJvdGF0ZTkwQ1csCisgICAgICAgIFJvdGF0aW9uVHlwZVJvdGF0ZTkwQ0NXCisgICAgfTsKKyAg ICAvLyBXaGV0aGVyIHRoZSBwbHVnaW4gY2FuIHJvdGF0ZSB0aGUgdmlldyBvZiBpdHMgY29udGVu dC4KKyAgICB2aXJ0dWFsIGJvb2wgY2FuUm90YXRlVmlldygpIHsgcmV0dXJuIGZhbHNlOyB9Cisg ICAgLy8gUm90YXRlcyB0aGUgcGx1Z2luJ3MgdmlldyBvZiBpdHMgY29udGVudC4KKyAgICB2aXJ0 dWFsIHZvaWQgcm90YXRlVmlldyhSb3RhdGlvblR5cGUgdHlwZSkgeyB9CisKIHByb3RlY3RlZDoK ICAgICB+V2ViUGx1Z2luKCkgeyB9CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvQ29udGV4dE1lbnVDbGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9Db250ZXh0TWVudUNsaWVudEltcGwuY3BwCShyZXZpc2lvbiAxMDQxNTEp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVudUNsaWVudEltcGwuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAw OSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA5 LCAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0yMzQsNiArMjM0LDEwIEBAIFBsYXRmb3JtTWVudURlc2Ny aXB0aW9uIENvbnRleHRNZW51Q2xpZW4KICAgICAgICAgICAgICAgICBIVE1MUGx1Z0luSW1hZ2VF bGVtZW50KiBwbHVnaW5FbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTFBsdWdJbkltYWdlRWxlbWVu dCo+KHIuaW5uZXJOb25TaGFyZWROb2RlKCkpOwogICAgICAgICAgICAgICAgIGRhdGEuc3JjVVJM ID0gcGx1Z2luRWxlbWVudC0+ZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwocGx1Z2luRWxlbWVudC0+ dXJsKCkpOwogICAgICAgICAgICAgICAgIGRhdGEubWVkaWFGbGFncyB8PSBXZWJDb250ZXh0TWVu dURhdGE6Ok1lZGlhQ2FuU2F2ZTsKKworICAgICAgICAgICAgICAgIC8vIEFkZCBjb250ZXh0IG1l bnUgY29tbWFuZHMgdGhhdCBhcmUgc3VwcG9ydGVkIGJ5IHRoZSBwbHVnaW4uCisgICAgICAgICAg ICAgICAgaWYgKHBsdWdpbi0+cGx1Z2luKCktPmNhblJvdGF0ZVZpZXcoKSkKKyAgICAgICAgICAg ICAgICAgICAgZGF0YS5tZWRpYUZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6TWVkaWFDYW5S b3RhdGU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiAxMDQxNTEpCisrKyBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIgR29vZ2xlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBh cmUKQEAgLTk1LDYgKzk1LDcgQEAKICNpbmNsdWRlICJQcm9ncmVzc1RyYWNrZXIuaCIKICNpbmNs dWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCisj aW5jbHVkZSAiUmVuZGVyV2lkZ2V0LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGUuaCIKICNp bmNsdWRlICJTY2hlbWVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIlNjcm9sbEFuaW1hdG9yLmgiCkBA IC0yMTczLDI5ICsyMTc0LDQ3IEBAIHZvaWQgV2ViVmlld0ltcGw6OnBlcmZvcm1NZWRpYVBsYXll ckFjdGkKIHsKICAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCA9IGhpdFRlc3RSZXN1bHRGb3JXaW5k b3dQb3MobG9jYXRpb24pOwogICAgIFJlZlB0cjxOb2RlPiBub2RlID0gcmVzdWx0LmlubmVyTm9u U2hhcmVkTm9kZSgpOwotICAgIGlmICghbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZpZGVv VGFnKSAmJiAhbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmF1ZGlvVGFnKSkKLSAgICAgIHJl dHVybjsKLQotICAgIFJlZlB0cjxIVE1MTWVkaWFFbGVtZW50PiBtZWRpYUVsZW1lbnQgPQotICAg ICAgICBzdGF0aWNfcG9pbnRlcl9jYXN0PEhUTUxNZWRpYUVsZW1lbnQ+KG5vZGUpOwotICAgIHN3 aXRjaCAoYWN0aW9uLnR5cGUpIHsKLSAgICBjYXNlIFdlYk1lZGlhUGxheWVyQWN0aW9uOjpQbGF5 OgotICAgICAgICBpZiAoYWN0aW9uLmVuYWJsZSkKLSAgICAgICAgICAgIG1lZGlhRWxlbWVudC0+ cGxheSgpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtZWRpYUVsZW1lbnQtPnBhdXNlKCk7 Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgV2ViTWVkaWFQbGF5ZXJBY3Rpb246Ok11dGU6Ci0g ICAgICAgIG1lZGlhRWxlbWVudC0+c2V0TXV0ZWQoYWN0aW9uLmVuYWJsZSk7Ci0gICAgICAgIGJy ZWFrOwotICAgIGNhc2UgV2ViTWVkaWFQbGF5ZXJBY3Rpb246Okxvb3A6Ci0gICAgICAgIG1lZGlh RWxlbWVudC0+c2V0TG9vcChhY3Rpb24uZW5hYmxlKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2Fz ZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6Q29udHJvbHM6Ci0gICAgICAgIG1lZGlhRWxlbWVudC0+ c2V0Q29udHJvbHMoYWN0aW9uLmVuYWJsZSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGRlZmF1bHQ6 Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIGlmIChub2RlLT5oYXNUYWdOYW1l KEhUTUxOYW1lczo6dmlkZW9UYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjphdWRp b1RhZykpIHsKKyAgICAgICAgUmVmUHRyPEhUTUxNZWRpYUVsZW1lbnQ+IG1lZGlhRWxlbWVudCA9 CisgICAgICAgICAgICBzdGF0aWNfcG9pbnRlcl9jYXN0PEhUTUxNZWRpYUVsZW1lbnQ+KG5vZGUp OworICAgICAgICBzd2l0Y2ggKGFjdGlvbi50eXBlKSB7CisgICAgICAgIGNhc2UgV2ViTWVkaWFQ bGF5ZXJBY3Rpb246OlBsYXk6CisgICAgICAgICAgICBpZiAoYWN0aW9uLmVuYWJsZSkKKyAgICAg ICAgICAgICAgICBtZWRpYUVsZW1lbnQtPnBsYXkoKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICBtZWRpYUVsZW1lbnQtPnBhdXNlKCk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6TXV0ZToKKyAgICAgICAgICAgIG1lZGlh RWxlbWVudC0+c2V0TXV0ZWQoYWN0aW9uLmVuYWJsZSk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6TG9vcDoKKyAgICAgICAgICAgIG1lZGlh RWxlbWVudC0+c2V0TG9vcChhY3Rpb24uZW5hYmxlKTsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIFdlYk1lZGlhUGxheWVyQWN0aW9uOjpDb250cm9sczoKKyAgICAgICAgICAgIG1l ZGlhRWxlbWVudC0+c2V0Q29udHJvbHMoYWN0aW9uLmVuYWJsZSk7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICB9CisgICAgfSBlbHNlIGlmIChub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6b2Jq ZWN0VGFnKQorICAgICAgICAgICAgICAgfHwgbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmVt YmVkVGFnKSkgeworICAgICAgICBSZW5kZXJPYmplY3QqIG9iamVjdCA9IG5vZGUtPnJlbmRlcmVy KCk7CisgICAgICAgIGlmIChvYmplY3QgJiYgb2JqZWN0LT5pc1dpZGdldCgpKSB7CisgICAgICAg ICAgICBXaWRnZXQqIHdpZGdldCA9IHRvUmVuZGVyV2lkZ2V0KG9iamVjdCktPndpZGdldCgpOwor ICAgICAgICAgICAgaWYgKHdpZGdldCAmJiB3aWRnZXQtPmlzUGx1Z2luQ29udGFpbmVyKCkpIHsK KyAgICAgICAgICAgICAgICBXZWJQbHVnaW5Db250YWluZXJJbXBsKiBwbHVnaW4gPSBzdGF0aWNf Y2FzdDxXZWJQbHVnaW5Db250YWluZXJJbXBsKj4od2lkZ2V0KTsKKyAgICAgICAgICAgICAgICBz d2l0Y2ggKGFjdGlvbi50eXBlKSB7CisgICAgICAgICAgICAgICAgY2FzZSBXZWJNZWRpYVBsYXll ckFjdGlvbjo6Um90YXRlOTBDVzoKKyAgICAgICAgICAgICAgICAgICAgcGx1Z2luLT5wbHVnaW4o KS0+cm90YXRlVmlldyhXZWJQbHVnaW46OlJvdGF0aW9uVHlwZVJvdGF0ZTkwQ1cpOworICAgICAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBjYXNlIFdlYk1lZGlhUGxheWVy QWN0aW9uOjpSb3RhdGU5MENDVzoKKyAgICAgICAgICAgICAgICAgICAgcGx1Z2luLT5wbHVnaW4o KS0+cm90YXRlVmlldyhXZWJQbHVnaW46OlJvdGF0aW9uVHlwZVJvdGF0ZTkwQ0NXKTsKKyAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAg ICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogfQogCkBAIC0yNTA0LDcgKzI1MjMsNyBAQCB2 b2lkIFdlYlZpZXdJbXBsOjpwZXJmb3JtQ3VzdG9tQ29udGV4dE1lCiAgICAgQ29udGV4dE1lbnUq IG1lbnUgPSBtX3BhZ2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLT5jb250ZXh0TWVudSgpOwog ICAgIGlmICghbWVudSkKICAgICAgICAgcmV0dXJuOwotICAgIENvbnRleHRNZW51SXRlbSogaXRl bSA9IG1lbnUtPml0ZW1XaXRoQWN0aW9uKHN0YXRpY19jYXN0PENvbnRleHRNZW51QWN0aW9uPihD b250ZXh0TWVudUl0ZW1CYXNlQ3VzdG9tVGFnICsgYWN0aW9uKSk7CisgICAgQ29udGV4dE1lbnVJ dGVtKiBpdGVtID0gbWVudS0+aXRlbVdpdGhBY3Rpb24oc3RhdGljX2Nhc3Q8Q29udGV4dE1lbnVB Y3Rpb24+KGFjdGlvbiArIENvbnRleHRNZW51SXRlbUJhc2VDdXN0b21UYWcpKTsKICAgICBpZiAo aXRlbSkKICAgICAgICAgbV9wYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS0+Y29udGV4dE1l bnVJdGVtU2VsZWN0ZWQoaXRlbSk7CiAgICAgbV9wYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIo KS0+Y2xlYXJDb250ZXh0TWVudSgpOwo= 121557 2012-01-07 11:56:37 -0800 2012-01-09 13:23:37 -0800 Proposed Patch aaa.txt text/plain 8413 bbudge SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDQzODgpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIz IEBACisyMDEyLTAxLTA3ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KKworICAg ICAgICBBZGQgdGhlIGNvbmNlcHQgb2Ygcm90YXRlIHZpZXcgY2FwYWJpbGl0eSB0byBXZWJQbHVn aW4uaCBhbmQgV2ViQ29udGV4dE1lbnVEYXRhLCBzbworICAgICAgICBwbHVnaW5zIGNhbiBwcmVz ZW50IHJvdGF0ZSBpdGVtcyBpbiBjb250ZXh0IG1lbnUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTY0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oOgor ICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudURhdGE6OldlYkNvbnRleHRNZW51RGF0YSk6 CisgICAgICAgICogcHVibGljL1dlYk1lZGlhUGxheWVyQWN0aW9uLmg6CisgICAgICAgICogcHVi bGljL1dlYlBsdWdpbi5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW46OmNhblJvdGF0ZVZp ZXcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW46OnJvdGF0ZVZpZXcpOgorICAgICAgICAq IHNyYy9Db250ZXh0TWVudUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDb250ZXh0 TWVudUNsaWVudEltcGw6OmdldEN1c3RvbU1lbnVGcm9tRGVmYXVsdEl0ZW1zKToKKyAgICAgICAg KiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cGVy Zm9ybU1lZGlhUGxheWVyQWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnBl cmZvcm1DdXN0b21Db250ZXh0TWVudUFjdGlvbik6CisKIDIwMTItMDEtMDYgIFcuIEphbWVzIE1h Y0xlYW4gIDx3am1hY2xlYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gQ3Vs bCBvY2NsdWRlZCB0aWxlcyBpbiB0aWxlZCBsYXllcnMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCShyZXZpc2lvbiAxMDQx NTEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb250ZXh0TWVudURhdGEu aAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw MDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAw OSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zIGFyZQpAQCAtMTAyLDYgKzEwMiw3IEBAIHN0cnVjdCBXZWJDb250ZXh0 TWVudURhdGEgewogICAgICAgICBNZWRpYUhhc1ZpZGVvID0gMHg0MCwKICAgICAgICAgTWVkaWFD b250cm9sUm9vdEVsZW1lbnQgPSAweDgwLAogICAgICAgICBNZWRpYUNhblByaW50ID0gMHgxMDAs CisgICAgICAgIE1lZGlhQ2FuUm90YXRlID0gMHgyMDAsCiAgICAgfTsKIAogICAgIC8vIEV4dHJh IGF0dHJpYnV0ZXMgZGVzY3JpYmluZyBtZWRpYSBlbGVtZW50cy4KSW5kZXg6IFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyQWN0aW9uLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXJBY3Rpb24uaAkocmV2 aXNpb24gMTA0MTUxKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQ bGF5ZXJBY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5 cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly aWdodCAoQykgMjAwOSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMzksNyArMzksOSBAQCBzdHJ1Y3Qg V2ViTWVkaWFQbGF5ZXJBY3Rpb24gewogICAgICAgICBQbGF5LAogICAgICAgICBNdXRlLAogICAg ICAgICBMb29wLAotICAgICAgICBDb250cm9scworICAgICAgICBDb250cm9scywKKyAgICAgICAg Um90YXRlOTBDVywKKyAgICAgICAgUm90YXRlOTBDQ1cKICAgICB9OwogCiAgICAgVHlwZSB0eXBl OwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgJKHJldmlz aW9uIDEwNDE1MSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbi5o CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAw OSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA5 LCAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0xMjUsNiArMTI1LDE2IEBAIHB1YmxpYzoKICAgICAvLyBU ZWxscyB0aGUgcGx1Z2luIHRoYXQgdGhlIHVzZXIgaGFzIHN0b3BwZWQgdGhlIGZpbmQgb3BlcmF0 aW9uLgogICAgIHZpcnR1YWwgdm9pZCBzdG9wRmluZCgpIHsgfQogCisgICAgLy8gVmlldyByb3Rh dGlvbiB0eXBlcy4KKyAgICBlbnVtIFJvdGF0aW9uVHlwZSB7CisgICAgICAgIFJvdGF0aW9uVHlw ZVJvdGF0ZTkwQ1csCisgICAgICAgIFJvdGF0aW9uVHlwZVJvdGF0ZTkwQ0NXCisgICAgfTsKKyAg ICAvLyBXaGV0aGVyIHRoZSBwbHVnaW4gY2FuIHJvdGF0ZSB0aGUgdmlldyBvZiBpdHMgY29udGVu dC4KKyAgICB2aXJ0dWFsIGJvb2wgY2FuUm90YXRlVmlldygpIHsgcmV0dXJuIGZhbHNlOyB9Cisg ICAgLy8gUm90YXRlcyB0aGUgcGx1Z2luJ3MgdmlldyBvZiBpdHMgY29udGVudC4KKyAgICB2aXJ0 dWFsIHZvaWQgcm90YXRlVmlldyhSb3RhdGlvblR5cGUgdHlwZSkgeyB9CisKIHByb3RlY3RlZDoK ICAgICB+V2ViUGx1Z2luKCkgeyB9CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvQ29udGV4dE1lbnVDbGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9Db250ZXh0TWVudUNsaWVudEltcGwuY3BwCShyZXZpc2lvbiAxMDQxNTEp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVudUNsaWVudEltcGwuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAw OSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA5 LCAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0yMzQsNiArMjM0LDEwIEBAIFBsYXRmb3JtTWVudURlc2Ny aXB0aW9uIENvbnRleHRNZW51Q2xpZW4KICAgICAgICAgICAgICAgICBIVE1MUGx1Z0luSW1hZ2VF bGVtZW50KiBwbHVnaW5FbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTFBsdWdJbkltYWdlRWxlbWVu dCo+KHIuaW5uZXJOb25TaGFyZWROb2RlKCkpOwogICAgICAgICAgICAgICAgIGRhdGEuc3JjVVJM ID0gcGx1Z2luRWxlbWVudC0+ZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwocGx1Z2luRWxlbWVudC0+ dXJsKCkpOwogICAgICAgICAgICAgICAgIGRhdGEubWVkaWFGbGFncyB8PSBXZWJDb250ZXh0TWVu dURhdGE6Ok1lZGlhQ2FuU2F2ZTsKKworICAgICAgICAgICAgICAgIC8vIEFkZCBjb250ZXh0IG1l bnUgY29tbWFuZHMgdGhhdCBhcmUgc3VwcG9ydGVkIGJ5IHRoZSBwbHVnaW4uCisgICAgICAgICAg ICAgICAgaWYgKHBsdWdpbi0+cGx1Z2luKCktPmNhblJvdGF0ZVZpZXcoKSkKKyAgICAgICAgICAg ICAgICAgICAgZGF0YS5tZWRpYUZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6TWVkaWFDYW5S b3RhdGU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiAxMDQxNTEpCisrKyBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIgR29vZ2xlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBh cmUKQEAgLTk1LDYgKzk1LDcgQEAKICNpbmNsdWRlICJQcm9ncmVzc1RyYWNrZXIuaCIKICNpbmNs dWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCisj aW5jbHVkZSAiUmVuZGVyV2lkZ2V0LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGUuaCIKICNp bmNsdWRlICJTY2hlbWVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIlNjcm9sbEFuaW1hdG9yLmgiCkBA IC0yMTczLDI5ICsyMTc0LDQ3IEBAIHZvaWQgV2ViVmlld0ltcGw6OnBlcmZvcm1NZWRpYVBsYXll ckFjdGkKIHsKICAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCA9IGhpdFRlc3RSZXN1bHRGb3JXaW5k b3dQb3MobG9jYXRpb24pOwogICAgIFJlZlB0cjxOb2RlPiBub2RlID0gcmVzdWx0LmlubmVyTm9u U2hhcmVkTm9kZSgpOwotICAgIGlmICghbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZpZGVv VGFnKSAmJiAhbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmF1ZGlvVGFnKSkKLSAgICAgIHJl dHVybjsKLQotICAgIFJlZlB0cjxIVE1MTWVkaWFFbGVtZW50PiBtZWRpYUVsZW1lbnQgPQotICAg ICAgICBzdGF0aWNfcG9pbnRlcl9jYXN0PEhUTUxNZWRpYUVsZW1lbnQ+KG5vZGUpOwotICAgIHN3 aXRjaCAoYWN0aW9uLnR5cGUpIHsKLSAgICBjYXNlIFdlYk1lZGlhUGxheWVyQWN0aW9uOjpQbGF5 OgotICAgICAgICBpZiAoYWN0aW9uLmVuYWJsZSkKLSAgICAgICAgICAgIG1lZGlhRWxlbWVudC0+ cGxheSgpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtZWRpYUVsZW1lbnQtPnBhdXNlKCk7 Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgV2ViTWVkaWFQbGF5ZXJBY3Rpb246Ok11dGU6Ci0g ICAgICAgIG1lZGlhRWxlbWVudC0+c2V0TXV0ZWQoYWN0aW9uLmVuYWJsZSk7Ci0gICAgICAgIGJy ZWFrOwotICAgIGNhc2UgV2ViTWVkaWFQbGF5ZXJBY3Rpb246Okxvb3A6Ci0gICAgICAgIG1lZGlh RWxlbWVudC0+c2V0TG9vcChhY3Rpb24uZW5hYmxlKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2Fz ZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6Q29udHJvbHM6Ci0gICAgICAgIG1lZGlhRWxlbWVudC0+ c2V0Q29udHJvbHMoYWN0aW9uLmVuYWJsZSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGRlZmF1bHQ6 Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIGlmIChub2RlLT5oYXNUYWdOYW1l KEhUTUxOYW1lczo6dmlkZW9UYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjphdWRp b1RhZykpIHsKKyAgICAgICAgUmVmUHRyPEhUTUxNZWRpYUVsZW1lbnQ+IG1lZGlhRWxlbWVudCA9 CisgICAgICAgICAgICBzdGF0aWNfcG9pbnRlcl9jYXN0PEhUTUxNZWRpYUVsZW1lbnQ+KG5vZGUp OworICAgICAgICBzd2l0Y2ggKGFjdGlvbi50eXBlKSB7CisgICAgICAgIGNhc2UgV2ViTWVkaWFQ bGF5ZXJBY3Rpb246OlBsYXk6CisgICAgICAgICAgICBpZiAoYWN0aW9uLmVuYWJsZSkKKyAgICAg ICAgICAgICAgICBtZWRpYUVsZW1lbnQtPnBsYXkoKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICBtZWRpYUVsZW1lbnQtPnBhdXNlKCk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6TXV0ZToKKyAgICAgICAgICAgIG1lZGlh RWxlbWVudC0+c2V0TXV0ZWQoYWN0aW9uLmVuYWJsZSk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBXZWJNZWRpYVBsYXllckFjdGlvbjo6TG9vcDoKKyAgICAgICAgICAgIG1lZGlh RWxlbWVudC0+c2V0TG9vcChhY3Rpb24uZW5hYmxlKTsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIFdlYk1lZGlhUGxheWVyQWN0aW9uOjpDb250cm9sczoKKyAgICAgICAgICAgIG1l ZGlhRWxlbWVudC0+c2V0Q29udHJvbHMoYWN0aW9uLmVuYWJsZSk7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICB9CisgICAgfSBlbHNlIGlmIChub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6b2Jq ZWN0VGFnKQorICAgICAgICAgICAgICAgfHwgbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmVt YmVkVGFnKSkgeworICAgICAgICBSZW5kZXJPYmplY3QqIG9iamVjdCA9IG5vZGUtPnJlbmRlcmVy KCk7CisgICAgICAgIGlmIChvYmplY3QgJiYgb2JqZWN0LT5pc1dpZGdldCgpKSB7CisgICAgICAg ICAgICBXaWRnZXQqIHdpZGdldCA9IHRvUmVuZGVyV2lkZ2V0KG9iamVjdCktPndpZGdldCgpOwor ICAgICAgICAgICAgaWYgKHdpZGdldCAmJiB3aWRnZXQtPmlzUGx1Z2luQ29udGFpbmVyKCkpIHsK KyAgICAgICAgICAgICAgICBXZWJQbHVnaW5Db250YWluZXJJbXBsKiBwbHVnaW4gPSBzdGF0aWNf Y2FzdDxXZWJQbHVnaW5Db250YWluZXJJbXBsKj4od2lkZ2V0KTsKKyAgICAgICAgICAgICAgICBz d2l0Y2ggKGFjdGlvbi50eXBlKSB7CisgICAgICAgICAgICAgICAgY2FzZSBXZWJNZWRpYVBsYXll ckFjdGlvbjo6Um90YXRlOTBDVzoKKyAgICAgICAgICAgICAgICAgICAgcGx1Z2luLT5wbHVnaW4o KS0+cm90YXRlVmlldyhXZWJQbHVnaW46OlJvdGF0aW9uVHlwZVJvdGF0ZTkwQ1cpOworICAgICAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBjYXNlIFdlYk1lZGlhUGxheWVy QWN0aW9uOjpSb3RhdGU5MENDVzoKKyAgICAgICAgICAgICAgICAgICAgcGx1Z2luLT5wbHVnaW4o KS0+cm90YXRlVmlldyhXZWJQbHVnaW46OlJvdGF0aW9uVHlwZVJvdGF0ZTkwQ0NXKTsKKyAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAg ICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogfQogCg== 121719 2012-01-09 13:23:37 -0800 2012-01-10 15:02:08 -0800 Proposed Patch aaa.txt text/plain 11636 bbudge SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDQ0NjMpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2 IEBACisyMDEyLTAxLTA5ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KKworICAg ICAgICBBbGxvdyBwbHVnaW5zIHRvIGFkZCByb3RhdGUgaXRlbXMgdG8gYnJvd3NlcidzIGNvbnRl eHQgbWVudS4gQWRkcyBhIG5ldworICAgICAgICBXZWJQbHVnaW5BY3Rpb24gc3RydWN0LCB3aXRo IHJvdGF0ZSB0eXBlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc1NjQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJDb250ZXh0TWVudURhdGEu aDoKKyAgICAgICAgKiBwdWJsaWMvV2ViUGx1Z2luLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBs dWdpbjo6Y2FuUm90YXRlVmlldyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbjo6cm90YXRl Vmlldyk6CisgICAgICAgICogcHVibGljL1dlYlBsdWdpbkFjdGlvbi5oOiBBZGRlZC4KKyAgICAg ICAgKFdlYktpdDo6V2ViUGx1Z2luQWN0aW9uOjpXZWJQbHVnaW5BY3Rpb24pOgorICAgICAgICAq IHB1YmxpYy9XZWJWaWV3Lmg6CisgICAgICAgICogc3JjL0NvbnRleHRNZW51Q2xpZW50SW1wbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51Q2xpZW50SW1wbDo6Z2V0Q3VzdG9tTWVu dUZyb21EZWZhdWx0SXRlbXMpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpwZXJmb3JtTWVkaWFQbGF5ZXJBY3Rpb24pOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cGVyZm9ybVBsdWdpbkFjdGlvbik6CisgICAgICAg ICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTItMDEtMDkgIFNoZXJpZmYgQm90ICA8d2Via2l0 LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0 IHIxMDQ0MTguCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCShyZXZpc2lvbiAxMDQz ODgpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAJKHdvcmtpbmcgY29weSkK QEAgLTIxNiw2ICsyMTYsNyBAQAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUGVyZm9ybWFu Y2UuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJQZXJtaXNzaW9uQ2xpZW50LmgnLAog ICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUGx1Z2luLmgnLAorICAgICAgICAgICAgICAgICdw dWJsaWMvV2ViUGx1Z2luQWN0aW9uLmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUGx1 Z2luQ29udGFpbmVyLmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUGx1Z2luRG9jdW1l bnQuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJQbHVnaW5MaXN0QnVpbGRlci5oJywK SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnRleHRN ZW51RGF0YS5oCShyZXZpc2lvbiAxMDQzODgpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJDb250ZXh0TWVudURhdGEuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMTAyLDYgKzEw Miw3IEBAIHN0cnVjdCBXZWJDb250ZXh0TWVudURhdGEgewogICAgICAgICBNZWRpYUhhc1ZpZGVv ID0gMHg0MCwKICAgICAgICAgTWVkaWFDb250cm9sUm9vdEVsZW1lbnQgPSAweDgwLAogICAgICAg ICBNZWRpYUNhblByaW50ID0gMHgxMDAsCisgICAgICAgIE1lZGlhQ2FuUm90YXRlID0gMHgyMDAs CiAgICAgfTsKIAogICAgIC8vIEV4dHJhIGF0dHJpYnV0ZXMgZGVzY3JpYmluZyBtZWRpYSBlbGVt ZW50cy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbi5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbi5oCShy ZXZpc2lvbiAxMDQzODgpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVn aW4uaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMp IDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykg MjAwOSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMTI1LDYgKzEyNSwxNiBAQCBwdWJsaWM6CiAgICAg Ly8gVGVsbHMgdGhlIHBsdWdpbiB0aGF0IHRoZSB1c2VyIGhhcyBzdG9wcGVkIHRoZSBmaW5kIG9w ZXJhdGlvbi4KICAgICB2aXJ0dWFsIHZvaWQgc3RvcEZpbmQoKSB7IH0KIAorICAgIC8vIFZpZXcg cm90YXRpb24gdHlwZXMuCisgICAgZW51bSBSb3RhdGlvblR5cGUgeworICAgICAgICBSb3RhdGlv blR5cGU5MENsb2Nrd2lzZSwKKyAgICAgICAgUm90YXRpb25UeXBlOTBDb3VudGVyY2xvY2t3aXNl CisgICAgfTsKKyAgICAvLyBXaGV0aGVyIHRoZSBwbHVnaW4gY2FuIHJvdGF0ZSB0aGUgdmlldyBv ZiBpdHMgY29udGVudC4KKyAgICB2aXJ0dWFsIGJvb2wgY2FuUm90YXRlVmlldygpIHsgcmV0dXJu IGZhbHNlOyB9CisgICAgLy8gUm90YXRlcyB0aGUgcGx1Z2luJ3MgdmlldyBvZiBpdHMgY29udGVu dC4KKyAgICB2aXJ0dWFsIHZvaWQgcm90YXRlVmlldyhSb3RhdGlvblR5cGUgdHlwZSkgeyB9CisK IHByb3RlY3RlZDoKICAgICB+V2ViUGx1Z2luKCkgeyB9CiB9OwpJbmRleDogU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luQWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luQWN0aW9uLmgJKHJldmlzaW9uIDApCisr KyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW5BY3Rpb24uaAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSw1NCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z IGFyZQorICogbWV0OgorICoKKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAgICAgKiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBj b3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBkaXN0cmlidXRpb24uCisgKiAgICAgKiBOZWl0aGVy IHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisgKiBjb250cmli dXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQg ZnJvbQorICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVy bWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklH SFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywg VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S CisgKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgVEhFIENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1Ig QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlks IE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisg KiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgV2ViUGx1Z2luQWN0aW9uX2gKKyNkZWZpbmUg V2ViUGx1Z2luQWN0aW9uX2gKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK3N0cnVjdCBXZWJQbHVn aW5BY3Rpb24geworICAgIGVudW0gVHlwZSB7CisgICAgICAgIFVua25vd24sCisgICAgICAgIFJv dGF0ZTkwQ2xvY2t3aXNlLAorICAgICAgICBSb3RhdGU5MENvdW50ZXJjbG9ja3dpc2UKKyAgICB9 OworCisgICAgVHlwZSB0eXBlOworICAgIGJvb2wgZW5hYmxlOworCisgICAgV2ViUGx1Z2luQWN0 aW9uKCkKKyAgICAgICAgOiB0eXBlKFVua25vd24pLCBlbmFibGUoZmFsc2UpIHsgfQorICAgIFdl YlBsdWdpbkFjdGlvbihUeXBlIHR5cGUsIGJvb2wgZW5hYmxlKQorICAgICAgICA6IHR5cGUodHlw ZSksIGVuYWJsZShlbmFibGUpIHsgfQorfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyNl bmRpZgoKUHJvcGVydHkgY2hhbmdlcyBvbjogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViUGx1Z2luQWN0aW9uLmgKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3ZuOmVvbC1zdHlsZQogICArIExG CgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAkocmV2aXNpb24g MTA0Mzg4KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01NSw2ICs1NSw3IEBAIGNsYXNzIFdlYlNwZWxsQ2hlY2tDbGllbnQ7CiBj bGFzcyBXZWJTdHJpbmc7CiBjbGFzcyBXZWJWaWV3Q2xpZW50Owogc3RydWN0IFdlYk1lZGlhUGxh eWVyQWN0aW9uOworc3RydWN0IFdlYlBsdWdpbkFjdGlvbjsKIHN0cnVjdCBXZWJQb2ludDsKIAog Y2xhc3MgV2ViVmlldyA6IHB1YmxpYyBXZWJXaWRnZXQgewpAQCAtMjczLDEwICsyNzQsMTQgQEAg cHVibGljOgogCiAgICAgLy8gTWVkaWEgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLSAgICAvLyBQZXJmb3JtcyB0aGUgc3Bl Y2lmaWVkIGFjdGlvbiBvbiB0aGUgbm9kZSBhdCB0aGUgZ2l2ZW4gbG9jYXRpb24uCisgICAgLy8g UGVyZm9ybXMgdGhlIHNwZWNpZmllZCBtZWRpYSBwbGF5ZXIgYWN0aW9uIG9uIHRoZSBub2RlIGF0 IHRoZSBnaXZlbiBsb2NhdGlvbi4KICAgICB2aXJ0dWFsIHZvaWQgcGVyZm9ybU1lZGlhUGxheWVy QWN0aW9uKAogICAgICAgICBjb25zdCBXZWJNZWRpYVBsYXllckFjdGlvbiYsIGNvbnN0IFdlYlBv aW50JiBsb2NhdGlvbikgPSAwOwogCisgICAgLy8gUGVyZm9ybXMgdGhlIHNwZWNpZmllZCBwbHVn aW4gYWN0aW9uIG9uIHRoZSBub2RlIGF0IHRoZSBnaXZlbiBsb2NhdGlvbi4KKyAgICB2aXJ0dWFs IHZvaWQgcGVyZm9ybVBsdWdpbkFjdGlvbigKKyAgICAgICAgY29uc3QgV2ViUGx1Z2luQWN0aW9u JiwgY29uc3QgV2ViUG9pbnQmIGxvY2F0aW9uKSA9IDA7CisKIAogICAgIC8vIERhdGEgZXhjaGFu Z2UgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVudUNsaWVudElt cGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0NvbnRleHRN ZW51Q2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDEwNDM4OCkKKysrIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL0NvbnRleHRNZW51Q2xpZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEs NSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTIgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAg LTIzNCw2ICsyMzQsMTAgQEAgUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGll bgogICAgICAgICAgICAgICAgIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqIHBsdWdpbkVsZW1lbnQg PSBzdGF0aWNfY2FzdDxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Kj4oci5pbm5lck5vblNoYXJlZE5v ZGUoKSk7CiAgICAgICAgICAgICAgICAgZGF0YS5zcmNVUkwgPSBwbHVnaW5FbGVtZW50LT5kb2N1 bWVudCgpLT5jb21wbGV0ZVVSTChwbHVnaW5FbGVtZW50LT51cmwoKSk7CiAgICAgICAgICAgICAg ICAgZGF0YS5tZWRpYUZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6TWVkaWFDYW5TYXZlOwor CisgICAgICAgICAgICAgICAgLy8gQWRkIGNvbnRleHQgbWVudSBjb21tYW5kcyB0aGF0IGFyZSBz dXBwb3J0ZWQgYnkgdGhlIHBsdWdpbi4KKyAgICAgICAgICAgICAgICBpZiAocGx1Z2luLT5wbHVn aW4oKS0+Y2FuUm90YXRlVmlldygpKQorICAgICAgICAgICAgICAgICAgICBkYXRhLm1lZGlhRmxh Z3MgfD0gV2ViQ29udGV4dE1lbnVEYXRhOjpNZWRpYUNhblJvdGF0ZTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5jcHAJKHJldmlzaW9uIDEwNDM4OCkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0g KiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtOTUsNiArOTUsNyBAQAog I2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyQ29tcG9z aXRvci5oIgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKKyNpbmNsdWRlICJSZW5kZXJXaWRnZXQu aCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIlNjaGVtZVJlZ2lzdHJ5 LmgiCiAjaW5jbHVkZSAiU2Nyb2xsQW5pbWF0b3IuaCIKQEAgLTEyNSw2ICsxMjYsNyBAQAogI2lu Y2x1ZGUgIldlYk1lZGlhUGxheWVyQWN0aW9uLmgiCiAjaW5jbHVkZSAiV2ViTm9kZS5oIgogI2lu Y2x1ZGUgIldlYlBsdWdpbi5oIgorI2luY2x1ZGUgIldlYlBsdWdpbkFjdGlvbi5oIgogI2luY2x1 ZGUgIldlYlBsdWdpbkNvbnRhaW5lckltcGwuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJQb2lu dC5oIgogI2luY2x1ZGUgIldlYlBvcHVwTWVudUltcGwuaCIKQEAgLTIxODMsNyArMjE4NSw3IEBA IHZvaWQgV2ViVmlld0ltcGw6OnBlcmZvcm1NZWRpYVBsYXllckFjdGkKICAgICBIaXRUZXN0UmVz dWx0IHJlc3VsdCA9IGhpdFRlc3RSZXN1bHRGb3JXaW5kb3dQb3MobG9jYXRpb24pOwogICAgIFJl ZlB0cjxOb2RlPiBub2RlID0gcmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgpOwogICAgIGlmICgh bm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZpZGVvVGFnKSAmJiAhbm9kZS0+aGFzVGFnTmFt ZShIVE1MTmFtZXM6OmF1ZGlvVGFnKSkKLSAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuOwog CiAgICAgUmVmUHRyPEhUTUxNZWRpYUVsZW1lbnQ+IG1lZGlhRWxlbWVudCA9CiAgICAgICAgIHN0 YXRpY19wb2ludGVyX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudD4obm9kZSk7CkBAIC0yMjA4LDYgKzIy MTAsMzMgQEAgdm9pZCBXZWJWaWV3SW1wbDo6cGVyZm9ybU1lZGlhUGxheWVyQWN0aQogICAgIH0K IH0KIAordm9pZCBXZWJWaWV3SW1wbDo6cGVyZm9ybVBsdWdpbkFjdGlvbihjb25zdCBXZWJQbHVn aW5BY3Rpb24mIGFjdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgV2ViUG9pbnQmIGxvY2F0aW9uKQoreworICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0g aGl0VGVzdFJlc3VsdEZvcldpbmRvd1Bvcyhsb2NhdGlvbik7CisgICAgUmVmUHRyPE5vZGU+IG5v ZGUgPSByZXN1bHQuaW5uZXJOb25TaGFyZWROb2RlKCk7CisgICAgaWYgKCFub2RlLT5oYXNUYWdO YW1lKEhUTUxOYW1lczo6b2JqZWN0VGFnKSAmJiAhbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6 OmVtYmVkVGFnKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUmVuZGVyT2JqZWN0KiBvYmplY3Qg PSBub2RlLT5yZW5kZXJlcigpOworICAgIGlmIChvYmplY3QgJiYgb2JqZWN0LT5pc1dpZGdldCgp KSB7CisgICAgICAgIFdpZGdldCogd2lkZ2V0ID0gdG9SZW5kZXJXaWRnZXQob2JqZWN0KS0+d2lk Z2V0KCk7CisgICAgICAgIGlmICh3aWRnZXQgJiYgd2lkZ2V0LT5pc1BsdWdpbkNvbnRhaW5lcigp KSB7CisgICAgICAgICAgICBXZWJQbHVnaW5Db250YWluZXJJbXBsKiBwbHVnaW4gPSBzdGF0aWNf Y2FzdDxXZWJQbHVnaW5Db250YWluZXJJbXBsKj4od2lkZ2V0KTsKKyAgICAgICAgICAgIHN3aXRj aCAoYWN0aW9uLnR5cGUpIHsKKyAgICAgICAgICAgIGNhc2UgV2ViUGx1Z2luQWN0aW9uOjpSb3Rh dGU5MENsb2Nrd2lzZToKKyAgICAgICAgICAgICAgICBwbHVnaW4tPnBsdWdpbigpLT5yb3RhdGVW aWV3KFdlYlBsdWdpbjo6Um90YXRpb25UeXBlOTBDbG9ja3dpc2UpOworICAgICAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgICAgY2FzZSBXZWJQbHVnaW5BY3Rpb246OlJvdGF0ZTkwQ291bnRl cmNsb2Nrd2lzZToKKyAgICAgICAgICAgICAgICBwbHVnaW4tPnBsdWdpbigpLT5yb3RhdGVWaWV3 KFdlYlBsdWdpbjo6Um90YXRpb25UeXBlOTBDb3VudGVyY2xvY2t3aXNlKTsKKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9Cit9CisKIHZv aWQgV2ViVmlld0ltcGw6OmNvcHlJbWFnZUF0KGNvbnN0IFdlYlBvaW50JiBwb2ludCkKIHsKICAg ICBpZiAoIW1fcGFnZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaAkocmV2aXNpb24gMTA0Mzg4KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTg2LDYgKzE4Niw5IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIHZvaWQgcGVyZm9ybU1lZGlhUGxheWVyQWN0aW9uKAogICAgICAgICBjb25zdCBX ZWJNZWRpYVBsYXllckFjdGlvbiYgYWN0aW9uLAogICAgICAgICBjb25zdCBXZWJQb2ludCYgbG9j YXRpb24pOworICAgIHZpcnR1YWwgdm9pZCBwZXJmb3JtUGx1Z2luQWN0aW9uKAorICAgICAgICBj b25zdCBXZWJQbHVnaW5BY3Rpb24mLAorICAgICAgICBjb25zdCBXZWJQb2ludCYpOwogICAgIHZp cnR1YWwgdm9pZCBjb3B5SW1hZ2VBdChjb25zdCBXZWJQb2ludCYgcG9pbnQpOwogICAgIHZpcnR1 YWwgdm9pZCBkcmFnU291cmNlRW5kZWRBdCgKICAgICAgICAgY29uc3QgV2ViUG9pbnQmIGNsaWVu dFBvaW50LAo=