37013 2010-04-01 23:59:21 -0700 [Chromium] The popup type (select or suggestion) should be passed to the WebClient::createPopupMenu() method 2010-04-02 12:12:02 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jcampan jcampan commit-queue dglazkov eric fishd webkit.review.bot oldest_to_newest 207733 0 jcampan 2010-04-01 23:59:21 -0700 Chromium on Linux needs to know when it displays a popup whether it is a select or a autofill/autocomplete. For that reason, the popup type (select or suggestion) should be passed to the WebClient::createPopupMenu() method. 207746 1 52389 jcampan 2010-04-02 00:13:49 -0700 Created attachment 52389 Adding the popup type to the WebClient::createPopupMenu() method 207751 2 webkit.review.bot 2010-04-02 00:16:04 -0700 Attachment 52389 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/chromium/src/ChromeClientImpl.cpp:705: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebKit/chromium/public/WebPopupType.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] Suppressing further [whitespace/carriage_return] reports for this file. Total errors found: 45 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 207762 3 webkit.review.bot 2010-04-02 00:23:32 -0700 Attachment 52389 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/1658102 207765 4 52389 abarth 2010-04-02 00:26:19 -0700 Comment on attachment 52389 Adding the popup type to the WebClient::createPopupMenu() method Looks like this patch could use a tune-up. 207770 5 52395 jcampan 2010-04-02 00:30:41 -0700 Created attachment 52395 Fixed style issues 207773 6 webkit.review.bot 2010-04-02 00:35:18 -0700 Attachment 52395 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/1614186 207887 7 52395 abarth 2010-04-02 09:41:50 -0700 Comment on attachment 52395 Fixed style issues This patch doesn't compile. Also, we'll need fishd to review changes to the WebKit API. 207889 8 52418 jcampan 2010-04-02 09:47:49 -0700 Created attachment 52418 Fixed compilation issue and cleaned-up 207891 9 52419 jcampan 2010-04-02 09:51:00 -0700 Created attachment 52419 Added missing file... 207893 10 52419 fishd 2010-04-02 09:53:46 -0700 Comment on attachment 52419 Added missing file... > Index: WebKit/chromium/public/WebPopupType.h ... > + * Copyright (C) 2009 Google Inc. All rights reserved. 2009 -> 2010 > Index: WebKit/chromium/src/ChromeClientImpl.cpp ... > +namespace { > + > +// Converts a WebCore::PopupContainerType to a WebKit::WebPopupType. > +WebKit::WebPopupType convertPopupType(WebCore::PopupContainer::PopupType type) > +{ > + switch (type) { > + case PopupContainer::Select: > + return WebKit::WebPopupTypeSelect; > + case PopupContainer::Suggestion: > + return WebKit::WebPopupTypeSuggestion; > + default: > + ASSERT_NOT_REACHED(); > + return WebKit::WebPopupTypeNone; > + } > +} > + > +} // namespace > + > namespace WebKit { In webkit code, it would be more commonplace for convertPopupType to be a static method in the WebKit namespace. Then you can do away with the WebKit:: prefix, and you can also do away with the WebCore:: prefix due to the using declaration at the top of this file. > + // TODO(jcivelli): Remove the deprecated methods once the Chromium side > + // use the new method. nit: WebKit style is to just add a FIXME comment without the (username) bit. R=me otherwise. Please fix these nits before committing. 207904 11 52420 jcampan 2010-04-02 10:06:59 -0700 Created attachment 52420 Applied fishd suggested changes 207990 12 52420 commit-queue 2010-04-02 12:11:56 -0700 Comment on attachment 52420 Applied fishd suggested changes Clearing flags on attachment: 52420 Committed r57014: <http://trac.webkit.org/changeset/57014> 207991 13 commit-queue 2010-04-02 12:12:02 -0700 All reviewed patches have been landed. Closing bug. 52389 2010-04-02 00:13:49 -0700 2010-04-02 00:30:41 -0700 Adding the popup type to the WebClient::createPopupMenu() method popup.patch text/plain 7840 jcampan SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1Njk3NikKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNC0wMiAgSmF5 IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHBvcHVwIHR5cGUgKHNlbGVjdCBvciBzdWdn ZXN0aW9uKSBpcyBub3cgcGFzc2VkIHRvIHRoZQorICAgICAgICBXZWJDbGllbnQ6OmNyZWF0ZVBv cHVwTWVudSgpIG1ldGhvZC4gVGhpcyBpcyByZXF1aXJlZCBmb3IKKyAgICAgICAgQ2hyb21pdW0g b24gTGludXggdG8gbWFrZSB0aGUgc2VsZWN0IHBvcHVwcyB3b3JrIGNvcnJlY3RseS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MDEzCisKKyAgICAg ICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJQb3B1cFR5cGUuaDogQWRkZWQu CisgICAgICAgIChXZWJLaXQ6Oik6CisgICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0NsaWVudDo6Y3JlYXRlUG9wdXBNZW51KToKKyAgICAg ICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNs aWVudEltcGw6OnBvcHVwT3BlbmVkKToKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1w bDo6Y29udmVydFBvcHVwVHlwZSk6CisgICAgICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuaDoK KwogMjAxMC0wNC0wMSAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBnb29nbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL1dlYktp dC5neXANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAkocmV2aXNp b24gNTY4OTcpCisrKyBXZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAkod29ya2luZyBjb3B5KQpA QCAtMTczLDYgKzE3Myw3IEBACiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJQb2ludC5oJywK ICAgICAgICAgICAgICAgICAncHVibGljL1dlYlBvcHVwTWVudS5oJywKICAgICAgICAgICAgICAg ICAncHVibGljL1dlYlBvcHVwTWVudUluZm8uaCcsCisgICAgICAgICAgICAgICAgJ3B1YmxpYy9X ZWJQb3B1cFR5cGUuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJQcml2YXRlUHRyLmgn LAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUmFuZ2UuaCcsCiAgICAgICAgICAgICAgICAg J3B1YmxpYy9XZWJSZWN0LmgnLApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQb3B1 cFR5cGUuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBU eXBlLmgJKHJldmlzaW9uIDApCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBvcHVwVHlw ZS5oCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQ0IEBACisvKg0KKyAqIENvcHlyaWdodCAoQykg MjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KKyAqDQorICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 DQorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zIGFyZQ0KKyAqIG1ldDoNCisgKg0KKyAqICAgICAqIFJlZGlzdHJpYnV0 aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0DQorICog bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyLg0KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUNCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyDQorICogaW4gdGhlIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQ0KKyAqIGRpc3RyaWJ1 dGlvbi4NCisgKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUg bmFtZXMgb2YgaXRzDQorICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3Ig cHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20NCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQg c3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLg0KKyAqDQorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUw0K KyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVE SU5HLCBCVVQgTk9UDQorICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SDQorICogQSBQQVJUSUNVTEFSIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQNCisgKiBPV05F UiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwNCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UDQorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsDQorICogREFUQSwgT1IgUFJP RklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z DQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVA0KKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0Up IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQ0KKyAqIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuDQorICov DQorDQorI2lmbmRlZiBXZWJQb3B1cFR5cGVfaA0KKyNkZWZpbmUgV2ViUG9wdXBUeXBlX2gNCisN CituYW1lc3BhY2UgV2ViS2l0IHsNCisNCitlbnVtIFdlYlBvcHVwVHlwZSB7DQorICAgIE5vbmUs IC8vIE5vdCBhIHBvcHVwLg0KKyAgICBTZWxlY3QsIC8vIEEgSFRNTCBzZWxlY3QgKGNvbWJvLWJv eCkgcG9wdXAuDQorICAgIFN1Z2dlc3Rpb24sIC8vIEFuIGF1dG9maWxsL2F1dG9jb21wbGV0ZSBw b3B1cC4NCit9Ow0KKw0KK30gLy8gbmFtZXNwYWNlIFdlYktpdA0KKw0KKyNlbmRpZg0KSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHJldmlzaW9uIDU2ODk3KQor KysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHdvcmtpbmcgY29weSkK QEAgLTYwLDYgKzYwLDcgQEAgc3RydWN0IFdlYkNvbnNvbGVNZXNzYWdlOwogc3RydWN0IFdlYkNv bnRleHRNZW51RGF0YTsKIHN0cnVjdCBXZWJQb2ludDsKIHN0cnVjdCBXZWJQb3B1cE1lbnVJbmZv OworZW51bSBXZWJQb3B1cFR5cGU7CiAKIC8vIFNpbmNlIGEgV2ViVmlldyBpcyBhIFdlYldpZGdl dCwgYSBXZWJWaWV3Q2xpZW50IGlzIGEgV2ViV2lkZ2V0Q2xpZW50LgogLy8gVmlydHVhbCBpbmhl cml0YW5jZSBhbGxvd3MgYW4gaW1wbGVtZW50YXRpb24gb2YgV2ViV2lkZ2V0Q2xpZW50IHRvIGJl CkBAIC03NSw5ICs3NiwxMCBAQCBwdWJsaWM6CiAKICAgICAvLyBDcmVhdGUgYSBuZXcgV2ViUG9w dXBNZW51LiAgSW4gdGhlIHNlY29uZCBmb3JtLCB0aGUgY2xpZW50IGlzCiAgICAgLy8gcmVzcG9u c2libGUgZm9yIHJlbmRlcmluZyB0aGUgY29udGVudHMgb2YgdGhlIHBvcHVwIG1lbnUuCi0gICAg dmlydHVhbCBXZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudSgpIHsgcmV0dXJuIDA7IH0KKyAgICB2 aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KFdlYlBvcHVwVHlwZSkgeyByZXR1cm4g MDsgfQogICAgIHZpcnR1YWwgV2ViV2lkZ2V0KiBjcmVhdGVQb3B1cE1lbnUoY29uc3QgV2ViUG9w dXBNZW51SW5mbyYpIHsgcmV0dXJuIDA7IH0KLSAgICAvLyBEZXByZWNhdGVkIG1ldGhvZC4KKyAg ICAvLyBEZXByZWNhdGVkIG1ldGhvZHMuCisgICAgdmlydHVhbCBXZWJXaWRnZXQqIGNyZWF0ZVBv cHVwTWVudSgpIHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9w dXBNZW51KGJvb2wgYWN0aXZhdGFibGUpIHsgcmV0dXJuIDA7IH0KIAogCkluZGV4OiBXZWJLaXQv Y2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0 L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAkocmV2aXNpb24gNTY4OTcpCisrKyBX ZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC02OCw2ICs2OCw3IEBACiAjaW5jbHVkZSAiV2ViS2l0LmgiCiAjaW5jbHVkZSAiV2ViUG9wdXBN ZW51SW1wbC5oIgogI2luY2x1ZGUgIldlYlBvcHVwTWVudUluZm8uaCIKKyNpbmNsdWRlICJXZWJQ b3B1cFR5cGUuaCIKICNpbmNsdWRlICJXZWJSZWN0LmgiCiAjaW5jbHVkZSAiV2ViVGV4dERpcmVj dGlvbi5oIgogI2luY2x1ZGUgIldlYlVSTFJlcXVlc3QuaCIKQEAgLTYwNiwxMSArNjA3LDE1IEBA IHZvaWQgQ2hyb21lQ2xpZW50SW1wbDo6cG9wdXBPcGVuZWQoUG9wdXAKICAgICAgICAgZ2V0UG9w dXBNZW51SW5mbyhwb3B1cENvbnRhaW5lciwgJnBvcHVwSW5mbyk7CiAgICAgICAgIHdlYndpZGdl dCA9IG1fd2ViVmlldy0+Y2xpZW50KCktPmNyZWF0ZVBvcHVwTWVudShwb3B1cEluZm8pOwogICAg IH0gZWxzZSB7Ci0gICAgICAgIHdlYndpZGdldCA9IG1fd2ViVmlldy0+Y2xpZW50KCktPmNyZWF0 ZVBvcHVwTWVudSgpOwotICAgICAgICBpZiAoIXdlYndpZGdldCkgewotICAgICAgICAgICAgLy8g VHJ5IHRoZSBkZXByZWNhdGVkIG1ldGhvZC4KKyAgICAgICAgd2Vid2lkZ2V0ID0gbV93ZWJWaWV3 LT5jbGllbnQoKS0+Y3JlYXRlUG9wdXBNZW51KAorICAgICAgICAgICAgY29udmVydFBvcHVwVHlw ZShwb3B1cENvbnRhaW5lci0+cG9wdXBUeXBlKCkpKTsKKyAgICAgICAgLy8gVHJ5IHRoZSBkZXBy ZWNhdGVkIG1ldGhvZC4KKyAgICAgICAgLy8gVE9ETyhqY2l2ZWxsaSk6IFJlbW92ZSB0aGUgZGVw cmVjYXRlZCBtZXRob2RzIG9uY2UgdGhlIENocm9taXVtIHNpZGUKKyAgICAgICAgLy8gICAgICAg ICAgICAgICAgIHVzZSB0aGUgbmV3IG1ldGhvZC4KKyAgICAgICAgaWYgKCF3ZWJ3aWRnZXQpCisg ICAgICAgICAgICB3ZWJ3aWRnZXQgPSBtX3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVQb3B1cE1l bnUoKTsKKyAgICAgICAgaWYgKCF3ZWJ3aWRnZXQpCiAgICAgICAgICAgICB3ZWJ3aWRnZXQgPSBt X3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVQb3B1cE1lbnUoZmFsc2UpOwotICAgICAgICB9ICAg IAogICAgIH0KICAgICBtX3dlYlZpZXctPnBvcHVwT3BlbmVkKHBvcHVwQ29udGFpbmVyKTsKICAg ICBzdGF0aWNfY2FzdDxXZWJQb3B1cE1lbnVJbXBsKj4od2Vid2lkZ2V0KS0+SW5pdChwb3B1cENv bnRhaW5lciwgYm91bmRzKTsKQEAgLTY5Myw2ICs2OTgsMTkgQEAgdm9pZCBDaHJvbWVDbGllbnRJ bXBsOjpkaWRDaGFuZ2VBY2Nlc3NpYgogICAgICAgICBtX3dlYlZpZXctPmNsaWVudCgpLT5kaWRD aGFuZ2VBY2Nlc3NpYmlsaXR5T2JqZWN0U3RhdGUoV2ViQWNjZXNzaWJpbGl0eU9iamVjdChvYmop KTsKIH0KIAorLy8gc3RhdGljCitXZWJQb3B1cFR5cGUgQ2hyb21lQ2xpZW50SW1wbDo6Y29udmVy dFBvcHVwVHlwZShQb3B1cENvbnRhaW5lcjo6UG9wdXBUeXBlIHR5cGUpCit7CisgICAgc3dpdGNo ICh0eXBlKSB7CisgICAgICAgIGNhc2UgUG9wdXBDb250YWluZXI6OlNlbGVjdDoKKyAgICAgICAg ICAgIHJldHVybiBTZWxlY3Q7CisgICAgICAgIGNhc2UgUG9wdXBDb250YWluZXI6OlN1Z2dlc3Rp b246CisgICAgICAgICAgICByZXR1cm4gU3VnZ2VzdGlvbjsKKyAgICAgICAgZGVmYXVsdDoKKyAg ICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0dXJuIE5vbmU7 CisgICAgfQorfQogCiAjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCiBOb3RpZmljYXRpb25QcmVz ZW50ZXIqIENocm9tZUNsaWVudEltcGw6Om5vdGlmaWNhdGlvblByZXNlbnRlcigpIGNvbnN0Cklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuaA0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5oCShyZXZpc2lvbiA1Njg5 NykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNv cHkpCkBAIC0zMywxMCArMzMsMTEgQEAKIAogI2luY2x1ZGUgIkNocm9tZUNsaWVudENocm9taXVt LmgiCiAKKyNpbmNsdWRlICJQb3B1cE1lbnVDaHJvbWl1bS5oIgorCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiBjbGFzcyBBY2Nlc3NpYmlsaXR5T2JqZWN0OwogY2xhc3MgSFRNTFBhcnNlclF1aXJrczsK LWNsYXNzIFBvcHVwQ29udGFpbmVyOwogY2xhc3MgU2VjdXJpdHlPcmlnaW47CiBzdHJ1Y3QgV2lu ZG93RmVhdHVyZXM7CiB9CkBAIC00NSw2ICs0Niw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xh c3MgV2ViVmlld0ltcGw7CiBzdHJ1Y3QgV2ViQ3Vyc29ySW5mbzsKIHN0cnVjdCBXZWJQb3B1cE1l bnVJbmZvOworZW51bSBXZWJQb3B1cFR5cGU7CiAKIC8vIEhhbmRsZXMgd2luZG93LWxldmVsIG5v dGlmaWNhdGlvbnMgZnJvbSBXZWJDb3JlIG9uIGJlaGFsZiBvZiBhIFdlYlZpZXcuCiBjbGFzcyBD aHJvbWVDbGllbnRJbXBsIDogcHVibGljIFdlYkNvcmU6OkNocm9tZUNsaWVudENocm9taXVtIHsK QEAgLTE1OSw2ICsxNjEsOSBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZvaWQgZ2V0UG9wdXBN ZW51SW5mbyhXZWJDb3JlOjpQb3B1cENvbnRhaW5lciosIFdlYlBvcHVwTWVudUluZm8qKTsKIAor ICAgIC8vIENvbnZlcnRzIGEgV2ViQ29yZTo6UG9wdXBDb250YWluZXJUeXBlIHRvIGEgV2ViS2l0 OjpXZWJQb3B1cFR5cGUuCisgICAgc3RhdGljIFdlYlBvcHVwVHlwZSBjb252ZXJ0UG9wdXBUeXBl KFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyOjpQb3B1cFR5cGUpOworCiAgICAgV2ViVmlld0ltcGwq IG1fd2ViVmlldzsgIC8vIHdlYWsgcG9pbnRlcgogICAgIGJvb2wgbV90b29sYmFyc1Zpc2libGU7 CiAgICAgYm9vbCBtX3N0YXR1c2JhclZpc2libGU7Cg== 52395 2010-04-02 00:30:41 -0700 2010-04-02 09:47:49 -0700 Fixed style issues popup.patch text/plain 8041 jcampan SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1Njk3NikKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNC0wMiAgSmF5 IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHBvcHVwIHR5cGUgKHNlbGVjdCBvciBzdWdn ZXN0aW9uKSBpcyBub3cgcGFzc2VkIHRvIHRoZQorICAgICAgICBXZWJDbGllbnQ6OmNyZWF0ZVBv cHVwTWVudSgpIG1ldGhvZC4gVGhpcyBpcyByZXF1aXJlZCBmb3IKKyAgICAgICAgQ2hyb21pdW0g b24gTGludXggdG8gbWFrZSB0aGUgc2VsZWN0IHBvcHVwcyB3b3JrIGNvcnJlY3RseS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MDEzCisKKyAgICAg ICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJQb3B1cFR5cGUuaDogQWRkZWQu CisgICAgICAgIChXZWJLaXQ6Oik6CisgICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0NsaWVudDo6Y3JlYXRlUG9wdXBNZW51KToKKyAgICAg ICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNs aWVudEltcGw6OnBvcHVwT3BlbmVkKToKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1w bDo6Y29udmVydFBvcHVwVHlwZSk6CisgICAgICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuaDoK KwogMjAxMC0wNC0wMSAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBnb29nbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL1dlYktp dC5neXANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAkocmV2aXNp b24gNTY4OTcpCisrKyBXZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAkod29ya2luZyBjb3B5KQpA QCAtMTczLDYgKzE3Myw3IEBACiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJQb2ludC5oJywK ICAgICAgICAgICAgICAgICAncHVibGljL1dlYlBvcHVwTWVudS5oJywKICAgICAgICAgICAgICAg ICAncHVibGljL1dlYlBvcHVwTWVudUluZm8uaCcsCisgICAgICAgICAgICAgICAgJ3B1YmxpYy9X ZWJQb3B1cFR5cGUuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJQcml2YXRlUHRyLmgn LAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUmFuZ2UuaCcsCiAgICAgICAgICAgICAgICAg J3B1YmxpYy9XZWJSZWN0LmgnLApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQb3B1 cFR5cGUuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBU eXBlLmgJKHJldmlzaW9uIDApCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBvcHVwVHlw ZS5oCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQ0IEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Cisg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAq ICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAg ICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMK KyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVj dHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Ig d3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg VEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUg TElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QK KyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBXZWJQb3B1cFR5cGVfaAor I2RlZmluZSBXZWJQb3B1cFR5cGVfaAorCituYW1lc3BhY2UgV2ViS2l0IHsKKworZW51bSBXZWJQ b3B1cFR5cGUgeworICAgIE5vbmUsIC8vIE5vdCBhIHBvcHVwLgorICAgIFNlbGVjdCwgLy8gQSBI VE1MIHNlbGVjdCAoY29tYm8tYm94KSBwb3B1cC4KKyAgICBTdWdnZXN0aW9uLCAvLyBBbiBhdXRv ZmlsbC9hdXRvY29tcGxldGUgcG9wdXAuCit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKwor I2VuZGlmCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaA0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCShyZXZp c2lvbiA1Njg5NykKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC02MCw2ICs2MCw3IEBAIHN0cnVjdCBXZWJDb25zb2xlTWVzc2FnZTsK IHN0cnVjdCBXZWJDb250ZXh0TWVudURhdGE7CiBzdHJ1Y3QgV2ViUG9pbnQ7CiBzdHJ1Y3QgV2Vi UG9wdXBNZW51SW5mbzsKK2VudW0gV2ViUG9wdXBUeXBlOwogCiAvLyBTaW5jZSBhIFdlYlZpZXcg aXMgYSBXZWJXaWRnZXQsIGEgV2ViVmlld0NsaWVudCBpcyBhIFdlYldpZGdldENsaWVudC4KIC8v IFZpcnR1YWwgaW5oZXJpdGFuY2UgYWxsb3dzIGFuIGltcGxlbWVudGF0aW9uIG9mIFdlYldpZGdl dENsaWVudCB0byBiZQpAQCAtNzUsOSArNzYsMTAgQEAgcHVibGljOgogCiAgICAgLy8gQ3JlYXRl IGEgbmV3IFdlYlBvcHVwTWVudS4gIEluIHRoZSBzZWNvbmQgZm9ybSwgdGhlIGNsaWVudCBpcwog ICAgIC8vIHJlc3BvbnNpYmxlIGZvciByZW5kZXJpbmcgdGhlIGNvbnRlbnRzIG9mIHRoZSBwb3B1 cCBtZW51LgotICAgIHZpcnR1YWwgV2ViV2lkZ2V0KiBjcmVhdGVQb3B1cE1lbnUoKSB7IHJldHVy biAwOyB9CisgICAgdmlydHVhbCBXZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudShXZWJQb3B1cFR5 cGUpIHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9wdXBNZW51 KGNvbnN0IFdlYlBvcHVwTWVudUluZm8mKSB7IHJldHVybiAwOyB9Ci0gICAgLy8gRGVwcmVjYXRl ZCBtZXRob2QuCisgICAgLy8gRGVwcmVjYXRlZCBtZXRob2RzLgorICAgIHZpcnR1YWwgV2ViV2lk Z2V0KiBjcmVhdGVQb3B1cE1lbnUoKSB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBXZWJXaWRn ZXQqIGNyZWF0ZVBvcHVwTWVudShib29sIGFjdGl2YXRhYmxlKSB7IHJldHVybiAwOyB9CiAKIApJ bmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcA0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9u IDU2ODk3KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNjgsNiArNjgsNyBAQAogI2luY2x1ZGUgIldlYktpdC5oIgogI2luY2x1 ZGUgIldlYlBvcHVwTWVudUltcGwuaCIKICNpbmNsdWRlICJXZWJQb3B1cE1lbnVJbmZvLmgiCisj aW5jbHVkZSAiV2ViUG9wdXBUeXBlLmgiCiAjaW5jbHVkZSAiV2ViUmVjdC5oIgogI2luY2x1ZGUg IldlYlRleHREaXJlY3Rpb24uaCIKICNpbmNsdWRlICJXZWJVUkxSZXF1ZXN0LmgiCkBAIC02MDYs MTEgKzYwNywxNSBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OnBvcHVwT3BlbmVkKFBvcHVwCiAg ICAgICAgIGdldFBvcHVwTWVudUluZm8ocG9wdXBDb250YWluZXIsICZwb3B1cEluZm8pOwogICAg ICAgICB3ZWJ3aWRnZXQgPSBtX3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVQb3B1cE1lbnUocG9w dXBJbmZvKTsKICAgICB9IGVsc2UgewotICAgICAgICB3ZWJ3aWRnZXQgPSBtX3dlYlZpZXctPmNs aWVudCgpLT5jcmVhdGVQb3B1cE1lbnUoKTsKLSAgICAgICAgaWYgKCF3ZWJ3aWRnZXQpIHsKLSAg ICAgICAgICAgIC8vIFRyeSB0aGUgZGVwcmVjYXRlZCBtZXRob2QuCisgICAgICAgIHdlYndpZGdl dCA9IG1fd2ViVmlldy0+Y2xpZW50KCktPmNyZWF0ZVBvcHVwTWVudSgKKyAgICAgICAgICAgIGNv bnZlcnRQb3B1cFR5cGUocG9wdXBDb250YWluZXItPnBvcHVwVHlwZSgpKSk7CisgICAgICAgIC8v IFRyeSB0aGUgZGVwcmVjYXRlZCBtZXRob2QuCisgICAgICAgIC8vIFRPRE8oamNpdmVsbGkpOiBS ZW1vdmUgdGhlIGRlcHJlY2F0ZWQgbWV0aG9kcyBvbmNlIHRoZSBDaHJvbWl1bSBzaWRlCisgICAg ICAgIC8vICAgICAgICAgICAgICAgICB1c2UgdGhlIG5ldyBtZXRob2QuCisgICAgICAgIGlmICgh d2Vid2lkZ2V0KQorICAgICAgICAgICAgd2Vid2lkZ2V0ID0gbV93ZWJWaWV3LT5jbGllbnQoKS0+ Y3JlYXRlUG9wdXBNZW51KCk7CisgICAgICAgIGlmICghd2Vid2lkZ2V0KQogICAgICAgICAgICAg d2Vid2lkZ2V0ID0gbV93ZWJWaWV3LT5jbGllbnQoKS0+Y3JlYXRlUG9wdXBNZW51KGZhbHNlKTsK LSAgICAgICAgfSAgICAKICAgICB9CiAgICAgbV93ZWJWaWV3LT5wb3B1cE9wZW5lZChwb3B1cENv bnRhaW5lcik7CiAgICAgc3RhdGljX2Nhc3Q8V2ViUG9wdXBNZW51SW1wbCo+KHdlYndpZGdldCkt PkluaXQocG9wdXBDb250YWluZXIsIGJvdW5kcyk7CkBAIC02ODYsNiArNjkxLDIwIEBAIHZvaWQg Q2hyb21lQ2xpZW50SW1wbDo6Z2V0UG9wdXBNZW51SW5mbygKICAgICBpbmZvLT5pdGVtcy5zd2Fw KG91dHB1dEl0ZW1zKTsKIH0KIAorLy8gc3RhdGljCitXZWJQb3B1cFR5cGUgQ2hyb21lQ2xpZW50 SW1wbDo6Y29udmVydFBvcHVwVHlwZShQb3B1cENvbnRhaW5lcjo6UG9wdXBUeXBlIHR5cGUpCit7 CisgICAgc3dpdGNoICh0eXBlKSB7CisgICAgY2FzZSBQb3B1cENvbnRhaW5lcjo6U2VsZWN0Ogor ICAgICAgICByZXR1cm4gU2VsZWN0OworICAgIGNhc2UgUG9wdXBDb250YWluZXI6OlN1Z2dlc3Rp b246CisgICAgICAgIHJldHVybiBTdWdnZXN0aW9uOworICAgIGRlZmF1bHQ6CisgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gTm9uZTsKKyAgICB9Cit9CisKIHZv aWQgQ2hyb21lQ2xpZW50SW1wbDo6ZGlkQ2hhbmdlQWNjZXNzaWJpbGl0eU9iamVjdFN0YXRlKEFj Y2Vzc2liaWxpdHlPYmplY3QqIG9iaikKIHsKICAgICAvLyBBbGVydCBhc3Npc3RpdmUgdGVjaG5v bG9neSBhYm91dCB0aGUgYWNjZXNzaWJpbGl0eSBvYmplY3Qgc3RhdGUgY2hhbmdlCkBAIC02OTMs NyArNzEyLDYgQEAgdm9pZCBDaHJvbWVDbGllbnRJbXBsOjpkaWRDaGFuZ2VBY2Nlc3NpYgogICAg ICAgICBtX3dlYlZpZXctPmNsaWVudCgpLT5kaWRDaGFuZ2VBY2Nlc3NpYmlsaXR5T2JqZWN0U3Rh dGUoV2ViQWNjZXNzaWJpbGl0eU9iamVjdChvYmopKTsKIH0KIAotCiAjaWYgRU5BQkxFKE5PVElG SUNBVElPTlMpCiBOb3RpZmljYXRpb25QcmVzZW50ZXIqIENocm9tZUNsaWVudEltcGw6Om5vdGlm aWNhdGlvblByZXNlbnRlcigpIGNvbnN0CiB7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0No cm9tZUNsaWVudEltcGwuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hy b21lQ2xpZW50SW1wbC5oCShyZXZpc2lvbiA1Njg5NykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv Q2hyb21lQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMywxMCArMzMsMTEgQEAKIAog I2luY2x1ZGUgIkNocm9tZUNsaWVudENocm9taXVtLmgiCiAKKyNpbmNsdWRlICJQb3B1cE1lbnVD aHJvbWl1bS5oIgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBBY2Nlc3NpYmlsaXR5T2Jq ZWN0OwogY2xhc3MgSFRNTFBhcnNlclF1aXJrczsKLWNsYXNzIFBvcHVwQ29udGFpbmVyOwogY2xh c3MgU2VjdXJpdHlPcmlnaW47CiBzdHJ1Y3QgV2luZG93RmVhdHVyZXM7CiB9CkBAIC00NSw2ICs0 Niw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViVmlld0ltcGw7CiBzdHJ1Y3QgV2Vi Q3Vyc29ySW5mbzsKIHN0cnVjdCBXZWJQb3B1cE1lbnVJbmZvOworZW51bSBXZWJQb3B1cFR5cGU7 CiAKIC8vIEhhbmRsZXMgd2luZG93LWxldmVsIG5vdGlmaWNhdGlvbnMgZnJvbSBXZWJDb3JlIG9u IGJlaGFsZiBvZiBhIFdlYlZpZXcuCiBjbGFzcyBDaHJvbWVDbGllbnRJbXBsIDogcHVibGljIFdl YkNvcmU6OkNocm9tZUNsaWVudENocm9taXVtIHsKQEAgLTE1OSw2ICsxNjEsOSBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIHZvaWQgZ2V0UG9wdXBNZW51SW5mbyhXZWJDb3JlOjpQb3B1cENvbnRh aW5lciosIFdlYlBvcHVwTWVudUluZm8qKTsKIAorICAgIC8vIENvbnZlcnRzIGEgV2ViQ29yZTo6 UG9wdXBDb250YWluZXJUeXBlIHRvIGEgV2ViS2l0OjpXZWJQb3B1cFR5cGUuCisgICAgc3RhdGlj IFdlYlBvcHVwVHlwZSBjb252ZXJ0UG9wdXBUeXBlKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyOjpQ b3B1cFR5cGUpOworCiAgICAgV2ViVmlld0ltcGwqIG1fd2ViVmlldzsgIC8vIHdlYWsgcG9pbnRl cgogICAgIGJvb2wgbV90b29sYmFyc1Zpc2libGU7CiAgICAgYm9vbCBtX3N0YXR1c2JhclZpc2li bGU7Cg== 52418 2010-04-02 09:47:49 -0700 2010-04-02 09:51:00 -0700 Fixed compilation issue and cleaned-up popup.patch text/plain 4682 jcampan SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1NzAwMykKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNC0wMiAgSmF5 IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHBvcHVwIHR5cGUgKHNlbGVjdCBvciBzdWdn ZXN0aW9uKSBpcyBub3cgcGFzc2VkIHRvIHRoZQorICAgICAgICBXZWJDbGllbnQ6OmNyZWF0ZVBv cHVwTWVudSgpIG1ldGhvZC4gVGhpcyBpcyByZXF1aXJlZCBmb3IKKyAgICAgICAgQ2hyb21pdW0g b24gTGludXggdG8gbWFrZSB0aGUgc2VsZWN0IHBvcHVwcyB3b3JrIGNvcnJlY3RseS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MDEzCisKKyAgICAg ICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Q2xpZW50Lmg6CisgICAg ICAgIChXZWJLaXQ6OldlYlZpZXdDbGllbnQ6OmNyZWF0ZVBvcHVwTWVudSk6CisgICAgICAgICog c3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udmVydFBvcHVw VHlwZSk6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OnBvcHVwT3BlbmVkKToK KwogMjAxMC0wNC0wMiAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAko cmV2aXNpb24gNTcwMDIpCisrKyBXZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAkod29ya2luZyBj b3B5KQpAQCAtMTcyLDYgKzE3Miw3IEBACiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJQb2lu dC5oJywKICAgICAgICAgICAgICAgICAncHVibGljL1dlYlBvcHVwTWVudS5oJywKICAgICAgICAg ICAgICAgICAncHVibGljL1dlYlBvcHVwTWVudUluZm8uaCcsCisgICAgICAgICAgICAgICAgJ3B1 YmxpYy9XZWJQb3B1cFR5cGUuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJQcml2YXRl UHRyLmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUmFuZ2UuaCcsCiAgICAgICAgICAg ICAgICAgJ3B1YmxpYy9XZWJSZWN0LmgnLApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJWaWV3Q2xpZW50LmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YlZpZXdDbGllbnQuaAkocmV2aXNpb24gNTcwMDIpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlZpZXdDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1 ZGUgIldlYkVkaXRpbmdBY3Rpb24uaCIKICNpbmNsdWRlICJXZWJGaWxlQ2hvb3NlckNvbXBsZXRp b24uaCIKICNpbmNsdWRlICJXZWJGaWxlQ2hvb3NlclBhcmFtcy5oIgorI2luY2x1ZGUgIldlYlBv cHVwVHlwZS5oIgogI2luY2x1ZGUgIldlYlN0cmluZy5oIgogI2luY2x1ZGUgIldlYlRleHRBZmZp bml0eS5oIgogI2luY2x1ZGUgIldlYlRleHREaXJlY3Rpb24uaCIKQEAgLTczLDkgKzc0LDEwIEBA IHB1YmxpYzoKIAogICAgIC8vIENyZWF0ZSBhIG5ldyBXZWJQb3B1cE1lbnUuICBJbiB0aGUgc2Vj b25kIGZvcm0sIHRoZSBjbGllbnQgaXMKICAgICAvLyByZXNwb25zaWJsZSBmb3IgcmVuZGVyaW5n IHRoZSBjb250ZW50cyBvZiB0aGUgcG9wdXAgbWVudS4KLSAgICB2aXJ0dWFsIFdlYldpZGdldCog Y3JlYXRlUG9wdXBNZW51KCkgeyByZXR1cm4gMDsgfQorICAgIHZpcnR1YWwgV2ViV2lkZ2V0KiBj cmVhdGVQb3B1cE1lbnUoV2ViUG9wdXBUeXBlKSB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBX ZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudShjb25zdCBXZWJQb3B1cE1lbnVJbmZvJikgeyByZXR1 cm4gMDsgfQotICAgIC8vIERlcHJlY2F0ZWQgbWV0aG9kLgorICAgIC8vIERlcHJlY2F0ZWQgbWV0 aG9kcy4KKyAgICB2aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KCkgeyByZXR1cm4g MDsgfQogICAgIHZpcnR1YWwgV2ViV2lkZ2V0KiBjcmVhdGVQb3B1cE1lbnUoYm9vbCBhY3RpdmF0 YWJsZSkgeyByZXR1cm4gMDsgfQogCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21l Q2xpZW50SW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9t ZUNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA1NzAwMikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv Q2hyb21lQ2xpZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4LDYgKzY4LDcgQEAKICNp bmNsdWRlICJXZWJLaXQuaCIKICNpbmNsdWRlICJXZWJQb3B1cE1lbnVJbXBsLmgiCiAjaW5jbHVk ZSAiV2ViUG9wdXBNZW51SW5mby5oIgorI2luY2x1ZGUgIldlYlBvcHVwVHlwZS5oIgogI2luY2x1 ZGUgIldlYlJlY3QuaCIKICNpbmNsdWRlICJXZWJUZXh0RGlyZWN0aW9uLmgiCiAjaW5jbHVkZSAi V2ViVVJMUmVxdWVzdC5oIgpAQCAtNzgsNiArNzksMjQgQEAKIAogdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAKK25hbWVzcGFjZSB7CisKKy8vIENvbnZlcnRzIGEgV2ViQ29yZTo6UG9wdXBDb250 YWluZXJUeXBlIHRvIGEgV2ViS2l0OjpXZWJQb3B1cFR5cGUuCitXZWJLaXQ6OldlYlBvcHVwVHlw ZSBjb252ZXJ0UG9wdXBUeXBlKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyOjpQb3B1cFR5cGUgdHlw ZSkKK3sKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBjYXNlIFBvcHVwQ29udGFpbmVyOjpTZWxl Y3Q6CisgICAgICAgIHJldHVybiBXZWJLaXQ6OldlYlBvcHVwVHlwZVNlbGVjdDsKKyAgICBjYXNl IFBvcHVwQ29udGFpbmVyOjpTdWdnZXN0aW9uOgorICAgICAgICByZXR1cm4gV2ViS2l0OjpXZWJQ b3B1cFR5cGVTdWdnZXN0aW9uOworICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOworICAgICAgICByZXR1cm4gV2ViS2l0OjpXZWJQb3B1cFR5cGVOb25lOworICAgIH0K K30KKworfSAvLyBuYW1lc3BhY2UKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIENocm9tZUNsaWVu dEltcGw6OkNocm9tZUNsaWVudEltcGwoV2ViVmlld0ltcGwqIHdlYlZpZXcpCkBAIC02MDYsMTEg KzYyNSwxNSBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OnBvcHVwT3BlbmVkKFBvcHVwCiAgICAg ICAgIGdldFBvcHVwTWVudUluZm8ocG9wdXBDb250YWluZXIsICZwb3B1cEluZm8pOwogICAgICAg ICB3ZWJ3aWRnZXQgPSBtX3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVQb3B1cE1lbnUocG9wdXBJ bmZvKTsKICAgICB9IGVsc2UgewotICAgICAgICB3ZWJ3aWRnZXQgPSBtX3dlYlZpZXctPmNsaWVu dCgpLT5jcmVhdGVQb3B1cE1lbnUoKTsKLSAgICAgICAgaWYgKCF3ZWJ3aWRnZXQpIHsKLSAgICAg ICAgICAgIC8vIFRyeSB0aGUgZGVwcmVjYXRlZCBtZXRob2QuCisgICAgICAgIHdlYndpZGdldCA9 IG1fd2ViVmlldy0+Y2xpZW50KCktPmNyZWF0ZVBvcHVwTWVudSgKKyAgICAgICAgICAgIGNvbnZl cnRQb3B1cFR5cGUocG9wdXBDb250YWluZXItPnBvcHVwVHlwZSgpKSk7CisgICAgICAgIC8vIFRy eSB0aGUgZGVwcmVjYXRlZCBtZXRob2RzLgorICAgICAgICAvLyBUT0RPKGpjaXZlbGxpKTogUmVt b3ZlIHRoZSBkZXByZWNhdGVkIG1ldGhvZHMgb25jZSB0aGUgQ2hyb21pdW0gc2lkZQorICAgICAg ICAvLyAgICAgICAgICAgICAgICAgdXNlIHRoZSBuZXcgbWV0aG9kLgorICAgICAgICBpZiAoIXdl YndpZGdldCkKKyAgICAgICAgICAgIHdlYndpZGdldCA9IG1fd2ViVmlldy0+Y2xpZW50KCktPmNy ZWF0ZVBvcHVwTWVudSgpOworICAgICAgICBpZiAoIXdlYndpZGdldCkKICAgICAgICAgICAgIHdl YndpZGdldCA9IG1fd2ViVmlldy0+Y2xpZW50KCktPmNyZWF0ZVBvcHVwTWVudShmYWxzZSk7Ci0g ICAgICAgIH0gICAgCiAgICAgfQogICAgIG1fd2ViVmlldy0+cG9wdXBPcGVuZWQocG9wdXBDb250 YWluZXIpOwogICAgIHN0YXRpY19jYXN0PFdlYlBvcHVwTWVudUltcGwqPih3ZWJ3aWRnZXQpLT5J bml0KHBvcHVwQ29udGFpbmVyLCBib3VuZHMpOwpAQCAtNjkzLDcgKzcxNiw2IEBAIHZvaWQgQ2hy b21lQ2xpZW50SW1wbDo6ZGlkQ2hhbmdlQWNjZXNzaWIKICAgICAgICAgbV93ZWJWaWV3LT5jbGll bnQoKS0+ZGlkQ2hhbmdlQWNjZXNzaWJpbGl0eU9iamVjdFN0YXRlKFdlYkFjY2Vzc2liaWxpdHlP YmplY3Qob2JqKSk7CiB9CiAKLQogI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQogTm90aWZpY2F0 aW9uUHJlc2VudGVyKiBDaHJvbWVDbGllbnRJbXBsOjpub3RpZmljYXRpb25QcmVzZW50ZXIoKSBj b25zdAogewo= 52419 2010-04-02 09:51:00 -0700 2010-04-02 10:06:59 -0700 Added missing file... popup.patch text/plain 6876 jcampan SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1NzAwNSkKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNC0wMiAgSmF5 IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHBvcHVwIHR5cGUgKHNlbGVjdCBvciBzdWdn ZXN0aW9uKSBpcyBub3cgcGFzc2VkIHRvIHRoZQorICAgICAgICBXZWJDbGllbnQ6OmNyZWF0ZVBv cHVwTWVudSgpIG1ldGhvZC4gVGhpcyBpcyByZXF1aXJlZCBmb3IKKyAgICAgICAgQ2hyb21pdW0g b24gTGludXggdG8gbWFrZSB0aGUgc2VsZWN0IHBvcHVwcyB3b3JrIGNvcnJlY3RseS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MDEzCisKKyAgICAg ICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJQb3B1cFR5cGUuaDogQWRkZWQu CisgICAgICAgIChXZWJLaXQ6Oik6CisgICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0NsaWVudDo6Y3JlYXRlUG9wdXBNZW51KToKKyAgICAg ICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0 UG9wdXBUeXBlKToKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6cG9wdXBPcGVu ZWQpOgorCiAyMDEwLTA0LTAyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCkluZGV4OiBXZWJLaXQvY2hy b21pdW0vV2ViS2l0Lmd5cA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9XZWJLaXQu Z3lwCShyZXZpc2lvbiA1NzAwMikKKysrIFdlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNzIsNiArMTcyLDcgQEAKICAgICAgICAgICAgICAgICAncHVibGljL1dl YlBvaW50LmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUG9wdXBNZW51LmgnLAogICAg ICAgICAgICAgICAgICdwdWJsaWMvV2ViUG9wdXBNZW51SW5mby5oJywKKyAgICAgICAgICAgICAg ICAncHVibGljL1dlYlBvcHVwVHlwZS5oJywKICAgICAgICAgICAgICAgICAncHVibGljL1dlYlBy aXZhdGVQdHIuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJSYW5nZS5oJywKICAgICAg ICAgICAgICAgICAncHVibGljL1dlYlJlY3QuaCcsCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlBvcHVwVHlwZS5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJQb3B1cFR5cGUuaAkocmV2aXNpb24gMCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViUG9wdXBUeXBlLmgJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDQgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0 aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJv bW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVj aWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFT IElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRS SUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAor ICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdlYlBv cHVwVHlwZV9oCisjZGVmaW5lIFdlYlBvcHVwVHlwZV9oCisKK25hbWVzcGFjZSBXZWJLaXQgewor CitlbnVtIFdlYlBvcHVwVHlwZSB7CisgICAgV2ViUG9wdXBUeXBlTm9uZSwgLy8gTm90IGEgcG9w dXAuCisgICAgV2ViUG9wdXBUeXBlU2VsZWN0LCAvLyBBIEhUTUwgc2VsZWN0IChjb21iby1ib3gp IHBvcHVwLgorICAgIFdlYlBvcHVwVHlwZVN1Z2dlc3Rpb24sIC8vIEFuIGF1dG9maWxsL2F1dG9j b21wbGV0ZSBwb3B1cC4KK307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5kaWYKSW5k ZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHJldmlzaW9uIDU3MDAy KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJXZWJFZGl0aW5nQWN0aW9uLmgiCiAjaW5j bHVkZSAiV2ViRmlsZUNob29zZXJDb21wbGV0aW9uLmgiCiAjaW5jbHVkZSAiV2ViRmlsZUNob29z ZXJQYXJhbXMuaCIKKyNpbmNsdWRlICJXZWJQb3B1cFR5cGUuaCIKICNpbmNsdWRlICJXZWJTdHJp bmcuaCIKICNpbmNsdWRlICJXZWJUZXh0QWZmaW5pdHkuaCIKICNpbmNsdWRlICJXZWJUZXh0RGly ZWN0aW9uLmgiCkBAIC03Myw5ICs3NCwxMCBAQCBwdWJsaWM6CiAKICAgICAvLyBDcmVhdGUgYSBu ZXcgV2ViUG9wdXBNZW51LiAgSW4gdGhlIHNlY29uZCBmb3JtLCB0aGUgY2xpZW50IGlzCiAgICAg Ly8gcmVzcG9uc2libGUgZm9yIHJlbmRlcmluZyB0aGUgY29udGVudHMgb2YgdGhlIHBvcHVwIG1l bnUuCi0gICAgdmlydHVhbCBXZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudSgpIHsgcmV0dXJuIDA7 IH0KKyAgICB2aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KFdlYlBvcHVwVHlwZSkg eyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgV2ViV2lkZ2V0KiBjcmVhdGVQb3B1cE1lbnUoY29u c3QgV2ViUG9wdXBNZW51SW5mbyYpIHsgcmV0dXJuIDA7IH0KLSAgICAvLyBEZXByZWNhdGVkIG1l dGhvZC4KKyAgICAvLyBEZXByZWNhdGVkIG1ldGhvZHMuCisgICAgdmlydHVhbCBXZWJXaWRnZXQq IGNyZWF0ZVBvcHVwTWVudSgpIHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIFdlYldpZGdldCog Y3JlYXRlUG9wdXBNZW51KGJvb2wgYWN0aXZhdGFibGUpIHsgcmV0dXJuIDA7IH0KIAogCkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAkocmV2aXNpb24gNTcw MDIpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02OCw2ICs2OCw3IEBACiAjaW5jbHVkZSAiV2ViS2l0LmgiCiAjaW5jbHVkZSAi V2ViUG9wdXBNZW51SW1wbC5oIgogI2luY2x1ZGUgIldlYlBvcHVwTWVudUluZm8uaCIKKyNpbmNs dWRlICJXZWJQb3B1cFR5cGUuaCIKICNpbmNsdWRlICJXZWJSZWN0LmgiCiAjaW5jbHVkZSAiV2Vi VGV4dERpcmVjdGlvbi5oIgogI2luY2x1ZGUgIldlYlVSTFJlcXVlc3QuaCIKQEAgLTc4LDYgKzc5 LDI0IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCituYW1lc3BhY2UgeworCisvLyBD b252ZXJ0cyBhIFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyVHlwZSB0byBhIFdlYktpdDo6V2ViUG9w dXBUeXBlLgorV2ViS2l0OjpXZWJQb3B1cFR5cGUgY29udmVydFBvcHVwVHlwZShXZWJDb3JlOjpQ b3B1cENvbnRhaW5lcjo6UG9wdXBUeXBlIHR5cGUpCit7CisgICAgc3dpdGNoICh0eXBlKSB7Cisg ICAgY2FzZSBQb3B1cENvbnRhaW5lcjo6U2VsZWN0OgorICAgICAgICByZXR1cm4gV2ViS2l0OjpX ZWJQb3B1cFR5cGVTZWxlY3Q7CisgICAgY2FzZSBQb3B1cENvbnRhaW5lcjo6U3VnZ2VzdGlvbjoK KyAgICAgICAgcmV0dXJuIFdlYktpdDo6V2ViUG9wdXBUeXBlU3VnZ2VzdGlvbjsKKyAgICBkZWZh dWx0OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIFdlYktp dDo6V2ViUG9wdXBUeXBlTm9uZTsKKyAgICB9Cit9CisKK30gLy8gbmFtZXNwYWNlCisKIG5hbWVz cGFjZSBXZWJLaXQgewogCiBDaHJvbWVDbGllbnRJbXBsOjpDaHJvbWVDbGllbnRJbXBsKFdlYlZp ZXdJbXBsKiB3ZWJWaWV3KQpAQCAtNjA2LDExICs2MjUsMTUgQEAgdm9pZCBDaHJvbWVDbGllbnRJ bXBsOjpwb3B1cE9wZW5lZChQb3B1cAogICAgICAgICBnZXRQb3B1cE1lbnVJbmZvKHBvcHVwQ29u dGFpbmVyLCAmcG9wdXBJbmZvKTsKICAgICAgICAgd2Vid2lkZ2V0ID0gbV93ZWJWaWV3LT5jbGll bnQoKS0+Y3JlYXRlUG9wdXBNZW51KHBvcHVwSW5mbyk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAg d2Vid2lkZ2V0ID0gbV93ZWJWaWV3LT5jbGllbnQoKS0+Y3JlYXRlUG9wdXBNZW51KCk7Ci0gICAg ICAgIGlmICghd2Vid2lkZ2V0KSB7Ci0gICAgICAgICAgICAvLyBUcnkgdGhlIGRlcHJlY2F0ZWQg bWV0aG9kLgorICAgICAgICB3ZWJ3aWRnZXQgPSBtX3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVQ b3B1cE1lbnUoCisgICAgICAgICAgICBjb252ZXJ0UG9wdXBUeXBlKHBvcHVwQ29udGFpbmVyLT5w b3B1cFR5cGUoKSkpOworICAgICAgICAvLyBUcnkgdGhlIGRlcHJlY2F0ZWQgbWV0aG9kcy4KKyAg ICAgICAgLy8gVE9ETyhqY2l2ZWxsaSk6IFJlbW92ZSB0aGUgZGVwcmVjYXRlZCBtZXRob2RzIG9u Y2UgdGhlIENocm9taXVtIHNpZGUKKyAgICAgICAgLy8gICAgICAgICAgICAgICAgIHVzZSB0aGUg bmV3IG1ldGhvZC4KKyAgICAgICAgaWYgKCF3ZWJ3aWRnZXQpCisgICAgICAgICAgICB3ZWJ3aWRn ZXQgPSBtX3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVQb3B1cE1lbnUoKTsKKyAgICAgICAgaWYg KCF3ZWJ3aWRnZXQpCiAgICAgICAgICAgICB3ZWJ3aWRnZXQgPSBtX3dlYlZpZXctPmNsaWVudCgp LT5jcmVhdGVQb3B1cE1lbnUoZmFsc2UpOwotICAgICAgICB9ICAgIAogICAgIH0KICAgICBtX3dl YlZpZXctPnBvcHVwT3BlbmVkKHBvcHVwQ29udGFpbmVyKTsKICAgICBzdGF0aWNfY2FzdDxXZWJQ b3B1cE1lbnVJbXBsKj4od2Vid2lkZ2V0KS0+SW5pdChwb3B1cENvbnRhaW5lciwgYm91bmRzKTsK QEAgLTY5Myw3ICs3MTYsNiBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OmRpZENoYW5nZUFjY2Vz c2liCiAgICAgICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPmRpZENoYW5nZUFjY2Vzc2liaWxpdHlP YmplY3RTdGF0ZShXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0KG9iaikpOwogfQogCi0KICNpZiBFTkFC TEUoTk9USUZJQ0FUSU9OUykKIE5vdGlmaWNhdGlvblByZXNlbnRlciogQ2hyb21lQ2xpZW50SW1w bDo6bm90aWZpY2F0aW9uUHJlc2VudGVyKCkgY29uc3QKIHsK 52420 2010-04-02 10:06:59 -0700 2010-04-02 12:11:56 -0700 Applied fishd suggested changes popup.patch text/plain 6845 jcampan SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1NzAwNSkKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNC0wMiAgSmF5 IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHBvcHVwIHR5cGUgKHNlbGVjdCBvciBzdWdn ZXN0aW9uKSBpcyBub3cgcGFzc2VkIHRvIHRoZQorICAgICAgICBXZWJDbGllbnQ6OmNyZWF0ZVBv cHVwTWVudSgpIG1ldGhvZC4gVGhpcyBpcyByZXF1aXJlZCBmb3IKKyAgICAgICAgQ2hyb21pdW0g b24gTGludXggdG8gbWFrZSB0aGUgc2VsZWN0IHBvcHVwcyB3b3JrIGNvcnJlY3RseS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MDEzCisKKyAgICAg ICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJQb3B1cFR5cGUuaDogQWRkZWQu CisgICAgICAgIChXZWJLaXQ6Oik6CisgICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0NsaWVudDo6Y3JlYXRlUG9wdXBNZW51KToKKyAgICAg ICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0 UG9wdXBUeXBlKToKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6cG9wdXBPcGVu ZWQpOgorCiAyMDEwLTA0LTAyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCkluZGV4OiBXZWJLaXQvY2hy b21pdW0vV2ViS2l0Lmd5cA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9XZWJLaXQu Z3lwCShyZXZpc2lvbiA1NzAwMikKKysrIFdlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNzIsNiArMTcyLDcgQEAKICAgICAgICAgICAgICAgICAncHVibGljL1dl YlBvaW50LmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViUG9wdXBNZW51LmgnLAogICAg ICAgICAgICAgICAgICdwdWJsaWMvV2ViUG9wdXBNZW51SW5mby5oJywKKyAgICAgICAgICAgICAg ICAncHVibGljL1dlYlBvcHVwVHlwZS5oJywKICAgICAgICAgICAgICAgICAncHVibGljL1dlYlBy aXZhdGVQdHIuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJSYW5nZS5oJywKICAgICAg ICAgICAgICAgICAncHVibGljL1dlYlJlY3QuaCcsCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlBvcHVwVHlwZS5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJQb3B1cFR5cGUuaAkocmV2aXNpb24gMCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViUG9wdXBUeXBlLmgJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDQgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0 aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJv bW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVj aWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFT IElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRS SUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAor ICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdlYlBv cHVwVHlwZV9oCisjZGVmaW5lIFdlYlBvcHVwVHlwZV9oCisKK25hbWVzcGFjZSBXZWJLaXQgewor CitlbnVtIFdlYlBvcHVwVHlwZSB7CisgICAgV2ViUG9wdXBUeXBlTm9uZSwgLy8gTm90IGEgcG9w dXAuCisgICAgV2ViUG9wdXBUeXBlU2VsZWN0LCAvLyBBIEhUTUwgc2VsZWN0IChjb21iby1ib3gp IHBvcHVwLgorICAgIFdlYlBvcHVwVHlwZVN1Z2dlc3Rpb24sIC8vIEFuIGF1dG9maWxsL2F1dG9j b21wbGV0ZSBwb3B1cC4KK307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5kaWYKSW5k ZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHJldmlzaW9uIDU3MDAy KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJXZWJFZGl0aW5nQWN0aW9uLmgiCiAjaW5j bHVkZSAiV2ViRmlsZUNob29zZXJDb21wbGV0aW9uLmgiCiAjaW5jbHVkZSAiV2ViRmlsZUNob29z ZXJQYXJhbXMuaCIKKyNpbmNsdWRlICJXZWJQb3B1cFR5cGUuaCIKICNpbmNsdWRlICJXZWJTdHJp bmcuaCIKICNpbmNsdWRlICJXZWJUZXh0QWZmaW5pdHkuaCIKICNpbmNsdWRlICJXZWJUZXh0RGly ZWN0aW9uLmgiCkBAIC03Myw5ICs3NCwxMCBAQCBwdWJsaWM6CiAKICAgICAvLyBDcmVhdGUgYSBu ZXcgV2ViUG9wdXBNZW51LiAgSW4gdGhlIHNlY29uZCBmb3JtLCB0aGUgY2xpZW50IGlzCiAgICAg Ly8gcmVzcG9uc2libGUgZm9yIHJlbmRlcmluZyB0aGUgY29udGVudHMgb2YgdGhlIHBvcHVwIG1l bnUuCi0gICAgdmlydHVhbCBXZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudSgpIHsgcmV0dXJuIDA7 IH0KKyAgICB2aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KFdlYlBvcHVwVHlwZSkg eyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgV2ViV2lkZ2V0KiBjcmVhdGVQb3B1cE1lbnUoY29u c3QgV2ViUG9wdXBNZW51SW5mbyYpIHsgcmV0dXJuIDA7IH0KLSAgICAvLyBEZXByZWNhdGVkIG1l dGhvZC4KKyAgICAvLyBEZXByZWNhdGVkIG1ldGhvZHMuCisgICAgdmlydHVhbCBXZWJXaWRnZXQq IGNyZWF0ZVBvcHVwTWVudSgpIHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIFdlYldpZGdldCog Y3JlYXRlUG9wdXBNZW51KGJvb2wgYWN0aXZhdGFibGUpIHsgcmV0dXJuIDA7IH0KIAogCkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAkocmV2aXNpb24gNTcw MDIpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02OCw2ICs2OCw3IEBACiAjaW5jbHVkZSAiV2ViS2l0LmgiCiAjaW5jbHVkZSAi V2ViUG9wdXBNZW51SW1wbC5oIgogI2luY2x1ZGUgIldlYlBvcHVwTWVudUluZm8uaCIKKyNpbmNs dWRlICJXZWJQb3B1cFR5cGUuaCIKICNpbmNsdWRlICJXZWJSZWN0LmgiCiAjaW5jbHVkZSAiV2Vi VGV4dERpcmVjdGlvbi5oIgogI2luY2x1ZGUgIldlYlVSTFJlcXVlc3QuaCIKQEAgLTgwLDYgKzgx LDIwIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAor Ly8gQ29udmVydHMgYSBXZWJDb3JlOjpQb3B1cENvbnRhaW5lclR5cGUgdG8gYSBXZWJLaXQ6Oldl YlBvcHVwVHlwZS4KK3N0YXRpYyBXZWJQb3B1cFR5cGUgY29udmVydFBvcHVwVHlwZShQb3B1cENv bnRhaW5lcjo6UG9wdXBUeXBlIHR5cGUpCit7CisgICAgc3dpdGNoICh0eXBlKSB7CisgICAgY2Fz ZSBQb3B1cENvbnRhaW5lcjo6U2VsZWN0OgorICAgICAgICByZXR1cm4gV2ViUG9wdXBUeXBlU2Vs ZWN0OworICAgIGNhc2UgUG9wdXBDb250YWluZXI6OlN1Z2dlc3Rpb246CisgICAgICAgIHJldHVy biBXZWJQb3B1cFR5cGVTdWdnZXN0aW9uOworICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gV2ViUG9wdXBUeXBlTm9uZTsKKyAgICB9Cit9 CisKIENocm9tZUNsaWVudEltcGw6OkNocm9tZUNsaWVudEltcGwoV2ViVmlld0ltcGwqIHdlYlZp ZXcpCiAgICAgOiBtX3dlYlZpZXcod2ViVmlldykKICAgICAsIG1fdG9vbGJhcnNWaXNpYmxlKHRy dWUpCkBAIC02MDYsMTEgKzYyMSwxNSBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OnBvcHVwT3Bl bmVkKFBvcHVwCiAgICAgICAgIGdldFBvcHVwTWVudUluZm8ocG9wdXBDb250YWluZXIsICZwb3B1 cEluZm8pOwogICAgICAgICB3ZWJ3aWRnZXQgPSBtX3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVQ b3B1cE1lbnUocG9wdXBJbmZvKTsKICAgICB9IGVsc2UgewotICAgICAgICB3ZWJ3aWRnZXQgPSBt X3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVQb3B1cE1lbnUoKTsKLSAgICAgICAgaWYgKCF3ZWJ3 aWRnZXQpIHsKLSAgICAgICAgICAgIC8vIFRyeSB0aGUgZGVwcmVjYXRlZCBtZXRob2QuCisgICAg ICAgIHdlYndpZGdldCA9IG1fd2ViVmlldy0+Y2xpZW50KCktPmNyZWF0ZVBvcHVwTWVudSgKKyAg ICAgICAgICAgIGNvbnZlcnRQb3B1cFR5cGUocG9wdXBDb250YWluZXItPnBvcHVwVHlwZSgpKSk7 CisgICAgICAgIC8vIFRyeSB0aGUgZGVwcmVjYXRlZCBtZXRob2RzLgorICAgICAgICAvLyBGSVhN RTogUmVtb3ZlIHRoZSBkZXByZWNhdGVkIG1ldGhvZHMgb25jZSB0aGUgQ2hyb21pdW0gc2lkZSB1 c2UgdGhlCisgICAgICAgIC8vICAgICAgICBuZXcgbWV0aG9kLgorICAgICAgICBpZiAoIXdlYndp ZGdldCkKKyAgICAgICAgICAgIHdlYndpZGdldCA9IG1fd2ViVmlldy0+Y2xpZW50KCktPmNyZWF0 ZVBvcHVwTWVudSgpOworICAgICAgICBpZiAoIXdlYndpZGdldCkKICAgICAgICAgICAgIHdlYndp ZGdldCA9IG1fd2ViVmlldy0+Y2xpZW50KCktPmNyZWF0ZVBvcHVwTWVudShmYWxzZSk7Ci0gICAg ICAgIH0gICAgCiAgICAgfQogICAgIG1fd2ViVmlldy0+cG9wdXBPcGVuZWQocG9wdXBDb250YWlu ZXIpOwogICAgIHN0YXRpY19jYXN0PFdlYlBvcHVwTWVudUltcGwqPih3ZWJ3aWRnZXQpLT5Jbml0 KHBvcHVwQ29udGFpbmVyLCBib3VuZHMpOwpAQCAtNjkzLDcgKzcxMiw2IEBAIHZvaWQgQ2hyb21l Q2xpZW50SW1wbDo6ZGlkQ2hhbmdlQWNjZXNzaWIKICAgICAgICAgbV93ZWJWaWV3LT5jbGllbnQo KS0+ZGlkQ2hhbmdlQWNjZXNzaWJpbGl0eU9iamVjdFN0YXRlKFdlYkFjY2Vzc2liaWxpdHlPYmpl Y3Qob2JqKSk7CiB9CiAKLQogI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQogTm90aWZpY2F0aW9u UHJlc2VudGVyKiBDaHJvbWVDbGllbnRJbXBsOjpub3RpZmljYXRpb25QcmVzZW50ZXIoKSBjb25z dAogewo=