46134 2010-09-20 16:42:32 -0700 REGRESSION (r61285): AIM 2.1.296: Code rendered as text in Welcome screen 2010-09-21 13:44:11 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar, Regression P2 Normal --- 40961 1 aestes aestes dbates mitz oldest_to_newest 281902 0 aestes 2010-09-20 16:42:32 -0700 After r61285, markup is displayed on the Mac AIM client's welcome screen when it links against a ToT WebKit.framework. This is due to a change in how WebKit's parser handles invalid markup. An app-specific workaround should be checked in. 281903 1 aestes 2010-09-20 16:43:28 -0700 <rdar://problem/8154379> 282004 2 68172 aestes 2010-09-20 18:34:08 -0700 Created attachment 68172 Patch 282010 3 68172 mitz 2010-09-20 18:39:40 -0700 Comment on attachment 68172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68172&action=review > WebKit/mac/WebView/WebView.mm:615 > +static bool shouldUsePreHTML5ParserQuirks(WebPreferences* preferences) > +{ > + return ([preferences usePreHTML5ParserQuirks] || applicationIsAOLInstantMessenger()); > +} Should this be limited to certain versions of AIM or simply versions of AIM linked against versions of WebKit that had the old parser? 282017 4 aestes 2010-09-20 18:52:15 -0700 (In reply to comment #3) > (From update of attachment 68172 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=68172&action=review > > > WebKit/mac/WebView/WebView.mm:615 > > +static bool shouldUsePreHTML5ParserQuirks(WebPreferences* preferences) > > +{ > > + return ([preferences usePreHTML5ParserQuirks] || applicationIsAOLInstantMessenger()); > > +} > > Should this be limited to certain versions of AIM or simply versions of AIM linked against versions of WebKit that had the old parser? bdash pointed out the rationale of doing this, so yes we should do this. I'm not sure whether it's better to check the version of AIM or check the version of WebKit AIM linked against; it seems the same thing can be accomplished either way. 282022 5 mitz 2010-09-20 19:05:09 -0700 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 68172 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=68172&action=review > > > > > WebKit/mac/WebView/WebView.mm:615 > > > +static bool shouldUsePreHTML5ParserQuirks(WebPreferences* preferences) > > > +{ > > > + return ([preferences usePreHTML5ParserQuirks] || applicationIsAOLInstantMessenger()); > > > +} > > > > Should this be limited to certain versions of AIM or simply versions of AIM linked against versions of WebKit that had the old parser? > > bdash pointed out the rationale of doing this, so yes we should do this. I'm not sure whether it's better to check the version of AIM or check the version of WebKit AIM linked against; it seems the same thing can be accomplished either way. I would check the WebKit version, since AIM’s version numbering is out of my control (and doesn't make much sense). I am not even sure that this behavior should be restricted to AIM. 282090 6 68172 dbates 2010-09-20 21:55:05 -0700 Comment on attachment 68172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68172&action=review > WebCore/ChangeLog:8 > + No new tests. (OOPS!) Briefly glanced at this patch and noticed this OOPS line. Obviously you will need to remove this line before landing. 282107 7 68189 aestes 2010-09-20 23:04:44 -0700 Created attachment 68189 Patch 282267 8 68189 aroben 2010-09-21 06:37:53 -0700 Comment on attachment 68189 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68189&action=review > WebKit/mac/WebView/WebView.mm:621 > +static bool shouldUsePreHTML5ParserQuirks(WebPreferences* preferences) > +{ > + // AIM clients linked against versions of WebKit prior to the introduction > + // of the HTML5 parser contain markup incompatible with the new parser. > + // Enable parser quirks to remain compatible with these clients. See > + // <https://bugs.webkit.org/show_bug.cgi?id=46134>. > + static bool shouldUsePreHTML5ParserQuirks = [preferences usePreHTML5ParserQuirks] > + || (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER) && applicationIsAOLInstantMessenger()); > + return shouldUsePreHTML5ParserQuirks; > +} This doesn't seem to support a client application calling [preferences setUsePreHTML5ParserQuirks] after this function is first called, or applications that use multiple WebPreferences instances. If you put the linked-on-or-after and is-AOL checks into their own static bool, then you can check [preferences usePreHTML5ParserQuirks] every time this function is called. 282465 9 68270 aestes 2010-09-21 11:57:50 -0700 Created attachment 68270 Patch 282466 10 aestes 2010-09-21 11:58:22 -0700 (In reply to comment #8) > (From update of attachment 68189 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=68189&action=review > > > WebKit/mac/WebView/WebView.mm:621 > > +static bool shouldUsePreHTML5ParserQuirks(WebPreferences* preferences) > > +{ > > + // AIM clients linked against versions of WebKit prior to the introduction > > + // of the HTML5 parser contain markup incompatible with the new parser. > > + // Enable parser quirks to remain compatible with these clients. See > > + // <https://bugs.webkit.org/show_bug.cgi?id=46134>. > > + static bool shouldUsePreHTML5ParserQuirks = [preferences usePreHTML5ParserQuirks] > > + || (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER) && applicationIsAOLInstantMessenger()); > > + return shouldUsePreHTML5ParserQuirks; > > +} > > This doesn't seem to support a client application calling [preferences setUsePreHTML5ParserQuirks] after this function is first called, or applications that use multiple WebPreferences instances. > > If you put the linked-on-or-after and is-AOL checks into their own static bool, then you can check [preferences usePreHTML5ParserQuirks] every time this function is called. Yep, you're right. Fixed. 282530 11 aestes 2010-09-21 13:44:11 -0700 Committed r67983: <http://trac.webkit.org/changeset/67983> 68172 2010-09-20 18:34:08 -0700 2010-09-20 23:04:40 -0700 Patch bug-46134-20100920183406.patch text/plain 4733 aestes SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzkwMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjAgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JF U1NJT04gKHI2MTI4NSk6IEFJTSAyLjEuMjk2OiBDb2RlIHJlbmRlcmVkIGFzIHRleHQgaW4gV2Vs Y29tZSBzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ2MTM0CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBX ZWJDb3JlLmV4cC5pbjogRXhwb3J0IF9fWk43V2ViQ29yZTMyYXBwbGljYXRpb25Jc0FPTEluc3Rh bnRNZXNzZW5nZXJFdi4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUnVudGltZUFwcGxpY2F0aW9u Q2hlY2tzLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNr cy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmFwcGxpY2F0aW9uSXNBT0xJbnN0YW50TWVzc2VuZ2Vy KTogRGV0ZXJtaW5lIGlmIHRoZSBlbWJlZGRpbmcKKyAgICAgICAgYXBwbGljYXRpb24gaXMgQU9M IEluc3RhbnQgTWVzc2VuZ2VyIGJ5IGNoZWNraW5nIHRoZSBidW5kbGUgaWRlbnRpZmllci4KKwog MjAxMC0wOS0yMCAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkOyBhbiBhdHRlbXB0IHRvIGZpeCBXaW5kb3dzIGJ1aWxkLgpJbmRleDog V2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUuZXhw LmluCShyZXZpc2lvbiA2Nzg5MCkKKysrIFdlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHdvcmtpbmcg Y29weSkKQEAgLTUxNiw2ICs1MTYsNyBAQCBfX1pON1dlYkNvcmUzMWNvbnRleHRNZW51SXRlbVRh Z0lnbm9yZUdyCiBfX1pON1dlYkNvcmUzMWNvbnRleHRNZW51SXRlbVRhZ01ha2VMb3dlckNhc2VF dgogX19aTjdXZWJDb3JlMzFjb250ZXh0TWVudUl0ZW1UYWdNYWtlVXBwZXJDYXNlRXYKIF9fWk43 V2ViQ29yZTMxY29udGV4dE1lbnVJdGVtVGFnU3RhcnRTcGVha2luZ0V2CitfX1pON1dlYkNvcmUz MmFwcGxpY2F0aW9uSXNBT0xJbnN0YW50TWVzc2VuZ2VyRXYKIF9fWk43V2ViQ29yZTMyY29udGV4 dE1lbnVJdGVtVGFnSW5zcGVjdEVsZW1lbnRFdgogX19aTjdXZWJDb3JlMzJjb250ZXh0TWVudUl0 ZW1UYWdTbWFydENvcHlQYXN0ZUV2CiBfX1pON1dlYkNvcmUzMnBsYWluVGV4dFRvTWFsbG9jQWxs b2NhdGVkQnVmZmVyRVBLTlNfNVJhbmdlRVJqYk5TXzIwVGV4dEl0ZXJhdG9yQmVoYXZpb3JFCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL21hYy9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL21hYy9SdW50aW1lQXBwbGljYXRpb25DaGVja3Mu aAkocmV2aXNpb24gNjc4OTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL21hYy9SdW50aW1lQXBwbGlj YXRpb25DaGVja3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIsNyBAQCBib29sIGFwcGxp Y2F0aW9uSXNBcHBsZU1haWwoKTsKIGJvb2wgYXBwbGljYXRpb25Jc1NhZmFyaSgpOwogYm9vbCBh cHBsaWNhdGlvbklzTWljcm9zb2Z0TWVzc2VuZ2VyKCk7CiBib29sIGFwcGxpY2F0aW9uSXNBZG9i ZUluc3RhbGxlcigpOworYm9vbCBhcHBsaWNhdGlvbklzQU9MSW5zdGFudE1lc3NlbmdlcigpOwog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbWFjL1J1 bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L21hYy9SdW50aW1lQXBwbGljYXRpb25DaGVja3MubW0JKHJldmlzaW9uIDY3ODkwKQorKysgV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLm1tCSh3b3JraW5nIGNv cHkpCkBAIC01Miw1ICs1MiwxMSBAQCBib29sIGFwcGxpY2F0aW9uSXNBZG9iZUluc3RhbGxlcigp CiAgICAgc3RhdGljIGJvb2wgaXNBZG9iZUluc3RhbGxlciA9IFtbW05TQnVuZGxlIG1haW5CdW5k bGVdIGJ1bmRsZUlkZW50aWZpZXJdIGlzRXF1YWxUb1N0cmluZzpAImNvbS5hZG9iZS5JbnN0YWxs ZXJzLlNldHVwIl07CiAgICAgcmV0dXJuIGlzQWRvYmVJbnN0YWxsZXI7CiB9CisgICAgCitib29s IGFwcGxpY2F0aW9uSXNBT0xJbnN0YW50TWVzc2VuZ2VyKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBp c0FPTEluc3RhbnRNZXNzZW5nZXIgPSBbW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVu dGlmaWVyXSBpc0VxdWFsVG9TdHJpbmc6QCJjb20uYW9sLmFpbS5kZXNrdG9wIl07CisgICAgcmV0 dXJuIGlzQU9MSW5zdGFudE1lc3NlbmdlcjsKK30KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJ bmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFu Z2VMb2cJKHJldmlzaW9uIDY3OTAzKQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOS0yMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0Bh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUkVHUkVTU0lPTiAocjYxMjg1KTogQUlNIDIuMS4yOTY6IENvZGUgcmVuZGVyZWQgYXMgdGV4 dCBpbiBXZWxjb21lIHNjcmVlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDYxMzQKKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAg ICAgKHNob3VsZFVzZVByZUhUTUw1UGFyc2VyUXVpcmtzKTogUmV0dXJucyB0cnVlIGlmIHRoZSBl bWJlZGRpbmcKKyAgICAgICAgYXBwbGljYXRpb24gaXMgQUlNIG9yIGlmIHRoZSBXZWJLaXRVc2VQ cmVIVE1MNVBhcnNlclF1aXJrcyBXZWJQcmVmZXJlbmNlCisgICAgICAgIGlzIGVuYWJsZWQuCisg ICAgICAgICgtW1dlYlZpZXcgX3ByZWZlcmVuY2VzQ2hhbmdlZE5vdGlmaWNhdGlvbjpdKTogQ2Fs bAorICAgICAgICBzaG91bGRVc2VQcmVIVE1MNVBhcnNlclF1aXJrcyB0byBzZXQgdXNlUHJlSFRN TDVQYXJzZXJRdWlya3MgaW4KKyAgICAgICAgV2ViQ29yZTo6U2V0dGluZ3MuCisKIDIwMTAtMDkt MjAgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gQmFydGguCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gNjc4OTApCisr KyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjA5LDYg KzYwOSwxMSBAQCBzdGF0aWMgYm9vbCBjb3JlVmlkZW9IYXM3MjI4ODM2Rml4KCkKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAorc3RhdGljIGJvb2wgc2hvdWxkVXNlUHJlSFRNTDVQYXJzZXJRdWlya3Mo V2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKQoreworICAgIHJldHVybiAoW3ByZWZlcmVuY2Vz IHVzZVByZUhUTUw1UGFyc2VyUXVpcmtzXSB8fCBhcHBsaWNhdGlvbklzQU9MSW5zdGFudE1lc3Nl bmdlcigpKTsKK30KKwogc3RhdGljIGJvb2wgc2hvdWxkRW5hYmxlTG9hZERlZmVycmluZygpCiB7 CiAgICAgcmV0dXJuICFhcHBsaWNhdGlvbklzQWRvYmVJbnN0YWxsZXIoKTsKQEAgLTE0NTMsNyAr MTQ1OCw3IEBAIC0gKHZvaWQpX3ByZWZlcmVuY2VzQ2hhbmdlZE5vdGlmaWNhdGlvbjoKICAgICBz ZXR0aW5ncy0+c2V0RnVsbFNjcmVlbkVuYWJsZWQoW3ByZWZlcmVuY2VzIGZ1bGxTY3JlZW5FbmFi bGVkXSk7CiAjZW5kaWYKICAgICBzZXR0aW5ncy0+c2V0TWVtb3J5SW5mb0VuYWJsZWQoW3ByZWZl cmVuY2VzIG1lbW9yeUluZm9FbmFibGVkXSk7Ci0gICAgc2V0dGluZ3MtPnNldFVzZVByZUhUTUw1 UGFyc2VyUXVpcmtzKFtwcmVmZXJlbmNlcyB1c2VQcmVIVE1MNVBhcnNlclF1aXJrc10pOworICAg IHNldHRpbmdzLT5zZXRVc2VQcmVIVE1MNVBhcnNlclF1aXJrcyhzaG91bGRVc2VQcmVIVE1MNVBh cnNlclF1aXJrcyhwcmVmZXJlbmNlcykpOwogCiAgICAgLy8gQXBwbGljYXRpb24gQ2FjaGUgUHJl ZmVyZW5jZXMgYXJlIHN0b3JlZCBvbiB0aGUgZ2xvYmFsIGNhY2hlIHN0b3JhZ2UgbWFuYWdlciwg bm90IGluIFNldHRpbmdzLgogICAgIFtXZWJBcHBsaWNhdGlvbkNhY2hlIHNldERlZmF1bHRPcmln aW5RdW90YTpbcHJlZmVyZW5jZXMgYXBwbGljYXRpb25DYWNoZURlZmF1bHRPcmlnaW5RdW90YV1d Owo= 68189 2010-09-20 23:04:44 -0700 2010-09-21 11:57:47 -0700 Patch bug-46134-20100920230443.patch text/plain 6072 aestes SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzkwMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMjAgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JF U1NJT04gKHI2MTI4NSk6IEFJTSAyLjEuMjk2OiBDb2RlIHJlbmRlcmVkIGFzIHRleHQgaW4gV2Vs Y29tZSBzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ2MTM0CisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogRXhwb3J0IF9fWk43V2ViQ29y ZTMyYXBwbGljYXRpb25Jc0FPTEluc3RhbnRNZXNzZW5nZXJFdi4KKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFj L1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmFwcGxpY2F0 aW9uSXNBT0xJbnN0YW50TWVzc2VuZ2VyKTogRGV0ZXJtaW5lIGlmIHRoZSBlbWJlZGRpbmcKKyAg ICAgICAgYXBwbGljYXRpb24gaXMgQU9MIEluc3RhbnQgTWVzc2VuZ2VyIGJ5IGNoZWNraW5nIHRo ZSBidW5kbGUgaWRlbnRpZmllci4KKwogMjAxMC0wOS0yMCAgTWloYWkgUGFycGFyaXRhICA8bWlo YWlwQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkOyBhbiBhdHRlbXB0IHRvIGZp eCBXaW5kb3dzIGJ1aWxkLgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiA2Nzg5MCkKKysrIFdlYkNvcmUv V2ViQ29yZS5leHAuaW4JKHdvcmtpbmcgY29weSkKQEAgLTUxNiw2ICs1MTYsNyBAQCBfX1pON1dl YkNvcmUzMWNvbnRleHRNZW51SXRlbVRhZ0lnbm9yZUdyCiBfX1pON1dlYkNvcmUzMWNvbnRleHRN ZW51SXRlbVRhZ01ha2VMb3dlckNhc2VFdgogX19aTjdXZWJDb3JlMzFjb250ZXh0TWVudUl0ZW1U YWdNYWtlVXBwZXJDYXNlRXYKIF9fWk43V2ViQ29yZTMxY29udGV4dE1lbnVJdGVtVGFnU3RhcnRT cGVha2luZ0V2CitfX1pON1dlYkNvcmUzMmFwcGxpY2F0aW9uSXNBT0xJbnN0YW50TWVzc2VuZ2Vy RXYKIF9fWk43V2ViQ29yZTMyY29udGV4dE1lbnVJdGVtVGFnSW5zcGVjdEVsZW1lbnRFdgogX19a TjdXZWJDb3JlMzJjb250ZXh0TWVudUl0ZW1UYWdTbWFydENvcHlQYXN0ZUV2CiBfX1pON1dlYkNv cmUzMnBsYWluVGV4dFRvTWFsbG9jQWxsb2NhdGVkQnVmZmVyRVBLTlNfNVJhbmdlRVJqYk5TXzIw VGV4dEl0ZXJhdG9yQmVoYXZpb3JFCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL21hYy9SdW50aW1l QXBwbGljYXRpb25DaGVja3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL21hYy9S dW50aW1lQXBwbGljYXRpb25DaGVja3MuaAkocmV2aXNpb24gNjc4OTApCisrKyBXZWJDb3JlL3Bs YXRmb3JtL21hYy9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaAkod29ya2luZyBjb3B5KQpAQCAt MzIsNiArMzIsNyBAQCBib29sIGFwcGxpY2F0aW9uSXNBcHBsZU1haWwoKTsKIGJvb2wgYXBwbGlj YXRpb25Jc1NhZmFyaSgpOwogYm9vbCBhcHBsaWNhdGlvbklzTWljcm9zb2Z0TWVzc2VuZ2VyKCk7 CiBib29sIGFwcGxpY2F0aW9uSXNBZG9iZUluc3RhbGxlcigpOworYm9vbCBhcHBsaWNhdGlvbklz QU9MSW5zdGFudE1lc3NlbmdlcigpOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vbWFjL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL21hYy9SdW50aW1lQXBwbGljYXRpb25DaGVja3MubW0J KHJldmlzaW9uIDY3ODkwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUnVudGltZUFwcGxpY2F0 aW9uQ2hlY2tzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01Miw1ICs1MiwxMSBAQCBib29sIGFwcGxp Y2F0aW9uSXNBZG9iZUluc3RhbGxlcigpCiAgICAgc3RhdGljIGJvb2wgaXNBZG9iZUluc3RhbGxl ciA9IFtbW05TQnVuZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlkZW50aWZpZXJdIGlzRXF1YWxUb1N0 cmluZzpAImNvbS5hZG9iZS5JbnN0YWxsZXJzLlNldHVwIl07CiAgICAgcmV0dXJuIGlzQWRvYmVJ bnN0YWxsZXI7CiB9CisgICAgCitib29sIGFwcGxpY2F0aW9uSXNBT0xJbnN0YW50TWVzc2VuZ2Vy KCkKK3sKKyAgICBzdGF0aWMgYm9vbCBpc0FPTEluc3RhbnRNZXNzZW5nZXIgPSBbW1tOU0J1bmRs ZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXSBpc0VxdWFsVG9TdHJpbmc6QCJjb20uYW9s LmFpbS5kZXNrdG9wIl07CisgICAgcmV0dXJuIGlzQU9MSW5zdGFudE1lc3NlbmdlcjsKK30KIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDY3OTAzKQorKysgV2ViS2l0 L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOS0y MCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTiAocjYxMjg1KTogQUlNIDIuMS4y OTY6IENvZGUgcmVuZGVyZWQgYXMgdGV4dCBpbiBXZWxjb21lIHNjcmVlbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYxMzQKKworICAgICAgICBBSU0g Y2xpZW50cyBsaW5rZWQgYWdhaW5zdCB2ZXJzaW9ucyBvZiBXZWJLaXQgcHJpb3IgdG8gdGhlIGlu dHJvZHVjdGlvbgorICAgICAgICBvZiB0aGUgSFRNTDUgcGFyc2VyIGNvbnRhaW4gbWFya3VwIGlu Y29tcGF0aWJsZSB3aXRoIHRoZSBuZXcgcGFyc2VyLgorICAgICAgICBFbmFibGUgcGFyc2VyIHF1 aXJrcyBpbiB0aGlzIGNhc2UgdG8gcmVtYWluIGNvbXBhdGlibGUgd2l0aCB0aGVzZQorICAgICAg ICBjbGllbnRzLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoc2hv dWxkVXNlUHJlSFRNTDVQYXJzZXJRdWlya3MpOiBSZXR1cm5zIHRydWUgaWYgdGhlIGVtYmVkZGlu ZworICAgICAgICBhcHBsaWNhdGlvbiBpcyBBSU0gYW5kIHdhcyBsaW5rZWQgYWdhaW5zdCBhIHZl cnNpb24gb2YgV2ViS2l0IHByaW9yIHRvCisgICAgICAgIHRoZSBpbnRyb2R1Y3Rpb24gb2YgdGhl IEhUTUw1IHBhcnNlciwgb3IgaWYgdGhlCisgICAgICAgIFdlYktpdFByZUhUTUw1UGFyc2VyUXVp cmtzIFdlYlByZWZlcmVuY2UgaXMgZW5hYmxlZC4KKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVy ZW5jZXNDaGFuZ2VkTm90aWZpY2F0aW9uOl0pOiBDYWxsCisgICAgICAgIFdlYkNvcmU6OlNldHRp bmdzOjpzZXRVc2VQcmVIVE1MNVBhcnNlclF1aXJrcygpLgorCiAyMDEwLTA5LTIwICBBbmR5IEVz dGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRo LgpJbmRleDogV2ViS2l0L21hYy9NaXNjL1dlYktpdFZlcnNpb25DaGVja3MuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvbWFjL01pc2MvV2ViS2l0VmVyc2lvbkNoZWNrcy5oCShyZXZpc2lvbiA2Nzg5 MCkKKysrIFdlYktpdC9tYWMvTWlzYy9XZWJLaXRWZXJzaW9uQ2hlY2tzLmgJKHdvcmtpbmcgY29w eSkKQEAgLTU0LDYgKzU0LDcgQEAKICNkZWZpbmUgV0VCS0lUX0ZJUlNUX1ZFUlNJT05fV0lUSE9V VF9CVU1QRVJDQVJfQkFDS19GT1JXQVJEX1FVSVJLIDB4MDIxMjA3MDAgLy8gNTMwLjcuMAogI2Rl ZmluZSBXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIT1VUX0NPTlRFTlRfU05JRkZJTkdfRk9SX0ZJ TEVfVVJMUyAweDAyMTIwQTAwIC8vIDUzMC4xMC4wCiAjZGVmaW5lIFdFQktJVF9GSVJTVF9WRVJT SU9OX1dJVEhPVVRfTElOS19FTEVNRU5UX1RFWFRfQ1NTX1FVSVJLIDB4MDIxMzAyMDAgLy8gNTMx LjIuMAorI2RlZmluZSBXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIX0hUTUw1X1BBUlNFUiAweDAy MTYwOTAwIC8vIDUzNC45LjAKIAogI2lmZGVmIF9fY3BsdXNwbHVzCiBleHRlcm4gIkMiIHsKSW5k ZXg6IFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lvbiA2Nzg5MCkKKysrIFdlYktpdC9tYWMvV2Vi Vmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MDksNiArNjA5LDE3IEBAIHN0YXRp YyBib29sIGNvcmVWaWRlb0hhczcyMjg4MzZGaXgoKQogICAgIHJldHVybiB0cnVlOwogfQogCitz dGF0aWMgYm9vbCBzaG91bGRVc2VQcmVIVE1MNVBhcnNlclF1aXJrcyhXZWJQcmVmZXJlbmNlcyog cHJlZmVyZW5jZXMpCit7CisgICAgLy8gQUlNIGNsaWVudHMgbGlua2VkIGFnYWluc3QgdmVyc2lv bnMgb2YgV2ViS2l0IHByaW9yIHRvIHRoZSBpbnRyb2R1Y3Rpb24KKyAgICAvLyBvZiB0aGUgSFRN TDUgcGFyc2VyIGNvbnRhaW4gbWFya3VwIGluY29tcGF0aWJsZSB3aXRoIHRoZSBuZXcgcGFyc2Vy LgorICAgIC8vIEVuYWJsZSBwYXJzZXIgcXVpcmtzIHRvIHJlbWFpbiBjb21wYXRpYmxlIHdpdGgg dGhlc2UgY2xpZW50cy4gU2VlCisgICAgLy8gPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NjEzND4uCisgICAgc3RhdGljIGJvb2wgc2hvdWxkVXNlUHJlSFRNTDVQYXJz ZXJRdWlya3MgPSBbcHJlZmVyZW5jZXMgdXNlUHJlSFRNTDVQYXJzZXJRdWlya3NdCisgICAgICAg IHx8ICghV2ViS2l0TGlua2VkT25PckFmdGVyKFdFQktJVF9GSVJTVF9WRVJTSU9OX1dJVEhfSFRN TDVfUEFSU0VSKSAmJiBhcHBsaWNhdGlvbklzQU9MSW5zdGFudE1lc3NlbmdlcigpKTsKKyAgICBy ZXR1cm4gc2hvdWxkVXNlUHJlSFRNTDVQYXJzZXJRdWlya3M7Cit9CisKIHN0YXRpYyBib29sIHNo b3VsZEVuYWJsZUxvYWREZWZlcnJpbmcoKQogewogICAgIHJldHVybiAhYXBwbGljYXRpb25Jc0Fk b2JlSW5zdGFsbGVyKCk7CkBAIC0xNDUzLDcgKzE0NjQsNyBAQCAtICh2b2lkKV9wcmVmZXJlbmNl c0NoYW5nZWROb3RpZmljYXRpb246CiAgICAgc2V0dGluZ3MtPnNldEZ1bGxTY3JlZW5FbmFibGVk KFtwcmVmZXJlbmNlcyBmdWxsU2NyZWVuRW5hYmxlZF0pOwogI2VuZGlmCiAgICAgc2V0dGluZ3Mt PnNldE1lbW9yeUluZm9FbmFibGVkKFtwcmVmZXJlbmNlcyBtZW1vcnlJbmZvRW5hYmxlZF0pOwot ICAgIHNldHRpbmdzLT5zZXRVc2VQcmVIVE1MNVBhcnNlclF1aXJrcyhbcHJlZmVyZW5jZXMgdXNl UHJlSFRNTDVQYXJzZXJRdWlya3NdKTsKKyAgICBzZXR0aW5ncy0+c2V0VXNlUHJlSFRNTDVQYXJz ZXJRdWlya3Moc2hvdWxkVXNlUHJlSFRNTDVQYXJzZXJRdWlya3MocHJlZmVyZW5jZXMpKTsKIAog ICAgIC8vIEFwcGxpY2F0aW9uIENhY2hlIFByZWZlcmVuY2VzIGFyZSBzdG9yZWQgb24gdGhlIGds b2JhbCBjYWNoZSBzdG9yYWdlIG1hbmFnZXIsIG5vdCBpbiBTZXR0aW5ncy4KICAgICBbV2ViQXBw bGljYXRpb25DYWNoZSBzZXREZWZhdWx0T3JpZ2luUXVvdGE6W3ByZWZlcmVuY2VzIGFwcGxpY2F0 aW9uQ2FjaGVEZWZhdWx0T3JpZ2luUXVvdGFdXTsK 68270 2010-09-21 11:57:50 -0700 2010-09-21 13:36:32 -0700 Patch bug-46134-20100921115749.patch text/plain 6039 aestes SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Nzk3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMjEgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JF U1NJT04gKHI2MTI4NSk6IEFJTSAyLjEuMjk2OiBDb2RlIHJlbmRlcmVkIGFzIHRleHQgaW4gV2Vs Y29tZSBzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ2MTM0CisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogRXhwb3J0IF9fWk43V2ViQ29y ZTMyYXBwbGljYXRpb25Jc0FPTEluc3RhbnRNZXNzZW5nZXJFdi4KKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFj L1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmFwcGxpY2F0 aW9uSXNBT0xJbnN0YW50TWVzc2VuZ2VyKTogRGV0ZXJtaW5lIGlmIHRoZSBlbWJlZGRpbmcKKyAg ICAgICAgYXBwbGljYXRpb24gaXMgQU9MIEluc3RhbnQgTWVzc2VuZ2VyIGJ5IGNoZWNraW5nIHRo ZSBidW5kbGUgaWRlbnRpZmllci4KKwogMjAxMC0wOS0yMSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVy bm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQuCkluZGV4 OiBXZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5l eHAuaW4JKHJldmlzaW9uIDY3OTcyKQorKysgV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2lu ZyBjb3B5KQpAQCAtNTE2LDYgKzUxNiw3IEBAIF9fWk43V2ViQ29yZTMxY29udGV4dE1lbnVJdGVt VGFnSWdub3JlR3IKIF9fWk43V2ViQ29yZTMxY29udGV4dE1lbnVJdGVtVGFnTWFrZUxvd2VyQ2Fz ZUV2CiBfX1pON1dlYkNvcmUzMWNvbnRleHRNZW51SXRlbVRhZ01ha2VVcHBlckNhc2VFdgogX19a TjdXZWJDb3JlMzFjb250ZXh0TWVudUl0ZW1UYWdTdGFydFNwZWFraW5nRXYKK19fWk43V2ViQ29y ZTMyYXBwbGljYXRpb25Jc0FPTEluc3RhbnRNZXNzZW5nZXJFdgogX19aTjdXZWJDb3JlMzJjb250 ZXh0TWVudUl0ZW1UYWdJbnNwZWN0RWxlbWVudEV2CiBfX1pON1dlYkNvcmUzMmNvbnRleHRNZW51 SXRlbVRhZ1NtYXJ0Q29weVBhc3RlRXYKIF9fWk43V2ViQ29yZTMycGxhaW5UZXh0VG9NYWxsb2NB bGxvY2F0ZWRCdWZmZXJFUEtOU181UmFuZ2VFUmpiTlNfMjBUZXh0SXRlcmF0b3JCZWhhdmlvckUK SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbWFjL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbWFjL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNr cy5oCShyZXZpc2lvbiA2Nzk3MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vbWFjL1J1bnRpbWVBcHBs aWNhdGlvbkNoZWNrcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBAIGJvb2wgYXBw bGljYXRpb25Jc0FwcGxlTWFpbCgpOwogYm9vbCBhcHBsaWNhdGlvbklzU2FmYXJpKCk7CiBib29s IGFwcGxpY2F0aW9uSXNNaWNyb3NvZnRNZXNzZW5nZXIoKTsKIGJvb2wgYXBwbGljYXRpb25Jc0Fk b2JlSW5zdGFsbGVyKCk7Citib29sIGFwcGxpY2F0aW9uSXNBT0xJbnN0YW50TWVzc2VuZ2VyKCk7 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9tYWMv UnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vbWFjL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5tbQkocmV2aXNpb24gNjc5NzIpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL21hYy9SdW50aW1lQXBwbGljYXRpb25DaGVja3MubW0JKHdvcmtpbmcg Y29weSkKQEAgLTUyLDUgKzUyLDExIEBAIGJvb2wgYXBwbGljYXRpb25Jc0Fkb2JlSW5zdGFsbGVy KCkKICAgICBzdGF0aWMgYm9vbCBpc0Fkb2JlSW5zdGFsbGVyID0gW1tbTlNCdW5kbGUgbWFpbkJ1 bmRsZV0gYnVuZGxlSWRlbnRpZmllcl0gaXNFcXVhbFRvU3RyaW5nOkAiY29tLmFkb2JlLkluc3Rh bGxlcnMuU2V0dXAiXTsKICAgICByZXR1cm4gaXNBZG9iZUluc3RhbGxlcjsKIH0KKyAgICAKK2Jv b2wgYXBwbGljYXRpb25Jc0FPTEluc3RhbnRNZXNzZW5nZXIoKQoreworICAgIHN0YXRpYyBib29s IGlzQU9MSW5zdGFudE1lc3NlbmdlciA9IFtbW05TQnVuZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlk ZW50aWZpZXJdIGlzRXF1YWxUb1N0cmluZzpAImNvbS5hb2wuYWltLmRlc2t0b3AiXTsKKyAgICBy ZXR1cm4gaXNBT0xJbnN0YW50TWVzc2VuZ2VyOworfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CkluZGV4OiBXZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL0No YW5nZUxvZwkocmV2aXNpb24gNjc5NzIpCisrKyBXZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEwLTA5LTIxICBBbmR5IEVzdGVzICA8YWVzdGVz QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSRUdSRVNTSU9OIChyNjEyODUpOiBBSU0gMi4xLjI5NjogQ29kZSByZW5kZXJlZCBhcyB0 ZXh0IGluIFdlbGNvbWUgc2NyZWVuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NjEzNAorCisgICAgICAgIEFJTSBjbGllbnRzIGxpbmtlZCBhZ2FpbnN0 IHZlcnNpb25zIG9mIFdlYktpdCBwcmlvciB0byB0aGUgaW50cm9kdWN0aW9uCisgICAgICAgIG9m IHRoZSBIVE1MNSBwYXJzZXIgY29udGFpbiBtYXJrdXAgaW5jb21wYXRpYmxlIHdpdGggdGhlIG5l dyBwYXJzZXIuCisgICAgICAgIEVuYWJsZSBwYXJzZXIgcXVpcmtzIGluIHRoaXMgY2FzZSB0byBy ZW1haW4gY29tcGF0aWJsZSB3aXRoIHRoZXNlCisgICAgICAgIGNsaWVudHMuCisKKyAgICAgICAg KiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgIChzaG91bGRVc2VQcmVIVE1MNVBhcnNlclF1 aXJrcyk6IFJldHVybnMgdHJ1ZSBpZiB0aGUgZW1iZWRkaW5nCisgICAgICAgIGFwcGxpY2F0aW9u IGlzIEFJTSBhbmQgd2FzIGxpbmtlZCBhZ2FpbnN0IGEgdmVyc2lvbiBvZiBXZWJLaXQgcHJpb3Ig dG8KKyAgICAgICAgdGhlIGludHJvZHVjdGlvbiBvZiB0aGUgSFRNTDUgcGFyc2VyLCBvciBpZiB0 aGUKKyAgICAgICAgV2ViS2l0UHJlSFRNTDVQYXJzZXJRdWlya3MgV2ViUHJlZmVyZW5jZSBpcyBl bmFibGVkLgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRp b246XSk6IENhbGwKKyAgICAgICAgV2ViQ29yZTo6U2V0dGluZ3M6OnNldFVzZVByZUhUTUw1UGFy c2VyUXVpcmtzKCkuCisKIDIwMTAtMDktMjEgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBPcmxvdy4KSW5kZXg6IFdlYktp dC9tYWMvTWlzYy9XZWJLaXRWZXJzaW9uQ2hlY2tzLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9NaXNjL1dlYktpdFZlcnNpb25DaGVja3MuaAkocmV2aXNpb24gNjc5NzIpCisrKyBXZWJLaXQv bWFjL01pc2MvV2ViS2l0VmVyc2lvbkNoZWNrcy5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw2ICs1 NCw3IEBACiAjZGVmaW5lIFdFQktJVF9GSVJTVF9WRVJTSU9OX1dJVEhPVVRfQlVNUEVSQ0FSX0JB Q0tfRk9SV0FSRF9RVUlSSyAweDAyMTIwNzAwIC8vIDUzMC43LjAKICNkZWZpbmUgV0VCS0lUX0ZJ UlNUX1ZFUlNJT05fV0lUSE9VVF9DT05URU5UX1NOSUZGSU5HX0ZPUl9GSUxFX1VSTFMgMHgwMjEy MEEwMCAvLyA1MzAuMTAuMAogI2RlZmluZSBXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIT1VUX0xJ TktfRUxFTUVOVF9URVhUX0NTU19RVUlSSyAweDAyMTMwMjAwIC8vIDUzMS4yLjAKKyNkZWZpbmUg V0VCS0lUX0ZJUlNUX1ZFUlNJT05fV0lUSF9IVE1MNV9QQVJTRVIgMHgwMjE2MDkwMCAvLyA1MzQu OS4wCiAKICNpZmRlZiBfX2NwbHVzcGx1cwogZXh0ZXJuICJDIiB7CkluZGV4OiBXZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQkocmV2aXNpb24gNjc5NzIpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtNjA5LDYgKzYwOSwxNiBAQCBzdGF0aWMgYm9vbCBjb3JlVmlk ZW9IYXM3MjI4ODM2Rml4KCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorc3RhdGljIGJvb2wgc2hv dWxkVXNlUHJlSFRNTDVQYXJzZXJRdWlya3MoV2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKQor eworICAgIC8vIEFJTSBjbGllbnRzIGxpbmtlZCBhZ2FpbnN0IHZlcnNpb25zIG9mIFdlYktpdCBw cmlvciB0byB0aGUgaW50cm9kdWN0aW9uCisgICAgLy8gb2YgdGhlIEhUTUw1IHBhcnNlciBjb250 YWluIG1hcmt1cCBpbmNvbXBhdGlibGUgd2l0aCB0aGUgbmV3IHBhcnNlci4KKyAgICAvLyBFbmFi bGUgcGFyc2VyIHF1aXJrcyB0byByZW1haW4gY29tcGF0aWJsZSB3aXRoIHRoZXNlIGNsaWVudHMu IFNlZQorICAgIC8vIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYx MzQ+LgorICAgIHN0YXRpYyBib29sIGlzQUlNQW5kTmVlZHNQYXJzZXJRdWlya3MgPSBhcHBsaWNh dGlvbklzQU9MSW5zdGFudE1lc3NlbmdlcigpICYmICFXZWJLaXRMaW5rZWRPbk9yQWZ0ZXIoV0VC S0lUX0ZJUlNUX1ZFUlNJT05fV0lUSF9IVE1MNV9QQVJTRVIpOworICAgIHJldHVybiBpc0FJTUFu ZE5lZWRzUGFyc2VyUXVpcmtzIHx8IFtwcmVmZXJlbmNlcyB1c2VQcmVIVE1MNVBhcnNlclF1aXJr c107Cit9CisKIHN0YXRpYyBib29sIHNob3VsZEVuYWJsZUxvYWREZWZlcnJpbmcoKQogewogICAg IHJldHVybiAhYXBwbGljYXRpb25Jc0Fkb2JlSW5zdGFsbGVyKCk7CkBAIC0xNDUzLDcgKzE0NjMs NyBAQCAtICh2b2lkKV9wcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRpb246CiAgICAgc2V0dGlu Z3MtPnNldEZ1bGxTY3JlZW5FbmFibGVkKFtwcmVmZXJlbmNlcyBmdWxsU2NyZWVuRW5hYmxlZF0p OwogI2VuZGlmCiAgICAgc2V0dGluZ3MtPnNldE1lbW9yeUluZm9FbmFibGVkKFtwcmVmZXJlbmNl cyBtZW1vcnlJbmZvRW5hYmxlZF0pOwotICAgIHNldHRpbmdzLT5zZXRVc2VQcmVIVE1MNVBhcnNl clF1aXJrcyhbcHJlZmVyZW5jZXMgdXNlUHJlSFRNTDVQYXJzZXJRdWlya3NdKTsKKyAgICBzZXR0 aW5ncy0+c2V0VXNlUHJlSFRNTDVQYXJzZXJRdWlya3Moc2hvdWxkVXNlUHJlSFRNTDVQYXJzZXJR dWlya3MocHJlZmVyZW5jZXMpKTsKIAogICAgIC8vIEFwcGxpY2F0aW9uIENhY2hlIFByZWZlcmVu Y2VzIGFyZSBzdG9yZWQgb24gdGhlIGdsb2JhbCBjYWNoZSBzdG9yYWdlIG1hbmFnZXIsIG5vdCBp biBTZXR0aW5ncy4KICAgICBbV2ViQXBwbGljYXRpb25DYWNoZSBzZXREZWZhdWx0T3JpZ2luUXVv dGE6W3ByZWZlcmVuY2VzIGFwcGxpY2F0aW9uQ2FjaGVEZWZhdWx0T3JpZ2luUXVvdGFdXTsK