92820 2012-07-31 18:39:23 -0700 [chromium mac] DumpRenderTree compile fails with warning/error in LayoutTestHelper.mm with 10.7sdk 2012-08-03 07:40:10 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr thakis dpranke jochen rsesek thakis webkit.review.bot oldest_to_newest 683737 0 jamesr 2012-07-31 18:39:23 -0700 Attempting to compile DumpRenderTree on any mac with Xcode 4.4 fails: ../../Tools/DumpRenderTree/chromium/LayoutTestHelper.mm:45:1: error: 'CMProfileLocation' is deprecated [-Werror,-Wdeprecated-declarations] CMProfileLocation initialColorProfileLocation; // The locType field is initialized to 0 which is the same as cmNoProfileBase. ^ ../../Tools/DumpRenderTree/chromium/LayoutTestHelper.mm:56:5: error: 'CMProfileRef' is deprecated [-Werror,-Wdeprecated-declarations] CMProfileRef profile = 0; ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ColorSync.framework/Headers/ColorSyncDeprecated.h:1002:41: note: 'CMProfileRef' declared here typedef struct OpaqueCMProfileRef* CMProfileRef DEPRECATED_IN_MAC_OS_X_VERSION_10_6_AND_LATER; We probably shouldn't be using this if it's deprecated in 10.6+ 683754 1 thakis 2012-07-31 19:11:15 -0700 This used to work fine at r123866 683846 2 thakis 2012-07-31 21:10:21 -0700 While biking home, it occurred to me that this was likely caused by http://crrev.com/149198 . And indeed, after adding mac_deployment_target=10.5 to my GYP_DEFINES, DumpRenderTree builds fine again. So I recommend that as workaround for now. The real fix is to get rid of these deprecated functions. 683853 3 thakis 2012-07-31 21:20:33 -0700 See bug 80571 for what the apple port does. Apparently the color management functions where deprecated in 10.6 but replacements don't exist until 10.7 :-/ But we could #ifdef on the sdk being 10.7 I suppose, since people building with the 10.7 SDK will have 10.7 and will run locally. Better than not building. 683892 4 155724 thakis 2012-07-31 23:04:28 -0700 Created attachment 155724 Patch 683893 5 thakis 2012-07-31 23:05:58 -0700 Note: I haven't tried the attached patch, I just checked that it compiles. It'd be great if someone could check that it produces a DRT that passes pixel tests. 686129 6 jamesr 2012-08-02 19:13:49 -0700 I've confirmed that with this patch I get a DRT and it produces sane looking pixels, but since we don't have cr-mac Mountain Lion baselines I can't tell if they are correct. On many tests the only difference appears to be text rasterization which I'd expect to be different so it looks good. 686136 7 thakis 2012-08-02 19:17:46 -0700 You can try LayoutTests/fast/scrolling/scrollbar-tickmarks-styled.html . It doesn't have text, but it does have colors, so it would check if the colorspace handling is right. 686151 8 jamesr 2012-08-02 19:30:48 -0700 $ run-webkit-tests --chromium --release fast/scrolling/scrollbar-tickmarks-styled.html wdiff is not installed; please install from MacPorts or elsewhere The test ran as expected. 686200 9 thakis 2012-08-02 21:03:33 -0700 r? then. 686283 10 155724 jochen 2012-08-03 00:06:30 -0700 Comment on attachment 155724 Patch Since you copied the code from the mac drt, should you add Apple to the copyright line in the header? View in context: https://bugs.webkit.org/attachment.cgi?id=155724&action=review > Tools/DumpRenderTree/chromium/LayoutTestHelper.mm:44 > + MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 this can all go on one line 686663 11 156360 thakis 2012-08-03 06:53:42 -0700 Created attachment 156360 Patch for landing 686666 12 thakis 2012-08-03 06:54:25 -0700 Both done, thanks. 686738 13 156360 webkit.review.bot 2012-08-03 07:40:06 -0700 Comment on attachment 156360 Patch for landing Clearing flags on attachment: 156360 Committed r124612: <http://trac.webkit.org/changeset/124612> 686739 14 webkit.review.bot 2012-08-03 07:40:10 -0700 All reviewed patches have been landed. Closing bug. 155724 2012-07-31 23:04:28 -0700 2012-08-03 06:53:39 -0700 Patch bug-92820-20120731230411.patch text/plain 6471 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGVkZDQwYjBkNTZlZmZiYzg1ZjA5YzdhZThmZGQ2OWVj MzM0ZDZjOS4uNmRjMzEyYjExYjEzMjQyNDU2NWNhODVmYjhhNDM1YjVjYmI0ZjU5NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTA3LTMxICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAg ICAgICBbY2hyb21pdW0gbWFjXSBEdW1wUmVuZGVyVHJlZSBjb21waWxlIGZhaWxzIHdpdGggd2Fy bmluZy9lcnJvciBpbiBMYXlvdXRUZXN0SGVscGVyLm1tIHdpdGggMTAuN3NkaworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI4MjAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGJ1aWxkaW5nIHdpdGgg dGhlIDEwLjcgU0RLLCB1c2UgbmV3ZXIgZnVuY3Rpb25zIHRvIHN3aXRjaCBjb2xvcgorICAgICAg ICBwcm9maWxlcy4gTm90ZSB0aGF0IHRoZXNlIG5ld2VyIGZ1bmN0aW9ucyBhcmVuJ3QgYXZhaWxh YmxlIG9uIDEwLjYsCisgICAgICAgIGJ1dCB3ZSBkb24ndCBpbnRlbmQgdG8gc2hpcCBEUlQgdG8g dXNlcnMsIGFuZCBubyBib3RzIHRoYXQgY3VycmVudGx5CisgICAgICAgIGJ1aWxkIHdpdGggdGhl IDEwLjcgU0RLIHNoaXAgdGhlaXIgYmluYXJpZXMgdG8gMTAuNiB0ZXN0ZXJzLgorCisgICAgICAg IFRoZSBuZXcgY29kZSB3YXMgY29waWVkIGZyb20gQXBwbGUncyBEUlQvbWFjL0xheW91dFRlc3RI ZWxwZXIubS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RI ZWxwZXIubW06CisgICAgICAgIChpbnN0YWxsTGF5b3V0VGVzdENvbG9yUHJvZmlsZSk6CisgICAg ICAgIChyZXN0b3JlVXNlckNvbG9yUHJvZmlsZSk6CisgICAgICAgIChzYXZlQ3VycmVudENvbG9y UHJvZmlsZSk6CisKIDIwMTItMDctMzEgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHVwZGF0ZSB3YXRjaGxpc3QKZGlmZiAtLWdpdCBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RIZWxwZXIubW0gYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0SGVscGVyLm1tCmluZGV4IDk3OGY3NGMw NjFjMDNhNTg2ZjBkNDQ4NGI0NmRhZTJiNTc1NDU2MzQuLjNmYmQyZDAxMWFjMDJhYjcyNDExNzgy NjRkZjNkZjk2OTE5NjFmMjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL0xheW91dFRlc3RIZWxwZXIubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vTGF5b3V0VGVzdEhlbHBlci5tbQpAQCAtNDAsMTMgKzQwLDk4IEBACiAKIG5hbWVzcGFjZSB7 CiAKKyNpZiBkZWZpbmVkKE1BQ19PU19YX1ZFUlNJT05fMTBfNykgJiYgXAorICAgIE1BQ19PU19Y X1ZFUlNJT05fTUFYX0FMTE9XRUQgPj0gTUFDX09TX1hfVkVSU0lPTl8xMF83CisKK0NGVVJMUmVm IHNVc2VyQ29sb3JQcm9maWxlVVJMOworCit2b2lkIGluc3RhbGxMYXlvdXRUZXN0Q29sb3JQcm9m aWxlKCkKK3sKKyAgICAvLyBUbyBtYWtlIHN1cmUgd2UgZ2V0IGNvbnNpc3RlbnQgY29sb3JzIChu b3QgZGVwZW5kZW50IG9uIHRoZSBjaG9zZW4gY29sb3IKKyAgICAvLyBzcGFjZSBvZiB0aGUgbWFp biBkaXNwbGF5KSwgd2UgZm9yY2UgdGhlIGdlbmVyaWMgUkdCIGNvbG9yIHByb2ZpbGUuCisgICAg Ly8gVGhpcyBjYXVzZXMgYSBjaGFuZ2UgdGhlIHVzZXIgY2FuIHNlZS4KKyAgICAKKyAgICBDRlVV SURSZWYgbWFpbkRpc3BsYXlJRCA9IENHRGlzcGxheUNyZWF0ZVVVSURGcm9tRGlzcGxheUlEKENH TWFpbkRpc3BsYXlJRCgpKTsKKyAgICAKKyAgICBpZiAoIXNVc2VyQ29sb3JQcm9maWxlVVJMKSB7 CisgICAgICAgIENGRGljdGlvbmFyeVJlZiBkZXZpY2VJbmZvID0gQ29sb3JTeW5jRGV2aWNlQ29w eURldmljZUluZm8oa0NvbG9yU3luY0Rpc3BsYXlEZXZpY2VDbGFzcywgbWFpbkRpc3BsYXlJRCk7 CisKKyAgICAgICAgaWYgKCFkZXZpY2VJbmZvKSB7CisgICAgICAgICAgICBOU0xvZyhAIk5vIGRp c3BsYXkgYXR0YWNoZWQgdG8gc3lzdGVtOyBub3Qgc2V0dGluZyBtYWluIGRpc3BsYXkncyBjb2xv ciBwcm9maWxlLiIpOworICAgICAgICAgICAgQ0ZSZWxlYXNlKG1haW5EaXNwbGF5SUQpOworICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgQ0ZEaWN0aW9uYXJ5UmVmIHBy b2ZpbGVJbmZvID0gKENGRGljdGlvbmFyeVJlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShkZXZpY2VJ bmZvLCBrQ29sb3JTeW5jQ3VzdG9tUHJvZmlsZXMpOworICAgICAgICBpZiAocHJvZmlsZUluZm8p IHsKKyAgICAgICAgICAgIHNVc2VyQ29sb3JQcm9maWxlVVJMID0gKENGVVJMUmVmKUNGRGljdGlv bmFyeUdldFZhbHVlKHByb2ZpbGVJbmZvLCBDRlNUUigiMSIpKTsKKyAgICAgICAgICAgIENGUmV0 YWluKHNVc2VyQ29sb3JQcm9maWxlVVJMKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAg IHByb2ZpbGVJbmZvID0gKENGRGljdGlvbmFyeVJlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShkZXZp Y2VJbmZvLCBrQ29sb3JTeW5jRmFjdG9yeVByb2ZpbGVzKTsKKyAgICAgICAgICAgIENGRGljdGlv bmFyeVJlZiBmYWN0b3J5UHJvZmlsZSA9IChDRkRpY3Rpb25hcnlSZWYpQ0ZEaWN0aW9uYXJ5R2V0 VmFsdWUocHJvZmlsZUluZm8sIENGU1RSKCIxIikpOworICAgICAgICAgICAgc1VzZXJDb2xvclBy b2ZpbGVVUkwgPSAoQ0ZVUkxSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUoZmFjdG9yeVByb2ZpbGUs IGtDb2xvclN5bmNEZXZpY2VQcm9maWxlVVJMKTsKKyAgICAgICAgICAgIENGUmV0YWluKHNVc2Vy Q29sb3JQcm9maWxlVVJMKTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgQ0ZSZWxlYXNl KGRldmljZUluZm8pOworICAgIH0KKworICAgIENvbG9yU3luY1Byb2ZpbGVSZWYgZ2VuZXJpY1JH QlByb2ZpbGUgPSBDb2xvclN5bmNQcm9maWxlQ3JlYXRlV2l0aE5hbWUoa0NvbG9yU3luY0dlbmVy aWNSR0JQcm9maWxlKTsKKyAgICBDRkVycm9yUmVmIGVycm9yOworICAgIENGVVJMUmVmIHByb2Zp bGVVUkwgPSBDb2xvclN5bmNQcm9maWxlR2V0VVJMKGdlbmVyaWNSR0JQcm9maWxlLCAmZXJyb3Ip OworICAgIGlmICghcHJvZmlsZVVSTCkgeworICAgICAgICBOU0xvZyhAIkZhaWxlZCB0byBnZXQg VVJMIG9mIEdlbmVyaWMgUkdCIGNvbG9yIHByb2ZpbGUhIE1hbnkgcGl4ZWwgdGVzdHMgbWF5IGZh aWwgYXMgYSByZXN1bHQuIEVycm9yOiAlQCIsIGVycm9yKTsKKyAgICAgICAgCisgICAgICAgIGlm IChzVXNlckNvbG9yUHJvZmlsZVVSTCkgeworICAgICAgICAgICAgQ0ZSZWxlYXNlKHNVc2VyQ29s b3JQcm9maWxlVVJMKTsKKyAgICAgICAgICAgIHNVc2VyQ29sb3JQcm9maWxlVVJMID0gMDsKKyAg ICAgICAgfQorICAgICAgICAKKyAgICAgICAgQ0ZSZWxlYXNlKGdlbmVyaWNSR0JQcm9maWxlKTsK KyAgICAgICAgQ0ZSZWxlYXNlKG1haW5EaXNwbGF5SUQpOworICAgICAgICByZXR1cm47CisgICAg fQorICAgICAgICAKKyAgICBDRk11dGFibGVEaWN0aW9uYXJ5UmVmIHByb2ZpbGVJbmZvID0gQ0ZE aWN0aW9uYXJ5Q3JlYXRlTXV0YWJsZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAwLCAma0NGVHlwZURp Y3Rpb25hcnlLZXlDYWxsQmFja3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKTsK KyAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShwcm9maWxlSW5mbywga0NvbG9yU3luY0RldmljZURl ZmF1bHRQcm9maWxlSUQsIHByb2ZpbGVVUkwpOworICAgIAorICAgIGlmICghQ29sb3JTeW5jRGV2 aWNlU2V0Q3VzdG9tUHJvZmlsZXMoa0NvbG9yU3luY0Rpc3BsYXlEZXZpY2VDbGFzcywgbWFpbkRp c3BsYXlJRCwgcHJvZmlsZUluZm8pKSB7CisgICAgICAgIE5TTG9nKEAiRmFpbGVkIHRvIHNldCBj b2xvciBwcm9maWxlIGZvciBtYWluIGRpc3BsYXkhIE1hbnkgcGl4ZWwgdGVzdHMgbWF5IGZhaWwg YXMgYSByZXN1bHQuIik7CisgICAgICAgIAorICAgICAgICBpZiAoc1VzZXJDb2xvclByb2ZpbGVV UkwpIHsKKyAgICAgICAgICAgIENGUmVsZWFzZShzVXNlckNvbG9yUHJvZmlsZVVSTCk7CisgICAg ICAgICAgICBzVXNlckNvbG9yUHJvZmlsZVVSTCA9IDA7CisgICAgICAgIH0KKyAgICB9CisgICAg CisgICAgQ0ZSZWxlYXNlKHByb2ZpbGVJbmZvKTsKKyAgICBDRlJlbGVhc2UoZ2VuZXJpY1JHQlBy b2ZpbGUpOworICAgIENGUmVsZWFzZShtYWluRGlzcGxheUlEKTsKK30KKwordm9pZCByZXN0b3Jl VXNlckNvbG9yUHJvZmlsZSh2b2lkKQoreworICAgIC8vIFRoaXMgaXMgdXNlZCBhcyBhIHNpZ25h bCBoYW5kbGVyLCBhbmQgdGh1cyB0aGUgY2FsbHMgaW50byBDb2xvclN5bmMgYXJlIHVuc2FmZS4K KyAgICAvLyBCdXQgd2UgbWlnaHQgYXMgd2VsbCB0cnkgdG8gcmVzdG9yZSB0aGUgdXNlcidzIGNv bG9yIHByb2ZpbGUsIHdlJ3JlIGdvaW5nIGRvd24gYW55d2F5Li4uCisgICAgCisgICAgaWYgKCFz VXNlckNvbG9yUHJvZmlsZVVSTCkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIENGVVVJRFJl ZiBtYWluRGlzcGxheUlEID0gQ0dEaXNwbGF5Q3JlYXRlVVVJREZyb21EaXNwbGF5SUQoQ0dNYWlu RGlzcGxheUlEKCkpOworICAgIENGTXV0YWJsZURpY3Rpb25hcnlSZWYgcHJvZmlsZUluZm8gPSBD RkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDAsICZrQ0ZUeXBl RGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3Mp OworICAgIENGRGljdGlvbmFyeVNldFZhbHVlKHByb2ZpbGVJbmZvLCBrQ29sb3JTeW5jRGV2aWNl RGVmYXVsdFByb2ZpbGVJRCwgc1VzZXJDb2xvclByb2ZpbGVVUkwpOworICAgIENvbG9yU3luY0Rl dmljZVNldEN1c3RvbVByb2ZpbGVzKGtDb2xvclN5bmNEaXNwbGF5RGV2aWNlQ2xhc3MsIG1haW5E aXNwbGF5SUQsIHByb2ZpbGVJbmZvKTsKKyAgICBDRlJlbGVhc2UobWFpbkRpc3BsYXlJRCk7Cisg ICAgQ0ZSZWxlYXNlKHByb2ZpbGVJbmZvKTsKK30KKworI2Vsc2UgLy8gRm9yIFNub3cgTGVvcGFy ZCBhbmQgYmVmb3JlLCB1c2Ugb2xkZXIgQ00qIEFQSS4KKwogY29uc3QgY2hhciBjb2xvclByb2Zp bGVQYXRoW10gPSAiL1N5c3RlbS9MaWJyYXJ5L0NvbG9yU3luYy9Qcm9maWxlcy9HZW5lcmljIFJH QiBQcm9maWxlLmljYyI7CiAKIENNUHJvZmlsZUxvY2F0aW9uIGluaXRpYWxDb2xvclByb2ZpbGVM b2NhdGlvbjsgLy8gVGhlIGxvY1R5cGUgZmllbGQgaXMgaW5pdGlhbGl6ZWQgdG8gMCB3aGljaCBp cyB0aGUgc2FtZSBhcyBjbU5vUHJvZmlsZUJhc2UuCiAKLX0gLy8gbmFtZXNwYWNlCi0KLXN0YXRp YyB2b2lkIGluc3RhbGxMYXlvdXRUZXN0Q29sb3JQcm9maWxlKCkKK3ZvaWQgaW5zdGFsbExheW91 dFRlc3RDb2xvclByb2ZpbGUoKQogewogICAgIC8vIFRvIG1ha2Ugc3VyZSB3ZSBnZXQgY29uc2lz dGVudCBjb2xvcnMgKG5vdCBkZXBlbmRlbnQgb24gdGhlIE1haW4gZGlzcGxheSksCiAgICAgLy8g d2UgZm9yY2UgdGhlIGdlbmVyaWMgcmdiIGNvbG9yIHByb2ZpbGUuICBUaGlzIGNhc2VzIGEgY2hh bmdlIHRoZSB1c2VyIGNhbgpAQCAtNzYsNyArMTYxLDcgQEAgc3RhdGljIHZvaWQgaW5zdGFsbExh eW91dFRlc3RDb2xvclByb2ZpbGUoKQogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgcmVzdG9yZVVz ZXJDb2xvclByb2ZpbGUodm9pZCkKK3ZvaWQgcmVzdG9yZVVzZXJDb2xvclByb2ZpbGUodm9pZCkK IHsKICAgICAvLyBUaGlzIGlzIHVzZWQgYXMgYSBzaWduYWwgaGFuZGxlciwgYW5kIHRodXMgdGhl IGNhbGxzIGludG8gQ29sb3JTeW5jIGFyZSB1bnNhZmUuCiAgICAgLy8gQnV0IHdlIG1pZ2h0IGFz IHdlbGwgdHJ5IHRvIHJlc3RvcmUgdGhlIHVzZXIncyBjb2xvciBwcm9maWxlLCB3ZSdyZSBnb2lu ZyBkb3duIGFueXdheS4uLgpAQCAtOTAsMTMgKzE3NSwxNyBAQCBzdGF0aWMgdm9pZCByZXN0b3Jl VXNlckNvbG9yUHJvZmlsZSh2b2lkKQogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgc2ltcGxlU2ln bmFsSGFuZGxlcihpbnQgc2lnKQorI2VuZGlmCisKK3ZvaWQgc2ltcGxlU2lnbmFsSGFuZGxlcihp bnQgc2lnKQogewogICAgIC8vIFRyeSB0byByZXN0b3JlIHRoZSBjb2xvciBwcm9maWxlIGFuZCB0 cnkgdG8gZ28gZG93biBjbGVhbmx5CiAgICAgcmVzdG9yZVVzZXJDb2xvclByb2ZpbGUoKTsKICAg ICBleGl0KDEyOCArIHNpZyk7CiB9CiAKK30gLy8gbmFtZXNwYWNlCisKIGludCBtYWluKGludCBh cmdjLCBjaGFyKiBhcmd2W10pCiB7CiAgICAgTlNBdXRvcmVsZWFzZVBvb2wqIHBvb2wgPSBbW05T QXV0b3JlbGVhc2VQb29sIGFsbG9jXSBpbml0XTsK 156360 2012-08-03 06:53:42 -0700 2012-08-03 07:40:06 -0700 Patch for landing bug-92820-20120803065325.patch text/plain 6760 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NTE4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTkzMzBjODZhMzgzZjhlZTZjNTg0Y2Q1YmU1YjQ5OTNh NjQyZDI1MC4uNTBiNjYxZDQxYTE5Y2Y1NzUzYmUzZDkwZGRiYzY2NmNiMGExNDBkNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTA3LTMxICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAg ICAgICBbY2hyb21pdW0gbWFjXSBEdW1wUmVuZGVyVHJlZSBjb21waWxlIGZhaWxzIHdpdGggd2Fy bmluZy9lcnJvciBpbiBMYXlvdXRUZXN0SGVscGVyLm1tIHdpdGggMTAuN3NkaworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI4MjAKKworICAgICAgICBS ZXZpZXdlZCBieSBKb2NoZW4gRWlzaW5nZXIuCisKKyAgICAgICAgV2hlbiBidWlsZGluZyB3aXRo IHRoZSAxMC43IFNESywgdXNlIG5ld2VyIGZ1bmN0aW9ucyB0byBzd2l0Y2ggY29sb3IKKyAgICAg ICAgcHJvZmlsZXMuIE5vdGUgdGhhdCB0aGVzZSBuZXdlciBmdW5jdGlvbnMgYXJlbid0IGF2YWls YWJsZSBvbiAxMC42LAorICAgICAgICBidXQgd2UgZG9uJ3QgaW50ZW5kIHRvIHNoaXAgRFJUIHRv IHVzZXJzLCBhbmQgbm8gYm90cyB0aGF0IGN1cnJlbnRseQorICAgICAgICBidWlsZCB3aXRoIHRo ZSAxMC43IFNESyBzaGlwIHRoZWlyIGJpbmFyaWVzIHRvIDEwLjYgdGVzdGVycy4KKworICAgICAg ICBUaGUgbmV3IGNvZGUgd2FzIGNvcGllZCBmcm9tIEFwcGxlJ3MgRFJUL21hYy9MYXlvdXRUZXN0 SGVscGVyLm0uCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0 SGVscGVyLm1tOgorICAgICAgICAoaW5zdGFsbExheW91dFRlc3RDb2xvclByb2ZpbGUpOgorICAg ICAgICAocmVzdG9yZVVzZXJDb2xvclByb2ZpbGUpOgorICAgICAgICAoc2F2ZUN1cnJlbnRDb2xv clByb2ZpbGUpOgorCiAyMDEyLTA2LTE1ICBEYXZpZCBCYXJ0b24gIDxkYmFydG9uQG1hdGhzY3Jp YmUuY29tPgogCiAgICAgICAgIE1hdGhNTDogbmVzdGVkIHNxdWFyZSByb290IHN5bWJvbHMgaGF2 ZSB2YXJ5aW5nIGRlc2NlbmRlcnMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL0xheW91dFRlc3RIZWxwZXIubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9MYXlvdXRUZXN0SGVscGVyLm1tCmluZGV4IDk3OGY3NGMwNjFjMDNhNTg2ZjBkNDQ4NGI0NmRh ZTJiNTc1NDU2MzQuLjVlY2FjNjY5MjQ4MmYyZTk4MzUxY2IwN2FkZWNkZDMwMzE5ZjA1N2YgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RIZWxwZXIu bW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdEhlbHBlci5t bQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTAgR29vZ2xlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMiBBcHBsZSBJbmMuCiAg KgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC00MCwxMyArNDEsOTcgQEAKIAog bmFtZXNwYWNlIHsKIAorI2lmIGRlZmluZWQoTUFDX09TX1hfVkVSU0lPTl8xMF83KSAmJiBNQUNf T1NfWF9WRVJTSU9OX01BWF9BTExPV0VEID49IE1BQ19PU19YX1ZFUlNJT05fMTBfNworCitDRlVS TFJlZiBzVXNlckNvbG9yUHJvZmlsZVVSTDsKKwordm9pZCBpbnN0YWxsTGF5b3V0VGVzdENvbG9y UHJvZmlsZSgpCit7CisgICAgLy8gVG8gbWFrZSBzdXJlIHdlIGdldCBjb25zaXN0ZW50IGNvbG9y cyAobm90IGRlcGVuZGVudCBvbiB0aGUgY2hvc2VuIGNvbG9yCisgICAgLy8gc3BhY2Ugb2YgdGhl IG1haW4gZGlzcGxheSksIHdlIGZvcmNlIHRoZSBnZW5lcmljIFJHQiBjb2xvciBwcm9maWxlLgor ICAgIC8vIFRoaXMgY2F1c2VzIGEgY2hhbmdlIHRoZSB1c2VyIGNhbiBzZWUuCisgICAgCisgICAg Q0ZVVUlEUmVmIG1haW5EaXNwbGF5SUQgPSBDR0Rpc3BsYXlDcmVhdGVVVUlERnJvbURpc3BsYXlJ RChDR01haW5EaXNwbGF5SUQoKSk7CisgICAgCisgICAgaWYgKCFzVXNlckNvbG9yUHJvZmlsZVVS TCkgeworICAgICAgICBDRkRpY3Rpb25hcnlSZWYgZGV2aWNlSW5mbyA9IENvbG9yU3luY0Rldmlj ZUNvcHlEZXZpY2VJbmZvKGtDb2xvclN5bmNEaXNwbGF5RGV2aWNlQ2xhc3MsIG1haW5EaXNwbGF5 SUQpOworCisgICAgICAgIGlmICghZGV2aWNlSW5mbykgeworICAgICAgICAgICAgTlNMb2coQCJO byBkaXNwbGF5IGF0dGFjaGVkIHRvIHN5c3RlbTsgbm90IHNldHRpbmcgbWFpbiBkaXNwbGF5J3Mg Y29sb3IgcHJvZmlsZS4iKTsKKyAgICAgICAgICAgIENGUmVsZWFzZShtYWluRGlzcGxheUlEKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIENGRGljdGlvbmFyeVJl ZiBwcm9maWxlSW5mbyA9IChDRkRpY3Rpb25hcnlSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUoZGV2 aWNlSW5mbywga0NvbG9yU3luY0N1c3RvbVByb2ZpbGVzKTsKKyAgICAgICAgaWYgKHByb2ZpbGVJ bmZvKSB7CisgICAgICAgICAgICBzVXNlckNvbG9yUHJvZmlsZVVSTCA9IChDRlVSTFJlZilDRkRp Y3Rpb25hcnlHZXRWYWx1ZShwcm9maWxlSW5mbywgQ0ZTVFIoIjEiKSk7CisgICAgICAgICAgICBD RlJldGFpbihzVXNlckNvbG9yUHJvZmlsZVVSTCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICBwcm9maWxlSW5mbyA9IChDRkRpY3Rpb25hcnlSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUo ZGV2aWNlSW5mbywga0NvbG9yU3luY0ZhY3RvcnlQcm9maWxlcyk7CisgICAgICAgICAgICBDRkRp Y3Rpb25hcnlSZWYgZmFjdG9yeVByb2ZpbGUgPSAoQ0ZEaWN0aW9uYXJ5UmVmKUNGRGljdGlvbmFy eUdldFZhbHVlKHByb2ZpbGVJbmZvLCBDRlNUUigiMSIpKTsKKyAgICAgICAgICAgIHNVc2VyQ29s b3JQcm9maWxlVVJMID0gKENGVVJMUmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKGZhY3RvcnlQcm9m aWxlLCBrQ29sb3JTeW5jRGV2aWNlUHJvZmlsZVVSTCk7CisgICAgICAgICAgICBDRlJldGFpbihz VXNlckNvbG9yUHJvZmlsZVVSTCk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIENGUmVs ZWFzZShkZXZpY2VJbmZvKTsKKyAgICB9CisKKyAgICBDb2xvclN5bmNQcm9maWxlUmVmIGdlbmVy aWNSR0JQcm9maWxlID0gQ29sb3JTeW5jUHJvZmlsZUNyZWF0ZVdpdGhOYW1lKGtDb2xvclN5bmNH ZW5lcmljUkdCUHJvZmlsZSk7CisgICAgQ0ZFcnJvclJlZiBlcnJvcjsKKyAgICBDRlVSTFJlZiBw cm9maWxlVVJMID0gQ29sb3JTeW5jUHJvZmlsZUdldFVSTChnZW5lcmljUkdCUHJvZmlsZSwgJmVy cm9yKTsKKyAgICBpZiAoIXByb2ZpbGVVUkwpIHsKKyAgICAgICAgTlNMb2coQCJGYWlsZWQgdG8g Z2V0IFVSTCBvZiBHZW5lcmljIFJHQiBjb2xvciBwcm9maWxlISBNYW55IHBpeGVsIHRlc3RzIG1h eSBmYWlsIGFzIGEgcmVzdWx0LiBFcnJvcjogJUAiLCBlcnJvcik7CisgICAgICAgIAorICAgICAg ICBpZiAoc1VzZXJDb2xvclByb2ZpbGVVUkwpIHsKKyAgICAgICAgICAgIENGUmVsZWFzZShzVXNl ckNvbG9yUHJvZmlsZVVSTCk7CisgICAgICAgICAgICBzVXNlckNvbG9yUHJvZmlsZVVSTCA9IDA7 CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIENGUmVsZWFzZShnZW5lcmljUkdCUHJvZmls ZSk7CisgICAgICAgIENGUmVsZWFzZShtYWluRGlzcGxheUlEKTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKyAgICAgICAgCisgICAgQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZiBwcm9maWxlSW5mbyA9 IENGRGljdGlvbmFyeUNyZWF0ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgJmtDRlR5 cGVEaWN0aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NGVHlwZURpY3Rpb25hcnlWYWx1ZUNhbGxCYWNr cyk7CisgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUocHJvZmlsZUluZm8sIGtDb2xvclN5bmNEZXZp Y2VEZWZhdWx0UHJvZmlsZUlELCBwcm9maWxlVVJMKTsKKyAgICAKKyAgICBpZiAoIUNvbG9yU3lu Y0RldmljZVNldEN1c3RvbVByb2ZpbGVzKGtDb2xvclN5bmNEaXNwbGF5RGV2aWNlQ2xhc3MsIG1h aW5EaXNwbGF5SUQsIHByb2ZpbGVJbmZvKSkgeworICAgICAgICBOU0xvZyhAIkZhaWxlZCB0byBz ZXQgY29sb3IgcHJvZmlsZSBmb3IgbWFpbiBkaXNwbGF5ISBNYW55IHBpeGVsIHRlc3RzIG1heSBm YWlsIGFzIGEgcmVzdWx0LiIpOworICAgICAgICAKKyAgICAgICAgaWYgKHNVc2VyQ29sb3JQcm9m aWxlVVJMKSB7CisgICAgICAgICAgICBDRlJlbGVhc2Uoc1VzZXJDb2xvclByb2ZpbGVVUkwpOwor ICAgICAgICAgICAgc1VzZXJDb2xvclByb2ZpbGVVUkwgPSAwOworICAgICAgICB9CisgICAgfQor ICAgIAorICAgIENGUmVsZWFzZShwcm9maWxlSW5mbyk7CisgICAgQ0ZSZWxlYXNlKGdlbmVyaWNS R0JQcm9maWxlKTsKKyAgICBDRlJlbGVhc2UobWFpbkRpc3BsYXlJRCk7Cit9CisKK3ZvaWQgcmVz dG9yZVVzZXJDb2xvclByb2ZpbGUodm9pZCkKK3sKKyAgICAvLyBUaGlzIGlzIHVzZWQgYXMgYSBz aWduYWwgaGFuZGxlciwgYW5kIHRodXMgdGhlIGNhbGxzIGludG8gQ29sb3JTeW5jIGFyZSB1bnNh ZmUuCisgICAgLy8gQnV0IHdlIG1pZ2h0IGFzIHdlbGwgdHJ5IHRvIHJlc3RvcmUgdGhlIHVzZXIn cyBjb2xvciBwcm9maWxlLCB3ZSdyZSBnb2luZyBkb3duIGFueXdheS4uLgorICAgIAorICAgIGlm ICghc1VzZXJDb2xvclByb2ZpbGVVUkwpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICBDRlVV SURSZWYgbWFpbkRpc3BsYXlJRCA9IENHRGlzcGxheUNyZWF0ZVVVSURGcm9tRGlzcGxheUlEKENH TWFpbkRpc3BsYXlJRCgpKTsKKyAgICBDRk11dGFibGVEaWN0aW9uYXJ5UmVmIHByb2ZpbGVJbmZv ID0gQ0ZEaWN0aW9uYXJ5Q3JlYXRlTXV0YWJsZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAwLCAma0NG VHlwZURpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJh Y2tzKTsKKyAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShwcm9maWxlSW5mbywga0NvbG9yU3luY0Rl dmljZURlZmF1bHRQcm9maWxlSUQsIHNVc2VyQ29sb3JQcm9maWxlVVJMKTsKKyAgICBDb2xvclN5 bmNEZXZpY2VTZXRDdXN0b21Qcm9maWxlcyhrQ29sb3JTeW5jRGlzcGxheURldmljZUNsYXNzLCBt YWluRGlzcGxheUlELCBwcm9maWxlSW5mbyk7CisgICAgQ0ZSZWxlYXNlKG1haW5EaXNwbGF5SUQp OworICAgIENGUmVsZWFzZShwcm9maWxlSW5mbyk7Cit9CisKKyNlbHNlIC8vIEZvciBTbm93IExl b3BhcmQgYW5kIGJlZm9yZSwgdXNlIG9sZGVyIENNKiBBUEkuCisKIGNvbnN0IGNoYXIgY29sb3JQ cm9maWxlUGF0aFtdID0gIi9TeXN0ZW0vTGlicmFyeS9Db2xvclN5bmMvUHJvZmlsZXMvR2VuZXJp YyBSR0IgUHJvZmlsZS5pY2MiOwogCiBDTVByb2ZpbGVMb2NhdGlvbiBpbml0aWFsQ29sb3JQcm9m aWxlTG9jYXRpb247IC8vIFRoZSBsb2NUeXBlIGZpZWxkIGlzIGluaXRpYWxpemVkIHRvIDAgd2hp Y2ggaXMgdGhlIHNhbWUgYXMgY21Ob1Byb2ZpbGVCYXNlLgogCi19IC8vIG5hbWVzcGFjZQotCi1z dGF0aWMgdm9pZCBpbnN0YWxsTGF5b3V0VGVzdENvbG9yUHJvZmlsZSgpCit2b2lkIGluc3RhbGxM YXlvdXRUZXN0Q29sb3JQcm9maWxlKCkKIHsKICAgICAvLyBUbyBtYWtlIHN1cmUgd2UgZ2V0IGNv bnNpc3RlbnQgY29sb3JzIChub3QgZGVwZW5kZW50IG9uIHRoZSBNYWluIGRpc3BsYXkpLAogICAg IC8vIHdlIGZvcmNlIHRoZSBnZW5lcmljIHJnYiBjb2xvciBwcm9maWxlLiAgVGhpcyBjYXNlcyBh IGNoYW5nZSB0aGUgdXNlciBjYW4KQEAgLTc2LDcgKzE2MSw3IEBAIHN0YXRpYyB2b2lkIGluc3Rh bGxMYXlvdXRUZXN0Q29sb3JQcm9maWxlKCkKICAgICB9CiB9CiAKLXN0YXRpYyB2b2lkIHJlc3Rv cmVVc2VyQ29sb3JQcm9maWxlKHZvaWQpCit2b2lkIHJlc3RvcmVVc2VyQ29sb3JQcm9maWxlKHZv aWQpCiB7CiAgICAgLy8gVGhpcyBpcyB1c2VkIGFzIGEgc2lnbmFsIGhhbmRsZXIsIGFuZCB0aHVz IHRoZSBjYWxscyBpbnRvIENvbG9yU3luYyBhcmUgdW5zYWZlLgogICAgIC8vIEJ1dCB3ZSBtaWdo dCBhcyB3ZWxsIHRyeSB0byByZXN0b3JlIHRoZSB1c2VyJ3MgY29sb3IgcHJvZmlsZSwgd2UncmUg Z29pbmcgZG93biBhbnl3YXkuLi4KQEAgLTkwLDEzICsxNzUsMTcgQEAgc3RhdGljIHZvaWQgcmVz dG9yZVVzZXJDb2xvclByb2ZpbGUodm9pZCkKICAgICB9CiB9CiAKLXN0YXRpYyB2b2lkIHNpbXBs ZVNpZ25hbEhhbmRsZXIoaW50IHNpZykKKyNlbmRpZgorCit2b2lkIHNpbXBsZVNpZ25hbEhhbmRs ZXIoaW50IHNpZykKIHsKICAgICAvLyBUcnkgdG8gcmVzdG9yZSB0aGUgY29sb3IgcHJvZmlsZSBh bmQgdHJ5IHRvIGdvIGRvd24gY2xlYW5seQogICAgIHJlc3RvcmVVc2VyQ29sb3JQcm9maWxlKCk7 CiAgICAgZXhpdCgxMjggKyBzaWcpOwogfQogCit9IC8vIG5hbWVzcGFjZQorCiBpbnQgbWFpbihp bnQgYXJnYywgY2hhciogYXJndltdKQogewogICAgIE5TQXV0b3JlbGVhc2VQb29sKiBwb29sID0g W1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07Cg==