209287 2020-03-19 09:44:39 -0700 Make the MediaSample::toJSONString method generic 2020-03-22 03:03:36 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand darin eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1631690 0 pnormand 2020-03-19 09:44:39 -0700 As the current Objc impl is cross-platform already, let's move it to the base class? 1631691 1 393988 pnormand 2020-03-19 09:46:25 -0700 Created attachment 393988 Patch 1631715 2 393988 eric.carlson 2020-03-19 10:17:29 -0700 Comment on attachment 393988 Patch r=me once the bots are happy 1632053 3 pnormand 2020-03-20 05:14:34 -0700 Ld /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/Release/TestWebKitAPI normal x86_64 cd /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/Tools/TestWebKitAPI export MACOSX_DEPLOYMENT_TARGET=10.14 /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -L/Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/Release -F/Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/Release -F/Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/Tools/TestWebKitAPI/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101400 -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/PrivateFrameworks -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/PrivateFrameworks -iframework /Application s/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Quartz.framework/Frameworks -filelist /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/TestWebKitAPI.build/Release/TestWebKitAPI.build/Objects-normal/x86_64/TestWebKitAPI.LinkFileList -Xlinker -rpath -Xlinker @loader_path -mmacosx-version-min=10.14 -Xlinker -object_path_lto -Xlinker /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/TestWebKitAPI.build/Release/TestWebKitAPI.build/Objects-normal/x86_64/TestWebKitAPI_lto.o -stdlib=libc++ -fobjc-link-runtime -Wl,-unexported_symbol -Wl,__ZN7testing4Test16TearDownTestCaseEv -Wl,-unexported_symbol -Wl,__ZN7testing4Test13SetUpTestCaseEv -lgtest -force_load /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/Release/libTestWebKitAPI.a -framework JavaScriptCore -framework WebKit -lWebCoreTestSupport -framework Network -framework PDFKit -framework Cocoa -framework Carbon -framework CoreGraphics -framework CoreLocation -framework CoreText -framework IOKit -lboringssl -licucore -framework LocalAuthentication -framework QuartzCore -framework Security -sectcreate __TEXT __info_plist /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/TestWebKitAPI.build/Release/TestWebKitAPI.build/Objects-normal/x86_64/Processed-Info.plist -Xlinker -dependency_info -Xlinker /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/TestWebKitAPI.build/Release/TestWebKitAPI.build/Objects-normal/x86_64/TestWebKitAPI_dependency_info.dat -o /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/WebKitBuild/Release/TestWebKitAPI ld: warning: directory not found for option '-F/Volumes/Data/worker/macOS-Mojave-Release-Build-EWS/build/Tools/TestWebKitAPI/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101400' Undefined symbols for architecture x86_64: "WebCore::FloatSize::toJSONObject() const", referenced from: WebCore::MediaSample::toJSONString() const in libTestWebKitAPI.a(SampleMap.o) ld: symbol(s) not found for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) I don't understand the error... FloatSize.cpp seems to be in TestWebKitAPI sources already. 1632138 4 eric.carlson 2020-03-20 10:00:10 -0700 I don't understand the failure either. I applied your patch locally and it builds without error. 1632139 5 393988 eric.carlson 2020-03-20 10:00:33 -0700 Comment on attachment 393988 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393988&action=review > Source/WebCore/platform/MediaSample.h:101 > + virtual String toJSONString() const Nit: this doesn't need to be virtual. 1632453 6 394165 pnormand 2020-03-21 03:54:52 -0700 Created attachment 394165 Patch 1632472 7 pnormand 2020-03-21 07:25:26 -0700 Committed r258807: <https://trac.webkit.org/changeset/258807> 1632473 8 webkit-bug-importer 2020-03-21 07:26:17 -0700 <rdar://problem/60724828> 1632545 9 394165 darin 2020-03-21 17:28:08 -0700 Comment on attachment 394165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394165&action=review > Source/WebCore/platform/MediaSample.h:112 > + String toJSONString() const > + { > + auto object = JSON::Object::create(); > + > + object->setObject("pts"_s, presentationTime().toJSONObject()); > + object->setObject("dts"_s, decodeTime().toJSONObject()); > + object->setObject("duration"_s, duration().toJSONObject()); > + object->setInteger("flags"_s, static_cast<unsigned>(flags())); > + object->setObject("presentationSize"_s, presentationSize().toJSONObject()); > + > + return object->toJSONString(); > + } Why inlined? No handy .cpp file to put it in? 1632616 10 394165 pnormand 2020-03-22 03:03:36 -0700 Comment on attachment 394165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394165&action=review >> Source/WebCore/platform/MediaSample.h:112 >> + } > > Why inlined? No handy .cpp file to put it in? No MediaSample.cpp indeed. This is the only method with more than one line body, I wasn't sure a dedicated .cpp file made sense in this case. 393988 2020-03-19 09:46:25 -0700 2020-03-21 03:54:46 -0700 Patch bug-209287-20200319164624.patch text/plain 3568 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWZjNjhlNDI2Y2EwNGIw YjAwNjE2MzhiM2Q3MDk5Mzc2MjU4YjQyNC4uMTczMjNhMGMwOWJhY2RhYmQxMzM2MmVmODcwMzgy YjIyNjg2MGI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAzLTE5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBNYWtlIHRoZSBN ZWRpYVNhbXBsZTo6dG9KU09OU3RyaW5nIG1ldGhvZCBnZW5lcmljCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkyODcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBpcyBnZW5lcmljIGFuZCB0aHVzIGNh biBiZSBzaGFyZWQgdG8gc3ViLWNsYXNzZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9NZWRpYVNh bXBsZS5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTYW1wbGU6OnRvSlNPTlN0cmluZyBjb25z dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFT YW1wbGVBVkZPYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLm1tOgorCiAyMDIwLTAzLTE5ICBBbnRvaW5lIFF1aW50 ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmltYXRpb25zXSBNYXJrIHBy b21pc2VzIGFzIGhhbmRsZWQgd2hlbiByZWplY3RlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vTWVkaWFTYW1wbGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01lZGlh U2FtcGxlLmgKaW5kZXggN2ZjOWRlMTEyN2E2ZGU5NGU4ZDE4MDI3NjBhOTIxM2UwMTNjNzE0Zi4u NmRlMDM5YzNjMDczZTkwZmI1MjIwNGUyYWJkMjYyZmMwM2Q5NmUyYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVkaWFTYW1wbGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9NZWRpYVNhbXBsZS5oCkBAIC05OCw3ICs5OCwxOCBAQCBwdWJsaWM6CiAgICAgYm9v bCBoYXNBbHBoYSgpIGNvbnN0IHsgcmV0dXJuIGZsYWdzKCkgJiBIYXNBbHBoYTsgfQogCiAgICAg dmlydHVhbCB2b2lkIGR1bXAoUHJpbnRTdHJlYW0mKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBT dHJpbmcgdG9KU09OU3RyaW5nKCkgY29uc3QgeyByZXR1cm4geyB9OyB9CisgICAgdmlydHVhbCBT dHJpbmcgdG9KU09OU3RyaW5nKCkgY29uc3QKKyAgICB7CisgICAgICAgIGF1dG8gb2JqZWN0ID0g SlNPTjo6T2JqZWN0OjpjcmVhdGUoKTsKKworICAgICAgICBvYmplY3QtPnNldE9iamVjdCgicHRz Il9zLCBwcmVzZW50YXRpb25UaW1lKCkudG9KU09OT2JqZWN0KCkpOworICAgICAgICBvYmplY3Qt PnNldE9iamVjdCgiZHRzIl9zLCBkZWNvZGVUaW1lKCkudG9KU09OT2JqZWN0KCkpOworICAgICAg ICBvYmplY3QtPnNldE9iamVjdCgiZHVyYXRpb24iX3MsIGR1cmF0aW9uKCkudG9KU09OT2JqZWN0 KCkpOworICAgICAgICBvYmplY3QtPnNldEludGVnZXIoImZsYWdzIl9zLCBzdGF0aWNfY2FzdDx1 bnNpZ25lZD4oZmxhZ3MoKSkpOworICAgICAgICBvYmplY3QtPnNldE9iamVjdCgicHJlc2VudGF0 aW9uU2l6ZSJfcywgcHJlc2VudGF0aW9uU2l6ZSgpLnRvSlNPTk9iamVjdCgpKTsKKworICAgICAg ICByZXR1cm4gb2JqZWN0LT50b0pTT05TdHJpbmcoKTsKKyAgICB9CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2FtcGxlQVZGT2JqQy5o CmluZGV4IDI0MzYyNjgxMjc3NmVhOGUzNWFjNWY2MGI0YTMzNDE4YjA0NTc0NjEuLjIxMTkwNDhh OGU5YWVmODM3N2NiYWRhNzk3M2Y5ZTU2MWIwOGI0YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2FtcGxlQVZGT2Jq Qy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhU2FtcGxlQVZGT2JqQy5oCkBAIC02OCw4ICs2OCw2IEBAIHB1YmxpYzoKIAogICAg IENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZUJ1ZmZlcigpIGNvbnN0IHsgcmV0dXJuIG1fc2FtcGxl LmdldCgpOyB9CiAKLSAgICBTdHJpbmcgdG9KU09OU3RyaW5nKCkgY29uc3Qgb3ZlcnJpZGU7Ci0K IHByb3RlY3RlZDoKICAgICBNZWRpYVNhbXBsZUFWRk9iakMoUmV0YWluUHRyPENNU2FtcGxlQnVm ZmVyUmVmPiYmIHNhbXBsZSkKICAgICAgICAgOiBtX3NhbXBsZShXVEZNb3ZlKHNhbXBsZSkpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0KaW5kZXggNTMwODc5 ZDU1OGE5NDdiMmEzNTgzMGQ4ZjBjNTNlNjkwN2I3OTZlOS4uZTZmMzhmNzZiM2JhOTU0MDEzMTIy YWEyMDMxYmFmOGIxN2I0ZjM2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2Ft cGxlQVZGT2JqQy5tbQpAQCAtMzE2LDE3ICszMTYsNCBAQCB2b2lkIE1lZGlhU2FtcGxlQVZGT2Jq Qzo6c2V0QXNEaXNwbGF5SW1tZWRpYXRlbHkoTWVkaWFTYW1wbGUmIHNhbXBsZSkKICAgICB9CiB9 CiAKLVN0cmluZyBNZWRpYVNhbXBsZUFWRk9iakM6OnRvSlNPTlN0cmluZygpIGNvbnN0Ci17Ci0g ICAgYXV0byBvYmplY3QgPSBKU09OOjpPYmplY3Q6OmNyZWF0ZSgpOwotCi0gICAgb2JqZWN0LT5z ZXRPYmplY3QoInB0cyJfcywgcHJlc2VudGF0aW9uVGltZSgpLnRvSlNPTk9iamVjdCgpKTsKLSAg ICBvYmplY3QtPnNldE9iamVjdCgiZHRzIl9zLCBkZWNvZGVUaW1lKCkudG9KU09OT2JqZWN0KCkp OwotICAgIG9iamVjdC0+c2V0T2JqZWN0KCJkdXJhdGlvbiJfcywgZHVyYXRpb24oKS50b0pTT05P YmplY3QoKSk7Ci0gICAgb2JqZWN0LT5zZXRJbnRlZ2VyKCJmbGFncyJfcywgc3RhdGljX2Nhc3Q8 dW5zaWduZWQ+KGZsYWdzKCkpKTsKLSAgICBvYmplY3QtPnNldE9iamVjdCgicHJlc2VudGF0aW9u U2l6ZSJfcywgcHJlc2VudGF0aW9uU2l6ZSgpLnRvSlNPTk9iamVjdCgpKTsKLQotICAgIHJldHVy biBvYmplY3QtPnRvSlNPTlN0cmluZygpOwotfQotCiB9Cg== 394165 2020-03-21 03:54:52 -0700 2020-03-21 03:54:52 -0700 Patch bug-209287-20200321105450.patch text/plain 3615 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU1MTQ0NzFjNWVjZTc2 MDIzMDQxN2I5MmVhNzE3YTI3Nzg2Y2U5OS4uZjQyYWJiZjQzYjE4YzM5MjNjZTYxYmFmMzdiN2Rj YTBlNTIwOWRhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAzLTE5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBNYWtlIHRoZSBN ZWRpYVNhbXBsZTo6dG9KU09OU3RyaW5nIG1ldGhvZCBnZW5lcmljCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkyODcKKworICAgICAgICBSZXZpZXdl ZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgSXQgaXMgZ2VuZXJpYyBhbmQgdGh1cyBjYW4g YmUgc2hhcmVkIHRvIHN1Yi1jbGFzc2VzLgorCisgICAgICAgICogcGxhdGZvcm0vTWVkaWFTYW1w bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxlOjp0b0pTT05TdHJpbmcgY29uc3Qp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2Ft cGxlQVZGT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhU2FtcGxlQVZGT2JqQy5tbToKKwogMjAyMC0wMy0yMCAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjU4Njc5KTog WyBNYWMgXSBmYXN0L3Njcm9sbGluZy9hcnJvdy1rZXktc2Nyb2xsLWluLXJ0bC1kb2N1bWVudC5o dG1sIGlzIGZhaWxpbmcgYW5kIHRpbWluZyBvdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL01lZGlhU2FtcGxlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZWRpYVNh bXBsZS5oCmluZGV4IDdmYzlkZTExMjdhNmRlOTRlOGQxODAyNzYwYTkyMTNlMDEzYzcxNGYuLjFl NDQyNzliZmRlNzVkZmVkOTE5ZTc2ODM0YzZlNmQwMDgwNjNhMGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL01lZGlhU2FtcGxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vTWVkaWFTYW1wbGUuaApAQCAtOTgsNyArOTgsMTggQEAgcHVibGljOgogICAgIGJvb2wg aGFzQWxwaGEoKSBjb25zdCB7IHJldHVybiBmbGFncygpICYgSGFzQWxwaGE7IH0KIAogICAgIHZp cnR1YWwgdm9pZCBkdW1wKFByaW50U3RyZWFtJikgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgU3Ry aW5nIHRvSlNPTlN0cmluZygpIGNvbnN0IHsgcmV0dXJuIHsgfTsgfQorICAgIFN0cmluZyB0b0pT T05TdHJpbmcoKSBjb25zdAorICAgIHsKKyAgICAgICAgYXV0byBvYmplY3QgPSBKU09OOjpPYmpl Y3Q6OmNyZWF0ZSgpOworCisgICAgICAgIG9iamVjdC0+c2V0T2JqZWN0KCJwdHMiX3MsIHByZXNl bnRhdGlvblRpbWUoKS50b0pTT05PYmplY3QoKSk7CisgICAgICAgIG9iamVjdC0+c2V0T2JqZWN0 KCJkdHMiX3MsIGRlY29kZVRpbWUoKS50b0pTT05PYmplY3QoKSk7CisgICAgICAgIG9iamVjdC0+ c2V0T2JqZWN0KCJkdXJhdGlvbiJfcywgZHVyYXRpb24oKS50b0pTT05PYmplY3QoKSk7CisgICAg ICAgIG9iamVjdC0+c2V0SW50ZWdlcigiZmxhZ3MiX3MsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihm bGFncygpKSk7CisgICAgICAgIG9iamVjdC0+c2V0T2JqZWN0KCJwcmVzZW50YXRpb25TaXplIl9z LCBwcmVzZW50YXRpb25TaXplKCkudG9KU09OT2JqZWN0KCkpOworCisgICAgICAgIHJldHVybiBv YmplY3QtPnRvSlNPTlN0cmluZygpOworICAgIH0KIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhU2FtcGxlQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKaW5kZXggMjQz NjI2ODEyNzc2ZWE4ZTM1YWM1ZjYwYjRhMzM0MThiMDQ1NzQ2MS4uMjExOTA0OGE4ZTlhZWY4Mzc3 Y2JhZGE3OTczZjllNTYxYjA4YjRhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFT YW1wbGVBVkZPYmpDLmgKQEAgLTY4LDggKzY4LDYgQEAgcHVibGljOgogCiAgICAgQ01TYW1wbGVC dWZmZXJSZWYgc2FtcGxlQnVmZmVyKCkgY29uc3QgeyByZXR1cm4gbV9zYW1wbGUuZ2V0KCk7IH0K IAotICAgIFN0cmluZyB0b0pTT05TdHJpbmcoKSBjb25zdCBvdmVycmlkZTsKLQogcHJvdGVjdGVk OgogICAgIE1lZGlhU2FtcGxlQVZGT2JqQyhSZXRhaW5QdHI8Q01TYW1wbGVCdWZmZXJSZWY+JiYg c2FtcGxlKQogICAgICAgICA6IG1fc2FtcGxlKFdURk1vdmUoc2FtcGxlKSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh U2FtcGxlQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhU2FtcGxlQVZGT2JqQy5tbQppbmRleCA1MzA4NzlkNTU4YTk0N2Iy YTM1ODMwZDhmMGM1M2U2OTA3Yjc5NmU5Li5lNmYzOGY3NmIzYmE5NTQwMTMxMjJhYTIwMzFiYWY4 YjE3YjRmMzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpD Lm1tCkBAIC0zMTYsMTcgKzMxNiw0IEBAIHZvaWQgTWVkaWFTYW1wbGVBVkZPYmpDOjpzZXRBc0Rp c3BsYXlJbW1lZGlhdGVseShNZWRpYVNhbXBsZSYgc2FtcGxlKQogICAgIH0KIH0KIAotU3RyaW5n IE1lZGlhU2FtcGxlQVZGT2JqQzo6dG9KU09OU3RyaW5nKCkgY29uc3QKLXsKLSAgICBhdXRvIG9i amVjdCA9IEpTT046Ok9iamVjdDo6Y3JlYXRlKCk7Ci0KLSAgICBvYmplY3QtPnNldE9iamVjdCgi cHRzIl9zLCBwcmVzZW50YXRpb25UaW1lKCkudG9KU09OT2JqZWN0KCkpOwotICAgIG9iamVjdC0+ c2V0T2JqZWN0KCJkdHMiX3MsIGRlY29kZVRpbWUoKS50b0pTT05PYmplY3QoKSk7Ci0gICAgb2Jq ZWN0LT5zZXRPYmplY3QoImR1cmF0aW9uIl9zLCBkdXJhdGlvbigpLnRvSlNPTk9iamVjdCgpKTsK LSAgICBvYmplY3QtPnNldEludGVnZXIoImZsYWdzIl9zLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4o ZmxhZ3MoKSkpOwotICAgIG9iamVjdC0+c2V0T2JqZWN0KCJwcmVzZW50YXRpb25TaXplIl9zLCBw cmVzZW50YXRpb25TaXplKCkudG9KU09OT2JqZWN0KCkpOwotCi0gICAgcmV0dXJuIG9iamVjdC0+ dG9KU09OU3RyaW5nKCk7Ci19Ci0KIH0K