231430 2021-10-08 07:40:10 -0700 [WPE][Qt] API export fixes 2021-10-08 09:23:00 -0700 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 231434 222860 1 pnormand pnormand bugs-noreply commit-queue mcatanzaro oldest_to_newest 1802041 0 pnormand 2021-10-08 07:40:10 -0700 Issues detected in https://bugs.webkit.org/show_bug.cgi?id=222860 1802044 1 440610 pnormand 2021-10-08 07:42:44 -0700 Created attachment 440610 Patch 1802073 2 ews-feeder 2021-10-08 08:33:28 -0700 Committed r283802 (242695@main): <https://commits.webkit.org/242695@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440610. 1802090 3 mcatanzaro 2021-10-08 08:56:32 -0700 commit-queue would be a lot more useful if it actually failed when the build is broken. :( 1802093 4 commit-queue 2021-10-08 08:57:32 -0700 Re-opened since this is blocked by bug 231434 1802099 5 mcatanzaro 2021-10-08 09:00:12 -0700 Closing this again. I'm going to revert only the change to TextChecker since the QtWPE API changes are all fine. We can figure out what's going wrong with TextChecker in bug #222860. FWIW the error is: GenerateTAPI /Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/WebKit.tbd normal x86_64 cd /Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/Source/WebKit export PATH="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin:/Applications/Xcode.app/Contents/Developer/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/tapi installapi -verify-against /Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/WebKit --verify-mode=Pedantic -target x86_64-apple-ios14.5-simulator -install_name /System/Library/Frameworks/WebKit.framework/WebKit -compatibility_version 1 -current_version 613.1.5 -reexport_framework WebKitLegacy -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.5.sdk -F/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator -F/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/Source/WebKit/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/14 -iframework /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.5.sdk/System/Library/PrivateFrameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.5.sdk/System/Library/Frameworks -L/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator -L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.5.sdk/System/Library/PrivateFrameworks/WebCore.framework/Frameworks -I/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/include -I/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/usr/local/include -I/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebCore.framework/PrivateHeaders/ForwardingHeaders -I/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/DerivedSources/WebKit2 -I/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/usr/local/include/WebKitAdditions -I/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.5.sdk/usr/local/include/WebKitAdditions -I/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/usr/local/include/webrtc -I/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.5.sdk/usr/local/include/webrtc -I/Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/Source/WebKit -DNDEBUG -DENABLE_EXPERIMENTAL_FEATURES -DHAVE_CORE_PREDICTION -DENABLE_LOWER_FORMATREADERBUNDLE_CODESIGNING_REQUIREMENTS -DFRAMEWORK_NAME=WebKit -x objective-c++ -std=gnu++1z -fno-rtti -DRELEASE_WITHOUT_OPTIMIZATIONS -reexport_install_name /System/Library/PrivateFrameworks/WebKitLegacy.framework/WebKitLegacy -extra-private-header /Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/Source/WebKit/Platform/ExtraPrivateSymbolsForTAPI.h -extra-public-header /Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/Source/WebKit/Platform/ExtraPublicSymbolsForTAPI.h -exclude-private-header /Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/PrivateHeaders/NSURLDownloadSPI.h /Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator /WebKit.framework -o /Volumes/Data/worker/iOS-14-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/WebKit.tbd warning: reexport_install_name is deprecated, use reexport_framework reexport_l or reexport_library error: headers don't have symbol '__ZN6WebKit11TextChecker33setContinuousSpellCheckingEnabledEb' 1802106 6 440610 mcatanzaro 2021-10-08 09:04:19 -0700 Comment on attachment 440610 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440610&action=review > Source/WebKit/UIProcess/TextChecker.h:31 > +#include <WebKit/WKDeclarationSpecifiers.h> Should be: #include "WKDeclarationSpecifiers.h" That said, I doubt that would make any difference for the build failure. 1802110 7 mcatanzaro 2021-10-08 09:06:03 -0700 (In reply to Michael Catanzaro from comment #5) > error: headers don't have symbol > '__ZN6WebKit11TextChecker33setContinuousSpellCheckingEnabledEb' Maybe it's checking to ensure no functions are exported except those declared in public headers? That is pretty strict.... 1802115 8 pnormand 2021-10-08 09:12:48 -0700 (In reply to Michael Catanzaro from comment #3) > commit-queue would be a lot more useful if it actually failed when the build > is broken. :( Yeah, what happened? I'm confused, if this broke some apple builds why did the patch land? 1802118 9 mcatanzaro 2021-10-08 09:23:00 -0700 commit-queue does not wait for the EWS builders, that's what happened. 440610 2021-10-08 07:42:44 -0700 2021-10-08 08:48:26 -0700 Patch bug-231430-20211008074243.patch text/plain 11602 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNjZDEyYWZlZTAyMWQ5OGRj MGFjMzAwZmJhMDkyZThhYTk1OWM1YjcuLmU0ZmIzZjgyYmQwYjc1NWE3MGY0ZjZkMzc0YWYwOTAy ODYyYTJiZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMTAtMDggIFBoaWxpcHBl IE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtXUEVdW1F0XSBBUEkg ZXhwb3J0IGZpeGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzE0MzAKKworICAgICAgICBSZXZpZXdlZCBieSBNaWNoYWVsIENhdGFuemFyby4KKwor ICAgICAgICBSZW1vdmUgaW50ZXJuYWwgV2ViS2l0IEFQSSAoR1JlZlB0cikgZnJvbSB0aGUgcHVi bGljIFF0V1BFIEFQSSwgYW5kIGV4cG9ydCBjbGFzc2VzIGV4cG9zaW5nCisgICAgICAgIHRoZSBw dWJsaWMgUXRXUEUgQVBJLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRW aWV3LmNwcDoKKyAgICAgICAgKFdQRVF0Vmlldzo6fldQRVF0Vmlldyk6CisgICAgICAgIChXUEVR dFZpZXc6OmNyZWF0ZVdlYlZpZXcpOgorICAgICAgICAoV1BFUXRWaWV3Ojp1cmwgY29uc3QpOgor ICAgICAgICAoV1BFUXRWaWV3OjpzZXRVcmwpOgorICAgICAgICAoV1BFUXRWaWV3Ojpsb2FkUHJv Z3Jlc3MgY29uc3QpOgorICAgICAgICAoV1BFUXRWaWV3Ojp0aXRsZSBjb25zdCk6CisgICAgICAg IChXUEVRdFZpZXc6OmNhbkdvQmFjayBjb25zdCk6CisgICAgICAgIChXUEVRdFZpZXc6OmlzTG9h ZGluZyBjb25zdCk6CisgICAgICAgIChXUEVRdFZpZXc6OmNhbkdvRm9yd2FyZCBjb25zdCk6Cisg ICAgICAgIChXUEVRdFZpZXc6OmdvQmFjayk6CisgICAgICAgIChXUEVRdFZpZXc6OmdvRm9yd2Fy ZCk6CisgICAgICAgIChXUEVRdFZpZXc6OnJlbG9hZCk6CisgICAgICAgIChXUEVRdFZpZXc6OnN0 b3ApOgorICAgICAgICAoV1BFUXRWaWV3Ojpsb2FkSHRtbCk6CisgICAgICAgIChXUEVRdFZpZXc6 OnJ1bkphdmFTY3JpcHQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmll dy5oOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKFdQRVF0Vmlldzo6dHJpZ2dlclVw ZGF0ZSk6IERlbGV0ZWQuCisgICAgICAgIChXUEVRdFZpZXc6OmVycm9yT2NjdXJlZCBjb25zdCk6 IERlbGV0ZWQuCisgICAgICAgIChXUEVRdFZpZXc6OnNldEVycm9yT2NjdXJlZCk6IERlbGV0ZWQu CisgICAgICAgICogVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3TG9hZFJlcXVlc3QuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvVGV4dENoZWNrZXIuaDoKKwogMjAyMS0xMC0wOCAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQmluZCB0aGUgbnVtYmVyIG9m IFdlYlJUQyBzb2NrZXRzIG9wZW5lZCBwZXIgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuY3BwCmluZGV4IDNlNDVkZTBkOTdiMWE1Y2Iz NWI0YTQyNjQyNjJjYWYyNGU2NzI3MjUuLmY3NTNmZTIzZDAxMTMwNTNhYmFjNzA5NjdjOGM3NzNh MzE2ZjQ5NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQv V1BFUXRWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQ RVF0Vmlldy5jcHAKQEAgLTU4LDExICs1OCwxNCBAQCBXUEVRdFZpZXc6OldQRVF0VmlldyhRUXVp Y2tJdGVtKiBwYXJlbnQpCiAKIFdQRVF0Vmlldzo6fldQRVF0VmlldygpCiB7Ci0gICAgZ19zaWdu YWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKG1fd2ViVmlldy5nZXQoKSwgcmVpbnRlcnBy ZXRfY2FzdDxncG9pbnRlcj4obm90aWZ5VXJsQ2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7Ci0gICAg Z19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKG1fd2ViVmlldy5nZXQoKSwgcmVp bnRlcnByZXRfY2FzdDxncG9pbnRlcj4obm90aWZ5VGl0bGVDaGFuZ2VkQ2FsbGJhY2spLCB0aGlz KTsKLSAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMobV93ZWJWaWV3Lmdl dCgpLCByZWludGVycHJldF9jYXN0PGdwb2ludGVyPihub3RpZnlMb2FkQ2hhbmdlZENhbGxiYWNr KSwgdGhpcyk7Ci0gICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKG1fd2Vi Vmlldy5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxncG9pbnRlcj4obm90aWZ5TG9hZEZhaWxlZENh bGxiYWNrKSwgdGhpcyk7Ci0gICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5j KG1fd2ViVmlldy5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxncG9pbnRlcj4obm90aWZ5TG9hZFBy b2dyZXNzQ2FsbGJhY2spLCB0aGlzKTsKKyAgICBpZiAobV93ZWJWaWV3KSB7CisgICAgICAgIGdf c2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVuYyhtX3dlYlZpZXcsIHJlaW50ZXJwcmV0 X2Nhc3Q8Z3BvaW50ZXI+KG5vdGlmeVVybENoYW5nZWRDYWxsYmFjayksIHRoaXMpOworICAgICAg ICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMobV93ZWJWaWV3LCByZWludGVy cHJldF9jYXN0PGdwb2ludGVyPihub3RpZnlUaXRsZUNoYW5nZWRDYWxsYmFjayksIHRoaXMpOwor ICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMobV93ZWJWaWV3LCBy ZWludGVycHJldF9jYXN0PGdwb2ludGVyPihub3RpZnlMb2FkQ2hhbmdlZENhbGxiYWNrKSwgdGhp cyk7CisgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVuYyhtX3dlYlZp ZXcsIHJlaW50ZXJwcmV0X2Nhc3Q8Z3BvaW50ZXI+KG5vdGlmeUxvYWRGYWlsZWRDYWxsYmFjayks IHRoaXMpOworICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMobV93 ZWJWaWV3LCByZWludGVycHJldF9jYXN0PGdwb2ludGVyPihub3RpZnlMb2FkUHJvZ3Jlc3NDYWxs YmFjayksIHRoaXMpOworICAgICAgICBnX29iamVjdF91bnJlZihtX3dlYlZpZXcpOworICAgIH0K IH0KIAogdm9pZCBXUEVRdFZpZXc6Omdlb21ldHJ5Q2hhbmdlZChjb25zdCBRUmVjdEYmIG5ld0dl b21ldHJ5LCBjb25zdCBRUmVjdEYmKQpAQCAtMTAxLDIyICsxMDQsMjIgQEAgdm9pZCBXUEVRdFZp ZXc6OmNyZWF0ZVdlYlZpZXcoKQogICAgIG1fYmFja2VuZCA9IGJhY2tlbmQuZ2V0KCk7CiAgICAg YXV0byBzZXR0aW5ncyA9IGFkb3B0R1JlZih3ZWJraXRfc2V0dGluZ3NfbmV3X3dpdGhfc2V0dGlu Z3MoImVuYWJsZS1kZXZlbG9wZXItZXh0cmFzIiwgVFJVRSwKICAgICAgICAgImVuYWJsZS13ZWJn bCIsIFRSVUUsICJlbmFibGUtbWVkaWFzb3VyY2UiLCBUUlVFLCBudWxscHRyKSk7Ci0gICAgbV93 ZWJWaWV3ID0gYWRvcHRHUmVmKFdFQktJVF9XRUJfVklFVyhnX29iamVjdF9uZXcoV0VCS0lUX1RZ UEVfV0VCX1ZJRVcsCisgICAgbV93ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKGdfb2JqZWN0X25l dyhXRUJLSVRfVFlQRV9XRUJfVklFVywKICAgICAgICAgImJhY2tlbmQiLCB3ZWJraXRfd2ViX3Zp ZXdfYmFja2VuZF9uZXcobV9iYWNrZW5kLT5iYWNrZW5kKCksIFtdKGdwb2ludGVyIGRhdGEpIHsK ICAgICAgICAgICAgIGRlbGV0ZSBzdGF0aWNfY2FzdDxXUEVRdFZpZXdCYWNrZW5kKj4oZGF0YSk7 CiAgICAgICAgIH0sIGJhY2tlbmQucmVsZWFzZSgpKSwKLSAgICAgICAgInNldHRpbmdzIiwgc2V0 dGluZ3MuZ2V0KCksIG51bGxwdHIpKSk7CisgICAgICAgICJzZXR0aW5ncyIsIHNldHRpbmdzLmdl dCgpLCBudWxscHRyKSk7CiAKLSAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV93ZWJWaWV3 LmdldCgpLCAibm90aWZ5Ojp1cmkiLCBHX0NBTExCQUNLKG5vdGlmeVVybENoYW5nZWRDYWxsYmFj ayksIHRoaXMpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX3dlYlZpZXcuZ2V0KCks ICJub3RpZnk6OnRpdGxlIiwgR19DQUxMQkFDSyhub3RpZnlUaXRsZUNoYW5nZWRDYWxsYmFjayks IHRoaXMpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX3dlYlZpZXcuZ2V0KCksICJu b3RpZnk6OmVzdGltYXRlZC1sb2FkLXByb2dyZXNzIiwgR19DQUxMQkFDSyhub3RpZnlMb2FkUHJv Z3Jlc3NDYWxsYmFjayksIHRoaXMpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJWaWV3Lmdl dCgpLCAibG9hZC1jaGFuZ2VkIiwgR19DQUxMQkFDSyhub3RpZnlMb2FkQ2hhbmdlZENhbGxiYWNr KSwgdGhpcyk7Ci0gICAgZ19zaWduYWxfY29ubmVjdChtX3dlYlZpZXcuZ2V0KCksICJsb2FkLWZh aWxlZCIsIEdfQ0FMTEJBQ0sobm90aWZ5TG9hZEZhaWxlZENhbGxiYWNrKSwgdGhpcyk7CisgICAg Z19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1fd2ViVmlldywgIm5vdGlmeTo6dXJpIiwgR19DQUxM QkFDSyhub3RpZnlVcmxDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKKyAgICBnX3NpZ25hbF9jb25u ZWN0X3N3YXBwZWQobV93ZWJWaWV3LCAibm90aWZ5Ojp0aXRsZSIsIEdfQ0FMTEJBQ0sobm90aWZ5 VGl0bGVDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBw ZWQobV93ZWJWaWV3LCAibm90aWZ5Ojplc3RpbWF0ZWQtbG9hZC1wcm9ncmVzcyIsIEdfQ0FMTEJB Q0sobm90aWZ5TG9hZFByb2dyZXNzQ2FsbGJhY2spLCB0aGlzKTsKKyAgICBnX3NpZ25hbF9jb25u ZWN0KG1fd2ViVmlldywgImxvYWQtY2hhbmdlZCIsIEdfQ0FMTEJBQ0sobm90aWZ5TG9hZENoYW5n ZWRDYWxsYmFjayksIHRoaXMpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJWaWV3LCAibG9h ZC1mYWlsZWQiLCBHX0NBTExCQUNLKG5vdGlmeUxvYWRGYWlsZWRDYWxsYmFjayksIHRoaXMpOwog CiAgICAgaWYgKCFtX3VybC5pc0VtcHR5KCkpCi0gICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2Fk X3VyaShtX3dlYlZpZXcuZ2V0KCksIG1fdXJsLnRvU3RyaW5nKCkudG9VdGY4KCkuY29uc3REYXRh KCkpOworICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkobV93ZWJWaWV3LCBtX3VybC50 b1N0cmluZygpLnRvVXRmOCgpLmNvbnN0RGF0YSgpKTsKICAgICBlbHNlIGlmICghbV9odG1sLmlz RW1wdHkoKSkKLSAgICAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbChtX3dlYlZpZXcuZ2V0 KCksIG1faHRtbC50b1V0ZjgoKS5jb25zdERhdGEoKSwgbV9iYXNlVXJsLnRvU3RyaW5nKCkudG9V dGY4KCkuY29uc3REYXRhKCkpOworICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sKG1f d2ViVmlldywgbV9odG1sLnRvVXRmOCgpLmNvbnN0RGF0YSgpLCBtX2Jhc2VVcmwudG9TdHJpbmco KS50b1V0ZjgoKS5jb25zdERhdGEoKSk7CiAKICAgICBRX0VNSVQgd2ViVmlld0NyZWF0ZWQoKTsK IH0KQEAgLTIwNCw3ICsyMDcsNyBAQCBRVXJsIFdQRVF0Vmlldzo6dXJsKCkgY29uc3QKICAgICBp ZiAoIW1fd2ViVmlldykKICAgICAgICAgcmV0dXJuIG1fdXJsOwogCi0gICAgY29uc3QgZ2NoYXIq IHVyaSA9IHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKG1fd2ViVmlldy5nZXQoKSk7CisgICAgY29u c3QgZ2NoYXIqIHVyaSA9IHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKG1fd2ViVmlldyk7CiAgICAg cmV0dXJuIHVyaSA/IFFVcmwoUVN0cmluZyh1cmkpKSA6IG1fdXJsOwogfQogCkBAIC0yMjcsNyAr MjMwLDcgQEAgdm9pZCBXUEVRdFZpZXc6OnNldFVybChjb25zdCBRVXJsJiB1cmwpCiAgICAgbV9l cnJvck9jY3VyZWQgPSBmYWxzZTsKICAgICBtX3VybCA9IHVybDsKICAgICBpZiAobV93ZWJWaWV3 KQotICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkobV93ZWJWaWV3LmdldCgpLCBtX3Vy bC50b1N0cmluZygpLnRvVXRmOCgpLmNvbnN0RGF0YSgpKTsKKyAgICAgICAgd2Via2l0X3dlYl92 aWV3X2xvYWRfdXJpKG1fd2ViVmlldywgbV91cmwudG9TdHJpbmcoKS50b1V0ZjgoKS5jb25zdERh dGEoKSk7CiB9CiAKIC8qIQpAQCAtMjQyLDcgKzI0NSw3IEBAIGludCBXUEVRdFZpZXc6OmxvYWRQ cm9ncmVzcygpIGNvbnN0CiAgICAgaWYgKCFtX3dlYlZpZXcpCiAgICAgICAgIHJldHVybiAwOwog Ci0gICAgcmV0dXJuIHdlYmtpdF93ZWJfdmlld19nZXRfZXN0aW1hdGVkX2xvYWRfcHJvZ3Jlc3Mo bV93ZWJWaWV3LmdldCgpKSAqIDEwMDsKKyAgICByZXR1cm4gd2Via2l0X3dlYl92aWV3X2dldF9l c3RpbWF0ZWRfbG9hZF9wcm9ncmVzcyhtX3dlYlZpZXcpICogMTAwOwogfQogCiAvKiEKQEAgLTI1 Niw3ICsyNTksNyBAQCBRU3RyaW5nIFdQRVF0Vmlldzo6dGl0bGUoKSBjb25zdAogICAgIGlmICgh bV93ZWJWaWV3KQogICAgICAgICByZXR1cm4gIiI7CiAKLSAgICByZXR1cm4gd2Via2l0X3dlYl92 aWV3X2dldF90aXRsZShtX3dlYlZpZXcuZ2V0KCkpOworICAgIHJldHVybiB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X3RpdGxlKG1fd2ViVmlldyk7CiB9CiAKIC8qIQpAQCAtMjcwLDcgKzI3Myw3IEBAIGJv b2wgV1BFUXRWaWV3OjpjYW5Hb0JhY2soKSBjb25zdAogICAgIGlmICghbV93ZWJWaWV3KQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gd2Via2l0X3dlYl92aWV3X2Nhbl9nb19i YWNrKG1fd2ViVmlldy5nZXQoKSk7CisgICAgcmV0dXJuIHdlYmtpdF93ZWJfdmlld19jYW5fZ29f YmFjayhtX3dlYlZpZXcpOwogfQogCiAvKiEKQEAgLTMwMSw3ICszMDQsNyBAQCBib29sIFdQRVF0 Vmlldzo6aXNMb2FkaW5nKCkgY29uc3QKICAgICBpZiAoIW1fd2ViVmlldykKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIHdlYmtpdF93ZWJfdmlld19pc19sb2FkaW5nKG1fd2Vi Vmlldy5nZXQoKSk7CisgICAgcmV0dXJuIHdlYmtpdF93ZWJfdmlld19pc19sb2FkaW5nKG1fd2Vi Vmlldyk7CiB9CiAKIC8qIQpAQCAtMzE1LDcgKzMxOCw3IEBAIGJvb2wgV1BFUXRWaWV3OjpjYW5H b0ZvcndhcmQoKSBjb25zdAogICAgIGlmICghbV93ZWJWaWV3KQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICByZXR1cm4gd2Via2l0X3dlYl92aWV3X2Nhbl9nb19mb3J3YXJkKG1fd2ViVmll dy5nZXQoKSk7CisgICAgcmV0dXJuIHdlYmtpdF93ZWJfdmlld19jYW5fZ29fZm9yd2FyZChtX3dl YlZpZXcpOwogfQogCiAvKiEKQEAgLTMyNiw3ICszMjksNyBAQCBib29sIFdQRVF0Vmlldzo6Y2Fu R29Gb3J3YXJkKCkgY29uc3QKIHZvaWQgV1BFUXRWaWV3Ojpnb0JhY2soKQogewogICAgIGlmICht X3dlYlZpZXcpCi0gICAgICAgIHdlYmtpdF93ZWJfdmlld19nb19iYWNrKG1fd2ViVmlldy5nZXQo KSk7CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19nb19iYWNrKG1fd2ViVmlldyk7CiB9CiAKIC8q IQpAQCAtMzM3LDcgKzM0MCw3IEBAIHZvaWQgV1BFUXRWaWV3Ojpnb0JhY2soKQogdm9pZCBXUEVR dFZpZXc6OmdvRm9yd2FyZCgpCiB7CiAgICAgaWYgKG1fd2ViVmlldykKLSAgICAgICAgd2Via2l0 X3dlYl92aWV3X2dvX2ZvcndhcmQobV93ZWJWaWV3LmdldCgpKTsKKyAgICAgICAgd2Via2l0X3dl Yl92aWV3X2dvX2ZvcndhcmQobV93ZWJWaWV3KTsKIH0KIAogLyohCkBAIC0zNDgsNyArMzUxLDcg QEAgdm9pZCBXUEVRdFZpZXc6OmdvRm9yd2FyZCgpCiB2b2lkIFdQRVF0Vmlldzo6cmVsb2FkKCkK IHsKICAgICBpZiAobV93ZWJWaWV3KQotICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfcmVsb2FkKG1f d2ViVmlldy5nZXQoKSk7CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19yZWxvYWQobV93ZWJWaWV3 KTsKIH0KIAogLyohCkBAIC0zNTksNyArMzYyLDcgQEAgdm9pZCBXUEVRdFZpZXc6OnJlbG9hZCgp CiB2b2lkIFdQRVF0Vmlldzo6c3RvcCgpCiB7CiAgICAgaWYgKG1fd2ViVmlldykKLSAgICAgICAg d2Via2l0X3dlYl92aWV3X3N0b3BfbG9hZGluZyhtX3dlYlZpZXcuZ2V0KCkpOworICAgICAgICB3 ZWJraXRfd2ViX3ZpZXdfc3RvcF9sb2FkaW5nKG1fd2ViVmlldyk7CiB9CiAKIC8qIQpAQCAtMzg3 LDcgKzM5MCw3IEBAIHZvaWQgV1BFUXRWaWV3Ojpsb2FkSHRtbChjb25zdCBRU3RyaW5nJiBodG1s LCBjb25zdCBRVXJsJiBiYXNlVXJsKQogICAgIG1fZXJyb3JPY2N1cmVkID0gZmFsc2U7CiAKICAg ICBpZiAobV93ZWJWaWV3KQotICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sKG1fd2Vi Vmlldy5nZXQoKSwgaHRtbC50b1V0ZjgoKS5jb25zdERhdGEoKSwgYmFzZVVybC50b1N0cmluZygp LnRvVXRmOCgpLmNvbnN0RGF0YSgpKTsKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRt bChtX3dlYlZpZXcsIGh0bWwudG9VdGY4KCkuY29uc3REYXRhKCksIGJhc2VVcmwudG9TdHJpbmco KS50b1V0ZjgoKS5jb25zdERhdGEoKSk7CiB9CiAKIHN0cnVjdCBKYXZhc2NyaXB0Q2FsbGJhY2tE YXRhIHsKQEAgLTQ1MSw3ICs0NTQsNyBAQCBzdGF0aWMgdm9pZCBqc0FzeW5jUmVhZHlDYWxsYmFj ayhHT2JqZWN0KiBvYmplY3QsIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRlcgogdm9pZCBX UEVRdFZpZXc6OnJ1bkphdmFTY3JpcHQoY29uc3QgUVN0cmluZyYgc2NyaXB0LCBjb25zdCBRSlNW YWx1ZSYgY2FsbGJhY2spCiB7CiAgICAgc3RkOjp1bmlxdWVfcHRyPEphdmFzY3JpcHRDYWxsYmFj a0RhdGE+IGRhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPEphdmFzY3JpcHRDYWxsYmFja0RhdGE+KGNh bGxiYWNrLCBRUG9pbnRlcjxXUEVRdFZpZXc+KHRoaXMpKTsKLSAgICB3ZWJraXRfd2ViX3ZpZXdf cnVuX2phdmFzY3JpcHQobV93ZWJWaWV3LmdldCgpLCBzY3JpcHQudG9VdGY4KCkuY29uc3REYXRh KCksIG51bGxwdHIsIGpzQXN5bmNSZWFkeUNhbGxiYWNrLCBkYXRhLnJlbGVhc2UoKSk7CisgICAg d2Via2l0X3dlYl92aWV3X3J1bl9qYXZhc2NyaXB0KG1fd2ViVmlldywgc2NyaXB0LnRvVXRmOCgp LmNvbnN0RGF0YSgpLCBudWxscHRyLCBqc0FzeW5jUmVhZHlDYWxsYmFjaywgZGF0YS5yZWxlYXNl KCkpOwogfQogCiB2b2lkIFdQRVF0Vmlldzo6bW91c2VQcmVzc0V2ZW50KFFNb3VzZUV2ZW50KiBl dmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BF UXRWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlldy5o CmluZGV4IDg3ZWM1MjczNTJiMTBkYTFlMWQ3Y2FlYzc2ZmQzZDU4OTEwYTQxNGUuLmY3OTUzNTU1 MDgzOWM4ZDI3MDNjZDYwMWM2N2ZlNjVjOTkwYzgxYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuaApAQCAtMzIsNyArMzIsNyBAQAogY2xhc3Mg V1BFUXRWaWV3QmFja2VuZDsKIGNsYXNzIFdQRVF0Vmlld0xvYWRSZXF1ZXN0OwogCi1jbGFzcyBX UEVRdFZpZXcgOiBwdWJsaWMgUVF1aWNrSXRlbSB7CitjbGFzcyBRX0RFQ0xfRVhQT1JUIFdQRVF0 VmlldyA6IHB1YmxpYyBRUXVpY2tJdGVtIHsKICAgICBRX09CSkVDVAogICAgIFFfRElTQUJMRV9D T1BZKFdQRVF0VmlldykKICAgICBRX1BST1BFUlRZKFFVcmwgdXJsIFJFQUQgdXJsIFdSSVRFIHNl dFVybCBOT1RJRlkgdXJsQ2hhbmdlZCkKQEAgLTExMCw3ICsxMTAsNyBAQCBwcml2YXRlOgogICAg IHN0YXRpYyB2b2lkIG5vdGlmeUxvYWRDaGFuZ2VkQ2FsbGJhY2soV2ViS2l0V2ViVmlldyosIFdl YktpdExvYWRFdmVudCwgV1BFUXRWaWV3Kik7CiAgICAgc3RhdGljIHZvaWQgbm90aWZ5TG9hZEZh aWxlZENhbGxiYWNrKFdlYktpdFdlYlZpZXcqLCBXZWJLaXRMb2FkRXZlbnQsIGNvbnN0IGdjaGFy KiBmYWlsaW5nVVJJLCBHRXJyb3IqLCBXUEVRdFZpZXcqKTsKIAotICAgIEdSZWZQdHI8V2ViS2l0 V2ViVmlldz4gbV93ZWJWaWV3OworICAgIFdlYktpdFdlYlZpZXcqIG1fd2ViVmlldyB7IG51bGxw dHIgfTsKICAgICBRVXJsIG1fdXJsOwogICAgIFFTdHJpbmcgbV9odG1sOwogICAgIFFVcmwgbV9i YXNlVXJsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9X UEVRdFZpZXdMb2FkUmVxdWVzdC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9x dC9XUEVRdFZpZXdMb2FkUmVxdWVzdC5oCmluZGV4IGFhZDBlMDY3ZTZjODI5OWYxNTY1Y2QxZDkx ZDg4YjNiZDFiYWUxZGEuLjIyMDdkZDZhODA4MGJhMDE3NDM4ZThjZmE1YWVlYjFmOGVkNGRlYjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3 TG9hZFJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQ RVF0Vmlld0xvYWRSZXF1ZXN0LmgKQEAgLTI2LDcgKzI2LDcgQEAKIAogY2xhc3MgV1BFUXRWaWV3 TG9hZFJlcXVlc3RQcml2YXRlOwogCi1jbGFzcyBXUEVRdFZpZXdMb2FkUmVxdWVzdCA6IHB1Ymxp YyBRT2JqZWN0IHsKK2NsYXNzIFFfREVDTF9FWFBPUlQgV1BFUXRWaWV3TG9hZFJlcXVlc3QgOiBw dWJsaWMgUU9iamVjdCB7CiAgICAgUV9PQkpFQ1QKICAgICBRX1BST1BFUlRZKFFVcmwgdXJsIFJF QUQgdXJsKQogICAgIFFfUFJPUEVSVFkoV1BFUXRWaWV3OjpMb2FkU3RhdHVzIHN0YXR1cyBSRUFE IHN0YXR1cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1RleHRDaGVja2Vy LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9UZXh0Q2hlY2tlci5oCmluZGV4IDU4YzNhZmUz NzM5M2Q4MDU1MDFlYTQ2MDE2YTVkMGMyOTM3NzAzZTQuLmI1NzNlYTQ2ZDBmZDdkZDU3OTZlNTdi YzRlNWM3YzEwYjg3NzUyOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Rl eHRDaGVja2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVGV4dENoZWNrZXIuaApA QCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIlRleHRDaGVja2VyQ29tcGxldGlvbi5oIgogI2lu Y2x1ZGUgPFdlYkNvcmUvRWRpdG9yQ2xpZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9UZXh0Q2hl Y2tlckNsaWVudC5oPgorI2luY2x1ZGUgPFdlYktpdC9XS0RlY2xhcmF0aW9uU3BlY2lmaWVycy5o PgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtNDEsNyArNDIsNyBAQCBwdWJsaWM6CiAgICAg c3RhdGljIGNvbnN0IFRleHRDaGVja2VyU3RhdGUmIHN0YXRlKCk7CiAgICAgc3RhdGljIGJvb2wg aXNDb250aW51b3VzU3BlbGxDaGVja2luZ0FsbG93ZWQoKTsKIAotICAgIHN0YXRpYyBib29sIHNl dENvbnRpbnVvdXNTcGVsbENoZWNraW5nRW5hYmxlZChib29sKTsKKyAgICBXS19FWFBPUlQgc3Rh dGljIGJvb2wgc2V0Q29udGludW91c1NwZWxsQ2hlY2tpbmdFbmFibGVkKGJvb2wpOwogICAgIHN0 YXRpYyB2b2lkIHNldEdyYW1tYXJDaGVja2luZ0VuYWJsZWQoYm9vbCk7CiAgICAgCiAgICAgc3Rh dGljIHZvaWQgc2V0VGVzdGluZ01vZGUoYm9vbCk7Cg==