41242 2010-06-25 18:21:06 -0700 [chromium] Get the selected text from plugins for right click menu 2010-06-28 14:07:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jam jam dglazkov fishd levin webkit.review.bot oldest_to_newest 243301 0 jam 2010-06-25 18:21:06 -0700 [chromium] Get the selected text from plugins for right click menu 243302 1 59821 jam 2010-06-25 18:23:23 -0700 Created attachment 59821 Patch 243303 2 webkit.review.bot 2010-06-25 18:26:14 -0700 Attachment 59821 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit/chromium/src/ContextMenuClientImpl.cpp:188: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] WebKit/chromium/src/WebPluginContainerImpl.cpp:249: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 243528 3 59866 jam 2010-06-27 18:17:10 -0700 Created attachment 59866 Patch 243529 4 59867 jam 2010-06-27 18:26:29 -0700 Created attachment 59867 Patch 243756 5 59867 fishd 2010-06-28 10:29:28 -0700 Comment on attachment 59867 Patch WebKit/chromium/src/ContextMenuClientImpl.cpp:166 + // We can always select all... nit: and translate WebKit/chromium/src/ContextMenuClientImpl.cpp:219 + data.editFlags &= ~WebContextMenuData::CanTranslate; maybe this should be inside the isWidget() block? an object tag can also be used like a DIV. 243804 6 jam 2010-06-28 12:01:26 -0700 (In reply to comment #5) > (From update of attachment 59867 [details]) > WebKit/chromium/src/ContextMenuClientImpl.cpp:166 > + // We can always select all... > nit: and translate I didn't change this because for translate, it's not always possible per the code below it. > > WebKit/chromium/src/ContextMenuClientImpl.cpp:219 > + data.editFlags &= ~WebContextMenuData::CanTranslate; > maybe this should be inside the isWidget() block? an object tag can > also be used like a DIV. done. i'm not familiar with the differences between these two. if it's a widget and it's an embed/object tag, are we guaranteed it's a plugin? 243806 7 fishd 2010-06-28 12:06:21 -0700 > done. i'm not familiar with the differences between these two. if it's a widget and it's an embed/object tag, are we guaranteed it's a plugin? yes. 243809 8 59919 jam 2010-06-28 12:09:18 -0700 Created attachment 59919 Patch 243888 9 jam 2010-06-28 14:07:26 -0700 Committed r62036: <http://trac.webkit.org/changeset/62036> 59821 2010-06-25 18:23:23 -0700 2010-06-27 18:17:07 -0700 Patch bug-41242-20100625182047.patch text/plain 4801 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE5MzEpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDYtMjUgIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEdldCB0aGUgc2VsZWN0ZWQgdGV4 dCBmcm9tIHBsdWdpbnMgZm9yIHJpZ2h0IGNsaWNrIG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjQyCisKKyAgICAgICAgKiBwdWJsaWMvV2Vi UGx1Z2luLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbjo6c2VsZWN0ZWRUZXh0KToKKyAg ICAgICAgKiBzcmMvQ29udGV4dE1lbnVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 Q29udGV4dE1lbnVDbGllbnRJbXBsOjpnZXRDdXN0b21NZW51RnJvbURlZmF1bHRJdGVtcyk6Cisg ICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZWxlY3RlZFRleHQpOgorICAgICAgICAqIHNyYy9X ZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisKIDIwMTAtMDYtMjUgIFZpY3RvciBXYW5nICA8dmlj dG9yd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpJ bmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW4uaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbi5oCShyZXZpc2lvbiA2MTkxNikKKysrIFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYg KzMyLDcgQEAKICNkZWZpbmUgV2ViUGx1Z2luX2gKIAogI2luY2x1ZGUgIldlYkNhbnZhcy5oIgor I2luY2x1ZGUgIldlYlN0cmluZy5oIgogCiBzdHJ1Y3QgTlBPYmplY3Q7CiAKQEAgLTkzLDYgKzk0 LDggQEAgcHVibGljOgogICAgIC8vIEVuZHMgdGhlIHByaW50IG9wZXJhdGlvbi4KICAgICB2aXJ0 dWFsIHZvaWQgcHJpbnRFbmQoKSB7IH0KIAorICAgIHZpcnR1YWwgV2ViU3RyaW5nIHNlbGVjdGVk VGV4dCgpIHsgcmV0dXJuIFdlYlN0cmluZygpOyB9CisKIHByb3RlY3RlZDoKICAgICB+V2ViUGx1 Z2luKCkgeyB9CiB9OwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVudUNsaWVu dEltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ29udGV4dE1lbnVD bGllbnRJbXBsLmNwcAkocmV2aXNpb24gNjE5MTYpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0Nv bnRleHRNZW51Q2xpZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDYgKzQ2LDcgQEAK ICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSAiTWVkaWFFcnJvci5oIgogI2luY2x1ZGUgIlBs YXRmb3JtU3RyaW5nLmgiCisjaW5jbHVkZSAiUmVuZGVyV2lkZ2V0LmgiCiAjaW5jbHVkZSAiVGV4 dEJyZWFrSXRlcmF0b3IuaCIKICNpbmNsdWRlICJXaWRnZXQuaCIKIApAQCAtNTMsNiArNTQsNyBA QAogI2luY2x1ZGUgIldlYkRhdGFTb3VyY2VJbXBsLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVJbXBs LmgiCiAjaW5jbHVkZSAiV2ViTWVudUl0ZW1JbmZvLmgiCisjaW5jbHVkZSAiV2ViUGx1Z2luQ29u dGFpbmVySW1wbC5oIgogI2luY2x1ZGUgIldlYlBvaW50LmgiCiAjaW5jbHVkZSAiV2ViU3RyaW5n LmgiCiAjaW5jbHVkZSAiV2ViVVJMLmgiCkBAIC0xNDYsNiArMTQ4LDcgQEAgUGxhdGZvcm1NZW51 RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogCiAgICAgV2ViQ29udGV4dE1lbnVEYXRhIGRh dGE7CiAgICAgZGF0YS5tb3VzZVBvc2l0aW9uID0gc2VsZWN0ZWRGcmFtZS0+dmlldygpLT5jb250 ZW50c1RvV2luZG93KHIucG9pbnQoKSk7CisgICAgZGF0YS5lZGl0RmxhZ3MgPSBXZWJDb250ZXh0 TWVudURhdGE6OkNhbkRvTm9uZTsKIAogICAgIC8vIExpbmtzLCBJbWFnZXMsIE1lZGlhIHRhZ3Ms IGFuZCBJbWFnZS9NZWRpYS1MaW5rcyB0YWtlIHByZWZlcmVuY2Ugb3ZlcgogICAgIC8vIGFsbCBl bHNlLgpAQCAtMTgyLDYgKzE4NSwyMCBAQCBQbGF0Zm9ybU1lbnVEZXNjcmlwdGlvbiBDb250ZXh0 TWVudUNsaWVuCiAgICAgICAgICAgICBkYXRhLm1lZGlhRmxhZ3MgfD0gV2ViQ29udGV4dE1lbnVE YXRhOjpNZWRpYUhhc1ZpZGVvOwogICAgICAgICBpZiAobWVkaWFFbGVtZW50LT5jb250cm9scygp KQogICAgICAgICAgICAgZGF0YS5tZWRpYUZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6TWVk aWFDb250cm9sczsKKyAgICB9IGVsc2UgaWYgKHIuaW5uZXJOb25TaGFyZWROb2RlKCktPmhhc1Rh Z05hbWUoSFRNTE5hbWVzOjpvYmplY3RUYWcpIHx8CisgICAgICAgICAgICAgICByLmlubmVyTm9u U2hhcmVkTm9kZSgpLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6ZW1iZWRUYWcpKSB7CisgICAgICAg IFJlbmRlck9iamVjdCogb2JqZWN0ID0gci5pbm5lck5vblNoYXJlZE5vZGUoKS0+cmVuZGVyZXIo KTsKKyAgICAgICAgaWYgKG9iamVjdCAmJiBvYmplY3QtPmlzV2lkZ2V0KCkpIHsKKyAgICAgICAg ICAgIFdpZGdldCogd2lkZ2V0ID0gdG9SZW5kZXJXaWRnZXQob2JqZWN0KS0+d2lkZ2V0KCk7Cisg ICAgICAgICAgICBpZiAod2lkZ2V0KSB7CisgICAgICAgICAgICAgICAgV2ViUGx1Z2luQ29udGFp bmVySW1wbCogcGx1Z2luID0gc3RhdGljX2Nhc3Q8V2ViUGx1Z2luQ29udGFpbmVySW1wbCo+KHdp ZGdldCk7CisgICAgICAgICAgICAgICAgV2ViU3RyaW5nIHRleHQgPSBwbHVnaW4tPnNlbGVjdGVk VGV4dCgpOworICAgICAgICAgICAgICAgIGlmICghdGV4dC5pc0VtcHR5KCkpIHsKKyAgICAgICAg ICAgICAgICAgICAgZGF0YS5zZWxlY3RlZFRleHQgPSB0ZXh0OworICAgICAgICAgICAgICAgICAg ICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNhbkNvcHk7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogCiAgICAgZGF0YS5p c0ltYWdlQmxvY2tlZCA9CkBAIC0yMjcsNyArMjQ0LDYgQEAgUGxhdGZvcm1NZW51RGVzY3JpcHRp b24gQ29udGV4dE1lbnVDbGllbgogICAgICAgICBkYXRhLnNlY3VyaXR5SW5mbyA9IGRzLT5yZXNw b25zZSgpLnNlY3VyaXR5SW5mbygpOwogCiAgICAgLy8gQ29tcHV0ZSBlZGl0IGZsYWdzLgotICAg IGRhdGEuZWRpdEZsYWdzID0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5Eb05vbmU7CiAgICAgaWYg KG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2FuVW5kbygpKQog ICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNhblVuZG87CiAg ICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2FuUmVk bygpKQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lcklt cGwuY3BwCShyZXZpc2lvbiA2MTkxOSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2lu Q29udGFpbmVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0Niw2ICsyNDYsMTAgQEAgdm9p ZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpwcmludEVuZCgpCiAgICAgcmV0dXJuIG1fd2ViUGx1 Z2luLT5wcmludEVuZCgpOwogfQogCitXZWJTdHJpbmcgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6 c2VsZWN0ZWRUZXh0KCkgeworICAgIHJldHVybiBtX3dlYlBsdWdpbi0+c2VsZWN0ZWRUZXh0KCk7 Cit9CisKIFdlYkVsZW1lbnQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6ZWxlbWVudCgpCiB7CiAg ICAgcmV0dXJuIFdlYkVsZW1lbnQobV9lbGVtZW50KTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9z cmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1 bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCShyZXZpc2lvbiA2MTkxNikKKysrIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCSh3b3JraW5nIGNvcHkpCkBA IC05OCw2ICs5OCw4IEBAIHB1YmxpYzoKICAgICAvLyBFbmRzIHRoZSBwcmludCBvcGVyYXRpb24u CiAgICAgdm9pZCBwcmludEVuZCgpOwogCisgICAgV2ViU3RyaW5nIHNlbGVjdGVkVGV4dCgpOwor CiAgICAgLy8gUmVzb3VyY2UgbG9hZCBldmVudHMgZm9yIHRoZSBwbHVnaW4ncyBzb3VyY2UgZGF0 YToKICAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlJik7CiAgICAgdm9pZCBkaWRSZWNlaXZlRGF0YShjb25zdCBjaGFyICpkYXRhLCBpbnQg ZGF0YUxlbmd0aCk7Cg== 59866 2010-06-27 18:17:10 -0700 2010-06-27 18:26:26 -0700 Patch bug-41242-20100627181435.patch text/plain 7149 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE5NzQpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDYtMjcgIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEdldCB0aGUgc2VsZWN0ZWQgdGV4 dCBmcm9tIHBsdWdpbnMgZm9yIHJpZ2h0IGNsaWNrIG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjQyCisKKyAgICAgICAgKiBwdWJsaWMvV2Vi Q29udGV4dE1lbnVEYXRhLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51RGF0YTo6 KToKKyAgICAgICAgKiBwdWJsaWMvV2ViUGx1Z2luLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBs dWdpbjo6c2VsZWN0ZWRUZXh0KToKKyAgICAgICAgKiBzcmMvQ29udGV4dE1lbnVDbGllbnRJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29udGV4dE1lbnVDbGllbnRJbXBsOjpnZXRDdXN0b21N ZW51RnJvbURlZmF1bHRJdGVtcyk6CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lcklt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZWxlY3Rl ZFRleHQpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisKIDIwMTAt MDYtMjYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI2MTk0My4KSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViQ29udGV4dE1lbnVEYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJDb250ZXh0TWVudURhdGEuaAkocmV2aXNpb24gNjE5MTYpCisrKyBXZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMjQsNiArMTI0LDcgQEAgc3RydWN0IFdlYkNvbnRleHRNZW51RGF0YSB7CiAgICAgICAgIENh blBhc3RlID0gMHgxMCwKICAgICAgICAgQ2FuRGVsZXRlID0gMHgyMCwKICAgICAgICAgQ2FuU2Vs ZWN0QWxsID0gMHg0MCwKKyAgICAgICAgQ2FuVHJhbnNsYXRlID0gMHg4MCwKICAgICB9OwogCiAg ICAgLy8gV2hpY2ggZWRpdCBvcGVyYXRpb25zIGFyZSBhdmFpbGFibGUgaW4gdGhlIGNvbnRleHQu CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbi5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgJKHJldmlzaW9uIDYxOTE2KQorKysg V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW4uaAkod29ya2luZyBjb3B5KQpAQCAtMzIs NiArMzIsNyBAQAogI2RlZmluZSBXZWJQbHVnaW5faAogCiAjaW5jbHVkZSAiV2ViQ2FudmFzLmgi CisjaW5jbHVkZSAiV2ViU3RyaW5nLmgiCiAKIHN0cnVjdCBOUE9iamVjdDsKIApAQCAtOTMsNiAr OTQsOCBAQCBwdWJsaWM6CiAgICAgLy8gRW5kcyB0aGUgcHJpbnQgb3BlcmF0aW9uLgogICAgIHZp cnR1YWwgdm9pZCBwcmludEVuZCgpIHsgfQogCisgICAgdmlydHVhbCBXZWJTdHJpbmcgc2VsZWN0 ZWRUZXh0KCkgeyByZXR1cm4gV2ViU3RyaW5nKCk7IH0KKwogcHJvdGVjdGVkOgogICAgIH5XZWJQ bHVnaW4oKSB7IH0KIH07CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0NvbnRleHRNZW51Q2xp ZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVu dUNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA2MTkxNikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv Q29udGV4dE1lbnVDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBA QAogI2luY2x1ZGUgIktVUkwuaCIKICNpbmNsdWRlICJNZWRpYUVycm9yLmgiCiAjaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKKyNpbmNsdWRlICJSZW5kZXJXaWRnZXQuaCIKICNpbmNsdWRlICJU ZXh0QnJlYWtJdGVyYXRvci5oIgogI2luY2x1ZGUgIldpZGdldC5oIgogCkBAIC01Myw2ICs1NCw3 IEBACiAjaW5jbHVkZSAiV2ViRGF0YVNvdXJjZUltcGwuaCIKICNpbmNsdWRlICJXZWJGcmFtZUlt cGwuaCIKICNpbmNsdWRlICJXZWJNZW51SXRlbUluZm8uaCIKKyNpbmNsdWRlICJXZWJQbHVnaW5D b250YWluZXJJbXBsLmgiCiAjaW5jbHVkZSAiV2ViUG9pbnQuaCIKICNpbmNsdWRlICJXZWJTdHJp bmcuaCIKICNpbmNsdWRlICJXZWJVUkwuaCIKQEAgLTE0Nyw2ICsxNDksMjQgQEAgUGxhdGZvcm1N ZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogICAgIFdlYkNvbnRleHRNZW51RGF0YSBk YXRhOwogICAgIGRhdGEubW91c2VQb3NpdGlvbiA9IHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+Y29u dGVudHNUb1dpbmRvdyhyLnBvaW50KCkpOwogCisgICAgLy8gQ29tcHV0ZSBlZGl0IGZsYWdzLgor ICAgIGRhdGEuZWRpdEZsYWdzID0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5Eb05vbmU7CisgICAg aWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2FuVW5kbygp KQorICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNhblVuZG87 CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2Fu UmVkbygpKQorICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNh blJlZG87CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3Io KS0+Y2FuQ3V0KCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0 YTo6Q2FuQ3V0OworICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUoKS0+ZWRp dG9yKCktPmNhbkNvcHkoKSkKKyAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1l bnVEYXRhOjpDYW5Db3B5OworICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUo KS0+ZWRpdG9yKCktPmNhblBhc3RlKCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNv bnRleHRNZW51RGF0YTo6Q2FuUGFzdGU7CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNv cmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2FuRGVsZXRlKCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdz IHw9IFdlYkNvbnRleHRNZW51RGF0YTo6Q2FuRGVsZXRlOworICAgIC8vIFdlIGNhbiBhbHdheXMg c2VsZWN0IGFsbC4uLgorICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6 Q2FuU2VsZWN0QWxsOworICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6 Q2FuVHJhbnNsYXRlOworCiAgICAgLy8gTGlua3MsIEltYWdlcywgTWVkaWEgdGFncywgYW5kIElt YWdlL01lZGlhLUxpbmtzIHRha2UgcHJlZmVyZW5jZSBvdmVyCiAgICAgLy8gYWxsIGVsc2UuCiAg ICAgZGF0YS5saW5rVVJMID0gci5hYnNvbHV0ZUxpbmtVUkwoKTsKQEAgLTE4Miw2ICsyMDIsMjEg QEAgUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogICAgICAgICAgICAg ZGF0YS5tZWRpYUZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6TWVkaWFIYXNWaWRlbzsKICAg ICAgICAgaWYgKG1lZGlhRWxlbWVudC0+Y29udHJvbHMoKSkKICAgICAgICAgICAgIGRhdGEubWVk aWFGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6Ok1lZGlhQ29udHJvbHM7CisgICAgfSBlbHNl IGlmIChyLmlubmVyTm9uU2hhcmVkTm9kZSgpLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6b2JqZWN0 VGFnKQorICAgICAgICAgICAgICAgfHwgci5pbm5lck5vblNoYXJlZE5vZGUoKS0+aGFzVGFnTmFt ZShIVE1MTmFtZXM6OmVtYmVkVGFnKSkgeworICAgICAgICBSZW5kZXJPYmplY3QqIG9iamVjdCA9 IHIuaW5uZXJOb25TaGFyZWROb2RlKCktPnJlbmRlcmVyKCk7CisgICAgICAgIGlmIChvYmplY3Qg JiYgb2JqZWN0LT5pc1dpZGdldCgpKSB7CisgICAgICAgICAgICBXaWRnZXQqIHdpZGdldCA9IHRv UmVuZGVyV2lkZ2V0KG9iamVjdCktPndpZGdldCgpOworICAgICAgICAgICAgaWYgKHdpZGdldCkg eworICAgICAgICAgICAgICAgIFdlYlBsdWdpbkNvbnRhaW5lckltcGwqIHBsdWdpbiA9IHN0YXRp Y19jYXN0PFdlYlBsdWdpbkNvbnRhaW5lckltcGwqPih3aWRnZXQpOworICAgICAgICAgICAgICAg IFdlYlN0cmluZyB0ZXh0ID0gcGx1Z2luLT5zZWxlY3RlZFRleHQoKTsKKyAgICAgICAgICAgICAg ICBpZiAoIXRleHQuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgICAgIGRhdGEuc2VsZWN0 ZWRUZXh0ID0gdGV4dDsKKyAgICAgICAgICAgICAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2Vi Q29udGV4dE1lbnVEYXRhOjpDYW5Db3B5OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IH0KKyAgICAgICAgfQorICAgICAgICBkYXRhLmVkaXRGbGFncyAmPSAhV2ViQ29udGV4dE1lbnVE YXRhOjpDYW5UcmFuc2xhdGU7CiAgICAgfQogCiAgICAgZGF0YS5pc0ltYWdlQmxvY2tlZCA9CkBA IC0yMjYsMjMgKzI2MSw2IEBAIFBsYXRmb3JtTWVudURlc2NyaXB0aW9uIENvbnRleHRNZW51Q2xp ZW4KICAgICBpZiAoZHMpCiAgICAgICAgIGRhdGEuc2VjdXJpdHlJbmZvID0gZHMtPnJlc3BvbnNl KCkuc2VjdXJpdHlJbmZvKCk7CiAKLSAgICAvLyBDb21wdXRlIGVkaXQgZmxhZ3MuCi0gICAgZGF0 YS5lZGl0RmxhZ3MgPSBXZWJDb250ZXh0TWVudURhdGE6OkNhbkRvTm9uZTsKLSAgICBpZiAobV93 ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1lKCktPmVkaXRvcigpLT5jYW5VbmRvKCkpCi0gICAg ICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6Q2FuVW5kbzsKLSAgICBp ZiAobV93ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1lKCktPmVkaXRvcigpLT5jYW5SZWRvKCkp Ci0gICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6Q2FuUmVkbzsK LSAgICBpZiAobV93ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1lKCktPmVkaXRvcigpLT5jYW5D dXQoKSkKLSAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5D dXQ7Ci0gICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+ Y2FuQ29weSgpKQotICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6 OkNhbkNvcHk7Ci0gICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0 b3IoKS0+Y2FuUGFzdGUoKSkKLSAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1l bnVEYXRhOjpDYW5QYXN0ZTsKLSAgICBpZiAobV93ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1l KCktPmVkaXRvcigpLT5jYW5EZWxldGUoKSkKLSAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2Vi Q29udGV4dE1lbnVEYXRhOjpDYW5EZWxldGU7Ci0gICAgLy8gV2UgY2FuIGFsd2F5cyBzZWxlY3Qg YWxsLi4uCi0gICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5TZWxl Y3RBbGw7Ci0KICAgICAvLyBGaWx0ZXIgb3V0IGN1c3RvbSBtZW51IGVsZW1lbnRzIGFuZCBhZGQg dGhlbSBpbnRvIHRoZSBkYXRhLgogICAgIHBvcHVsYXRlQ3VzdG9tTWVudUl0ZW1zKGRlZmF1bHRN ZW51LCAmZGF0YSk7CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFp bmVySW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5D b250YWluZXJJbXBsLmNwcAkocmV2aXNpb24gNjE5MTkpCisrKyBXZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDYsNiArMjQ2 LDExIEBAIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6cHJpbnRFbmQoKQogICAgIHJldHVy biBtX3dlYlBsdWdpbi0+cHJpbnRFbmQoKTsKIH0KIAorV2ViU3RyaW5nIFdlYlBsdWdpbkNvbnRh aW5lckltcGw6OnNlbGVjdGVkVGV4dCgpCit7CisgICAgcmV0dXJuIG1fd2ViUGx1Z2luLT5zZWxl Y3RlZFRleHQoKTsKK30KKwogV2ViRWxlbWVudCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjplbGVt ZW50KCkKIHsKICAgICByZXR1cm4gV2ViRWxlbWVudChtX2VsZW1lbnQpOwpJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJKHJldmlzaW9uIDYxOTE2 KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJKHdvcmtp bmcgY29weSkKQEAgLTk4LDYgKzk4LDggQEAgcHVibGljOgogICAgIC8vIEVuZHMgdGhlIHByaW50 IG9wZXJhdGlvbi4KICAgICB2b2lkIHByaW50RW5kKCk7CiAKKyAgICBXZWJTdHJpbmcgc2VsZWN0 ZWRUZXh0KCk7CisKICAgICAvLyBSZXNvdXJjZSBsb2FkIGV2ZW50cyBmb3IgdGhlIHBsdWdpbidz IHNvdXJjZSBkYXRhOgogICAgIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVzcG9uc2UmKTsKICAgICB2b2lkIGRpZFJlY2VpdmVEYXRhKGNvbnN0IGNoYXIg KmRhdGEsIGludCBkYXRhTGVuZ3RoKTsK 59867 2010-06-27 18:26:29 -0700 2010-06-28 12:09:15 -0700 Patch bug-41242-20100627182354.patch text/plain 7149 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE5NzQpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDYtMjcgIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEdldCB0aGUgc2VsZWN0ZWQgdGV4 dCBmcm9tIHBsdWdpbnMgZm9yIHJpZ2h0IGNsaWNrIG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjQyCisKKyAgICAgICAgKiBwdWJsaWMvV2Vi Q29udGV4dE1lbnVEYXRhLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51RGF0YTo6 KToKKyAgICAgICAgKiBwdWJsaWMvV2ViUGx1Z2luLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBs dWdpbjo6c2VsZWN0ZWRUZXh0KToKKyAgICAgICAgKiBzcmMvQ29udGV4dE1lbnVDbGllbnRJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29udGV4dE1lbnVDbGllbnRJbXBsOjpnZXRDdXN0b21N ZW51RnJvbURlZmF1bHRJdGVtcyk6CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lcklt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZWxlY3Rl ZFRleHQpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisKIDIwMTAt MDYtMjYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI2MTk0My4KSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViQ29udGV4dE1lbnVEYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJDb250ZXh0TWVudURhdGEuaAkocmV2aXNpb24gNjE5MTYpCisrKyBXZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMjQsNiArMTI0LDcgQEAgc3RydWN0IFdlYkNvbnRleHRNZW51RGF0YSB7CiAgICAgICAgIENh blBhc3RlID0gMHgxMCwKICAgICAgICAgQ2FuRGVsZXRlID0gMHgyMCwKICAgICAgICAgQ2FuU2Vs ZWN0QWxsID0gMHg0MCwKKyAgICAgICAgQ2FuVHJhbnNsYXRlID0gMHg4MCwKICAgICB9OwogCiAg ICAgLy8gV2hpY2ggZWRpdCBvcGVyYXRpb25zIGFyZSBhdmFpbGFibGUgaW4gdGhlIGNvbnRleHQu CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbi5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgJKHJldmlzaW9uIDYxOTE2KQorKysg V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW4uaAkod29ya2luZyBjb3B5KQpAQCAtMzIs NiArMzIsNyBAQAogI2RlZmluZSBXZWJQbHVnaW5faAogCiAjaW5jbHVkZSAiV2ViQ2FudmFzLmgi CisjaW5jbHVkZSAiV2ViU3RyaW5nLmgiCiAKIHN0cnVjdCBOUE9iamVjdDsKIApAQCAtOTMsNiAr OTQsOCBAQCBwdWJsaWM6CiAgICAgLy8gRW5kcyB0aGUgcHJpbnQgb3BlcmF0aW9uLgogICAgIHZp cnR1YWwgdm9pZCBwcmludEVuZCgpIHsgfQogCisgICAgdmlydHVhbCBXZWJTdHJpbmcgc2VsZWN0 ZWRUZXh0KCkgeyByZXR1cm4gV2ViU3RyaW5nKCk7IH0KKwogcHJvdGVjdGVkOgogICAgIH5XZWJQ bHVnaW4oKSB7IH0KIH07CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0NvbnRleHRNZW51Q2xp ZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVu dUNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA2MTkxNikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv Q29udGV4dE1lbnVDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBA QAogI2luY2x1ZGUgIktVUkwuaCIKICNpbmNsdWRlICJNZWRpYUVycm9yLmgiCiAjaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKKyNpbmNsdWRlICJSZW5kZXJXaWRnZXQuaCIKICNpbmNsdWRlICJU ZXh0QnJlYWtJdGVyYXRvci5oIgogI2luY2x1ZGUgIldpZGdldC5oIgogCkBAIC01Myw2ICs1NCw3 IEBACiAjaW5jbHVkZSAiV2ViRGF0YVNvdXJjZUltcGwuaCIKICNpbmNsdWRlICJXZWJGcmFtZUlt cGwuaCIKICNpbmNsdWRlICJXZWJNZW51SXRlbUluZm8uaCIKKyNpbmNsdWRlICJXZWJQbHVnaW5D b250YWluZXJJbXBsLmgiCiAjaW5jbHVkZSAiV2ViUG9pbnQuaCIKICNpbmNsdWRlICJXZWJTdHJp bmcuaCIKICNpbmNsdWRlICJXZWJVUkwuaCIKQEAgLTE0Nyw2ICsxNDksMjQgQEAgUGxhdGZvcm1N ZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogICAgIFdlYkNvbnRleHRNZW51RGF0YSBk YXRhOwogICAgIGRhdGEubW91c2VQb3NpdGlvbiA9IHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+Y29u dGVudHNUb1dpbmRvdyhyLnBvaW50KCkpOwogCisgICAgLy8gQ29tcHV0ZSBlZGl0IGZsYWdzLgor ICAgIGRhdGEuZWRpdEZsYWdzID0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5Eb05vbmU7CisgICAg aWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2FuVW5kbygp KQorICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNhblVuZG87 CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2Fu UmVkbygpKQorICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNh blJlZG87CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3Io KS0+Y2FuQ3V0KCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0 YTo6Q2FuQ3V0OworICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUoKS0+ZWRp dG9yKCktPmNhbkNvcHkoKSkKKyAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1l bnVEYXRhOjpDYW5Db3B5OworICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUo KS0+ZWRpdG9yKCktPmNhblBhc3RlKCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNv bnRleHRNZW51RGF0YTo6Q2FuUGFzdGU7CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNv cmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2FuRGVsZXRlKCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdz IHw9IFdlYkNvbnRleHRNZW51RGF0YTo6Q2FuRGVsZXRlOworICAgIC8vIFdlIGNhbiBhbHdheXMg c2VsZWN0IGFsbC4uLgorICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6 Q2FuU2VsZWN0QWxsOworICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6 Q2FuVHJhbnNsYXRlOworCiAgICAgLy8gTGlua3MsIEltYWdlcywgTWVkaWEgdGFncywgYW5kIElt YWdlL01lZGlhLUxpbmtzIHRha2UgcHJlZmVyZW5jZSBvdmVyCiAgICAgLy8gYWxsIGVsc2UuCiAg ICAgZGF0YS5saW5rVVJMID0gci5hYnNvbHV0ZUxpbmtVUkwoKTsKQEAgLTE4Miw2ICsyMDIsMjEg QEAgUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogICAgICAgICAgICAg ZGF0YS5tZWRpYUZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6TWVkaWFIYXNWaWRlbzsKICAg ICAgICAgaWYgKG1lZGlhRWxlbWVudC0+Y29udHJvbHMoKSkKICAgICAgICAgICAgIGRhdGEubWVk aWFGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6Ok1lZGlhQ29udHJvbHM7CisgICAgfSBlbHNl IGlmIChyLmlubmVyTm9uU2hhcmVkTm9kZSgpLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6b2JqZWN0 VGFnKQorICAgICAgICAgICAgICAgfHwgci5pbm5lck5vblNoYXJlZE5vZGUoKS0+aGFzVGFnTmFt ZShIVE1MTmFtZXM6OmVtYmVkVGFnKSkgeworICAgICAgICBSZW5kZXJPYmplY3QqIG9iamVjdCA9 IHIuaW5uZXJOb25TaGFyZWROb2RlKCktPnJlbmRlcmVyKCk7CisgICAgICAgIGlmIChvYmplY3Qg JiYgb2JqZWN0LT5pc1dpZGdldCgpKSB7CisgICAgICAgICAgICBXaWRnZXQqIHdpZGdldCA9IHRv UmVuZGVyV2lkZ2V0KG9iamVjdCktPndpZGdldCgpOworICAgICAgICAgICAgaWYgKHdpZGdldCkg eworICAgICAgICAgICAgICAgIFdlYlBsdWdpbkNvbnRhaW5lckltcGwqIHBsdWdpbiA9IHN0YXRp Y19jYXN0PFdlYlBsdWdpbkNvbnRhaW5lckltcGwqPih3aWRnZXQpOworICAgICAgICAgICAgICAg IFdlYlN0cmluZyB0ZXh0ID0gcGx1Z2luLT5zZWxlY3RlZFRleHQoKTsKKyAgICAgICAgICAgICAg ICBpZiAoIXRleHQuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgICAgIGRhdGEuc2VsZWN0 ZWRUZXh0ID0gdGV4dDsKKyAgICAgICAgICAgICAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2Vi Q29udGV4dE1lbnVEYXRhOjpDYW5Db3B5OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IH0KKyAgICAgICAgfQorICAgICAgICBkYXRhLmVkaXRGbGFncyAmPSB+V2ViQ29udGV4dE1lbnVE YXRhOjpDYW5UcmFuc2xhdGU7CiAgICAgfQogCiAgICAgZGF0YS5pc0ltYWdlQmxvY2tlZCA9CkBA IC0yMjYsMjMgKzI2MSw2IEBAIFBsYXRmb3JtTWVudURlc2NyaXB0aW9uIENvbnRleHRNZW51Q2xp ZW4KICAgICBpZiAoZHMpCiAgICAgICAgIGRhdGEuc2VjdXJpdHlJbmZvID0gZHMtPnJlc3BvbnNl KCkuc2VjdXJpdHlJbmZvKCk7CiAKLSAgICAvLyBDb21wdXRlIGVkaXQgZmxhZ3MuCi0gICAgZGF0 YS5lZGl0RmxhZ3MgPSBXZWJDb250ZXh0TWVudURhdGE6OkNhbkRvTm9uZTsKLSAgICBpZiAobV93 ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1lKCktPmVkaXRvcigpLT5jYW5VbmRvKCkpCi0gICAg ICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6Q2FuVW5kbzsKLSAgICBp ZiAobV93ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1lKCktPmVkaXRvcigpLT5jYW5SZWRvKCkp Ci0gICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6Q2FuUmVkbzsK LSAgICBpZiAobV93ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1lKCktPmVkaXRvcigpLT5jYW5D dXQoKSkKLSAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5D dXQ7Ci0gICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+ Y2FuQ29weSgpKQotICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6 OkNhbkNvcHk7Ci0gICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0 b3IoKS0+Y2FuUGFzdGUoKSkKLSAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1l bnVEYXRhOjpDYW5QYXN0ZTsKLSAgICBpZiAobV93ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1l KCktPmVkaXRvcigpLT5jYW5EZWxldGUoKSkKLSAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2Vi Q29udGV4dE1lbnVEYXRhOjpDYW5EZWxldGU7Ci0gICAgLy8gV2UgY2FuIGFsd2F5cyBzZWxlY3Qg YWxsLi4uCi0gICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5TZWxl Y3RBbGw7Ci0KICAgICAvLyBGaWx0ZXIgb3V0IGN1c3RvbSBtZW51IGVsZW1lbnRzIGFuZCBhZGQg dGhlbSBpbnRvIHRoZSBkYXRhLgogICAgIHBvcHVsYXRlQ3VzdG9tTWVudUl0ZW1zKGRlZmF1bHRN ZW51LCAmZGF0YSk7CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFp bmVySW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5D b250YWluZXJJbXBsLmNwcAkocmV2aXNpb24gNjE5MTkpCisrKyBXZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDYsNiArMjQ2 LDExIEBAIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6cHJpbnRFbmQoKQogICAgIHJldHVy biBtX3dlYlBsdWdpbi0+cHJpbnRFbmQoKTsKIH0KIAorV2ViU3RyaW5nIFdlYlBsdWdpbkNvbnRh aW5lckltcGw6OnNlbGVjdGVkVGV4dCgpCit7CisgICAgcmV0dXJuIG1fd2ViUGx1Z2luLT5zZWxl Y3RlZFRleHQoKTsKK30KKwogV2ViRWxlbWVudCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjplbGVt ZW50KCkKIHsKICAgICByZXR1cm4gV2ViRWxlbWVudChtX2VsZW1lbnQpOwpJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJKHJldmlzaW9uIDYxOTE2 KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJKHdvcmtp bmcgY29weSkKQEAgLTk4LDYgKzk4LDggQEAgcHVibGljOgogICAgIC8vIEVuZHMgdGhlIHByaW50 IG9wZXJhdGlvbi4KICAgICB2b2lkIHByaW50RW5kKCk7CiAKKyAgICBXZWJTdHJpbmcgc2VsZWN0 ZWRUZXh0KCk7CisKICAgICAvLyBSZXNvdXJjZSBsb2FkIGV2ZW50cyBmb3IgdGhlIHBsdWdpbidz IHNvdXJjZSBkYXRhOgogICAgIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVzcG9uc2UmKTsKICAgICB2b2lkIGRpZFJlY2VpdmVEYXRhKGNvbnN0IGNoYXIg KmRhdGEsIGludCBkYXRhTGVuZ3RoKTsK 59919 2010-06-28 12:09:18 -0700 2010-06-28 13:42:20 -0700 Patch bug-41242-20100628120841.patch text/plain 7157 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE5NzQpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDYtMjcgIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEdldCB0aGUgc2VsZWN0ZWQgdGV4 dCBmcm9tIHBsdWdpbnMgZm9yIHJpZ2h0IGNsaWNrIG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjQyCisKKyAgICAgICAgKiBwdWJsaWMvV2Vi Q29udGV4dE1lbnVEYXRhLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51RGF0YTo6 KToKKyAgICAgICAgKiBwdWJsaWMvV2ViUGx1Z2luLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBs dWdpbjo6c2VsZWN0ZWRUZXh0KToKKyAgICAgICAgKiBzcmMvQ29udGV4dE1lbnVDbGllbnRJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29udGV4dE1lbnVDbGllbnRJbXBsOjpnZXRDdXN0b21N ZW51RnJvbURlZmF1bHRJdGVtcyk6CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lcklt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZWxlY3Rl ZFRleHQpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisKIDIwMTAt MDYtMjYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI2MTk0My4KSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViQ29udGV4dE1lbnVEYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJDb250ZXh0TWVudURhdGEuaAkocmV2aXNpb24gNjE5MTYpCisrKyBXZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnRleHRNZW51RGF0YS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMjQsNiArMTI0LDcgQEAgc3RydWN0IFdlYkNvbnRleHRNZW51RGF0YSB7CiAgICAgICAgIENh blBhc3RlID0gMHgxMCwKICAgICAgICAgQ2FuRGVsZXRlID0gMHgyMCwKICAgICAgICAgQ2FuU2Vs ZWN0QWxsID0gMHg0MCwKKyAgICAgICAgQ2FuVHJhbnNsYXRlID0gMHg4MCwKICAgICB9OwogCiAg ICAgLy8gV2hpY2ggZWRpdCBvcGVyYXRpb25zIGFyZSBhdmFpbGFibGUgaW4gdGhlIGNvbnRleHQu CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbi5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luLmgJKHJldmlzaW9uIDYxOTE2KQorKysg V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW4uaAkod29ya2luZyBjb3B5KQpAQCAtMzIs NiArMzIsNyBAQAogI2RlZmluZSBXZWJQbHVnaW5faAogCiAjaW5jbHVkZSAiV2ViQ2FudmFzLmgi CisjaW5jbHVkZSAiV2ViU3RyaW5nLmgiCiAKIHN0cnVjdCBOUE9iamVjdDsKIApAQCAtOTMsNiAr OTQsOCBAQCBwdWJsaWM6CiAgICAgLy8gRW5kcyB0aGUgcHJpbnQgb3BlcmF0aW9uLgogICAgIHZp cnR1YWwgdm9pZCBwcmludEVuZCgpIHsgfQogCisgICAgdmlydHVhbCBXZWJTdHJpbmcgc2VsZWN0 ZWRUZXh0KCkgeyByZXR1cm4gV2ViU3RyaW5nKCk7IH0KKwogcHJvdGVjdGVkOgogICAgIH5XZWJQ bHVnaW4oKSB7IH0KIH07CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0NvbnRleHRNZW51Q2xp ZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVu dUNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA2MTkxNikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv Q29udGV4dE1lbnVDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBA QAogI2luY2x1ZGUgIktVUkwuaCIKICNpbmNsdWRlICJNZWRpYUVycm9yLmgiCiAjaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKKyNpbmNsdWRlICJSZW5kZXJXaWRnZXQuaCIKICNpbmNsdWRlICJU ZXh0QnJlYWtJdGVyYXRvci5oIgogI2luY2x1ZGUgIldpZGdldC5oIgogCkBAIC01Myw2ICs1NCw3 IEBACiAjaW5jbHVkZSAiV2ViRGF0YVNvdXJjZUltcGwuaCIKICNpbmNsdWRlICJXZWJGcmFtZUlt cGwuaCIKICNpbmNsdWRlICJXZWJNZW51SXRlbUluZm8uaCIKKyNpbmNsdWRlICJXZWJQbHVnaW5D b250YWluZXJJbXBsLmgiCiAjaW5jbHVkZSAiV2ViUG9pbnQuaCIKICNpbmNsdWRlICJXZWJTdHJp bmcuaCIKICNpbmNsdWRlICJXZWJVUkwuaCIKQEAgLTE0Nyw2ICsxNDksMjQgQEAgUGxhdGZvcm1N ZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogICAgIFdlYkNvbnRleHRNZW51RGF0YSBk YXRhOwogICAgIGRhdGEubW91c2VQb3NpdGlvbiA9IHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+Y29u dGVudHNUb1dpbmRvdyhyLnBvaW50KCkpOwogCisgICAgLy8gQ29tcHV0ZSBlZGl0IGZsYWdzLgor ICAgIGRhdGEuZWRpdEZsYWdzID0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5Eb05vbmU7CisgICAg aWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2FuVW5kbygp KQorICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNhblVuZG87 CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2Fu UmVkbygpKQorICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNh blJlZG87CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3Io KS0+Y2FuQ3V0KCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0 YTo6Q2FuQ3V0OworICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUoKS0+ZWRp dG9yKCktPmNhbkNvcHkoKSkKKyAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1l bnVEYXRhOjpDYW5Db3B5OworICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUo KS0+ZWRpdG9yKCktPmNhblBhc3RlKCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNv bnRleHRNZW51RGF0YTo6Q2FuUGFzdGU7CisgICAgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNv cmVGcmFtZSgpLT5lZGl0b3IoKS0+Y2FuRGVsZXRlKCkpCisgICAgICAgIGRhdGEuZWRpdEZsYWdz IHw9IFdlYkNvbnRleHRNZW51RGF0YTo6Q2FuRGVsZXRlOworICAgIC8vIFdlIGNhbiBhbHdheXMg c2VsZWN0IGFsbC4uLgorICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6 Q2FuU2VsZWN0QWxsOworICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6 Q2FuVHJhbnNsYXRlOworCiAgICAgLy8gTGlua3MsIEltYWdlcywgTWVkaWEgdGFncywgYW5kIElt YWdlL01lZGlhLUxpbmtzIHRha2UgcHJlZmVyZW5jZSBvdmVyCiAgICAgLy8gYWxsIGVsc2UuCiAg ICAgZGF0YS5saW5rVVJMID0gci5hYnNvbHV0ZUxpbmtVUkwoKTsKQEAgLTE4Miw2ICsyMDIsMjEg QEAgUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogICAgICAgICAgICAg ZGF0YS5tZWRpYUZsYWdzIHw9IFdlYkNvbnRleHRNZW51RGF0YTo6TWVkaWFIYXNWaWRlbzsKICAg ICAgICAgaWYgKG1lZGlhRWxlbWVudC0+Y29udHJvbHMoKSkKICAgICAgICAgICAgIGRhdGEubWVk aWFGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6Ok1lZGlhQ29udHJvbHM7CisgICAgfSBlbHNl IGlmIChyLmlubmVyTm9uU2hhcmVkTm9kZSgpLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6b2JqZWN0 VGFnKQorICAgICAgICAgICAgICAgfHwgci5pbm5lck5vblNoYXJlZE5vZGUoKS0+aGFzVGFnTmFt ZShIVE1MTmFtZXM6OmVtYmVkVGFnKSkgeworICAgICAgICBSZW5kZXJPYmplY3QqIG9iamVjdCA9 IHIuaW5uZXJOb25TaGFyZWROb2RlKCktPnJlbmRlcmVyKCk7CisgICAgICAgIGlmIChvYmplY3Qg JiYgb2JqZWN0LT5pc1dpZGdldCgpKSB7CisgICAgICAgICAgICBXaWRnZXQqIHdpZGdldCA9IHRv UmVuZGVyV2lkZ2V0KG9iamVjdCktPndpZGdldCgpOworICAgICAgICAgICAgaWYgKHdpZGdldCkg eworICAgICAgICAgICAgICAgIFdlYlBsdWdpbkNvbnRhaW5lckltcGwqIHBsdWdpbiA9IHN0YXRp Y19jYXN0PFdlYlBsdWdpbkNvbnRhaW5lckltcGwqPih3aWRnZXQpOworICAgICAgICAgICAgICAg IFdlYlN0cmluZyB0ZXh0ID0gcGx1Z2luLT5zZWxlY3RlZFRleHQoKTsKKyAgICAgICAgICAgICAg ICBpZiAoIXRleHQuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgICAgIGRhdGEuc2VsZWN0 ZWRUZXh0ID0gdGV4dDsKKyAgICAgICAgICAgICAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2Vi Q29udGV4dE1lbnVEYXRhOjpDYW5Db3B5OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICBkYXRhLmVkaXRGbGFncyAmPSB+V2ViQ29udGV4dE1lbnVEYXRhOjpDYW5UcmFuc2xhdGU7 CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9CiAKICAgICBkYXRhLmlzSW1hZ2VCbG9j a2VkID0KQEAgLTIyNiwyMyArMjYxLDYgQEAgUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4 dE1lbnVDbGllbgogICAgIGlmIChkcykKICAgICAgICAgZGF0YS5zZWN1cml0eUluZm8gPSBkcy0+ cmVzcG9uc2UoKS5zZWN1cml0eUluZm8oKTsKIAotICAgIC8vIENvbXB1dGUgZWRpdCBmbGFncy4K LSAgICBkYXRhLmVkaXRGbGFncyA9IFdlYkNvbnRleHRNZW51RGF0YTo6Q2FuRG9Ob25lOwotICAg IGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUoKS0+ZWRpdG9yKCktPmNhblVuZG8o KSkKLSAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1lbnVEYXRhOjpDYW5VbmRv OwotICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUoKS0+ZWRpdG9yKCktPmNh blJlZG8oKSkKLSAgICAgICAgZGF0YS5lZGl0RmxhZ3MgfD0gV2ViQ29udGV4dE1lbnVEYXRhOjpD YW5SZWRvOwotICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJDb3JlRnJhbWUoKS0+ZWRpdG9y KCktPmNhbkN1dCgpKQotICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURh dGE6OkNhbkN1dDsKLSAgICBpZiAobV93ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1lKCktPmVk aXRvcigpLT5jYW5Db3B5KCkpCi0gICAgICAgIGRhdGEuZWRpdEZsYWdzIHw9IFdlYkNvbnRleHRN ZW51RGF0YTo6Q2FuQ29weTsKLSAgICBpZiAobV93ZWJWaWV3LT5mb2N1c2VkV2ViQ29yZUZyYW1l KCktPmVkaXRvcigpLT5jYW5QYXN0ZSgpKQotICAgICAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJD b250ZXh0TWVudURhdGE6OkNhblBhc3RlOwotICAgIGlmIChtX3dlYlZpZXctPmZvY3VzZWRXZWJD b3JlRnJhbWUoKS0+ZWRpdG9yKCktPmNhbkRlbGV0ZSgpKQotICAgICAgICBkYXRhLmVkaXRGbGFn cyB8PSBXZWJDb250ZXh0TWVudURhdGE6OkNhbkRlbGV0ZTsKLSAgICAvLyBXZSBjYW4gYWx3YXlz IHNlbGVjdCBhbGwuLi4KLSAgICBkYXRhLmVkaXRGbGFncyB8PSBXZWJDb250ZXh0TWVudURhdGE6 OkNhblNlbGVjdEFsbDsKLQogICAgIC8vIEZpbHRlciBvdXQgY3VzdG9tIG1lbnUgZWxlbWVudHMg YW5kIGFkZCB0aGVtIGludG8gdGhlIGRhdGEuCiAgICAgcG9wdWxhdGVDdXN0b21NZW51SXRlbXMo ZGVmYXVsdE1lbnUsICZkYXRhKTsKIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVn aW5Db250YWluZXJJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCShyZXZpc2lvbiA2MTkxOSkKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0 Niw2ICsyNDYsMTEgQEAgdm9pZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpwcmludEVuZCgpCiAg ICAgcmV0dXJuIG1fd2ViUGx1Z2luLT5wcmludEVuZCgpOwogfQogCitXZWJTdHJpbmcgV2ViUGx1 Z2luQ29udGFpbmVySW1wbDo6c2VsZWN0ZWRUZXh0KCkKK3sKKyAgICByZXR1cm4gbV93ZWJQbHVn aW4tPnNlbGVjdGVkVGV4dCgpOworfQorCiBXZWJFbGVtZW50IFdlYlBsdWdpbkNvbnRhaW5lcklt cGw6OmVsZW1lbnQoKQogewogICAgIHJldHVybiBXZWJFbGVtZW50KG1fZWxlbWVudCk7CkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAkocmV2aXNp b24gNjE5MTYpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwu aAkod29ya2luZyBjb3B5KQpAQCAtOTgsNiArOTgsOCBAQCBwdWJsaWM6CiAgICAgLy8gRW5kcyB0 aGUgcHJpbnQgb3BlcmF0aW9uLgogICAgIHZvaWQgcHJpbnRFbmQoKTsKIAorICAgIFdlYlN0cmlu ZyBzZWxlY3RlZFRleHQoKTsKKwogICAgIC8vIFJlc291cmNlIGxvYWQgZXZlbnRzIGZvciB0aGUg cGx1Z2luJ3Mgc291cmNlIGRhdGE6CiAgICAgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2UoY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHZvaWQgZGlkUmVjZWl2ZURhdGEoY29u c3QgY2hhciAqZGF0YSwgaW50IGRhdGFMZW5ndGgpOwo=