41244 2010-06-25 22:06:08 -0700 [chromium]Remove deprecated code related to input method. 2010-06-28 14:50:57 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 suzhe webkit-unassigned commit-queue dglazkov eric jianli ojan tony webkit.review.bot oldest_to_newest 243323 0 suzhe 2010-06-25 22:06:08 -0700 This patch just removes some deprecated code. No functionality change. Please refer to: https://bugs.webkit.org/show_bug.cgi?id=40608 243324 1 59822 suzhe 2010-06-25 22:09:58 -0700 Created attachment 59822 The patch for review. The patch for review. 243330 2 webkit.review.bot 2010-06-25 22:52:33 -0700 Attachment 59822 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/3350023 243534 3 tony 2010-06-27 19:13:51 -0700 The build on chromium failed. Looks like there are still references to WebCompositionCommand.h (probably the include statement itself?). Should be fine once you get it to pass the EWS bots. 243753 4 59822 jianli 2010-06-28 10:26:42 -0700 Comment on attachment 59822 The patch for review. You need to remove the file from WebKit/chromium/WebKit.gyp. Please make sure you build and test the Chromium. 243766 5 59910 suzhe 2010-06-28 10:41:44 -0700 Created attachment 59910 Fix build issue. 243788 6 59910 jianli 2010-06-28 11:39:31 -0700 Comment on attachment 59910 Fix build issue. Do you want to have the reviewer to add your patch to the commit queue? If so, please set the commit-queue flag from empty to "?". WebKit/chromium/ChangeLog:18 + * tests/PopupMenuTest.cpp: Please also mention here why you need to change this file to override the default implementations since the main description only says to remove the deprecated code. 243801 7 suzhe 2010-06-28 11:57:05 -0700 (In reply to comment #6) > (From update of attachment 59910 [details]) > Do you want to have the reviewer to add your patch to the commit queue? If so, please set the commit-queue flag from empty to "?". > > WebKit/chromium/ChangeLog:18 > + * tests/PopupMenuTest.cpp: > Please also mention here why you need to change this file to override the default implementations since the main description only says to remove the deprecated code. I should have made this change in the patch of bug 40608. These new methods are pure virtual, so they needs to be overridden here. But as this TestWebWidget class is not used anywhere, it's actually won't break any test without this change. 243805 8 jianli 2010-06-28 12:05:21 -0700 (In reply to comment #7) > (In reply to comment #6) > > (From update of attachment 59910 [details] [details]) > > Do you want to have the reviewer to add your patch to the commit queue? If so, please set the commit-queue flag from empty to "?". > > > > WebKit/chromium/ChangeLog:18 > > + * tests/PopupMenuTest.cpp: > > Please also mention here why you need to change this file to override the default implementations since the main description only says to remove the deprecated code. > > I should have made this change in the patch of bug 40608. These new methods are pure virtual, so they needs to be overridden here. But as this TestWebWidget class is not used anywhere, it's actually won't break any test without this change. It would be better to mention all the changes made in the patch. It might be as simple as adding the following line to the description. Also update TestPopupMenuClient to add missing implementations. Also, what I mean is that you need to set both review flag and commit-queue flag when you submit a new patch for review if you want to use the commit queue to commit your patch. 243850 9 59928 suzhe 2010-06-28 13:14:57 -0700 Created attachment 59928 Update ChangeLog to mention the change in TestPopupMenu.cpp 243906 10 59928 jianli 2010-06-28 14:31:59 -0700 Comment on attachment 59928 Update ChangeLog to mention the change in TestPopupMenu.cpp r=me 243915 11 59928 commit-queue 2010-06-28 14:50:51 -0700 Comment on attachment 59928 Update ChangeLog to mention the change in TestPopupMenu.cpp Clearing flags on attachment: 59928 Committed r62039: <http://trac.webkit.org/changeset/62039> 243916 12 commit-queue 2010-06-28 14:50:57 -0700 All reviewed patches have been landed. Closing bug. 59822 2010-06-25 22:09:58 -0700 2010-06-28 10:41:44 -0700 The patch for review. webkit-remove-deprecated.diff text/plain 12831 suzhe SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE5MzkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDYtMjUgIFpoZSBT dSAgPHN1emhlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbY2hyb21pdW1dUmVtb3ZlIGRlcHJlY2F0ZWQgY29kZSByZWxhdGVk IHRvIGlucHV0IG1ldGhvZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQxMjQ0CisKKyAgICAgICAgKiBwdWJsaWMvV2ViQ29tcG9zaXRpb25Db21tYW5k Lmg6IFJlbW92ZWQuCisgICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoKKyAgICAgICAg KiBwdWJsaWMvV2ViV2lkZ2V0Lmg6CisgICAgICAgICogc3JjL0VkaXRvckNsaWVudEltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JDbGllbnRJbXBsOjpzZXRJbnB1dE1ldGhvZFN0YXRl KToKKyAgICAgICAgKiBzcmMvV2ViUG9wdXBNZW51SW1wbC5jcHA6CisgICAgICAgICogc3JjL1dl YlBvcHVwTWVudUltcGwuaDoKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAg ICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTA2LTI1ICBTdGVybGluZyBTd2lnYXJ0ICA8 c3N3aWdhcnRAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4K SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tcG9zaXRpb25Db21tYW5kLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdGlvbkNvbW1hbmQu aAkocmV2aXNpb24gNjE5MzkpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0 aW9uQ29tbWFuZC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDQ1ICswLDAgQEAKLS8qCi0gKiBDb3B5 cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKLSAqIG1ldDoKLSAqCi0gKiAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAot ICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgotICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZQotICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgotICogaW4gdGhlIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQotICogZGlzdHJpYnV0 aW9uLgotICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cwotICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJv bW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KLSAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVj aWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwotICogIkFT IElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QKLSAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUgotICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKLSAqIE9XTkVSIE9SIENPTlRS SUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAot ICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVAotICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCi0gKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKLSAqIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKLSAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaWZuZGVmIFdlYkNv bXBvc2l0aW9uQ29tbWFuZF9oCi0jZGVmaW5lIFdlYkNvbXBvc2l0aW9uQ29tbWFuZF9oCi0KLW5h bWVzcGFjZSBXZWJLaXQgewotCi0vLyBERVBSRUNBVEVELgotZW51bSBXZWJDb21wb3NpdGlvbkNv bW1hbmQgewotICAgIFdlYkNvbXBvc2l0aW9uQ29tbWFuZERpc2NhcmQsCi0gICAgV2ViQ29tcG9z aXRpb25Db21tYW5kU2V0LAotICAgIFdlYkNvbXBvc2l0aW9uQ29tbWFuZENvbmZpcm0sCi19Owot Ci19IC8vIG5hbWVzcGFjZSBXZWJLaXQKLQotI2VuZGlmCkluZGV4OiBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlZpZXdDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlZpZXdDbGllbnQuaAkocmV2aXNpb24gNjE5MzkpCisrKyBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlZpZXdDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTI2LDkgKzEyNiw2IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoKSB7 IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBib29sIGlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNw YWNlRW5hYmxlZCgpIHsgcmV0dXJuIHRydWU7IH0KIAotICAgIC8vIERFUFJFQ0FURUQ6IHJlcGxh Y2VkIGJ5IFdlYldpZGdldENsaWVudDo6cmVzZXRJbnB1dE1ldGhvZCgpLgotICAgIHZpcnR1YWwg dm9pZCBzZXRJbnB1dE1ldGhvZEVuYWJsZWQoYm9vbCBlbmFibGVkKSB7IH0KLQogICAgIHZpcnR1 YWwgdm9pZCBkaWRCZWdpbkVkaXRpbmcoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdl U2VsZWN0aW9uKGJvb2wgaXNTZWxlY3Rpb25FbXB0eSkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRp ZENoYW5nZUNvbnRlbnRzKCkgeyB9CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldp ZGdldC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgJ KHJldmlzaW9uIDYxOTM5KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXQuaAko d29ya2luZyBjb3B5KQpAQCAtNzksMTMgKzc5LDYgQEAgcHVibGljOgogICAgIC8vIENhbGxlZCB0 byBpbmZvcm0gdGhlIFdlYldpZGdldCB0aGF0IGl0IGhhcyBnYWluZWQgb3IgbG9zdCBrZXlib2Fy ZCBmb2N1cy4KICAgICB2aXJ0dWFsIHZvaWQgc2V0Rm9jdXMoYm9vbCkgPSAwOwogCi0gICAgLy8g REVQUkVDQVRFRC4gSXQncyByZXBsYWNlZCBieSBzZXRDb21wb3NpdGlvbigpIGFuZCBjb25maXJt Q29tcG9zaXRpb24oKS4KLSAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlQ29tcG9zaXRpb25FdmVudChX ZWJDb21wb3NpdGlvbkNvbW1hbmQgY29tbWFuZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbnQgY3Vyc29yUG9zaXRpb24sCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaW50IHRhcmdldFN0YXJ0LAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGludCB0YXJnZXRFbmQsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiB0ZXh0KSA9IDA7Ci0KICAgICAvLyBD YWxsZWQgdG8gaW5mb3JtIHRoZSBXZWJXaWRnZXQgb2YgYSBuZXcgY29tcG9zaXRpb24gdGV4dC4K ICAgICAvLyBJZiBzZWxlY3Rpb25TdGFydCBhbmQgc2VsZWN0aW9uRW5kIGhhcyB0aGUgc2FtZSB2 YWx1ZSwgdGhlbiBpdCBpbmRpY2F0ZXMKICAgICAvLyB0aGUgaW5wdXQgY2FyZXQgcG9zaXRpb24u IElmIHRoZSB0ZXh0IGlzIGVtcHR5LCB0aGVuIHRoZSBleGlzdGluZwpAQCAtMTAxLDEwICs5NCw2 IEBAIHB1YmxpYzoKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlcmUgaXMgYW4gb25nb2luZyBj b21wb3NpdGlvbi4KICAgICB2aXJ0dWFsIGJvb2wgY29uZmlybUNvbXBvc2l0aW9uKCkgPSAwOwog Ci0gICAgLy8gREVQUkVDQVRFRC4gSXQncyByZXBsYWNlZCBieSB0ZXh0SW5wdXRUeXBlKCkgYW5k Ci0gICAgLy8gY2FyZXRPclNlbGVjdGlvbkJvdW5kcygpLgotICAgIHZpcnR1YWwgYm9vbCBxdWVy eUNvbXBvc2l0aW9uU3RhdHVzKGJvb2wqIGVuYWJsZWQsIFdlYlJlY3QqIGNhcmV0Qm91bmRzKSA9 IDA7Ci0KICAgICAvLyBSZXR1cm5zIHRoZSBjdXJyZW50IHRleHQgaW5wdXQgdHlwZSBvZiB0aGlz IFdlYldpZGdldC4KICAgICB2aXJ0dWFsIFdlYlRleHRJbnB1dFR5cGUgdGV4dElucHV0VHlwZSgp ID0gMDsKIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9FZGl0b3JDbGllbnRJbXBsLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0VkaXRvckNsaWVudEltcGwuY3BwCShy ZXZpc2lvbiA2MTkzOSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvRWRpdG9yQ2xpZW50SW1wbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTkyMSwxMyArOTIxLDggQEAgdm9pZCBFZGl0b3JDbGllbnRJ bXBsOjpnZXRHdWVzc2VzRm9yV29yZAogCiB2b2lkIEVkaXRvckNsaWVudEltcGw6OnNldElucHV0 TWV0aG9kU3RhdGUoYm9vbCBlbmFibGVkKQogewotICAgIGlmIChtX3dlYlZpZXctPmNsaWVudCgp KSB7CisgICAgaWYgKG1fd2ViVmlldy0+Y2xpZW50KCkpCiAgICAgICAgIG1fd2ViVmlldy0+Y2xp ZW50KCktPnJlc2V0SW5wdXRNZXRob2QoKTsKLQotICAgICAgICAvLyBSZW1vdmUgdGhpcyBsaW5l IHdoZW4gV2ViVmlld0NsaWVudDo6c2V0SW5wdXRNZXRob2RFbmFibGVkKCkgZ2V0cwotICAgICAg ICAvLyByZW1vdmVkLgotICAgICAgICBtX3dlYlZpZXctPmNsaWVudCgpLT5zZXRJbnB1dE1ldGhv ZEVuYWJsZWQoZW5hYmxlZCk7Ci0gICAgfQogfQogCiB9IC8vIG5hbWVzYWNlIFdlYktpdApJbmRl eDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCShyZXZpc2lvbiA2MTkz OSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTIzMCwxNCArMjMwLDYgQEAgdm9pZCBXZWJQb3B1cE1lbnVJbXBsOjpzZXRGb2N1 cyhib29sIGVuYQogewogfQogCi0vLyBERVBSRUNBVEVELCB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIu Ci1ib29sIFdlYlBvcHVwTWVudUltcGw6OmhhbmRsZUNvbXBvc2l0aW9uRXZlbnQoCi0gICAgV2Vi Q29tcG9zaXRpb25Db21tYW5kIGNvbW1hbmQsIGludCBjdXJzb3JQb3NpdGlvbiwgaW50IHRhcmdl dFN0YXJ0LAotICAgIGludCB0YXJnZXRFbmQsIGNvbnN0IFdlYlN0cmluZyYgaW1lU3RyaW5nKQot ewotICAgIHJldHVybiBmYWxzZTsKLX0KLQogYm9vbCBXZWJQb3B1cE1lbnVJbXBsOjpzZXRDb21w b3NpdGlvbigKICAgICBjb25zdCBXZWJTdHJpbmcmIHRleHQsIGNvbnN0IFdlYlZlY3RvcjxXZWJD b21wb3NpdGlvblVuZGVybGluZT4mIHVuZGVybGluZXMsCiAgICAgaW50IHNlbGVjdGlvblN0YXJ0 LCBpbnQgc2VsZWN0aW9uRW5kKQpAQCAtMjUwLDEyICsyNDIsNiBAQCBib29sIFdlYlBvcHVwTWVu dUltcGw6OmNvbmZpcm1Db21wb3NpdGlvCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi0vLyBERVBS RUNBVEVELCB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIuCi1ib29sIFdlYlBvcHVwTWVudUltcGw6OnF1 ZXJ5Q29tcG9zaXRpb25TdGF0dXMoYm9vbCogZW5hYmxlZCwgV2ViUmVjdCogY2FyZXRSZWN0KQot ewotICAgIHJldHVybiBmYWxzZTsKLX0KLQogV2ViVGV4dElucHV0VHlwZSBXZWJQb3B1cE1lbnVJ bXBsOjp0ZXh0SW5wdXRUeXBlKCkKIHsKICAgICByZXR1cm4gV2ViVGV4dElucHV0VHlwZU5vbmU7 CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuaAkocmV2aXNpb24gNjE5 MzkpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuaAkod29ya2luZyBj b3B5KQpAQCAtNjYsMTkgKzY2LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxl SW5wdXRFdmVudChjb25zdCBXZWJJbnB1dEV2ZW50Jik7CiAgICAgdmlydHVhbCB2b2lkIG1vdXNl Q2FwdHVyZUxvc3QoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0Rm9jdXMoYm9vbCBlbmFibGUpOwot Ci0gICAgLy8gREVQUkVDQVRFRCwgd2lsbCBiZSByZW1vdmVkIGxhdGVyLgotICAgIHZpcnR1YWwg Ym9vbCBoYW5kbGVDb21wb3NpdGlvbkV2ZW50KAotICAgICAgICBXZWJDb21wb3NpdGlvbkNvbW1h bmQgY29tbWFuZCwgaW50IGN1cnNvclBvc2l0aW9uLAotICAgICAgICBpbnQgdGFyZ2V0U3RhcnQs IGludCB0YXJnZXRFbmQsIGNvbnN0IFdlYlN0cmluZyYgdGV4dCk7CiAgICAgdmlydHVhbCBib29s IHNldENvbXBvc2l0aW9uKAogICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHRleHQsCiAgICAgICAg IGNvbnN0IFdlYlZlY3RvcjxXZWJDb21wb3NpdGlvblVuZGVybGluZT4mIHVuZGVybGluZXMsCiAg ICAgICAgIGludCBzZWxlY3Rpb25TdGFydCwgaW50IHNlbGVjdGlvbkVuZCk7CiAgICAgdmlydHVh bCBib29sIGNvbmZpcm1Db21wb3NpdGlvbigpOwotCi0gICAgLy8gREVQUkVDQVRFRCwgd2lsbCBi ZSByZW1vdmVkIGxhdGVyLgotICAgIHZpcnR1YWwgYm9vbCBxdWVyeUNvbXBvc2l0aW9uU3RhdHVz KGJvb2wqIGVuYWJsZWQsIFdlYlJlY3QqIGNhcmV0UmVjdCk7CiAgICAgdmlydHVhbCBXZWJUZXh0 SW5wdXRUeXBlIHRleHRJbnB1dFR5cGUoKTsKICAgICB2aXJ0dWFsIFdlYlJlY3QgY2FyZXRPclNl bGVjdGlvbkJvdW5kcygpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0RGlyZWN0aW9uKFdlYlRl eHREaXJlY3Rpb24gZGlyZWN0aW9uKTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu Y3BwCShyZXZpc2lvbiA2MTkzOSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTY0LDQ4ICsxMTY0LDYgQEAgdm9pZCBXZWJWaWV3SW1w bDo6c2V0Rm9jdXMoYm9vbCBlbmFibGUpCiAgICAgfQogfQogCi0vLyBERVBSRUNBVEVELCB3aWxs IGJlIHJlbW92ZWQgbGF0ZXIuCi1ib29sIFdlYlZpZXdJbXBsOjpoYW5kbGVDb21wb3NpdGlvbkV2 ZW50KFdlYkNvbXBvc2l0aW9uQ29tbWFuZCBjb21tYW5kLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnQgY3Vyc29yUG9zaXRpb24sCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGludCB0YXJnZXRTdGFydCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHRhcmdldEVuZCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBpbWVTdHJpbmcpCi17 Ci0gICAgaWYgKGNvbW1hbmQgPT0gV2ViS2l0OjpXZWJDb21wb3NpdGlvbkNvbW1hbmRTZXQpIHsK LSAgICAgICAgaWYgKHRhcmdldFN0YXJ0IDwgMCkKLSAgICAgICAgICAgIHRhcmdldFN0YXJ0ID0g MDsKLSAgICAgICAgaWYgKHRhcmdldEVuZCA8IDApCi0gICAgICAgICAgICB0YXJnZXRFbmQgPSBz dGF0aWNfY2FzdDxpbnQ+KGltZVN0cmluZy5sZW5ndGgoKSk7Ci0KLSAgICAgICAgLy8gQ3JlYXRl IGN1c3RvbSB1bmRlcmxpbmVzLgotICAgICAgICAvLyBUbyBlbXBoYXNpemUgdGhlIHNlbGVjdGlv biwgdGhlIHNlbGVjdGVkIHJlZ2lvbiB1c2VzIGEgc29saWQgYmxhY2sKLSAgICAgICAgLy8gZm9y IGl0cyB1bmRlcmxpbmUgd2hpbGUgb3RoZXIgcmVnaW9ucyB1c2VzIGEgcGFsZSBncmF5IGZvciB0 aGVpcnMuCi0gICAgICAgIFdlYlZlY3RvcjxXZWJDb21wb3NpdGlvblVuZGVybGluZT4gdW5kZXJs aW5lcyhzdGF0aWNfY2FzdDxzaXplX3Q+KDMpKTsKLSAgICAgICAgdW5kZXJsaW5lc1swXS5zdGFy dE9mZnNldCA9IDA7Ci0gICAgICAgIHVuZGVybGluZXNbMF0uZW5kT2Zmc2V0ID0gdGFyZ2V0U3Rh cnQ7Ci0gICAgICAgIHVuZGVybGluZXNbMF0udGhpY2sgPSB0cnVlOwotICAgICAgICB1bmRlcmxp bmVzWzBdLmNvbG9yID0gMHhmZmQzZDNkMzsKLSAgICAgICAgdW5kZXJsaW5lc1sxXS5zdGFydE9m ZnNldCA9IHRhcmdldFN0YXJ0OwotICAgICAgICB1bmRlcmxpbmVzWzFdLmVuZE9mZnNldCA9IHRh cmdldEVuZDsKLSAgICAgICAgdW5kZXJsaW5lc1sxXS50aGljayA9IHRydWU7Ci0gICAgICAgIHVu ZGVybGluZXNbMV0uY29sb3IgPSAweGZmMDAwMDAwOwotICAgICAgICB1bmRlcmxpbmVzWzJdLnN0 YXJ0T2Zmc2V0ID0gdGFyZ2V0RW5kOwotICAgICAgICB1bmRlcmxpbmVzWzJdLmVuZE9mZnNldCA9 IHN0YXRpY19jYXN0PHVuc2lnbmVkPihpbWVTdHJpbmcubGVuZ3RoKCkpOwotICAgICAgICB1bmRl cmxpbmVzWzJdLnRoaWNrID0gdHJ1ZTsKLSAgICAgICAgdW5kZXJsaW5lc1syXS5jb2xvciA9IDB4 ZmZkM2QzZDM7Ci0gICAgICAgIHJldHVybiBzZXRDb21wb3NpdGlvbihpbWVTdHJpbmcsIHVuZGVy bGluZXMsIGN1cnNvclBvc2l0aW9uLCBjdXJzb3JQb3NpdGlvbik7Ci0gICAgfQotCi0gICAgaWYg KGNvbW1hbmQgPT0gV2ViS2l0OjpXZWJDb21wb3NpdGlvbkNvbW1hbmREaXNjYXJkKQotICAgICAg ICBzZXRDb21wb3NpdGlvbihXZWJTdHJpbmcoKSwgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5k ZXJsaW5lPigpLCAwLCAwKTsKLSAgICBlbHNlIGlmIChjb21tYW5kID09IFdlYktpdDo6V2ViQ29t cG9zaXRpb25Db21tYW5kQ29uZmlybSkgewotICAgICAgICBzZXRDb21wb3NpdGlvbihpbWVTdHJp bmcsIFdlYlZlY3RvcjxXZWJDb21wb3NpdGlvblVuZGVybGluZT4oKSwgMCwgMCk7Ci0gICAgICAg IGNvbmZpcm1Db21wb3NpdGlvbigpOwotICAgIH0KLQotICAgIHJldHVybiB0cnVlOwotfQotCiBi b29sIFdlYlZpZXdJbXBsOjpzZXRDb21wb3NpdGlvbigKICAgICBjb25zdCBXZWJTdHJpbmcmIHRl eHQsCiAgICAgY29uc3QgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYgdW5kZXJs aW5lcywKQEAgLTEyODQsNDEgKzEyNDIsNiBAQCBib29sIFdlYlZpZXdJbXBsOjpjb25maXJtQ29t cG9zaXRpb24oKQogICAgIHJldHVybiB0cnVlOwogfQogCi0vLyBERVBSRUNBVEVELCB3aWxsIGJl IHJlbW92ZWQgbGF0ZXIuCi1ib29sIFdlYlZpZXdJbXBsOjpxdWVyeUNvbXBvc2l0aW9uU3RhdHVz KGJvb2wqIGVuYWJsZUlNRSwgV2ViUmVjdCogY2FyZXRSZWN0KQotewotICAgIC8vIFN0b3JlIHdo ZXRoZXIgdGhlIHNlbGVjdGVkIG5vZGUgbmVlZHMgSU1FIGFuZCB0aGUgY2FyZXQgcmVjdGFuZ2xl LgotICAgIC8vIFRoaXMgcHJvY2VzcyBjb25zaXN0cyBvZiB0aGUgZm9sbG93aW5nIGZvdXIgc3Rl cHM6Ci0gICAgLy8gIDEuIFJldHJpZXZlIHRoZSBzZWxlY3Rpb24gY29udHJvbGxlciBvZiB0aGUg Zm9jdXNlZCBmcmFtZTsKLSAgICAvLyAgMi4gUmV0cmlldmUgdGhlIGNhcmV0IHJlY3RhbmdsZSBm cm9tIHRoZSBjb250cm9sbGVyOwotICAgIC8vICAzLiBDb252ZXJ0IHRoZSByZWN0YW5nbGUsIHdo aWNoIGlzIHJlbGF0aXZlIHRvIHRoZSBwYXJlbnQgdmlldywgdG8gdGhlCi0gICAgLy8gICAgIG9u ZSByZWxhdGl2ZSB0byB0aGUgY2xpZW50IHdpbmRvdywgYW5kOwotICAgIC8vICA0LiBTdG9yZSB0 aGUgY29udmVydGVkIHJlY3RhbmdsZS4KLSAgICBjb25zdCBGcmFtZSogZm9jdXNlZCA9IGZvY3Vz ZWRXZWJDb3JlRnJhbWUoKTsKLSAgICBpZiAoIWZvY3VzZWQpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIGNvbnN0IEVkaXRvciogZWRpdG9yID0gZm9jdXNlZC0+ZWRpdG9yKCk7Ci0gICAg aWYgKCFlZGl0b3IgfHwgIWVkaXRvci0+Y2FuRWRpdCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0KLSAgICBTZWxlY3Rpb25Db250cm9sbGVyKiBjb250cm9sbGVyID0gZm9jdXNlZC0+c2VsZWN0 aW9uKCk7Ci0gICAgaWYgKCFjb250cm9sbGVyKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg ICBjb25zdCBOb2RlKiBub2RlID0gY29udHJvbGxlci0+c3RhcnQoKS5ub2RlKCk7Ci0gICAgaWYg KCFub2RlKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAqZW5hYmxlSU1FID0gbm9kZS0+ c2hvdWxkVXNlSW5wdXRNZXRob2QoKSAmJiAhY29udHJvbGxlci0+aXNJblBhc3N3b3JkRmllbGQo KTsKLSAgICBjb25zdCBGcmFtZVZpZXcqIHZpZXcgPSBub2RlLT5kb2N1bWVudCgpLT52aWV3KCk7 Ci0gICAgaWYgKCF2aWV3KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAqY2FyZXRSZWN0 ID0gdmlldy0+Y29udGVudHNUb1dpbmRvdyhjb250cm9sbGVyLT5hYnNvbHV0ZUNhcmV0Qm91bmRz KCkpOwotICAgIHJldHVybiB0cnVlOwotfQotCiBXZWJUZXh0SW5wdXRUeXBlIFdlYlZpZXdJbXBs Ojp0ZXh0SW5wdXRUeXBlKCkKIHsKICAgICBXZWJUZXh0SW5wdXRUeXBlIHR5cGUgPSBXZWJUZXh0 SW5wdXRUeXBlTm9uZTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgJKHJldmlzaW9u IDYxOTM5KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCSh3b3JraW5nIGNv cHkpCkBAIC05MywyMiArOTMsMTIgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVJ bnB1dEV2ZW50KGNvbnN0IFdlYklucHV0RXZlbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgbW91c2VD YXB0dXJlTG9zdCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRGb2N1cyhib29sIGVuYWJsZSk7Ci0K LSAgICAvLyBERVBSRUNBVEVELCB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIuCi0gICAgdmlydHVhbCBi b29sIGhhbmRsZUNvbXBvc2l0aW9uRXZlbnQoV2ViQ29tcG9zaXRpb25Db21tYW5kIGNvbW1hbmQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGN1cnNvclBvc2l0 aW9uLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCB0YXJnZXRT dGFydCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgdGFyZ2V0 RW5kLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYlN0 cmluZyYgdGV4dCk7CiAgICAgdmlydHVhbCBib29sIHNldENvbXBvc2l0aW9uKAogICAgICAgICBj b25zdCBXZWJTdHJpbmcmIHRleHQsCiAgICAgICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJDb21wb3Np dGlvblVuZGVybGluZT4mIHVuZGVybGluZXMsCiAgICAgICAgIGludCBzZWxlY3Rpb25TdGFydCwK ICAgICAgICAgaW50IHNlbGVjdGlvbkVuZCk7CiAgICAgdmlydHVhbCBib29sIGNvbmZpcm1Db21w b3NpdGlvbigpOwotCi0gICAgLy8gREVQUkVDQVRFRCwgd2lsbCBiZSByZW1vdmVkIGxhdGVyLgot ICAgIHZpcnR1YWwgYm9vbCBxdWVyeUNvbXBvc2l0aW9uU3RhdHVzKGJvb2wqIGVuYWJsZWQsIFdl YlJlY3QqIGNhcmV0UmVjdCk7CiAgICAgdmlydHVhbCBXZWJUZXh0SW5wdXRUeXBlIHRleHRJbnB1 dFR5cGUoKTsKICAgICB2aXJ0dWFsIFdlYlJlY3QgY2FyZXRPclNlbGVjdGlvbkJvdW5kcygpOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0RGlyZWN0aW9uKFdlYlRleHREaXJlY3Rpb24gZGlyZWN0 aW9uKTsK 59910 2010-06-28 10:41:44 -0700 2010-06-28 13:14:57 -0700 Fix build issue. webkit-remove-deprecated.diff text/plain 15181 suzhe SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjIwMTcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDYtMjggIFpoZSBT dSAgPHN1emhlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbY2hyb21pdW1dUmVtb3ZlIGRlcHJlY2F0ZWQgY29kZSByZWxhdGVk IHRvIGlucHV0IG1ldGhvZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQxMjQ0CisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1Ymxp Yy9XZWJDb21wb3NpdGlvbkNvbW1hbmQuaDogUmVtb3ZlZC4KKyAgICAgICAgKiBwdWJsaWMvV2Vi Vmlld0NsaWVudC5oOgorICAgICAgICAqIHB1YmxpYy9XZWJXaWRnZXQuaDoKKyAgICAgICAgKiBz cmMvRWRpdG9yQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVudElt cGw6OnNldElucHV0TWV0aG9kU3RhdGUpOgorICAgICAgICAqIHNyYy9XZWJQb3B1cE1lbnVJbXBs LmNwcDoKKyAgICAgICAgKiBzcmMvV2ViUG9wdXBNZW51SW1wbC5oOgorICAgICAgICAqIHNyYy9X ZWJWaWV3SW1wbC5jcHA6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisgICAgICAgICog dGVzdHMvUG9wdXBNZW51VGVzdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlRlc3RXZWJXaWRnZXQ6 OnNldENvbXBvc2l0aW9uKToKKyAgICAgICAgKFdlYktpdDo6VGVzdFdlYldpZGdldDo6Y29uZmly bUNvbXBvc2l0aW9uKToKKyAgICAgICAgKFdlYktpdDo6VGVzdFdlYldpZGdldDo6dGV4dElucHV0 VHlwZSk6CisgICAgICAgIChXZWJLaXQ6OlRlc3RXZWJXaWRnZXQ6OmNhcmV0T3JTZWxlY3Rpb25C b3VuZHMpOgorCiAyMDEwLTA2LTI4ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBDaHJvbWl1bSBkZWJ1Z2dlciB0ZXN0cy4K SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9j aHJvbWl1bS9XZWJLaXQuZ3lwCShyZXZpc2lvbiA2MjAxNSkKKysrIFdlYktpdC9jaHJvbWl1bS9X ZWJLaXQuZ3lwCSh3b3JraW5nIGNvcHkpCkBAIC05Miw3ICs5Miw2IEBACiAgICAgICAgICAgICAg ICAgJ3B1YmxpYy9XZWJDb2xvck5hbWUuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJD b21tb24uaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJDb21tb25Xb3JrZXJDbGllbnQu aCcsCi0gICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJDb21wb3NpdGlvbkNvbW1hbmQuaCcsCiAg ICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJDb21wb3NpdGlvblVuZGVybGluZS5oJywKICAgICAg ICAgICAgICAgICAncHVibGljL1dlYkNvbnNvbGVNZXNzYWdlLmgnLAogICAgICAgICAgICAgICAg ICdwdWJsaWMvV2ViQ29udGV4dE1lbnVEYXRhLmgnLApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJDb21wb3NpdGlvbkNvbW1hbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkNvbXBvc2l0aW9uQ29tbWFuZC5oCShyZXZpc2lvbiA2MjAxNSkKKysrIFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tcG9zaXRpb25Db21tYW5kLmgJKHdvcmtpbmcgY29w eSkKQEAgLTEsNDUgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFy ZQotICogbWV0OgotICoKLSAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCi0gKiBjb3B5 cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyCi0gKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlCi0gKiBkaXN0cmlidXRpb24uCi0gKiAgICAgKiBOZWl0aGVyIHRo ZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCi0gKiBjb250cmlidXRv cnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJv bQotICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlz c2lvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQg SE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCi0gKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAotICogTElNSVRFRCBUTywgVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCi0g KiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg VEhFIENPUFlSSUdIVAotICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCi0gKiBTUEVDSUFMLCBFWEVNUExBUlksIE9S IENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVT RSwKLSAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZF UiBDQVVTRUQgQU5EIE9OIEFOWQotICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgotICovCi0KLSNpZm5kZWYgV2ViQ29tcG9zaXRpb25Db21tYW5kX2gKLSNkZWZp bmUgV2ViQ29tcG9zaXRpb25Db21tYW5kX2gKLQotbmFtZXNwYWNlIFdlYktpdCB7Ci0KLS8vIERF UFJFQ0FURUQuCi1lbnVtIFdlYkNvbXBvc2l0aW9uQ29tbWFuZCB7Ci0gICAgV2ViQ29tcG9zaXRp b25Db21tYW5kRGlzY2FyZCwKLSAgICBXZWJDb21wb3NpdGlvbkNvbW1hbmRTZXQsCi0gICAgV2Vi Q29tcG9zaXRpb25Db21tYW5kQ29uZmlybSwKLX07Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYktpdAot Ci0jZW5kaWYKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCShyZXZp c2lvbiA2MjAxNSkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjYsOSArMTI2LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9v bCBpc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0 dWFsIGJvb2wgaXNTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKCkgeyByZXR1cm4gdHJ1 ZTsgfQogCi0gICAgLy8gREVQUkVDQVRFRDogcmVwbGFjZWQgYnkgV2ViV2lkZ2V0Q2xpZW50Ojpy ZXNldElucHV0TWV0aG9kKCkuCi0gICAgdmlydHVhbCB2b2lkIHNldElucHV0TWV0aG9kRW5hYmxl ZChib29sIGVuYWJsZWQpIHsgfQotCiAgICAgdmlydHVhbCB2b2lkIGRpZEJlZ2luRWRpdGluZygp IHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VTZWxlY3Rpb24oYm9vbCBpc1NlbGVjdGlv bkVtcHR5KSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlQ29udGVudHMoKSB7IH0KSW5k ZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXQuaAkocmV2aXNpb24gNjIwMTUpCisrKyBXZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3ICsz Myw2IEBACiAKICNpbmNsdWRlICJXZWJDYW52YXMuaCIKICNpbmNsdWRlICJXZWJDb21tb24uaCIK LSNpbmNsdWRlICJXZWJDb21wb3NpdGlvbkNvbW1hbmQuaCIKICNpbmNsdWRlICJXZWJDb21wb3Np dGlvblVuZGVybGluZS5oIgogI2luY2x1ZGUgIldlYlRleHRJbnB1dFR5cGUuaCIKICNpbmNsdWRl ICJXZWJUZXh0RGlyZWN0aW9uLmgiCkBAIC03OSwxMyArNzgsNiBAQCBwdWJsaWM6CiAgICAgLy8g Q2FsbGVkIHRvIGluZm9ybSB0aGUgV2ViV2lkZ2V0IHRoYXQgaXQgaGFzIGdhaW5lZCBvciBsb3N0 IGtleWJvYXJkIGZvY3VzLgogICAgIHZpcnR1YWwgdm9pZCBzZXRGb2N1cyhib29sKSA9IDA7CiAK LSAgICAvLyBERVBSRUNBVEVELiBJdCdzIHJlcGxhY2VkIGJ5IHNldENvbXBvc2l0aW9uKCkgYW5k IGNvbmZpcm1Db21wb3NpdGlvbigpLgotICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVDb21wb3NpdGlv bkV2ZW50KFdlYkNvbXBvc2l0aW9uQ29tbWFuZCBjb21tYW5kLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGludCBjdXJzb3JQb3NpdGlvbiwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgdGFyZ2V0U3RhcnQsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHRhcmdldEVuZCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHRleHQpID0gMDsKLQog ICAgIC8vIENhbGxlZCB0byBpbmZvcm0gdGhlIFdlYldpZGdldCBvZiBhIG5ldyBjb21wb3NpdGlv biB0ZXh0LgogICAgIC8vIElmIHNlbGVjdGlvblN0YXJ0IGFuZCBzZWxlY3Rpb25FbmQgaGFzIHRo ZSBzYW1lIHZhbHVlLCB0aGVuIGl0IGluZGljYXRlcwogICAgIC8vIHRoZSBpbnB1dCBjYXJldCBw b3NpdGlvbi4gSWYgdGhlIHRleHQgaXMgZW1wdHksIHRoZW4gdGhlIGV4aXN0aW5nCkBAIC0xMDEs MTAgKzkzLDYgQEAgcHVibGljOgogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGVyZSBpcyBhbiBv bmdvaW5nIGNvbXBvc2l0aW9uLgogICAgIHZpcnR1YWwgYm9vbCBjb25maXJtQ29tcG9zaXRpb24o KSA9IDA7CiAKLSAgICAvLyBERVBSRUNBVEVELiBJdCdzIHJlcGxhY2VkIGJ5IHRleHRJbnB1dFR5 cGUoKSBhbmQKLSAgICAvLyBjYXJldE9yU2VsZWN0aW9uQm91bmRzKCkuCi0gICAgdmlydHVhbCBi b29sIHF1ZXJ5Q29tcG9zaXRpb25TdGF0dXMoYm9vbCogZW5hYmxlZCwgV2ViUmVjdCogY2FyZXRC b3VuZHMpID0gMDsKLQogICAgIC8vIFJldHVybnMgdGhlIGN1cnJlbnQgdGV4dCBpbnB1dCB0eXBl IG9mIHRoaXMgV2ViV2lkZ2V0LgogICAgIHZpcnR1YWwgV2ViVGV4dElucHV0VHlwZSB0ZXh0SW5w dXRUeXBlKCkgPSAwOwogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0VkaXRvckNsaWVudElt cGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvRWRpdG9yQ2xpZW50SW1w bC5jcHAJKHJldmlzaW9uIDYyMDE1KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9FZGl0b3JDbGll bnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTIxLDEzICs5MjEsOCBAQCB2b2lkIEVkaXRv ckNsaWVudEltcGw6OmdldEd1ZXNzZXNGb3JXb3JkCiAKIHZvaWQgRWRpdG9yQ2xpZW50SW1wbDo6 c2V0SW5wdXRNZXRob2RTdGF0ZShib29sIGVuYWJsZWQpCiB7Ci0gICAgaWYgKG1fd2ViVmlldy0+ Y2xpZW50KCkpIHsKKyAgICBpZiAobV93ZWJWaWV3LT5jbGllbnQoKSkKICAgICAgICAgbV93ZWJW aWV3LT5jbGllbnQoKS0+cmVzZXRJbnB1dE1ldGhvZCgpOwotCi0gICAgICAgIC8vIFJlbW92ZSB0 aGlzIGxpbmUgd2hlbiBXZWJWaWV3Q2xpZW50OjpzZXRJbnB1dE1ldGhvZEVuYWJsZWQoKSBnZXRz Ci0gICAgICAgIC8vIHJlbW92ZWQuCi0gICAgICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPnNldElu cHV0TWV0aG9kRW5hYmxlZChlbmFibGVkKTsKLSAgICB9CiB9CiAKIH0gLy8gbmFtZXNhY2UgV2Vi S2l0CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAJKHJldmlz aW9uIDYyMDE1KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjMwLDE0ICsyMzAsNiBAQCB2b2lkIFdlYlBvcHVwTWVudUltcGw6 OnNldEZvY3VzKGJvb2wgZW5hCiB7CiB9CiAKLS8vIERFUFJFQ0FURUQsIHdpbGwgYmUgcmVtb3Zl ZCBsYXRlci4KLWJvb2wgV2ViUG9wdXBNZW51SW1wbDo6aGFuZGxlQ29tcG9zaXRpb25FdmVudCgK LSAgICBXZWJDb21wb3NpdGlvbkNvbW1hbmQgY29tbWFuZCwgaW50IGN1cnNvclBvc2l0aW9uLCBp bnQgdGFyZ2V0U3RhcnQsCi0gICAgaW50IHRhcmdldEVuZCwgY29uc3QgV2ViU3RyaW5nJiBpbWVT dHJpbmcpCi17Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCiBib29sIFdlYlBvcHVwTWVudUltcGw6 OnNldENvbXBvc2l0aW9uKAogICAgIGNvbnN0IFdlYlN0cmluZyYgdGV4dCwgY29uc3QgV2ViVmVj dG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYgdW5kZXJsaW5lcywKICAgICBpbnQgc2VsZWN0 aW9uU3RhcnQsIGludCBzZWxlY3Rpb25FbmQpCkBAIC0yNTAsMTIgKzI0Miw2IEBAIGJvb2wgV2Vi UG9wdXBNZW51SW1wbDo6Y29uZmlybUNvbXBvc2l0aW8KICAgICByZXR1cm4gZmFsc2U7CiB9CiAK LS8vIERFUFJFQ0FURUQsIHdpbGwgYmUgcmVtb3ZlZCBsYXRlci4KLWJvb2wgV2ViUG9wdXBNZW51 SW1wbDo6cXVlcnlDb21wb3NpdGlvblN0YXR1cyhib29sKiBlbmFibGVkLCBXZWJSZWN0KiBjYXJl dFJlY3QpCi17Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCiBXZWJUZXh0SW5wdXRUeXBlIFdlYlBv cHVwTWVudUltcGw6OnRleHRJbnB1dFR5cGUoKQogewogICAgIHJldHVybiBXZWJUZXh0SW5wdXRU eXBlTm9uZTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5oCShyZXZp c2lvbiA2MjAxNSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5oCSh3 b3JraW5nIGNvcHkpCkBAIC02NiwxOSArNjYsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9v bCBoYW5kbGVJbnB1dEV2ZW50KGNvbnN0IFdlYklucHV0RXZlbnQmKTsKICAgICB2aXJ0dWFsIHZv aWQgbW91c2VDYXB0dXJlTG9zdCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRGb2N1cyhib29sIGVu YWJsZSk7Ci0KLSAgICAvLyBERVBSRUNBVEVELCB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIuCi0gICAg dmlydHVhbCBib29sIGhhbmRsZUNvbXBvc2l0aW9uRXZlbnQoCi0gICAgICAgIFdlYkNvbXBvc2l0 aW9uQ29tbWFuZCBjb21tYW5kLCBpbnQgY3Vyc29yUG9zaXRpb24sCi0gICAgICAgIGludCB0YXJn ZXRTdGFydCwgaW50IHRhcmdldEVuZCwgY29uc3QgV2ViU3RyaW5nJiB0ZXh0KTsKICAgICB2aXJ0 dWFsIGJvb2wgc2V0Q29tcG9zaXRpb24oCiAgICAgICAgIGNvbnN0IFdlYlN0cmluZyYgdGV4dCwK ICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYgdW5kZXJs aW5lcywKICAgICAgICAgaW50IHNlbGVjdGlvblN0YXJ0LCBpbnQgc2VsZWN0aW9uRW5kKTsKICAg ICB2aXJ0dWFsIGJvb2wgY29uZmlybUNvbXBvc2l0aW9uKCk7Ci0KLSAgICAvLyBERVBSRUNBVEVE LCB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIuCi0gICAgdmlydHVhbCBib29sIHF1ZXJ5Q29tcG9zaXRp b25TdGF0dXMoYm9vbCogZW5hYmxlZCwgV2ViUmVjdCogY2FyZXRSZWN0KTsKICAgICB2aXJ0dWFs IFdlYlRleHRJbnB1dFR5cGUgdGV4dElucHV0VHlwZSgpOwogICAgIHZpcnR1YWwgV2ViUmVjdCBj YXJldE9yU2VsZWN0aW9uQm91bmRzKCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFRleHREaXJlY3Rp b24oV2ViVGV4dERpcmVjdGlvbiBkaXJlY3Rpb24pOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5jcHAJKHJldmlzaW9uIDYyMDE1KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNjQsNDggKzExNjQsNiBAQCB2b2lkIFdl YlZpZXdJbXBsOjpzZXRGb2N1cyhib29sIGVuYWJsZSkKICAgICB9CiB9CiAKLS8vIERFUFJFQ0FU RUQsIHdpbGwgYmUgcmVtb3ZlZCBsYXRlci4KLWJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZUNvbXBv c2l0aW9uRXZlbnQoV2ViQ29tcG9zaXRpb25Db21tYW5kIGNvbW1hbmQsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBjdXJzb3JQb3NpdGlvbiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHRhcmdldFN0YXJ0LAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgdGFyZ2V0RW5kLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIGltZVN0 cmluZykKLXsKLSAgICBpZiAoY29tbWFuZCA9PSBXZWJLaXQ6OldlYkNvbXBvc2l0aW9uQ29tbWFu ZFNldCkgewotICAgICAgICBpZiAodGFyZ2V0U3RhcnQgPCAwKQotICAgICAgICAgICAgdGFyZ2V0 U3RhcnQgPSAwOwotICAgICAgICBpZiAodGFyZ2V0RW5kIDwgMCkKLSAgICAgICAgICAgIHRhcmdl dEVuZCA9IHN0YXRpY19jYXN0PGludD4oaW1lU3RyaW5nLmxlbmd0aCgpKTsKLQotICAgICAgICAv LyBDcmVhdGUgY3VzdG9tIHVuZGVybGluZXMuCi0gICAgICAgIC8vIFRvIGVtcGhhc2l6ZSB0aGUg c2VsZWN0aW9uLCB0aGUgc2VsZWN0ZWQgcmVnaW9uIHVzZXMgYSBzb2xpZCBibGFjawotICAgICAg ICAvLyBmb3IgaXRzIHVuZGVybGluZSB3aGlsZSBvdGhlciByZWdpb25zIHVzZXMgYSBwYWxlIGdy YXkgZm9yIHRoZWlycy4KLSAgICAgICAgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5l PiB1bmRlcmxpbmVzKHN0YXRpY19jYXN0PHNpemVfdD4oMykpOwotICAgICAgICB1bmRlcmxpbmVz WzBdLnN0YXJ0T2Zmc2V0ID0gMDsKLSAgICAgICAgdW5kZXJsaW5lc1swXS5lbmRPZmZzZXQgPSB0 YXJnZXRTdGFydDsKLSAgICAgICAgdW5kZXJsaW5lc1swXS50aGljayA9IHRydWU7Ci0gICAgICAg IHVuZGVybGluZXNbMF0uY29sb3IgPSAweGZmZDNkM2QzOwotICAgICAgICB1bmRlcmxpbmVzWzFd LnN0YXJ0T2Zmc2V0ID0gdGFyZ2V0U3RhcnQ7Ci0gICAgICAgIHVuZGVybGluZXNbMV0uZW5kT2Zm c2V0ID0gdGFyZ2V0RW5kOwotICAgICAgICB1bmRlcmxpbmVzWzFdLnRoaWNrID0gdHJ1ZTsKLSAg ICAgICAgdW5kZXJsaW5lc1sxXS5jb2xvciA9IDB4ZmYwMDAwMDA7Ci0gICAgICAgIHVuZGVybGlu ZXNbMl0uc3RhcnRPZmZzZXQgPSB0YXJnZXRFbmQ7Ci0gICAgICAgIHVuZGVybGluZXNbMl0uZW5k T2Zmc2V0ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGltZVN0cmluZy5sZW5ndGgoKSk7Ci0gICAg ICAgIHVuZGVybGluZXNbMl0udGhpY2sgPSB0cnVlOwotICAgICAgICB1bmRlcmxpbmVzWzJdLmNv bG9yID0gMHhmZmQzZDNkMzsKLSAgICAgICAgcmV0dXJuIHNldENvbXBvc2l0aW9uKGltZVN0cmlu ZywgdW5kZXJsaW5lcywgY3Vyc29yUG9zaXRpb24sIGN1cnNvclBvc2l0aW9uKTsKLSAgICB9Ci0K LSAgICBpZiAoY29tbWFuZCA9PSBXZWJLaXQ6OldlYkNvbXBvc2l0aW9uQ29tbWFuZERpc2NhcmQp Ci0gICAgICAgIHNldENvbXBvc2l0aW9uKFdlYlN0cmluZygpLCBXZWJWZWN0b3I8V2ViQ29tcG9z aXRpb25VbmRlcmxpbmU+KCksIDAsIDApOwotICAgIGVsc2UgaWYgKGNvbW1hbmQgPT0gV2ViS2l0 OjpXZWJDb21wb3NpdGlvbkNvbW1hbmRDb25maXJtKSB7Ci0gICAgICAgIHNldENvbXBvc2l0aW9u KGltZVN0cmluZywgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPigpLCAwLCAwKTsK LSAgICAgICAgY29uZmlybUNvbXBvc2l0aW9uKCk7Ci0gICAgfQotCi0gICAgcmV0dXJuIHRydWU7 Ci19Ci0KIGJvb2wgV2ViVmlld0ltcGw6OnNldENvbXBvc2l0aW9uKAogICAgIGNvbnN0IFdlYlN0 cmluZyYgdGV4dCwKICAgICBjb25zdCBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+ JiB1bmRlcmxpbmVzLApAQCAtMTI4NCw0MSArMTI0Miw2IEBAIGJvb2wgV2ViVmlld0ltcGw6OmNv bmZpcm1Db21wb3NpdGlvbigpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLS8vIERFUFJFQ0FURUQs IHdpbGwgYmUgcmVtb3ZlZCBsYXRlci4KLWJvb2wgV2ViVmlld0ltcGw6OnF1ZXJ5Q29tcG9zaXRp b25TdGF0dXMoYm9vbCogZW5hYmxlSU1FLCBXZWJSZWN0KiBjYXJldFJlY3QpCi17Ci0gICAgLy8g U3RvcmUgd2hldGhlciB0aGUgc2VsZWN0ZWQgbm9kZSBuZWVkcyBJTUUgYW5kIHRoZSBjYXJldCBy ZWN0YW5nbGUuCi0gICAgLy8gVGhpcyBwcm9jZXNzIGNvbnNpc3RzIG9mIHRoZSBmb2xsb3dpbmcg Zm91ciBzdGVwczoKLSAgICAvLyAgMS4gUmV0cmlldmUgdGhlIHNlbGVjdGlvbiBjb250cm9sbGVy IG9mIHRoZSBmb2N1c2VkIGZyYW1lOwotICAgIC8vICAyLiBSZXRyaWV2ZSB0aGUgY2FyZXQgcmVj dGFuZ2xlIGZyb20gdGhlIGNvbnRyb2xsZXI7Ci0gICAgLy8gIDMuIENvbnZlcnQgdGhlIHJlY3Rh bmdsZSwgd2hpY2ggaXMgcmVsYXRpdmUgdG8gdGhlIHBhcmVudCB2aWV3LCB0byB0aGUKLSAgICAv LyAgICAgb25lIHJlbGF0aXZlIHRvIHRoZSBjbGllbnQgd2luZG93LCBhbmQ7Ci0gICAgLy8gIDQu IFN0b3JlIHRoZSBjb252ZXJ0ZWQgcmVjdGFuZ2xlLgotICAgIGNvbnN0IEZyYW1lKiBmb2N1c2Vk ID0gZm9jdXNlZFdlYkNvcmVGcmFtZSgpOwotICAgIGlmICghZm9jdXNlZCkKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotCi0gICAgY29uc3QgRWRpdG9yKiBlZGl0b3IgPSBmb2N1c2VkLT5lZGl0b3Io KTsKLSAgICBpZiAoIWVkaXRvciB8fCAhZWRpdG9yLT5jYW5FZGl0KCkpCi0gICAgICAgIHJldHVy biBmYWxzZTsKLQotICAgIFNlbGVjdGlvbkNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBmb2N1c2Vk LT5zZWxlY3Rpb24oKTsKLSAgICBpZiAoIWNvbnRyb2xsZXIpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIGNvbnN0IE5vZGUqIG5vZGUgPSBjb250cm9sbGVyLT5zdGFydCgpLm5vZGUoKTsK LSAgICBpZiAoIW5vZGUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICplbmFibGVJTUUg PSBub2RlLT5zaG91bGRVc2VJbnB1dE1ldGhvZCgpICYmICFjb250cm9sbGVyLT5pc0luUGFzc3dv cmRGaWVsZCgpOwotICAgIGNvbnN0IEZyYW1lVmlldyogdmlldyA9IG5vZGUtPmRvY3VtZW50KCkt PnZpZXcoKTsKLSAgICBpZiAoIXZpZXcpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICpj YXJldFJlY3QgPSB2aWV3LT5jb250ZW50c1RvV2luZG93KGNvbnRyb2xsZXItPmFic29sdXRlQ2Fy ZXRCb3VuZHMoKSk7Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIFdlYlRleHRJbnB1dFR5cGUgV2Vi Vmlld0ltcGw6OnRleHRJbnB1dFR5cGUoKQogewogICAgIFdlYlRleHRJbnB1dFR5cGUgdHlwZSA9 IFdlYlRleHRJbnB1dFR5cGVOb25lOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAko cmV2aXNpb24gNjIwMTUpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgJKHdv cmtpbmcgY29weSkKQEAgLTkzLDIyICs5MywxMiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29s IGhhbmRsZUlucHV0RXZlbnQoY29uc3QgV2ViSW5wdXRFdmVudCYpOwogICAgIHZpcnR1YWwgdm9p ZCBtb3VzZUNhcHR1cmVMb3N0KCk7CiAgICAgdmlydHVhbCB2b2lkIHNldEZvY3VzKGJvb2wgZW5h YmxlKTsKLQotICAgIC8vIERFUFJFQ0FURUQsIHdpbGwgYmUgcmVtb3ZlZCBsYXRlci4KLSAgICB2 aXJ0dWFsIGJvb2wgaGFuZGxlQ29tcG9zaXRpb25FdmVudChXZWJDb21wb3NpdGlvbkNvbW1hbmQg Y29tbWFuZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgY3Vy c29yUG9zaXRpb24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 IHRhcmdldFN0YXJ0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu dCB0YXJnZXRFbmQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgV2ViU3RyaW5nJiB0ZXh0KTsKICAgICB2aXJ0dWFsIGJvb2wgc2V0Q29tcG9zaXRpb24oCiAg ICAgICAgIGNvbnN0IFdlYlN0cmluZyYgdGV4dCwKICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdl YkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYgdW5kZXJsaW5lcywKICAgICAgICAgaW50IHNlbGVjdGlv blN0YXJ0LAogICAgICAgICBpbnQgc2VsZWN0aW9uRW5kKTsKICAgICB2aXJ0dWFsIGJvb2wgY29u ZmlybUNvbXBvc2l0aW9uKCk7Ci0KLSAgICAvLyBERVBSRUNBVEVELCB3aWxsIGJlIHJlbW92ZWQg bGF0ZXIuCi0gICAgdmlydHVhbCBib29sIHF1ZXJ5Q29tcG9zaXRpb25TdGF0dXMoYm9vbCogZW5h YmxlZCwgV2ViUmVjdCogY2FyZXRSZWN0KTsKICAgICB2aXJ0dWFsIFdlYlRleHRJbnB1dFR5cGUg dGV4dElucHV0VHlwZSgpOwogICAgIHZpcnR1YWwgV2ViUmVjdCBjYXJldE9yU2VsZWN0aW9uQm91 bmRzKCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFRleHREaXJlY3Rpb24oV2ViVGV4dERpcmVjdGlv biBkaXJlY3Rpb24pOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1BvcHVwTWVudVRlc3Qu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS90ZXN0cy9Qb3B1cE1lbnVUZXN0LmNw cAkocmV2aXNpb24gNjIwMTUpCisrKyBXZWJLaXQvY2hyb21pdW0vdGVzdHMvUG9wdXBNZW51VGVz dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMiwxMiArMTIyLDE0IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIGJvb2wgaGFuZGxlSW5wdXRFdmVudChjb25zdCBXZWJJbnB1dEV2ZW50JikgeyByZXR1 cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgdm9pZCBtb3VzZUNhcHR1cmVMb3N0KCkgeyB9CiAgICAg dmlydHVhbCB2b2lkIHNldEZvY3VzKGJvb2wpIHsgfQotICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVD b21wb3NpdGlvbkV2ZW50KFdlYkNvbXBvc2l0aW9uQ29tbWFuZCBjb21tYW5kLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBjdXJzb3JQb3NpdGlvbiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgdGFyZ2V0U3RhcnQsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHRhcmdldEVuZCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHRleHQp IHsgcmV0dXJuIHRydWU7IH0KLSAgICB2aXJ0dWFsIGJvb2wgcXVlcnlDb21wb3NpdGlvblN0YXR1 cyhib29sKiBlbmFibGVkLCBXZWJSZWN0KiBjYXJldEJvdW5kcykgeyByZXR1cm4gdHJ1ZTsgfQor ICAgIHZpcnR1YWwgYm9vbCBzZXRDb21wb3NpdGlvbigKKyAgICAgICAgY29uc3QgV2ViU3RyaW5n JiB0ZXh0LAorICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+ JiB1bmRlcmxpbmVzLAorICAgICAgICBpbnQgc2VsZWN0aW9uU3RhcnQsCisgICAgICAgIGludCBz ZWxlY3Rpb25FbmQpIHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIGJvb2wgY29uZmlybUNv bXBvc2l0aW9uKCkgeyByZXR1cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgV2ViVGV4dElucHV0VHlw ZSB0ZXh0SW5wdXRUeXBlKCkgeyByZXR1cm4gV2ViS2l0OjpXZWJUZXh0SW5wdXRUeXBlTm9uZTsg fQorICAgIHZpcnR1YWwgV2ViUmVjdCBjYXJldE9yU2VsZWN0aW9uQm91bmRzKCkgeyByZXR1cm4g V2ViUmVjdCgpOyB9CiAgICAgdmlydHVhbCB2b2lkIHNldFRleHREaXJlY3Rpb24oV2ViVGV4dERp cmVjdGlvbikgeyB9CiB9OwogCg== 59928 2010-06-28 13:14:57 -0700 2010-06-28 14:50:51 -0700 Update ChangeLog to mention the change in TestPopupMenu.cpp webkit-remove-deprecated.diff text/plain 15277 suzhe SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjIwMTcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTAtMDYtMjggIFpoZSBT dSAgPHN1emhlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbY2hyb21pdW1dUmVtb3ZlIGRlcHJlY2F0ZWQgY29kZSByZWxhdGVk IHRvIGlucHV0IG1ldGhvZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQxMjQ0CisKKyAgICAgICAgQWxzbyB1cGRhdGUgVGVzdFdlYldpZGdldCBpbiB0 ZXN0cy9Qb3B1cE1lbnVUZXN0LmNwcCB0byBhZGQgbWlzc2luZyBpbXBsZW1lbnRhdGlvbnMuCisK KyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJDb21wb3NpdGlvbkNv bW1hbmQuaDogUmVtb3ZlZC4KKyAgICAgICAgKiBwdWJsaWMvV2ViVmlld0NsaWVudC5oOgorICAg ICAgICAqIHB1YmxpYy9XZWJXaWRnZXQuaDoKKyAgICAgICAgKiBzcmMvRWRpdG9yQ2xpZW50SW1w bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVudEltcGw6OnNldElucHV0TWV0aG9k U3RhdGUpOgorICAgICAgICAqIHNyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcDoKKyAgICAgICAgKiBz cmMvV2ViUG9wdXBNZW51SW1wbC5oOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6Cisg ICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisgICAgICAgICogdGVzdHMvUG9wdXBNZW51VGVz dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlRlc3RXZWJXaWRnZXQ6OnNldENvbXBvc2l0aW9uKToK KyAgICAgICAgKFdlYktpdDo6VGVzdFdlYldpZGdldDo6Y29uZmlybUNvbXBvc2l0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6VGVzdFdlYldpZGdldDo6dGV4dElucHV0VHlwZSk6CisgICAgICAgIChX ZWJLaXQ6OlRlc3RXZWJXaWRnZXQ6OmNhcmV0T3JTZWxlY3Rpb25Cb3VuZHMpOgorCiAyMDEwLTA2 LTI4ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVu cmV2aWV3ZWQuIEZpeCBDaHJvbWl1bSBkZWJ1Z2dlciB0ZXN0cy4KSW5kZXg6IFdlYktpdC9jaHJv bWl1bS9XZWJLaXQuZ3lwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lw CShyZXZpc2lvbiA2MjAxNSkKKysrIFdlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCSh3b3JraW5n IGNvcHkpCkBAIC05Miw3ICs5Miw2IEBACiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJDb2xv ck5hbWUuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJDb21tb24uaCcsCiAgICAgICAg ICAgICAgICAgJ3B1YmxpYy9XZWJDb21tb25Xb3JrZXJDbGllbnQuaCcsCi0gICAgICAgICAgICAg ICAgJ3B1YmxpYy9XZWJDb21wb3NpdGlvbkNvbW1hbmQuaCcsCiAgICAgICAgICAgICAgICAgJ3B1 YmxpYy9XZWJDb21wb3NpdGlvblVuZGVybGluZS5oJywKICAgICAgICAgICAgICAgICAncHVibGlj L1dlYkNvbnNvbGVNZXNzYWdlLmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViQ29udGV4 dE1lbnVEYXRhLmgnLApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdGlv bkNvbW1hbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbXBv c2l0aW9uQ29tbWFuZC5oCShyZXZpc2lvbiA2MjAxNSkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViQ29tcG9zaXRpb25Db21tYW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNDUgKzAsMCBA QAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQotICogbWV0OgotICoKLSAq ICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0Ci0gKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCi0gKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCi0gKiBpbiB0 aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl Ci0gKiBkaXN0cmlidXRpb24uCi0gKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJ bmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCi0gKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8g ZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQotICogdGhpcyBzb2Z0d2Fy ZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KLSAqCi0gKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJ QlVUT1JTCi0gKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVAotICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCi0gKiBBIFBBUlRJQ1VMQVIgUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAotICog T1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsCi0gKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKLSAqIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFO WQotICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0K LSNpZm5kZWYgV2ViQ29tcG9zaXRpb25Db21tYW5kX2gKLSNkZWZpbmUgV2ViQ29tcG9zaXRpb25D b21tYW5kX2gKLQotbmFtZXNwYWNlIFdlYktpdCB7Ci0KLS8vIERFUFJFQ0FURUQuCi1lbnVtIFdl YkNvbXBvc2l0aW9uQ29tbWFuZCB7Ci0gICAgV2ViQ29tcG9zaXRpb25Db21tYW5kRGlzY2FyZCwK LSAgICBXZWJDb21wb3NpdGlvbkNvbW1hbmRTZXQsCi0gICAgV2ViQ29tcG9zaXRpb25Db21tYW5k Q29uZmlybSwKLX07Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYktpdAotCi0jZW5kaWYKSW5kZXg6IFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCShyZXZpc2lvbiA2MjAxNSkKKysrIFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0x MjYsOSArMTI2LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc1NtYXJ0SW5zZXJ0RGVs ZXRlRW5hYmxlZCgpIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTZWxlY3RU cmFpbGluZ1doaXRlc3BhY2VFbmFibGVkKCkgeyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgLy8gREVQ UkVDQVRFRDogcmVwbGFjZWQgYnkgV2ViV2lkZ2V0Q2xpZW50OjpyZXNldElucHV0TWV0aG9kKCku Ci0gICAgdmlydHVhbCB2b2lkIHNldElucHV0TWV0aG9kRW5hYmxlZChib29sIGVuYWJsZWQpIHsg fQotCiAgICAgdmlydHVhbCB2b2lkIGRpZEJlZ2luRWRpdGluZygpIHsgfQogICAgIHZpcnR1YWwg dm9pZCBkaWRDaGFuZ2VTZWxlY3Rpb24oYm9vbCBpc1NlbGVjdGlvbkVtcHR5KSB7IH0KICAgICB2 aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlQ29udGVudHMoKSB7IH0KSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViV2lkZ2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJXaWRnZXQuaAkocmV2aXNpb24gNjIwMTUpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYldpZGdldC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3ICszMyw2IEBACiAKICNpbmNsdWRl ICJXZWJDYW52YXMuaCIKICNpbmNsdWRlICJXZWJDb21tb24uaCIKLSNpbmNsdWRlICJXZWJDb21w b3NpdGlvbkNvbW1hbmQuaCIKICNpbmNsdWRlICJXZWJDb21wb3NpdGlvblVuZGVybGluZS5oIgog I2luY2x1ZGUgIldlYlRleHRJbnB1dFR5cGUuaCIKICNpbmNsdWRlICJXZWJUZXh0RGlyZWN0aW9u LmgiCkBAIC03OSwxMyArNzgsNiBAQCBwdWJsaWM6CiAgICAgLy8gQ2FsbGVkIHRvIGluZm9ybSB0 aGUgV2ViV2lkZ2V0IHRoYXQgaXQgaGFzIGdhaW5lZCBvciBsb3N0IGtleWJvYXJkIGZvY3VzLgog ICAgIHZpcnR1YWwgdm9pZCBzZXRGb2N1cyhib29sKSA9IDA7CiAKLSAgICAvLyBERVBSRUNBVEVE LiBJdCdzIHJlcGxhY2VkIGJ5IHNldENvbXBvc2l0aW9uKCkgYW5kIGNvbmZpcm1Db21wb3NpdGlv bigpLgotICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVDb21wb3NpdGlvbkV2ZW50KFdlYkNvbXBvc2l0 aW9uQ29tbWFuZCBjb21tYW5kLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGludCBjdXJzb3JQb3NpdGlvbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpbnQgdGFyZ2V0U3RhcnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaW50IHRhcmdldEVuZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHRleHQpID0gMDsKLQogICAgIC8vIENhbGxlZCB0byBp bmZvcm0gdGhlIFdlYldpZGdldCBvZiBhIG5ldyBjb21wb3NpdGlvbiB0ZXh0LgogICAgIC8vIElm IHNlbGVjdGlvblN0YXJ0IGFuZCBzZWxlY3Rpb25FbmQgaGFzIHRoZSBzYW1lIHZhbHVlLCB0aGVu IGl0IGluZGljYXRlcwogICAgIC8vIHRoZSBpbnB1dCBjYXJldCBwb3NpdGlvbi4gSWYgdGhlIHRl eHQgaXMgZW1wdHksIHRoZW4gdGhlIGV4aXN0aW5nCkBAIC0xMDEsMTAgKzkzLDYgQEAgcHVibGlj OgogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGVyZSBpcyBhbiBvbmdvaW5nIGNvbXBvc2l0aW9u LgogICAgIHZpcnR1YWwgYm9vbCBjb25maXJtQ29tcG9zaXRpb24oKSA9IDA7CiAKLSAgICAvLyBE RVBSRUNBVEVELiBJdCdzIHJlcGxhY2VkIGJ5IHRleHRJbnB1dFR5cGUoKSBhbmQKLSAgICAvLyBj YXJldE9yU2VsZWN0aW9uQm91bmRzKCkuCi0gICAgdmlydHVhbCBib29sIHF1ZXJ5Q29tcG9zaXRp b25TdGF0dXMoYm9vbCogZW5hYmxlZCwgV2ViUmVjdCogY2FyZXRCb3VuZHMpID0gMDsKLQogICAg IC8vIFJldHVybnMgdGhlIGN1cnJlbnQgdGV4dCBpbnB1dCB0eXBlIG9mIHRoaXMgV2ViV2lkZ2V0 LgogICAgIHZpcnR1YWwgV2ViVGV4dElucHV0VHlwZSB0ZXh0SW5wdXRUeXBlKCkgPSAwOwogCklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0VkaXRvckNsaWVudEltcGwuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvRWRpdG9yQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDYy MDE1KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9FZGl0b3JDbGllbnRJbXBsLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtOTIxLDEzICs5MjEsOCBAQCB2b2lkIEVkaXRvckNsaWVudEltcGw6OmdldEd1 ZXNzZXNGb3JXb3JkCiAKIHZvaWQgRWRpdG9yQ2xpZW50SW1wbDo6c2V0SW5wdXRNZXRob2RTdGF0 ZShib29sIGVuYWJsZWQpCiB7Ci0gICAgaWYgKG1fd2ViVmlldy0+Y2xpZW50KCkpIHsKKyAgICBp ZiAobV93ZWJWaWV3LT5jbGllbnQoKSkKICAgICAgICAgbV93ZWJWaWV3LT5jbGllbnQoKS0+cmVz ZXRJbnB1dE1ldGhvZCgpOwotCi0gICAgICAgIC8vIFJlbW92ZSB0aGlzIGxpbmUgd2hlbiBXZWJW aWV3Q2xpZW50OjpzZXRJbnB1dE1ldGhvZEVuYWJsZWQoKSBnZXRzCi0gICAgICAgIC8vIHJlbW92 ZWQuCi0gICAgICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPnNldElucHV0TWV0aG9kRW5hYmxlZChl bmFibGVkKTsKLSAgICB9CiB9CiAKIH0gLy8gbmFtZXNhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9j aHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAJKHJldmlzaW9uIDYyMDE1KQorKysgV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjMwLDE0ICsyMzAsNiBAQCB2b2lkIFdlYlBvcHVwTWVudUltcGw6OnNldEZvY3VzKGJvb2wgZW5h CiB7CiB9CiAKLS8vIERFUFJFQ0FURUQsIHdpbGwgYmUgcmVtb3ZlZCBsYXRlci4KLWJvb2wgV2Vi UG9wdXBNZW51SW1wbDo6aGFuZGxlQ29tcG9zaXRpb25FdmVudCgKLSAgICBXZWJDb21wb3NpdGlv bkNvbW1hbmQgY29tbWFuZCwgaW50IGN1cnNvclBvc2l0aW9uLCBpbnQgdGFyZ2V0U3RhcnQsCi0g ICAgaW50IHRhcmdldEVuZCwgY29uc3QgV2ViU3RyaW5nJiBpbWVTdHJpbmcpCi17Ci0gICAgcmV0 dXJuIGZhbHNlOwotfQotCiBib29sIFdlYlBvcHVwTWVudUltcGw6OnNldENvbXBvc2l0aW9uKAog ICAgIGNvbnN0IFdlYlN0cmluZyYgdGV4dCwgY29uc3QgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9u VW5kZXJsaW5lPiYgdW5kZXJsaW5lcywKICAgICBpbnQgc2VsZWN0aW9uU3RhcnQsIGludCBzZWxl Y3Rpb25FbmQpCkBAIC0yNTAsMTIgKzI0Miw2IEBAIGJvb2wgV2ViUG9wdXBNZW51SW1wbDo6Y29u ZmlybUNvbXBvc2l0aW8KICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLS8vIERFUFJFQ0FURUQsIHdp bGwgYmUgcmVtb3ZlZCBsYXRlci4KLWJvb2wgV2ViUG9wdXBNZW51SW1wbDo6cXVlcnlDb21wb3Np dGlvblN0YXR1cyhib29sKiBlbmFibGVkLCBXZWJSZWN0KiBjYXJldFJlY3QpCi17Ci0gICAgcmV0 dXJuIGZhbHNlOwotfQotCiBXZWJUZXh0SW5wdXRUeXBlIFdlYlBvcHVwTWVudUltcGw6OnRleHRJ bnB1dFR5cGUoKQogewogICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlTm9uZTsKSW5kZXg6IFdl YktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5oCShyZXZpc2lvbiA2MjAxNSkKKysrIFdl YktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC02 NiwxOSArNjYsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVJbnB1dEV2ZW50 KGNvbnN0IFdlYklucHV0RXZlbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgbW91c2VDYXB0dXJlTG9z dCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRGb2N1cyhib29sIGVuYWJsZSk7Ci0KLSAgICAvLyBE RVBSRUNBVEVELCB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIuCi0gICAgdmlydHVhbCBib29sIGhhbmRs ZUNvbXBvc2l0aW9uRXZlbnQoCi0gICAgICAgIFdlYkNvbXBvc2l0aW9uQ29tbWFuZCBjb21tYW5k LCBpbnQgY3Vyc29yUG9zaXRpb24sCi0gICAgICAgIGludCB0YXJnZXRTdGFydCwgaW50IHRhcmdl dEVuZCwgY29uc3QgV2ViU3RyaW5nJiB0ZXh0KTsKICAgICB2aXJ0dWFsIGJvb2wgc2V0Q29tcG9z aXRpb24oCiAgICAgICAgIGNvbnN0IFdlYlN0cmluZyYgdGV4dCwKICAgICAgICAgY29uc3QgV2Vi VmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYgdW5kZXJsaW5lcywKICAgICAgICAgaW50 IHNlbGVjdGlvblN0YXJ0LCBpbnQgc2VsZWN0aW9uRW5kKTsKICAgICB2aXJ0dWFsIGJvb2wgY29u ZmlybUNvbXBvc2l0aW9uKCk7Ci0KLSAgICAvLyBERVBSRUNBVEVELCB3aWxsIGJlIHJlbW92ZWQg bGF0ZXIuCi0gICAgdmlydHVhbCBib29sIHF1ZXJ5Q29tcG9zaXRpb25TdGF0dXMoYm9vbCogZW5h YmxlZCwgV2ViUmVjdCogY2FyZXRSZWN0KTsKICAgICB2aXJ0dWFsIFdlYlRleHRJbnB1dFR5cGUg dGV4dElucHV0VHlwZSgpOwogICAgIHZpcnR1YWwgV2ViUmVjdCBjYXJldE9yU2VsZWN0aW9uQm91 bmRzKCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFRleHREaXJlY3Rpb24oV2ViVGV4dERpcmVjdGlv biBkaXJlY3Rpb24pOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJldmlz aW9uIDYyMDE1KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTExNjQsNDggKzExNjQsNiBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRGb2N1 cyhib29sIGVuYWJsZSkKICAgICB9CiB9CiAKLS8vIERFUFJFQ0FURUQsIHdpbGwgYmUgcmVtb3Zl ZCBsYXRlci4KLWJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZUNvbXBvc2l0aW9uRXZlbnQoV2ViQ29t cG9zaXRpb25Db21tYW5kIGNvbW1hbmQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGludCBjdXJzb3JQb3NpdGlvbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaW50IHRhcmdldFN0YXJ0LAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgdGFyZ2V0RW5kLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIGltZVN0cmluZykKLXsKLSAgICBpZiAo Y29tbWFuZCA9PSBXZWJLaXQ6OldlYkNvbXBvc2l0aW9uQ29tbWFuZFNldCkgewotICAgICAgICBp ZiAodGFyZ2V0U3RhcnQgPCAwKQotICAgICAgICAgICAgdGFyZ2V0U3RhcnQgPSAwOwotICAgICAg ICBpZiAodGFyZ2V0RW5kIDwgMCkKLSAgICAgICAgICAgIHRhcmdldEVuZCA9IHN0YXRpY19jYXN0 PGludD4oaW1lU3RyaW5nLmxlbmd0aCgpKTsKLQotICAgICAgICAvLyBDcmVhdGUgY3VzdG9tIHVu ZGVybGluZXMuCi0gICAgICAgIC8vIFRvIGVtcGhhc2l6ZSB0aGUgc2VsZWN0aW9uLCB0aGUgc2Vs ZWN0ZWQgcmVnaW9uIHVzZXMgYSBzb2xpZCBibGFjawotICAgICAgICAvLyBmb3IgaXRzIHVuZGVy bGluZSB3aGlsZSBvdGhlciByZWdpb25zIHVzZXMgYSBwYWxlIGdyYXkgZm9yIHRoZWlycy4KLSAg ICAgICAgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPiB1bmRlcmxpbmVzKHN0YXRp Y19jYXN0PHNpemVfdD4oMykpOwotICAgICAgICB1bmRlcmxpbmVzWzBdLnN0YXJ0T2Zmc2V0ID0g MDsKLSAgICAgICAgdW5kZXJsaW5lc1swXS5lbmRPZmZzZXQgPSB0YXJnZXRTdGFydDsKLSAgICAg ICAgdW5kZXJsaW5lc1swXS50aGljayA9IHRydWU7Ci0gICAgICAgIHVuZGVybGluZXNbMF0uY29s b3IgPSAweGZmZDNkM2QzOwotICAgICAgICB1bmRlcmxpbmVzWzFdLnN0YXJ0T2Zmc2V0ID0gdGFy Z2V0U3RhcnQ7Ci0gICAgICAgIHVuZGVybGluZXNbMV0uZW5kT2Zmc2V0ID0gdGFyZ2V0RW5kOwot ICAgICAgICB1bmRlcmxpbmVzWzFdLnRoaWNrID0gdHJ1ZTsKLSAgICAgICAgdW5kZXJsaW5lc1sx XS5jb2xvciA9IDB4ZmYwMDAwMDA7Ci0gICAgICAgIHVuZGVybGluZXNbMl0uc3RhcnRPZmZzZXQg PSB0YXJnZXRFbmQ7Ci0gICAgICAgIHVuZGVybGluZXNbMl0uZW5kT2Zmc2V0ID0gc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KGltZVN0cmluZy5sZW5ndGgoKSk7Ci0gICAgICAgIHVuZGVybGluZXNbMl0u dGhpY2sgPSB0cnVlOwotICAgICAgICB1bmRlcmxpbmVzWzJdLmNvbG9yID0gMHhmZmQzZDNkMzsK LSAgICAgICAgcmV0dXJuIHNldENvbXBvc2l0aW9uKGltZVN0cmluZywgdW5kZXJsaW5lcywgY3Vy c29yUG9zaXRpb24sIGN1cnNvclBvc2l0aW9uKTsKLSAgICB9Ci0KLSAgICBpZiAoY29tbWFuZCA9 PSBXZWJLaXQ6OldlYkNvbXBvc2l0aW9uQ29tbWFuZERpc2NhcmQpCi0gICAgICAgIHNldENvbXBv c2l0aW9uKFdlYlN0cmluZygpLCBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+KCks IDAsIDApOwotICAgIGVsc2UgaWYgKGNvbW1hbmQgPT0gV2ViS2l0OjpXZWJDb21wb3NpdGlvbkNv bW1hbmRDb25maXJtKSB7Ci0gICAgICAgIHNldENvbXBvc2l0aW9uKGltZVN0cmluZywgV2ViVmVj dG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPigpLCAwLCAwKTsKLSAgICAgICAgY29uZmlybUNv bXBvc2l0aW9uKCk7Ci0gICAgfQotCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIGJvb2wgV2ViVmll d0ltcGw6OnNldENvbXBvc2l0aW9uKAogICAgIGNvbnN0IFdlYlN0cmluZyYgdGV4dCwKICAgICBj b25zdCBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+JiB1bmRlcmxpbmVzLApAQCAt MTI4NCw0MSArMTI0Miw2IEBAIGJvb2wgV2ViVmlld0ltcGw6OmNvbmZpcm1Db21wb3NpdGlvbigp CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLS8vIERFUFJFQ0FURUQsIHdpbGwgYmUgcmVtb3ZlZCBs YXRlci4KLWJvb2wgV2ViVmlld0ltcGw6OnF1ZXJ5Q29tcG9zaXRpb25TdGF0dXMoYm9vbCogZW5h YmxlSU1FLCBXZWJSZWN0KiBjYXJldFJlY3QpCi17Ci0gICAgLy8gU3RvcmUgd2hldGhlciB0aGUg c2VsZWN0ZWQgbm9kZSBuZWVkcyBJTUUgYW5kIHRoZSBjYXJldCByZWN0YW5nbGUuCi0gICAgLy8g VGhpcyBwcm9jZXNzIGNvbnNpc3RzIG9mIHRoZSBmb2xsb3dpbmcgZm91ciBzdGVwczoKLSAgICAv LyAgMS4gUmV0cmlldmUgdGhlIHNlbGVjdGlvbiBjb250cm9sbGVyIG9mIHRoZSBmb2N1c2VkIGZy YW1lOwotICAgIC8vICAyLiBSZXRyaWV2ZSB0aGUgY2FyZXQgcmVjdGFuZ2xlIGZyb20gdGhlIGNv bnRyb2xsZXI7Ci0gICAgLy8gIDMuIENvbnZlcnQgdGhlIHJlY3RhbmdsZSwgd2hpY2ggaXMgcmVs YXRpdmUgdG8gdGhlIHBhcmVudCB2aWV3LCB0byB0aGUKLSAgICAvLyAgICAgb25lIHJlbGF0aXZl IHRvIHRoZSBjbGllbnQgd2luZG93LCBhbmQ7Ci0gICAgLy8gIDQuIFN0b3JlIHRoZSBjb252ZXJ0 ZWQgcmVjdGFuZ2xlLgotICAgIGNvbnN0IEZyYW1lKiBmb2N1c2VkID0gZm9jdXNlZFdlYkNvcmVG cmFtZSgpOwotICAgIGlmICghZm9jdXNlZCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAg Y29uc3QgRWRpdG9yKiBlZGl0b3IgPSBmb2N1c2VkLT5lZGl0b3IoKTsKLSAgICBpZiAoIWVkaXRv ciB8fCAhZWRpdG9yLT5jYW5FZGl0KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIFNl bGVjdGlvbkNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBmb2N1c2VkLT5zZWxlY3Rpb24oKTsKLSAg ICBpZiAoIWNvbnRyb2xsZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGNvbnN0IE5v ZGUqIG5vZGUgPSBjb250cm9sbGVyLT5zdGFydCgpLm5vZGUoKTsKLSAgICBpZiAoIW5vZGUpCi0g ICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICplbmFibGVJTUUgPSBub2RlLT5zaG91bGRVc2VJ bnB1dE1ldGhvZCgpICYmICFjb250cm9sbGVyLT5pc0luUGFzc3dvcmRGaWVsZCgpOwotICAgIGNv bnN0IEZyYW1lVmlldyogdmlldyA9IG5vZGUtPmRvY3VtZW50KCktPnZpZXcoKTsKLSAgICBpZiAo IXZpZXcpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICpjYXJldFJlY3QgPSB2aWV3LT5j b250ZW50c1RvV2luZG93KGNvbnRyb2xsZXItPmFic29sdXRlQ2FyZXRCb3VuZHMoKSk7Ci0gICAg cmV0dXJuIHRydWU7Ci19Ci0KIFdlYlRleHRJbnB1dFR5cGUgV2ViVmlld0ltcGw6OnRleHRJbnB1 dFR5cGUoKQogewogICAgIFdlYlRleHRJbnB1dFR5cGUgdHlwZSA9IFdlYlRleHRJbnB1dFR5cGVO b25lOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAkocmV2aXNpb24gNjIwMTUpCisr KyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTkz LDIyICs5MywxMiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGhhbmRsZUlucHV0RXZlbnQo Y29uc3QgV2ViSW5wdXRFdmVudCYpOwogICAgIHZpcnR1YWwgdm9pZCBtb3VzZUNhcHR1cmVMb3N0 KCk7CiAgICAgdmlydHVhbCB2b2lkIHNldEZvY3VzKGJvb2wgZW5hYmxlKTsKLQotICAgIC8vIERF UFJFQ0FURUQsIHdpbGwgYmUgcmVtb3ZlZCBsYXRlci4KLSAgICB2aXJ0dWFsIGJvb2wgaGFuZGxl Q29tcG9zaXRpb25FdmVudChXZWJDb21wb3NpdGlvbkNvbW1hbmQgY29tbWFuZCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgY3Vyc29yUG9zaXRpb24sCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHRhcmdldFN0YXJ0LAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCB0YXJnZXRFbmQsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiB0ZXh0 KTsKICAgICB2aXJ0dWFsIGJvb2wgc2V0Q29tcG9zaXRpb24oCiAgICAgICAgIGNvbnN0IFdlYlN0 cmluZyYgdGV4dCwKICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJs aW5lPiYgdW5kZXJsaW5lcywKICAgICAgICAgaW50IHNlbGVjdGlvblN0YXJ0LAogICAgICAgICBp bnQgc2VsZWN0aW9uRW5kKTsKICAgICB2aXJ0dWFsIGJvb2wgY29uZmlybUNvbXBvc2l0aW9uKCk7 Ci0KLSAgICAvLyBERVBSRUNBVEVELCB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIuCi0gICAgdmlydHVh bCBib29sIHF1ZXJ5Q29tcG9zaXRpb25TdGF0dXMoYm9vbCogZW5hYmxlZCwgV2ViUmVjdCogY2Fy ZXRSZWN0KTsKICAgICB2aXJ0dWFsIFdlYlRleHRJbnB1dFR5cGUgdGV4dElucHV0VHlwZSgpOwog ICAgIHZpcnR1YWwgV2ViUmVjdCBjYXJldE9yU2VsZWN0aW9uQm91bmRzKCk7CiAgICAgdmlydHVh bCB2b2lkIHNldFRleHREaXJlY3Rpb24oV2ViVGV4dERpcmVjdGlvbiBkaXJlY3Rpb24pOwpJbmRl eDogV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1BvcHVwTWVudVRlc3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS90ZXN0cy9Qb3B1cE1lbnVUZXN0LmNwcAkocmV2aXNpb24gNjIwMTUp CisrKyBXZWJLaXQvY2hyb21pdW0vdGVzdHMvUG9wdXBNZW51VGVzdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEyMiwxMiArMTIyLDE0IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxl SW5wdXRFdmVudChjb25zdCBXZWJJbnB1dEV2ZW50JikgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZp cnR1YWwgdm9pZCBtb3VzZUNhcHR1cmVMb3N0KCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHNldEZv Y3VzKGJvb2wpIHsgfQotICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVDb21wb3NpdGlvbkV2ZW50KFdl YkNvbXBvc2l0aW9uQ29tbWFuZCBjb21tYW5kLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGludCBjdXJzb3JQb3NpdGlvbiwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgdGFyZ2V0U3RhcnQsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaW50IHRhcmdldEVuZCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHRleHQpIHsgcmV0dXJuIHRydWU7IH0K LSAgICB2aXJ0dWFsIGJvb2wgcXVlcnlDb21wb3NpdGlvblN0YXR1cyhib29sKiBlbmFibGVkLCBX ZWJSZWN0KiBjYXJldEJvdW5kcykgeyByZXR1cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgYm9vbCBz ZXRDb21wb3NpdGlvbigKKyAgICAgICAgY29uc3QgV2ViU3RyaW5nJiB0ZXh0LAorICAgICAgICBj b25zdCBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+JiB1bmRlcmxpbmVzLAorICAg ICAgICBpbnQgc2VsZWN0aW9uU3RhcnQsCisgICAgICAgIGludCBzZWxlY3Rpb25FbmQpIHsgcmV0 dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIGJvb2wgY29uZmlybUNvbXBvc2l0aW9uKCkgeyByZXR1 cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgV2ViVGV4dElucHV0VHlwZSB0ZXh0SW5wdXRUeXBlKCkg eyByZXR1cm4gV2ViS2l0OjpXZWJUZXh0SW5wdXRUeXBlTm9uZTsgfQorICAgIHZpcnR1YWwgV2Vi UmVjdCBjYXJldE9yU2VsZWN0aW9uQm91bmRzKCkgeyByZXR1cm4gV2ViUmVjdCgpOyB9CiAgICAg dmlydHVhbCB2b2lkIHNldFRleHREaXJlY3Rpb24oV2ViVGV4dERpcmVjdGlvbikgeyB9CiB9Owog Cg==