135500 2014-08-01 02:06:50 -0700 ARCify MiniBrowser 2014-08-02 09:01:35 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 thorton thorton andersca ap mitz sam simon.fraser oldest_to_newest 1026215 0 thorton 2014-08-01 02:06:50 -0700 ARC makes Cocoa memory management a good bit simpler. We can't use ARC in WebKit because we need to build 32-bit, but I don't see any reason MiniBrowser would have that requirement (hopefully somebody will chime in if they know why). 1026216 1 235883 thorton 2014-08-01 02:08:30 -0700 Created attachment 235883 patch 1026217 2 thorton 2014-08-01 02:08:42 -0700 I did this on top of https://bugs.webkit.org/show_bug.cgi?id=135499, so it won't apply. 1026242 3 mitz 2014-08-01 08:26:40 -0700 Seems appropriate to do with the WebKit2 parts of MiniBrowser, since the Modern WebKit API is only available with the modern Objective-C runtime. However, I think we should keep the Legacy WebKit parts working in 32-bit mode, as we have no other means to test it. 1026270 4 thorton 2014-08-01 10:52:09 -0700 That makes sense, and I think mix-and-match memory management is probably not a great idea, so let's not do this! Thanks, Dan! 1026461 5 235883 sam 2014-08-02 09:00:52 -0700 Comment on attachment 235883 patch View in context: https://bugs.webkit.org/attachment.cgi?id=235883&action=review > Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:341 > + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; > + CLANG_ENABLE_OBJC_ARC = YES; These should be in the .xcconfig files. 235883 2014-08-01 02:08:30 -0700 2014-08-02 09:01:35 -0700 patch arcbrowser.diff text/plain 9235 thorton ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhMmI1 OWM1Li4wNWMyMjE0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMzkgQEAKIDIwMTQtMDgtMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQVJDaWZ5IE1pbmlCcm93c2VyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU1MDAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL01p bmlCcm93c2VyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIEJ1aWxkIHdpdGgg QVJDIG9uLCBhbmQgZG9uJ3QgYnVpbGQgMzItYml0IE1pbmlCcm93c2VyLgorCisgICAgICAgICog TWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm06CisgICAgICAgICgtW0Jyb3dzZXJBcHBEZWxl Z2F0ZSBhd2FrZUZyb21OaWJdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRlIGFwcGxp Y2F0aW9uRGlkRmluaXNoTGF1bmNoaW5nOl0pOgorICAgICAgICAoLVtCcm93c2VyQXBwRGVsZWdh dGUgb3BlbkRvY3VtZW50Ol0pOgorICAgICAgICAoLVtCcm93c2VyQXBwRGVsZWdhdGUgbmV3V2lu ZG93Ol0pOiBEZWxldGVkLgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9TZXR0aW5nc0NvbnRy b2xsZXIubToKKyAgICAgICAgKC1bU2V0dGluZ3NDb250cm9sbGVyIF9hZGRJdGVtV2l0aFRpdGxl OmFjdGlvbjppbmRlbnRlZDpdKToKKyAgICAgICAgKC1bU2V0dGluZ3NDb250cm9sbGVyIF9hZGRI ZWFkZXJXaXRoVGl0bGU6XSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJX aW5kb3dDb250cm9sbGVyLm06CisgICAgICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVy IGRlYWxsb2NdKToKKyAgICAgICAgKC1bV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgcmVtb3Zl UmVpbnNlcnRXZWJWaWV3Ol0pOgorICAgICAgICAoLVtXSzFCcm93c2VyV2luZG93Q29udHJvbGxl ciB3aW5kb3dXaWxsQ2xvc2U6XSk6CisgICAgICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9s bGVyIHdlYlZpZXc6cnVuSmF2YVNjcmlwdEFsZXJ0UGFuZWxXaXRoTWVzc2FnZTppbml0aWF0ZWRC eUZyYW1lOl0pOgorICAgICAgICAoLVtXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciB3aW5kb3dT aG91bGRDbG9zZTpdKTogRGVsZXRlZC4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvV0syQnJv d3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRy b2xsZXIgZGVhbGxvY10pOgorICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBy ZW1vdmVSZWluc2VydFdlYlZpZXc6XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250 cm9sbGVyIHdpbmRvd1dpbGxDbG9zZTpdKToKKyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIgd2ViVmlldzpydW5KYXZhU2NyaXB0QWxlcnRQYW5lbFdpdGhNZXNzYWdlOmluaXRp YXRlZEJ5RnJhbWU6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJX aW5kb3dDb250cm9sbGVyIHdlYlZpZXc6cnVuSmF2YVNjcmlwdENvbmZpcm1QYW5lbFdpdGhNZXNz YWdlOmluaXRpYXRlZEJ5RnJhbWU6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dL MkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHdlYlZpZXc6cnVuSmF2YVNjcmlwdFRleHRJbnB1dFBh bmVsV2l0aFByb21wdDpkZWZhdWx0VGV4dDppbml0aWF0ZWRCeUZyYW1lOmNvbXBsZXRpb25IYW5k bGVyOl0pOgorICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBzaG93SGlkZVdl YlZpZXc6XSk6IERlbGV0ZWQuCisgICAgICAgIERvIHRoZSBhdXRvbWF0aWMgQVJDaWZpY2F0aW9u IGRhbmNlLgorCisyMDE0LTA4LTAxICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgorCiAgICAgICAgIE1ha2UgaXQgZWFzZXIgdG8gYWRkIHN3aXRjaGVzIHRvIE1pbmlCcm93 c2VyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU0 OTkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvTWluaUJyb3dzZXIueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvaiBiL1Rvb2xzL01pbmlCcm93c2VyL01pbmlCcm93c2VyLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKaW5kZXggNDE4YTExNC4uOTljZDg3ZSAxMDA2NDQKLS0tIGEvVG9v bHMvTWluaUJyb3dzZXIvTWluaUJyb3dzZXIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysg Yi9Ub29scy9NaW5pQnJvd3Nlci9NaW5pQnJvd3Nlci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CkBAIC0zMzcsNiArMzM3LDggQEAKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJ YmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVuY2UgPSAxQUZGRUY4MzE4NjBFRUZCMDBEQTQ2NUUgLyog TWluaUJyb3dzZXJCdW5kbGUueGNjb25maWcgKi87CiAJCQlidWlsZFNldHRpbmdzID0geworCQkJ CUFSQ0hTID0gIiQoQVJDSFNfU1RBTkRBUkRfNjRfQklUKSI7CisJCQkJQ0xBTkdfRU5BQkxFX09C SkNfQVJDID0gWUVTOwogCQkJCUlORk9QTElTVF9GSUxFID0gIiI7CiAJCQkJV1JBUFBFUl9FWFRF TlNJT04gPSB3a2J1bmRsZTsKIAkJCX07CkBAIC0zNDYsNiArMzQ4LDggQEAKIAkJCWlzYSA9IFhD QnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVuY2UgPSAxQUZG RUY4MzE4NjBFRUZCMDBEQTQ2NUUgLyogTWluaUJyb3dzZXJCdW5kbGUueGNjb25maWcgKi87CiAJ CQlidWlsZFNldHRpbmdzID0geworCQkJCUFSQ0hTID0gIiQoQVJDSFNfU1RBTkRBUkRfNjRfQklU KSI7CisJCQkJQ0xBTkdfRU5BQkxFX09CSkNfQVJDID0gWUVTOwogCQkJCUlORk9QTElTVF9GSUxF ID0gIiI7CiAJCQkJV1JBUFBFUl9FWFRFTlNJT04gPSB3a2J1bmRsZTsKIAkJCX07CkBAIC0zNTUs NiArMzU5LDggQEAKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNvbmZp Z3VyYXRpb25SZWZlcmVuY2UgPSBCQ0E4Q0JERjExRTU3OEEwMDA4MTJGQjcgLyogTWluaUJyb3dz ZXIueGNjb25maWcgKi87CiAJCQlidWlsZFNldHRpbmdzID0geworCQkJCUFSQ0hTID0gIiQoQVJD SFNfU1RBTkRBUkRfNjRfQklUKSI7CisJCQkJQ0xBTkdfRU5BQkxFX09CSkNfQVJDID0gWUVTOwog CQkJfTsKIAkJCW5hbWUgPSBEZWJ1ZzsKIAkJfTsKQEAgLTM2Miw2ICszNjgsOCBAQAogCQkJaXNh ID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9 IEJDQThDQkRGMTFFNTc4QTAwMDgxMkZCNyAvKiBNaW5pQnJvd3Nlci54Y2NvbmZpZyAqLzsKIAkJ CWJ1aWxkU2V0dGluZ3MgPSB7CisJCQkJQVJDSFMgPSAiJChBUkNIU19TVEFOREFSRF82NF9CSVQp IjsKKwkJCQlDTEFOR19FTkFCTEVfT0JKQ19BUkMgPSBZRVM7CiAJCQl9OwogCQkJbmFtZSA9IFJl bGVhc2U7CiAJCX07CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdh dGUubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tCmluZGV4IGNmNGI0NzQu LjgyNjAyYTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5t CisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tCkBAIC01NCw3ICs1NCw3 IEBAIC0gKHZvaWQpYXdha2VGcm9tTmliCiB7CiAgICAgTlNNZW51SXRlbSAqaXRlbSA9IFtbTlNN ZW51SXRlbSBhbGxvY10gaW5pdF07CiAgICAgW2l0ZW0gc2V0U3VibWVudTpbW1NldHRpbmdzQ29u dHJvbGxlciBzaGFyZWRdIG1lbnVdXTsKLSAgICBbW05TQXBwIG1haW5NZW51XSBpbnNlcnRJdGVt OltpdGVtIGF1dG9yZWxlYXNlXSBhdEluZGV4OltbTlNBcHAgbWFpbk1lbnVdIGluZGV4T2ZJdGVt V2l0aFRpdGxlOkAiRGVidWciXV07CisgICAgW1tOU0FwcCBtYWluTWVudV0gaW5zZXJ0SXRlbTpp dGVtIGF0SW5kZXg6W1tOU0FwcCBtYWluTWVudV0gaW5kZXhPZkl0ZW1XaXRoVGl0bGU6QCJEZWJ1 ZyJdXTsKIH0KIAogLSAoSUJBY3Rpb24pbmV3V2luZG93OihpZClzZW5kZXIKQEAgLTkyLDcgKzky LDYgQEAgLSAodm9pZClhcHBsaWNhdGlvbkRpZEZpbmlzaExhdW5jaGluZzooTlNOb3RpZmljYXRp b24gKilhTm90aWZpY2F0aW9uCiB7CiAgICAgV2ViSGlzdG9yeSAqd2ViSGlzdG9yeSA9IFtbV2Vi SGlzdG9yeSBhbGxvY10gaW5pdF07CiAgICAgW1dlYkhpc3Rvcnkgc2V0T3B0aW9uYWxTaGFyZWRI aXN0b3J5OndlYkhpc3RvcnldOwotICAgIFt3ZWJIaXN0b3J5IHJlbGVhc2VdOwogCiAgICAgW3Nl bGYgX3VwZGF0ZU5ld1dpbmRvd0tleUVxdWl2YWxlbnRzXTsKIApAQCAtMTI2LDcgKzEyNSw3IEBA IC0gKElCQWN0aW9uKW9wZW5Eb2N1bWVudDooaWQpc2VuZGVyCiAgICAgQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIgKmJyb3dzZXJXaW5kb3dDb250cm9sbGVyID0gW3NlbGYgZnJvbnRtb3N0QnJvd3Nl cldpbmRvd0NvbnRyb2xsZXJdOwogCiAgICAgaWYgKGJyb3dzZXJXaW5kb3dDb250cm9sbGVyKSB7 Ci0gICAgICAgIE5TT3BlblBhbmVsICpvcGVuUGFuZWwgPSBbW05TT3BlblBhbmVsIG9wZW5QYW5l bF0gcmV0YWluXTsKKyAgICAgICAgTlNPcGVuUGFuZWwgKm9wZW5QYW5lbCA9IFtOU09wZW5QYW5l bCBvcGVuUGFuZWxdOwogICAgICAgICBbb3BlblBhbmVsIGJlZ2luU2hlZXRNb2RhbEZvcldpbmRv dzpicm93c2VyV2luZG93Q29udHJvbGxlci53aW5kb3cgY29tcGxldGlvbkhhbmRsZXI6XihOU0lu dGVnZXIgcmVzdWx0KSB7CiAgICAgICAgICAgICBpZiAocmVzdWx0ICE9IE5TT0tCdXR0b24pCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFj L1NldHRpbmdzQ29udHJvbGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1NldHRpbmdzQ29u dHJvbGxlci5tCmluZGV4IGRiZTk1NWIuLmUxZWRmYmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlC cm93c2VyL21hYy9TZXR0aW5nc0NvbnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9t YWMvU2V0dGluZ3NDb250cm9sbGVyLm0KQEAgLTcyLDEzICs3MiwxMiBAQCAtICh2b2lkKV9hZGRJ dGVtV2l0aFRpdGxlOihOU1N0cmluZyAqKXRpdGxlIGFjdGlvbjooU0VMKWFjdGlvbiBpbmRlbnRl ZDooQk9PTClpbgogICAgIGlmIChpbmRlbnRlZCkKICAgICAgICAgW2l0ZW0gc2V0SW5kZW50YXRp b25MZXZlbDoxXTsKICAgICBbX21lbnUgYWRkSXRlbTppdGVtXTsKLSAgICBbaXRlbSByZWxlYXNl XTsKIH0KIAogLSAodm9pZClfYWRkSGVhZGVyV2l0aFRpdGxlOihOU1N0cmluZyAqKXRpdGxlCiB7 CiAgICAgW19tZW51IGFkZEl0ZW06W05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV1dOwotICAgIFtf bWVudSBhZGRJdGVtOltbW05TTWVudUl0ZW0gYWxsb2NdIGluaXRXaXRoVGl0bGU6dGl0bGUgYWN0 aW9uOm5pbCBrZXlFcXVpdmFsZW50OkAiIl0gYXV0b3JlbGVhc2VdXTsKKyAgICBbX21lbnUgYWRk SXRlbTpbW05TTWVudUl0ZW0gYWxsb2NdIGluaXRXaXRoVGl0bGU6dGl0bGUgYWN0aW9uOm5pbCBr ZXlFcXVpdmFsZW50OkAiIl1dOwogfQogCiAtICh2b2lkKV9wb3B1bGF0ZU1lbnUKZGlmZiAtLWdp dCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tIGIv VG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KaW5kZXgg NGRhNWM1ZC4uYjE3ZGVjNSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJy b3dzZXJXaW5kb3dDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJy b3dzZXJXaW5kb3dDb250cm9sbGVyLm0KQEAgLTU5LDkgKzU5LDcgQEAgLSAodm9pZClkZWFsbG9j CiAgICAgW193ZWJWaWV3IHNldEZyYW1lTG9hZERlbGVnYXRlOm5pbF07CiAgICAgW193ZWJWaWV3 IHNldFVJRGVsZWdhdGU6bmlsXTsKICAgICBbX3dlYlZpZXcgc2V0UmVzb3VyY2VMb2FkRGVsZWdh dGU6bmlsXTsKLSAgICBbX3dlYlZpZXcgcmVsZWFzZV07CiAKLSAgICBbc3VwZXIgZGVhbGxvY107 CiB9CiAKIC0gKHZvaWQpbG9hZFVSTFN0cmluZzooTlNTdHJpbmcgKil1cmxTdHJpbmcKQEAgLTg4 LDExICs4Niw5IEBAIC0gKElCQWN0aW9uKXNob3dIaWRlV2ViVmlldzooaWQpc2VuZGVyCiAtIChJ QkFjdGlvbilyZW1vdmVSZWluc2VydFdlYlZpZXc6KGlkKXNlbmRlcgogewogICAgIGlmIChbX3dl YlZpZXcgd2luZG93XSkgewotICAgICAgICBbX3dlYlZpZXcgcmV0YWluXTsKICAgICAgICAgW193 ZWJWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOyAKICAgICB9IGVsc2UgewogICAgICAgICBbY29u dGFpbmVyVmlldyBhZGRTdWJ2aWV3Ol93ZWJWaWV3XTsKLSAgICAgICAgW193ZWJWaWV3IHJlbGVh c2VdOwogICAgIH0KIH0KIApAQCAtMTYzLDcgKzE1OSw2IEBAIC0gKEJPT0wpd2luZG93U2hvdWxk Q2xvc2U6KGlkKXNlbmRlcgogLSAodm9pZCl3aW5kb3dXaWxsQ2xvc2U6KE5TTm90aWZpY2F0aW9u ICopbm90aWZpY2F0aW9uCiB7CiAgICAgWyhCcm93c2VyQXBwRGVsZWdhdGUgKilbTlNBcHAgZGVs ZWdhdGVdIGJyb3dzZXJXaW5kb3dXaWxsQ2xvc2U6c2VsZi53aW5kb3ddOwotICAgIFtzZWxmIGF1 dG9yZWxlYXNlXTsKIH0KIAogLSAodm9pZClhcHBsaWNhdGlvblRlcm1pbmF0aW5nCkBAIC0yOTMs NyArMjg4LDYgQEAgLSAodm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopc2VuZGVyIHJ1bkphdmFTY3Jp cHRBbGVydFBhbmVsV2l0aE1lc3NhZ2U6KE5TU3RyaW5nICoKICAgICBhbGVydC5pbmZvcm1hdGl2 ZVRleHQgPSBtZXNzYWdlOwogCiAgICAgW2FsZXJ0IHJ1bk1vZGFsXTsKLSAgICBbYWxlcnQgcmVs ZWFzZV07CiB9CiAKIEBlbmQKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJC cm93c2VyV2luZG93Q29udHJvbGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dz ZXJXaW5kb3dDb250cm9sbGVyLm0KaW5kZXggNDdkY2Q5Ny4uOTBlYWVlNiAxMDA2NDQKLS0tIGEv VG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KKysrIGIv VG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KQEAgLTgy LDEwICs4Miw2IEBAIC0gKHZvaWQpZGVhbGxvYwogICAgIAogICAgIFtwcm9ncmVzc0luZGljYXRv ciB1bmJpbmQ6TlNIaWRkZW5CaW5kaW5nXTsKICAgICBbcHJvZ3Jlc3NJbmRpY2F0b3IgdW5iaW5k Ok5TVmFsdWVCaW5kaW5nXTsKLQotICAgIFtfd2ViVmlldyByZWxlYXNlXTsKLQotICAgIFtzdXBl ciBkZWFsbG9jXTsKIH0KIAogLSAoSUJBY3Rpb24pZmV0Y2g6KGlkKXNlbmRlcgpAQCAtMTA0LDEz ICsxMDAsMTAgQEAgLSAoSUJBY3Rpb24pc2hvd0hpZGVXZWJWaWV3OihpZClzZW5kZXIKIAogLSAo SUJBY3Rpb24pcmVtb3ZlUmVpbnNlcnRXZWJWaWV3OihpZClzZW5kZXIKIHsKLSAgICBpZiAoW193 ZWJWaWV3IHdpbmRvd10pIHsKLSAgICAgICAgW193ZWJWaWV3IHJldGFpbl07CisgICAgaWYgKFtf d2ViVmlldyB3aW5kb3ddKQogICAgICAgICBbX3dlYlZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107 IAotICAgIH0gZWxzZSB7CisgICAgZWxzZQogICAgICAgICBbY29udGFpbmVyVmlldyBhZGRTdWJ2 aWV3Ol93ZWJWaWV3XTsKLSAgICAgICAgW193ZWJWaWV3IHJlbGVhc2VdOwotICAgIH0KIH0KIAog LSAoQk9PTCl2YWxpZGF0ZU1lbnVJdGVtOihOU01lbnVJdGVtICopbWVudUl0ZW0KQEAgLTIxOSw3 ICsyMTIsNiBAQCAtIChCT09MKXdpbmRvd1Nob3VsZENsb3NlOihpZClzZW5kZXIKIC0gKHZvaWQp d2luZG93V2lsbENsb3NlOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgogewogICAgIFso QnJvd3NlckFwcERlbGVnYXRlICopW05TQXBwIGRlbGVnYXRlXSBicm93c2VyV2luZG93V2lsbENs b3NlOnNlbGYud2luZG93XTsKLSAgICBbc2VsZiBhdXRvcmVsZWFzZV07CiB9CiAKIC0gKHZvaWQp YXBwbGljYXRpb25UZXJtaW5hdGluZwpAQCAtMzIxLDcgKzMxMyw2IEBAIC0gKHZvaWQpd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBydW5KYXZhU2NyaXB0QWxlcnRQYW5lbFdpdGhNZXNzYWdl OihOU1N0cmluCiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCiAg ICAgW2FsZXJ0IGJlZ2luU2hlZXRNb2RhbEZvcldpbmRvdzpzZWxmLndpbmRvdyBjb21wbGV0aW9u SGFuZGxlcjpedm9pZCAoTlNNb2RhbFJlc3BvbnNlIHJlc3BvbnNlKSB7CiAgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyKCk7Ci0gICAgICAgIFthbGVydCByZWxlYXNlXTsKICAgICB9XTsKICNlbmRp ZgogfQpAQCAtMzM5LDcgKzMzMCw2IEBAIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBydW5KYXZhU2NyaXB0Q29uZmlybVBhbmVsV2l0aE1lc3NhZ2U6KE5TU3RyCiAjaWYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCiAgICAgW2FsZXJ0IGJlZ2luU2hl ZXRNb2RhbEZvcldpbmRvdzpzZWxmLndpbmRvdyBjb21wbGV0aW9uSGFuZGxlcjpedm9pZCAoTlNN b2RhbFJlc3BvbnNlIHJlc3BvbnNlKSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHJlc3Bv bnNlID09IE5TQWxlcnRGaXJzdEJ1dHRvblJldHVybik7Ci0gICAgICAgIFthbGVydCByZWxlYXNl XTsKICAgICB9XTsKICNlbmRpZgogfQpAQCAtMzYyLDcgKzM1Miw2IEBAIC0gKHZvaWQpd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBydW5KYXZhU2NyaXB0VGV4dElucHV0UGFuZWxXaXRoUHJv bXB0OihOU1N0CiAgICAgW2FsZXJ0IGJlZ2luU2hlZXRNb2RhbEZvcldpbmRvdzpzZWxmLndpbmRv dyBjb21wbGV0aW9uSGFuZGxlcjpedm9pZCAoTlNNb2RhbFJlc3BvbnNlIHJlc3BvbnNlKSB7CiAg ICAgICAgIFtpbnB1dCB2YWxpZGF0ZUVkaXRpbmddOwogICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihyZXNwb25zZSA9PSBOU0FsZXJ0Rmlyc3RCdXR0b25SZXR1cm4gPyBbaW5wdXQgc3RyaW5nVmFs dWVdIDogbmlsKTsKLSAgICAgICAgW2FsZXJ0IHJlbGVhc2VdOwogICAgIH1dOwogI2VuZGlmCiB9 Cg==