153134 2016-01-15 10:27:41 -0800 Fix audio build with video disabled 2016-01-15 15:34:42 -0800 1 1 1 Unclassified WebKit Web Audio Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 153135 1 olivier.blin webkit-unassigned bfulgham commit-queue eric.carlson jer.noble mcatanzaro zan oldest_to_newest 1155821 0 olivier.blin 2016-01-15 10:27:41 -0800 Build and link fails when WebAudio is enabled but VIDEO disabled. WebKit/Source/WebCore/testing/Internals.cpp: In member function ‘void WebCore::Internals::setAudioContextRestrictions(WebCore::AudioContext*, const WTF::String&, WebCore::ExceptionCode&)’: WebKit/Source/WebCore/testing/Internals.cpp:2952:20: error: ‘MediaElementSession’ has not been declared restrictions = MediaElementSession::NoRestrictions; Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::AudioContext(WebCore::Document&): error: undefined reference to 'WebCore::PlatformMediaSession::create(WebCore::PlatformMediaSessionClient&)' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::AudioContext(WebCore::Document&, unsigned int, unsigned long, float): error: undefined reference to 'WebCore::PlatformMediaSession::create(WebCore::PlatformMediaSessionClient&)' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::constructCommon(): error: undefined reference to 'WebCore::PlatformMediaSession::setCanProduceAudio(bool)' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::willBeginPlayback(): error: undefined reference to 'WebCore::PlatformMediaSession::clientWillBeginPlayback()' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::willPausePlayback(): error: undefined reference to 'WebCore::PlatformMediaSession::clientWillPausePlayback()' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:vtable for WebCore::AudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionTitle() const' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:vtable for WebCore::AudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionDuration() const' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:vtable for WebCore::AudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime() const' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/OfflineAudioContext.cpp.o):OfflineAudioContext.cpp:vtable for WebCore::OfflineAudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionTitle() const' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/OfflineAudioContext.cpp.o):OfflineAudioContext.cpp:vtable for WebCore::OfflineAudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionDuration() const' ../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/OfflineAudioContext.cpp.o):OfflineAudioContext.cpp:vtable for WebCore::OfflineAudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime() const' collect2: error: ld returned 1 exit status 1155823 1 269065 olivier.blin 2016-01-15 10:32:26 -0800 Created attachment 269065 Patch 1155824 2 olivier.blin 2016-01-15 10:33:30 -0800 You may prefer guarding the method implementation instead of their whole declaration. Though, MediaPlayer::invalidTime() would not be available when video is disabled. 1155859 3 269065 mcatanzaro 2016-01-15 11:47:02 -0800 Comment on attachment 269065 Patch Thanks for your patch. If you don't have commit access, please set the cq? flag to request commit-queue. 1155939 4 269101 olivier.blin 2016-01-15 14:34:34 -0800 Created attachment 269101 Patch 1155993 5 269101 commit-queue 2016-01-15 15:34:38 -0800 Comment on attachment 269101 Patch Clearing flags on attachment: 269101 Committed r195154: <http://trac.webkit.org/changeset/195154> 1155994 6 commit-queue 2016-01-15 15:34:42 -0800 All reviewed patches have been landed. Closing bug. 269065 2016-01-15 10:32:26 -0800 2016-01-15 14:34:27 -0800 Patch bug-153134-20160115193155.patch text/plain 4927 olivier.blin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1MTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQ3MGQyYTkwMzhjYTNm MWE3ZTFlNmVkOGI4OGNmMGM4MTIxNzlkNy4uMzQ0MWViNDM4OTIyODA4ZGUxNjI5ZDNmZjBlYmE0 YTBhNzM1YjIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE2LTAxLTE1ICBPbGl2 aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CiAKKyAgICAgICAgRml4IGF1 ZGlvIGJ1aWxkIHdpdGggdmlkZW8gZGlzYWJsZWQKKworICAgICAgICBCdWlsZCBmYWlscyB3aGVu IFdlYkF1ZGlvIGlzIGVuYWJsZWQgYnV0IFZJREVPIGRpc2FibGVkLgorCisgICAgICAgIEZpeCBh dWRpbyBidWlsZCB3aXRoIHZpZGVvIGRpc2FibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTMxMzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgc2luY2UgdGhpcyBpcyBhIGJ1aWxk IGZpeCBvbmx5LgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Np b24uY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmg6 CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyLmNw cDoKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnRlcm5hbHM6OnNldEF1ZGlvQ29udGV4dFJlc3RyaWN0aW9ucyk6CisKKzIwMTYtMDEtMTUgIE9s aXZpZXIgQmxpbiAgPG9saXZpZXIuYmxpbkBzb2Z0YXRob21lLmNvbT4KKwogICAgICAgICBbR1RL XSBGaXggYnVpbGQgb2YgUmVuZGVyVGhlbWVHdGsgd2l0aG91dCBWSURFTyBieSBpbmNsdWRpbmcg SFRNTElucHV0RWxlbWVudAogCiAgICAgICAgIEJ1aWxkIHdhcyBmaW5lIHdpdGggVklERU8gZW5h YmxlZCwgc2luY2UgSFRNTElucHV0RWxlbWVudC5oIHdhcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCmluZGV4IDVlMjYx ZDZkNDc2ZDc3MmZhMjljYzJkMmViMjFiNzNiYTFhZDgyM2IuLjgyMDczOGVkYzE4MGM0YjRlOGIx ZGIyYmMyZmMzN2VlYTBhNTc1NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKQEAgLTI2LDcgKzI2LDcgQEAKICNp bmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oIgogCi0j aWYgRU5BQkxFKFZJREVPKQorI2lmIEVOQUJMRShWSURFTykgfHwgRU5BQkxFKFdFQl9BVURJTykK ICNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2lu Y2x1ZGUgIk1lZGlhUGxheWVyLmgiCkBAIC0yMDUsNiArMjA1LDcgQEAgUGxhdGZvcm1NZWRpYVNl c3Npb246Ok1lZGlhVHlwZSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6cHJlc2VudGF0aW9uVHlwZSgp IGNvbnN0CiAgICAgcmV0dXJuIG1fY2xpZW50LnByZXNlbnRhdGlvblR5cGUoKTsKIH0KIAorI2lm IEVOQUJMRShWSURFTykKIFN0cmluZyBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6dGl0bGUoKSBjb25z dAogewogICAgIHJldHVybiBtX2NsaWVudC5tZWRpYVNlc3Npb25UaXRsZSgpOwpAQCAtMjE5LDYg KzIyMCw3IEBAIGRvdWJsZSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6Y3VycmVudFRpbWUoKSBjb25z dAogewogICAgIHJldHVybiBtX2NsaWVudC5tZWRpYVNlc3Npb25DdXJyZW50VGltZSgpOwogfQor I2VuZGlmCiAgICAgCiBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpjYW5SZWNlaXZlUmVtb3Rl Q29udHJvbENvbW1hbmRzKCkgY29uc3QKIHsKQEAgLTI5OSw2ICszMDEsNyBAQCB2b2lkIFBsYXRm b3JtTWVkaWFTZXNzaW9uOjpzZXRDYW5Qcm9kdWNlQXVkaW8oYm9vbCBjYW5Qcm9kdWNlQXVkaW8p CiAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkuc2Vzc2lv bkNhblByb2R1Y2VBdWRpb0NoYW5nZWQoKnRoaXMpOwogfQogCisjaWYgRU5BQkxFKFZJREVPKQog U3RyaW5nIFBsYXRmb3JtTWVkaWFTZXNzaW9uQ2xpZW50OjptZWRpYVNlc3Npb25UaXRsZSgpIGNv bnN0CiB7CiAgICAgcmV0dXJuIFN0cmluZygpOwpAQCAtMzEzLDYgKzMxNiw3IEBAIGRvdWJsZSBQ bGF0Zm9ybU1lZGlhU2Vzc2lvbkNsaWVudDo6bWVkaWFTZXNzaW9uQ3VycmVudFRpbWUoKSBjb25z dAogewogICAgIHJldHVybiBNZWRpYVBsYXllcjo6aW52YWxpZFRpbWUoKTsKIH0KKyNlbmRpZgog CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1Bs YXRmb3JtTWVkaWFTZXNzaW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0 Zm9ybU1lZGlhU2Vzc2lvbi5oCmluZGV4IDY5YWNiZjYzZmVhMTgyYWJlOGI0NWY0ZTFkOTI1MTM5 NTZjOWY5MzEuLjFiYmE2Y2M3YmJiYzdhM2IzNzg5MWY1NmZiMmFkMWY2OTFkMGJjZGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Np b24uaApAQCAtOTcsOSArOTcsMTEgQEAgcHVibGljOgogICAgIAogICAgIHZvaWQgdmlzaWJpbGl0 eUNoYW5nZWQoKTsKIAorI2lmIEVOQUJMRShWSURFTykKICAgICBTdHJpbmcgdGl0bGUoKSBjb25z dDsKICAgICBkb3VibGUgZHVyYXRpb24oKSBjb25zdDsKICAgICBkb3VibGUgY3VycmVudFRpbWUo KSBjb25zdDsKKyNlbmRpZgogCiAgICAgZW51bSBSZW1vdGVDb250cm9sQ29tbWFuZFR5cGUgewog ICAgICAgICBOb0NvbW1hbmQsCkBAIC0xNzYsOSArMTc4LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIHZvaWQgbWF5UmVzdW1lUGxheWJhY2soYm9vbCBzaG91bGRSZXN1bWUpID0gMDsKICAgICB2 aXJ0dWFsIHZvaWQgc3VzcGVuZFBsYXliYWNrKCkgPSAwOwogCisjaWYgRU5BQkxFKFZJREVPKQog ICAgIHZpcnR1YWwgU3RyaW5nIG1lZGlhU2Vzc2lvblRpdGxlKCkgY29uc3Q7CiAgICAgdmlydHVh bCBkb3VibGUgbWVkaWFTZXNzaW9uRHVyYXRpb24oKSBjb25zdDsKICAgICB2aXJ0dWFsIGRvdWJs ZSBtZWRpYVNlc3Npb25DdXJyZW50VGltZSgpIGNvbnN0OworI2VuZGlmCiAgICAgCiAgICAgdmly dHVhbCBib29sIGNhblJlY2VpdmVSZW1vdGVDb250cm9sQ29tbWFuZHMoKSBjb25zdCA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZW1vdGVDb250cm9sQ29tbWFuZChQbGF0Zm9ybU1l ZGlhU2Vzc2lvbjo6UmVtb3RlQ29udHJvbENvbW1hbmRUeXBlKSA9IDA7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb25N YW5hZ2VyLmNwcAppbmRleCBkZDlmZjMwNmY0OTYwNTQwNDY1ZWU1MTIzZjEzNjM4YWQ3OTI0MTRl Li4yNTRlMGJlMmE4NjM1ZjQwYWVhYTI4YTgyNTY3NjEzNGQ1YmMyMWEzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNz aW9uTWFuYWdlci5jcHAKQEAgLTI2LDcgKzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIuaCIKIAotI2lmIEVOQUJMRShWSURF TykKKyNpZiBFTkFCTEUoVklERU8pIHx8IEVOQUJMRShXRUJfQVVESU8pCiAKICNpbmNsdWRlICJB dWRpb1Nlc3Npb24uaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbHMuY3BwCmluZGV4IDZlYTIyM2ZiYTQxNDQxNmYwNzk4NmU2NzIwODUxOTg4ZGNjMGU0 NmQuLmQwMDMwNmYxYjkyNjMxNDY1YjJiODc2ZDUxY2YzZjY1ZjdhMjQxNzcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTI5NDksNyArMjk0OSw3IEBAIHZvaWQgSW50ZXJu YWxzOjpzZXRBdWRpb0NvbnRleHRSZXN0cmljdGlvbnMoQXVkaW9Db250ZXh0KiBjb250ZXh0LCBj b25zdCBTdHJpbmcKICAgICBBdWRpb0NvbnRleHQ6OkJlaGF2aW9yUmVzdHJpY3Rpb25zIHJlc3Ry aWN0aW9ucyA9IGNvbnRleHQtPmJlaGF2aW9yUmVzdHJpY3Rpb25zKCk7CiAgICAgY29udGV4dC0+ cmVtb3ZlQmVoYXZpb3JSZXN0cmljdGlvbihyZXN0cmljdGlvbnMpOwogCi0gICAgcmVzdHJpY3Rp b25zID0gTWVkaWFFbGVtZW50U2Vzc2lvbjo6Tm9SZXN0cmljdGlvbnM7CisgICAgcmVzdHJpY3Rp b25zID0gQXVkaW9Db250ZXh0OjpOb1Jlc3RyaWN0aW9uczsKIAogICAgIFZlY3RvcjxTdHJpbmc+ IHJlc3RyaWN0aW9uc0FycmF5OwogICAgIHJlc3RyaWN0aW9uc1N0cmluZy5zcGxpdCgnLCcsIGZh bHNlLCByZXN0cmljdGlvbnNBcnJheSk7Cg== 269101 2016-01-15 14:34:34 -0800 2016-01-15 15:34:38 -0800 Patch bug-153134-20160115233404.patch text/plain 4863 olivier.blin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1MTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWY0N2ZhZDg1MmY1NDAx ZDVjMzUwODBjMWZjNDMxM2U5YWY5Mzg4OS4uZGNmNzgwN2NhYjc5YmRlOTdkZWQxNDAzZGE4ZjQ2 ZGVhMDgzNWMyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE2LTAxLTE1ICBPbGl2 aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CiAKKyAgICAgICAgRml4IGF1 ZGlvIGJ1aWxkIHdpdGggdmlkZW8gZGlzYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzEzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEJ1aWxkIGZhaWxzIHdoZW4gV2ViQXVkaW8gaXMgZW5hYmxl ZCBidXQgVklERU8gZGlzYWJsZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoaXMg aXMgYSBidWlsZCBmaXggb25seS4KKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3Jt TWVkaWFTZXNzaW9uLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlh U2Vzc2lvbi5oOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9u TWFuYWdlci5jcHA6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW50ZXJuYWxzOjpzZXRBdWRpb0NvbnRleHRSZXN0cmljdGlvbnMpOgorCisyMDE2 LTAxLTE1ICBPbGl2aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CisKICAg ICAgICAgW0dUS10gRml4IGJ1aWxkIG9mIFJlbmRlclRoZW1lR3RrIHdpdGhvdXQgVklERU8gYnkg aW5jbHVkaW5nIEhUTUxJbnB1dEVsZW1lbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1MzEzMwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKaW5kZXggNWUyNjFkNmQ0NzZk NzcyZmEyOWNjMmQyZWIyMWI3M2JhMWFkODIzYi4uODIwNzM4ZWRjMTgwYzRiNGU4YjFkYjJiYzJm YzM3ZWVhMGE1NzU2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v UGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1 ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcApAQCAtMjYsNyArMjYsNyBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIlBsYXRmb3JtTWVkaWFTZXNzaW9uLmgiCiAKLSNpZiBFTkFC TEUoVklERU8pCisjaWYgRU5BQkxFKFZJREVPKSB8fCBFTkFCTEUoV0VCX0FVRElPKQogI2luY2x1 ZGUgIkhUTUxNZWRpYUVsZW1lbnQuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAi TWVkaWFQbGF5ZXIuaCIKQEAgLTIwNSw2ICsyMDUsNyBAQCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6 TWVkaWFUeXBlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpwcmVzZW50YXRpb25UeXBlKCkgY29uc3QK ICAgICByZXR1cm4gbV9jbGllbnQucHJlc2VudGF0aW9uVHlwZSgpOwogfQogCisjaWYgRU5BQkxF KFZJREVPKQogU3RyaW5nIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjp0aXRsZSgpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIG1fY2xpZW50Lm1lZGlhU2Vzc2lvblRpdGxlKCk7CkBAIC0yMTksNiArMjIwLDcg QEAgZG91YmxlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpjdXJyZW50VGltZSgpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIG1fY2xpZW50Lm1lZGlhU2Vzc2lvbkN1cnJlbnRUaW1lKCk7CiB9CisjZW5kaWYK ICAgICAKIGJvb2wgUGxhdGZvcm1NZWRpYVNlc3Npb246OmNhblJlY2VpdmVSZW1vdGVDb250cm9s Q29tbWFuZHMoKSBjb25zdAogewpAQCAtMjk5LDYgKzMwMSw3IEBAIHZvaWQgUGxhdGZvcm1NZWRp YVNlc3Npb246OnNldENhblByb2R1Y2VBdWRpbyhib29sIGNhblByb2R1Y2VBdWRpbykKICAgICBQ bGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5zZXNzaW9uQ2FuUHJv ZHVjZUF1ZGlvQ2hhbmdlZCgqdGhpcyk7CiB9CiAKKyNpZiBFTkFCTEUoVklERU8pCiBTdHJpbmcg UGxhdGZvcm1NZWRpYVNlc3Npb25DbGllbnQ6Om1lZGlhU2Vzc2lvblRpdGxlKCkgY29uc3QKIHsK ICAgICByZXR1cm4gU3RyaW5nKCk7CkBAIC0zMTMsNiArMzE2LDcgQEAgZG91YmxlIFBsYXRmb3Jt TWVkaWFTZXNzaW9uQ2xpZW50OjptZWRpYVNlc3Npb25DdXJyZW50VGltZSgpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIE1lZGlhUGxheWVyOjppbnZhbGlkVGltZSgpOwogfQorI2VuZGlmCiAKIH0KICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1N ZWRpYVNlc3Npb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVk aWFTZXNzaW9uLmgKaW5kZXggNjlhY2JmNjNmZWExODJhYmU4YjQ1ZjRlMWQ5MjUxMzk1NmM5Zjkz MS4uMWJiYTZjYzdiYmJjN2EzYjM3ODkxZjU2ZmIyYWQxZjY5MWQwYmNkYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCkBA IC05Nyw5ICs5NywxMSBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCB2aXNpYmlsaXR5Q2hhbmdl ZCgpOwogCisjaWYgRU5BQkxFKFZJREVPKQogICAgIFN0cmluZyB0aXRsZSgpIGNvbnN0OwogICAg IGRvdWJsZSBkdXJhdGlvbigpIGNvbnN0OwogICAgIGRvdWJsZSBjdXJyZW50VGltZSgpIGNvbnN0 OworI2VuZGlmCiAKICAgICBlbnVtIFJlbW90ZUNvbnRyb2xDb21tYW5kVHlwZSB7CiAgICAgICAg IE5vQ29tbWFuZCwKQEAgLTE3Niw5ICsxNzgsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9p ZCBtYXlSZXN1bWVQbGF5YmFjayhib29sIHNob3VsZFJlc3VtZSkgPSAwOwogICAgIHZpcnR1YWwg dm9pZCBzdXNwZW5kUGxheWJhY2soKSA9IDA7CiAKKyNpZiBFTkFCTEUoVklERU8pCiAgICAgdmly dHVhbCBTdHJpbmcgbWVkaWFTZXNzaW9uVGl0bGUoKSBjb25zdDsKICAgICB2aXJ0dWFsIGRvdWJs ZSBtZWRpYVNlc3Npb25EdXJhdGlvbigpIGNvbnN0OwogICAgIHZpcnR1YWwgZG91YmxlIG1lZGlh U2Vzc2lvbkN1cnJlbnRUaW1lKCkgY29uc3Q7CisjZW5kaWYKICAgICAKICAgICB2aXJ0dWFsIGJv b2wgY2FuUmVjZWl2ZVJlbW90ZUNvbnRyb2xDb21tYW5kcygpIGNvbnN0ID0gMDsKICAgICB2aXJ0 dWFsIHZvaWQgZGlkUmVjZWl2ZVJlbW90ZUNvbnRyb2xDb21tYW5kKFBsYXRmb3JtTWVkaWFTZXNz aW9uOjpSZW1vdGVDb250cm9sQ29tbWFuZFR5cGUpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIu Y3BwCmluZGV4IGRkOWZmMzA2ZjQ5NjA1NDA0NjVlZTUxMjNmMTM2MzhhZDc5MjQxNGUuLjI1NGUw YmUyYTg2MzVmNDBhZWFhMjhhODI1Njc2MTM0ZDViYzIxYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5h Z2VyLmNwcApAQCAtMjYsNyArMjYsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg IlBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5oIgogCi0jaWYgRU5BQkxFKFZJREVPKQorI2lm IEVOQUJMRShWSURFTykgfHwgRU5BQkxFKFdFQl9BVURJTykKIAogI2luY2x1ZGUgIkF1ZGlvU2Vz c2lvbi5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFs cy5jcHAKaW5kZXggNmVhMjIzZmJhNDE0NDE2ZjA3OTg2ZTY3MjA4NTE5ODhkY2MwZTQ2ZC4uZDAw MzA2ZjFiOTI2MzE0NjViMmI4NzZkNTFjZjNmNjVmN2EyNDE3NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvSW50ZXJuYWxzLmNwcApAQCAtMjk0OSw3ICsyOTQ5LDcgQEAgdm9pZCBJbnRlcm5hbHM6OnNl dEF1ZGlvQ29udGV4dFJlc3RyaWN0aW9ucyhBdWRpb0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0 cmluZwogICAgIEF1ZGlvQ29udGV4dDo6QmVoYXZpb3JSZXN0cmljdGlvbnMgcmVzdHJpY3Rpb25z ID0gY29udGV4dC0+YmVoYXZpb3JSZXN0cmljdGlvbnMoKTsKICAgICBjb250ZXh0LT5yZW1vdmVC ZWhhdmlvclJlc3RyaWN0aW9uKHJlc3RyaWN0aW9ucyk7CiAKLSAgICByZXN0cmljdGlvbnMgPSBN ZWRpYUVsZW1lbnRTZXNzaW9uOjpOb1Jlc3RyaWN0aW9uczsKKyAgICByZXN0cmljdGlvbnMgPSBB dWRpb0NvbnRleHQ6Ok5vUmVzdHJpY3Rpb25zOwogCiAgICAgVmVjdG9yPFN0cmluZz4gcmVzdHJp Y3Rpb25zQXJyYXk7CiAgICAgcmVzdHJpY3Rpb25zU3RyaW5nLnNwbGl0KCcsJywgZmFsc2UsIHJl c3RyaWN0aW9uc0FycmF5KTsK