41424 2010-06-30 12:03:01 -0700 Stop linking against opengl32.lib in Windows Chromium port 2010-07-01 12:45:03 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 41430 1 kbr kbr cmarrin dglazkov oliver webkit.review.bot zmo oldest_to_newest 244874 0 kbr 2010-06-30 12:03:01 -0700 The Windows Chromium port links against opengl32.lib for the legacy in-process WebGL implementation (which may still be useful as a basis for other ports, which is one of the reasons it is still being left in place). This dependency is impacting browser startup time. The copy of GLEW in Chromium has been updated to dynamically look up all of the core WGL entry points; the code in WebKit needs to be updated to use the new entry points and stop adding opengl32.lib to the link line. See http://crbug.com/45586 . 244879 1 60141 kbr 2010-06-30 12:13:51 -0700 Created attachment 60141 Patch 244880 2 webkit.review.bot 2010-06-30 12:14:55 -0700 Attachment 60141 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit/chromium/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 244882 3 60142 kbr 2010-06-30 12:23:34 -0700 Created attachment 60142 Revised patch Revised patch fixing tab in ChangeLog 244937 4 60142 dglazkov 2010-06-30 14:16:48 -0700 Comment on attachment 60142 Revised patch Please roll DEPS in WebKit/chromium to pick up downstream changes before landing this. 245491 5 60142 kbr 2010-07-01 12:44:58 -0700 Comment on attachment 60142 Revised patch Clearing flags on attachment: 60142 Committed r62288: <http://trac.webkit.org/changeset/62288> 245492 6 kbr 2010-07-01 12:45:03 -0700 All reviewed patches have been landed. Closing bug. 60141 2010-06-30 12:13:51 -0700 2010-06-30 12:23:34 -0700 Patch opengl32.patch text/plain 4796 kbr SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2MjE5MykKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNi0zMCAgS2Vu bmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCBsaW5raW5nIGFnYWluc3Qgb3BlbmdsMzIubGli IGluIFdpbmRvd3MgQ2hyb21pdW0gcG9ydAorCWh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00MTQyNAorCisgICAgICAgICogV2ViS2l0Lmd5cDoKKyAgICAgICAgKiBzcmMv V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6On5XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1 bHRJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1w bDo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVm YXVsdEltcGw6Om1ha2VDb250ZXh0Q3VycmVudCk6CisgICAgICAgICogc3JjL1dlYkdyYXBoaWNz Q29udGV4dDNERGVmYXVsdEltcGwuaDoKKwogMjAxMC0wNi0yNSAgUGF2ZWwgRmVsZG1hbiAgPHBm ZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0 c2t5LgpJbmRleDogV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXANCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAkocmV2aXNpb24gNjIxOTIpCisrKyBXZWJLaXQvY2hy b21pdW0vV2ViS2l0Lmd5cAkod29ya2luZyBjb3B5KQpAQCAtNTMwLDEzICs1MzAsNiBAQAogICAg ICAgICAgICAgICAgICAgICAgICAgJ0dMRVdfTk9fR0xVPTEnLAogICAgICAgICAgICAgICAgICAg ICBdLAogICAgICAgICAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKLSAgICAgICAgICAgICAg ICAgICAgICAgIFsnT1M9PSJ3aW4iJywgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICds aW5rX3NldHRpbmdzJzogewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnbGlicmFy aWVzJzogWwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy1sb3BlbmdsMzIu bGliJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICB9LAotICAgICAgICAgICAgICAgICAgICAgICAgfV0sCiAgICAgICAgICAg ICAgICAgICAgICAgICBbJ09TPT0ibWFjIicsIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnbGlua19zZXR0aW5ncyc6IHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2xp YnJhcmllcyc6IFsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0 M0REZWZhdWx0SW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuY3BwCShyZXZpc2lvbiA2MjE5MikKKysrIFdl YktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE3Myw4ICsxNzMsOCBAQCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1 bHRJbXBsOjp+V2ViR3JhCiAgICAgICAgIGdsRGVsZXRlRnJhbWVidWZmZXJzRVhUKDEsICZtX2Zi byk7CiAjZW5kaWYgLy8gIVJFTkRFUl9UT19ERUJVR0dJTkdfV0lORE9XCiAjaWYgT1MoV0lORE9X UykKLSAgICAgICAgd2dsTWFrZUN1cnJlbnQoMCwgMCk7Ci0gICAgICAgIHdnbERlbGV0ZUNvbnRl eHQobV9jb250ZXh0T2JqKTsKKyAgICAgICAgd2dsZXdNYWtlQ3VycmVudCgwLCAwKTsKKyAgICAg ICAgd2dsZXdEZWxldGVDb250ZXh0KG1fY29udGV4dE9iaik7CiAgICAgICAgIFJlbGVhc2VEQyht X2NhbnZhc1dpbmRvdywgbV9jYW52YXNEQyk7CiAgICAgICAgIERlc3Ryb3lXaW5kb3cobV9jYW52 YXNXaW5kb3cpOwogI2VsaWYgUExBVEZPUk0oQ0cpCkBAIC0xOTcsNiArMTk3LDE0IEBAIFdlYkdy YXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6On5XZWJHcmEKIGJvb2wgV2ViR3JhcGhpY3NDb250 ZXh0M0REZWZhdWx0SW1wbDo6aW5pdGlhbGl6ZShXZWJHcmFwaGljc0NvbnRleHQzRDo6QXR0cmli dXRlcyBhdHRyaWJ1dGVzLCBXZWJWaWV3KiB3ZWJWaWV3KQogewogI2lmIE9TKFdJTkRPV1MpCisg ICAgaWYgKCFzX2luaXRpYWxpemVkR0xFVykgeworICAgICAgICAvLyBEbyB0aGlzIG9ubHkgdGhl IGZpcnN0IHRpbWUgdGhyb3VnaC4KKyAgICAgICAgaWYgKCF3Z2xld0luaXQoKSkgeworICAgICAg ICAgICAgcHJpbnRmKCJXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOiB3Z2xld0luaXQg ZmFpbGVkXG4iKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgIH0K KwogICAgIFdORENMQVNTIHdjOwogICAgIGlmICghR2V0Q2xhc3NJbmZvKEdldE1vZHVsZUhhbmRs ZSgwKSwgTCJDQU5WQVNHTCIsICZ3YykpIHsKICAgICAgICAgWmVyb01lbW9yeSgmd2MsIHNpemVv ZihXTkRDTEFTUykpOwpAQCAtMjQ2LDEzICsyNTQsMTMgQEAgYm9vbCBXZWJHcmFwaGljc0NvbnRl eHQzRERlZmF1bHRJbXBsOjppbgogICAgIH0KIAogICAgIC8vIGNyZWF0ZSByZW5kZXJpbmcgY29u dGV4dAotICAgIG1fY29udGV4dE9iaiA9IHdnbENyZWF0ZUNvbnRleHQobV9jYW52YXNEQyk7Cisg ICAgbV9jb250ZXh0T2JqID0gd2dsZXdDcmVhdGVDb250ZXh0KG1fY2FudmFzREMpOwogICAgIGlm ICghbV9jb250ZXh0T2JqKSB7CiAgICAgICAgIHByaW50ZigiV2ViR3JhcGhpY3NDb250ZXh0M0RE ZWZhdWx0SW1wbDogd2dsQ3JlYXRlQ29udGV4dCBmYWlsZWRcbiIpOwogICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfQogCi0gICAgaWYgKCF3Z2xNYWtlQ3VycmVudChtX2NhbnZhc0RDLCBtX2Nv bnRleHRPYmopKSB7CisgICAgaWYgKCF3Z2xld01ha2VDdXJyZW50KG1fY2FudmFzREMsIG1fY29u dGV4dE9iaikpIHsKICAgICAgICAgcHJpbnRmKCJXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJ bXBsOiB3Z2xNYWtlQ3VycmVudCBmYWlsZWRcbiIpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQpAQCAtMjYwLDcgKzI2OCw3IEBAIGJvb2wgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0 SW1wbDo6aW4KICNpZmRlZiBSRU5ERVJfVE9fREVCVUdHSU5HX1dJTkRPVwogICAgIHR5cGVkZWYg Qk9PTCAoV0lOQVBJICogUEZOV0dMU1dBUElOVEVSVkFMRVhUUFJPQykgKGludCBpbnRlcnZhbCk7 CiAgICAgUEZOV0dMU1dBUElOVEVSVkFMRVhUUFJPQyBzZXRTd2FwSW50ZXJ2YWwgPSAwOwotICAg IHNldFN3YXBJbnRlcnZhbCA9IChQRk5XR0xTV0FQSU5URVJWQUxFWFRQUk9DKSB3Z2xHZXRQcm9j QWRkcmVzcygid2dsU3dhcEludGVydmFsRVhUIik7CisgICAgc2V0U3dhcEludGVydmFsID0gKFBG TldHTFNXQVBJTlRFUlZBTEVYVFBST0MpIHdnbGV3R2V0UHJvY0FkZHJlc3MoIndnbFN3YXBJbnRl cnZhbEVYVCIpOwogICAgIGlmIChzZXRTd2FwSW50ZXJ2YWwpCiAgICAgICAgIHNldFN3YXBJbnRl cnZhbCgxKTsKICNlbmRpZiAvLyBSRU5ERVJfVE9fREVCVUdHSU5HX1dJTkRPVwpAQCAtNDE2LDgg KzQyNCw4IEBAIHZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6dmEKIGJvb2wg V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6bWFrZUNvbnRleHRDdXJyZW50KCkKIHsK ICNpZiBPUyhXSU5ET1dTKQotICAgIGlmICh3Z2xHZXRDdXJyZW50Q29udGV4dCgpICE9IG1fY29u dGV4dE9iaikKLSAgICAgICAgaWYgKHdnbE1ha2VDdXJyZW50KG1fY2FudmFzREMsIG1fY29udGV4 dE9iaikpCisgICAgaWYgKHdnbGV3R2V0Q3VycmVudENvbnRleHQoKSAhPSBtX2NvbnRleHRPYmop CisgICAgICAgIGlmICh3Z2xld01ha2VDdXJyZW50KG1fY2FudmFzREMsIG1fY29udGV4dE9iaikp CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICNlbGlmIFBMQVRGT1JNKENHKQogICAgIGlmIChD R0xHZXRDdXJyZW50Q29udGV4dCgpICE9IG1fY29udGV4dE9iaikKSW5kZXg6IFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5oDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmgJ KHJldmlzaW9uIDYyMTkyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRl eHQzRERlZmF1bHRJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDkgQEAKICNlbmRp ZgogCiAjaW5jbHVkZSAiR0wvZ2xldy5oIgorI2lmIE9TKFdJTkRPV1MpCisjaW5jbHVkZSAiR0wv d2dsZXcuaCIKKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ0cpCiAjaW5jbHVkZSA8T3BlbkdML09w ZW5HTC5oPgo= 60142 2010-06-30 12:23:34 -0700 2010-07-01 12:44:58 -0700 Revised patch opengl32.patch text/plain 4803 kbr SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2MjE5MykKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNi0zMCAgS2Vu bmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCBsaW5raW5nIGFnYWluc3Qgb3BlbmdsMzIubGli IGluIFdpbmRvd3MgQ2hyb21pdW0gcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDE0MjQKKworICAgICAgICAqIFdlYktpdC5neXA6CisgICAgICAg ICogc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjp+V2ViR3JhcGhpY3NDb250ZXh0 M0REZWZhdWx0SW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVm YXVsdEltcGw6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRl eHQzRERlZmF1bHRJbXBsOjptYWtlQ29udGV4dEN1cnJlbnQpOgorICAgICAgICAqIHNyYy9XZWJH cmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmg6CisKIDIwMTAtMDYtMjUgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBT ZW1pa2hhdHNreS4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQotLS0gV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAJKHJldmlzaW9uIDYyMTkyKQorKysgV2Vi S2l0L2Nocm9taXVtL1dlYktpdC5neXAJKHdvcmtpbmcgY29weSkKQEAgLTUzMCwxMyArNTMwLDYg QEAKICAgICAgICAgICAgICAgICAgICAgICAgICdHTEVXX05PX0dMVT0xJywKICAgICAgICAgICAg ICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAgICAgJ2NvbmRpdGlvbnMnOiBbCi0gICAgICAg ICAgICAgICAgICAgICAgICBbJ09TPT0id2luIicsIHsKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnbGlua19zZXR0aW5ncyc6IHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg J2xpYnJhcmllcyc6IFsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICctbG9w ZW5nbDMyLmxpYicsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF0sCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgfSwKLSAgICAgICAgICAgICAgICAgICAgICAgIH1dLAogICAg ICAgICAgICAgICAgICAgICAgICAgWydPUz09Im1hYyInLCB7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ2xpbmtfc2V0dGluZ3MnOiB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICdsaWJyYXJpZXMnOiBbCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNz Q29udGV4dDNERGVmYXVsdEltcGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcAkocmV2aXNpb24gNjIxOTIp CisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzMsOCArMTczLDggQEAgV2ViR3JhcGhpY3NDb250ZXh0 M0REZWZhdWx0SW1wbDo6fldlYkdyYQogICAgICAgICBnbERlbGV0ZUZyYW1lYnVmZmVyc0VYVCgx LCAmbV9mYm8pOwogI2VuZGlmIC8vICFSRU5ERVJfVE9fREVCVUdHSU5HX1dJTkRPVwogI2lmIE9T KFdJTkRPV1MpCi0gICAgICAgIHdnbE1ha2VDdXJyZW50KDAsIDApOwotICAgICAgICB3Z2xEZWxl dGVDb250ZXh0KG1fY29udGV4dE9iaik7CisgICAgICAgIHdnbGV3TWFrZUN1cnJlbnQoMCwgMCk7 CisgICAgICAgIHdnbGV3RGVsZXRlQ29udGV4dChtX2NvbnRleHRPYmopOwogICAgICAgICBSZWxl YXNlREMobV9jYW52YXNXaW5kb3csIG1fY2FudmFzREMpOwogICAgICAgICBEZXN0cm95V2luZG93 KG1fY2FudmFzV2luZG93KTsKICNlbGlmIFBMQVRGT1JNKENHKQpAQCAtMTk3LDYgKzE5NywxNCBA QCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjp+V2ViR3JhCiBib29sIFdlYkdyYXBo aWNzQ29udGV4dDNERGVmYXVsdEltcGw6OmluaXRpYWxpemUoV2ViR3JhcGhpY3NDb250ZXh0M0Q6 OkF0dHJpYnV0ZXMgYXR0cmlidXRlcywgV2ViVmlldyogd2ViVmlldykKIHsKICNpZiBPUyhXSU5E T1dTKQorICAgIGlmICghc19pbml0aWFsaXplZEdMRVcpIHsKKyAgICAgICAgLy8gRG8gdGhpcyBv bmx5IHRoZSBmaXJzdCB0aW1lIHRocm91Z2guCisgICAgICAgIGlmICghd2dsZXdJbml0KCkpIHsK KyAgICAgICAgICAgIHByaW50ZigiV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDogd2ds ZXdJbml0IGZhaWxlZFxuIik7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0K KyAgICB9CisKICAgICBXTkRDTEFTUyB3YzsKICAgICBpZiAoIUdldENsYXNzSW5mbyhHZXRNb2R1 bGVIYW5kbGUoMCksIEwiQ0FOVkFTR0wiLCAmd2MpKSB7CiAgICAgICAgIFplcm9NZW1vcnkoJndj LCBzaXplb2YoV05EQ0xBU1MpKTsKQEAgLTI0NiwxMyArMjU0LDEzIEBAIGJvb2wgV2ViR3JhcGhp Y3NDb250ZXh0M0REZWZhdWx0SW1wbDo6aW4KICAgICB9CiAKICAgICAvLyBjcmVhdGUgcmVuZGVy aW5nIGNvbnRleHQKLSAgICBtX2NvbnRleHRPYmogPSB3Z2xDcmVhdGVDb250ZXh0KG1fY2FudmFz REMpOworICAgIG1fY29udGV4dE9iaiA9IHdnbGV3Q3JlYXRlQ29udGV4dChtX2NhbnZhc0RDKTsK ICAgICBpZiAoIW1fY29udGV4dE9iaikgewogICAgICAgICBwcmludGYoIldlYkdyYXBoaWNzQ29u dGV4dDNERGVmYXVsdEltcGw6IHdnbENyZWF0ZUNvbnRleHQgZmFpbGVkXG4iKTsKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIGlmICghd2dsTWFrZUN1cnJlbnQobV9jYW52YXNE QywgbV9jb250ZXh0T2JqKSkgeworICAgIGlmICghd2dsZXdNYWtlQ3VycmVudChtX2NhbnZhc0RD LCBtX2NvbnRleHRPYmopKSB7CiAgICAgICAgIHByaW50ZigiV2ViR3JhcGhpY3NDb250ZXh0M0RE ZWZhdWx0SW1wbDogd2dsTWFrZUN1cnJlbnQgZmFpbGVkXG4iKTsKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KQEAgLTI2MCw3ICsyNjgsNyBAQCBib29sIFdlYkdyYXBoaWNzQ29udGV4dDNE RGVmYXVsdEltcGw6OmluCiAjaWZkZWYgUkVOREVSX1RPX0RFQlVHR0lOR19XSU5ET1cKICAgICB0 eXBlZGVmIEJPT0wgKFdJTkFQSSAqIFBGTldHTFNXQVBJTlRFUlZBTEVYVFBST0MpIChpbnQgaW50 ZXJ2YWwpOwogICAgIFBGTldHTFNXQVBJTlRFUlZBTEVYVFBST0Mgc2V0U3dhcEludGVydmFsID0g MDsKLSAgICBzZXRTd2FwSW50ZXJ2YWwgPSAoUEZOV0dMU1dBUElOVEVSVkFMRVhUUFJPQykgd2ds R2V0UHJvY0FkZHJlc3MoIndnbFN3YXBJbnRlcnZhbEVYVCIpOworICAgIHNldFN3YXBJbnRlcnZh bCA9IChQRk5XR0xTV0FQSU5URVJWQUxFWFRQUk9DKSB3Z2xld0dldFByb2NBZGRyZXNzKCJ3Z2xT d2FwSW50ZXJ2YWxFWFQiKTsKICAgICBpZiAoc2V0U3dhcEludGVydmFsKQogICAgICAgICBzZXRT d2FwSW50ZXJ2YWwoMSk7CiAjZW5kaWYgLy8gUkVOREVSX1RPX0RFQlVHR0lOR19XSU5ET1cKQEAg LTQxNiw4ICs0MjQsOCBAQCB2b2lkIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OnZh CiBib29sIFdlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6Om1ha2VDb250ZXh0Q3VycmVu dCgpCiB7CiAjaWYgT1MoV0lORE9XUykKLSAgICBpZiAod2dsR2V0Q3VycmVudENvbnRleHQoKSAh PSBtX2NvbnRleHRPYmopCi0gICAgICAgIGlmICh3Z2xNYWtlQ3VycmVudChtX2NhbnZhc0RDLCBt X2NvbnRleHRPYmopKQorICAgIGlmICh3Z2xld0dldEN1cnJlbnRDb250ZXh0KCkgIT0gbV9jb250 ZXh0T2JqKQorICAgICAgICBpZiAod2dsZXdNYWtlQ3VycmVudChtX2NhbnZhc0RDLCBtX2NvbnRl eHRPYmopKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAjZWxpZiBQTEFURk9STShDRykKICAg ICBpZiAoQ0dMR2V0Q3VycmVudENvbnRleHQoKSAhPSBtX2NvbnRleHRPYmopCkluZGV4OiBXZWJL aXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuaA0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0 SW1wbC5oCShyZXZpc2lvbiA2MjE5MikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhp Y3NDb250ZXh0M0REZWZhdWx0SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw5IEBA CiAjZW5kaWYKIAogI2luY2x1ZGUgIkdML2dsZXcuaCIKKyNpZiBPUyhXSU5ET1dTKQorI2luY2x1 ZGUgIkdML3dnbGV3LmgiCisjZW5kaWYKIAogI2lmIFBMQVRGT1JNKENHKQogI2luY2x1ZGUgPE9w ZW5HTC9PcGVuR0wuaD4K