56983 2011-03-23 18:33:47 -0700 [chromium] Implement preload=none, setPreload hooks to media player 2011-06-20 11:56:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 vrk vrk acolwell annacc commit-queue eric scherkus oldest_to_newest 372597 0 vrk 2011-03-23 18:33:47 -0700 [chromium] Add setPreload hooks to Chromium media player 372600 1 86730 vrk 2011-03-23 18:35:08 -0700 Created attachment 86730 Patch 372671 2 86730 eric.carlson 2011-03-23 22:20:38 -0700 Comment on attachment 86730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86730&action=review > Source/WebKit/chromium/ChangeLog:9 > + setAutobuffer methods. This has been replace with Typos: methods -> method, and replace -> replaced 373166 3 86851 vrk 2011-03-24 16:15:21 -0700 Created attachment 86851 Patch 373539 4 86851 eric.carlson 2011-03-25 09:06:13 -0700 Comment on attachment 86851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86851&action=review r- for now as I am not sure the details are quite right yet. > Source/WebKit/chromium/public/WebMediaPlayer.h:103 > + virtual bool setPreload(Preload) { return false; }; Does this function really need to return a bool? > Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:190 > + return static_cast<unsigned>(MediaPlayer::MetaData); Don't you want to return m_preload here instead of hard coding MediaPlayer::MetaData? > Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:216 > + Frame* frame = static_cast<HTMLMediaElement*>( > + m_mediaPlayer->mediaPlayerClient())->document()->frame(); This indentation is odd, I thought at first that a stray tab had snuck in. I am not sure that the line break helps readability. > Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:259 > + if (m_delayingLoad) > + startDelayedLoad(); If you don't set m_delayingLoad to false before calling startDelayedLoad(), won't it ASSERT if this is called when m_preload == MediaPlayer::None? > Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:466 > + if (m_delayingLoad && m_preload != MediaPlayer::None) > + startDelayedLoad(); Ditto. 374845 5 87226 vrk 2011-03-28 15:44:59 -0700 Created attachment 87226 Patch 374849 6 86851 vrk 2011-03-28 15:48:50 -0700 Comment on attachment 86851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86851&action=review Thanks for looking! I uploaded a new patch with the fixes - let me know whatever questions/concerns you still have! >> Source/WebKit/chromium/public/WebMediaPlayer.h:103 >> + virtual bool setPreload(Preload) { return false; }; > > Does this function really need to return a bool? No it doesn't. Fixed! >> Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:190 >> + return static_cast<unsigned>(MediaPlayer::MetaData); > > Don't you want to return m_preload here instead of hard coding MediaPlayer::MetaData? Yes, thanks! :) Fixed! >> Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:216 >> + m_mediaPlayer->mediaPlayerClient())->document()->frame(); > > This indentation is odd, I thought at first that a stray tab had snuck in. I am not sure that the line break helps readability. OK! Changed to all on one line. >> Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:259 >> + startDelayedLoad(); > > If you don't set m_delayingLoad to false before calling startDelayedLoad(), won't it ASSERT if this is called when m_preload == MediaPlayer::None? It shouldn't - the assert is for m_delayingLoad, not !m_delayingLoad (i.e. m_delayingLoad must be true whenever you first call startDelayedLoad). 375261 7 87226 commit-queue 2011-03-29 06:42:53 -0700 Comment on attachment 87226 Patch Rejecting attachment 87226 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-..." exit_code: 2 Last 500 characters of output: s). patching file Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h Hunk #1 FAILED at 76. Hunk #2 succeeded at 88 (offset 1 line). Hunk #3 succeeded at 108 (offset 1 line). Hunk #4 succeeded at 131 (offset 1 line). Hunk #5 succeeded at 144 (offset 1 line). 1 out of 5 hunks FAILED -- saving rejects to file Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Carlson', u'--for..." exit_code: 1 Full output: http://queues.webkit.org/results/8273869 376470 8 vrk 2011-03-30 10:52:12 -0700 Since there were merge conflicts, I'll ask scherkus or someone to land by hand! 423240 9 eric 2011-06-18 13:40:34 -0700 Attachment 87226 was posted by a committer and has review+, assigning to Victoria Kirst for commit. 423822 10 scherkus 2011-06-20 11:55:14 -0700 blah I landed this a while back: http://trac.webkit.org/changeset/82641 apologies (again!) for not updating this bug 423826 11 87226 scherkus 2011-06-20 11:56:42 -0700 Comment on attachment 87226 Patch Obsoleting patch since it was landed a while ago. 86730 2011-03-23 18:35:08 -0700 2011-03-24 16:15:19 -0700 Patch bug-56983-20110323183507.patch text/plain 5278 vrk U3VidmVyc2lvbiBSZXZpc2lvbjogODE4MzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ODRmYWZjZjRlNzBmMDA3ZjdmNThjZDIxZjU4ZGQ4Njc2ZWRjYjc1MS4uODFmMzI5OTI1MjU5MmQ4 MGE0NjJmNGU1NDY3YmY3MjAyNTExYTVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMiBAQAorMjAxMS0wMy0yMyAgVmljdG9yaWEgS2lyc3QgIDx2cmtAZ29vZ2xlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hy b21pdW1dIEFkZCBzZXRQcmVsb2FkIGhvb2tzIHRvIENocm9taXVtIG1lZGlhIHBsYXllcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY5ODMKKworICAg ICAgICBDaHJvbWl1bSdzIG1lZGlhIHBsYXllciBzdGlsbCBoYWQgdGhlIG5vdy1kZXByZWNhdGVk CisgICAgICAgIHNldEF1dG9idWZmZXIgbWV0aG9kcy4gVGhpcyBoYXMgYmVlbiByZXBsYWNlIHdp dGgKKyAgICAgICAgc2V0UHJlbG9hZC4KKworICAgICAgICAqIHB1YmxpYy9XZWJNZWRpYVBsYXll ci5oOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllcjo6c2V0UHJlbG9hZCk6CisgICAg ICAgICogcHVibGljL1dlYk1lZGlhUGxheWVyQ2xpZW50Lmg6CisgICAgICAgICogc3JjL1dlYk1l ZGlhUGxheWVyQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVy Q2xpZW50SW1wbDo6cHJlbG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xp ZW50SW1wbDo6c2V0UHJlbG9hZCk6CisgICAgICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50 SW1wbC5oOgorCiAyMDExLTAzLTIzICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4K IAogICAgICAgICBSb2xsZWQgZm9yd2FyZCBDaHJvbWl1bSBERVBTIGFnYWluIHRvIGZpeCBEdW1w UmVuZGVyVHJlZSBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViTWVkaWFQbGF5ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1l ZGlhUGxheWVyLmgKaW5kZXggYzAwODRkYjlmYzNiMjY5YWY3NmVlYmQ1OTZiN2NiMjFlOGJlMWU3 Ny4uOTJkZTBiODg0ZDc2ZjQyY2FkNjI2NWQ1YWM1MmE1YzczZWZjNDhhZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCkBAIC03OSw2ICs3OSwx MiBAQCBwdWJsaWM6CiAgICAgICAgIExpdmVTdHJlYW0sCiAgICAgfTsKIAorICAgIGVudW0gUHJl bG9hZCB7CisgICAgICAgIE5vbmUsCisgICAgICAgIE1ldGFEYXRhLAorICAgICAgICBBdXRvLAor ICAgIH07CisKICAgICB2aXJ0dWFsIH5XZWJNZWRpYVBsYXllcigpIHt9CiAKICAgICB2aXJ0dWFs IHZvaWQgbG9hZChjb25zdCBXZWJVUkwmKSA9IDA7CkBAIC05NCw3ICsxMDAsNyBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCB2b2lkIHNldFJhdGUoZmxvYXQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg c2V0Vm9sdW1lKGZsb2F0KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFZpc2libGUoYm9vbCkg PSAwOwotICAgIHZpcnR1YWwgYm9vbCBzZXRBdXRvQnVmZmVyKGJvb2wpID0gMDsKKyAgICB2aXJ0 dWFsIGJvb2wgc2V0UHJlbG9hZChQcmVsb2FkKSB7IHJldHVybiBmYWxzZTsgfTsKICAgICB2aXJ0 dWFsIGJvb2wgdG90YWxCeXRlc0tub3duKCkgPSAwOwogICAgIHZpcnR1YWwgY29uc3QgV2ViVGlt ZVJhbmdlcyYgYnVmZmVyZWQoKSA9IDA7CiAgICAgdmlydHVhbCBmbG9hdCBtYXhUaW1lU2Vla2Fi bGUoKSBjb25zdCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJNZWRpYVBsYXllckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViTWVkaWFQbGF5ZXJDbGllbnQuaAppbmRleCA3ZTVkZDY4YzkxNjgxNjRhZDZlY2NiNjEyZmUz MWNmMjhlMGE3MjFlLi5hOGNiY2ZhNzFiNmVjOTMwYzYyYTllMDQ4NTFiYTdhYTFhN2ViNzFkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllckNs aWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVy Q2xpZW50LmgKQEAgLTQ5LDYgKzQ5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzaXpl Q2hhbmdlZCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2F3VW5zdXBwb3J0ZWRUcmFja3MoKSA9 IDA7CiAgICAgdmlydHVhbCBmbG9hdCB2b2x1bWUoKSBjb25zdCA9IDA7CisgICAgdmlydHVhbCB1 bnNpZ25lZCBwcmVsb2FkKCkgY29uc3QgPSAwOwogCiBwcm90ZWN0ZWQ6CiAgICAgfldlYk1lZGlh UGxheWVyQ2xpZW50KCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcAppbmRleCBhMWI0MjhjYjkzNmUxNGY5YzI2 ZTYxZWExYmNhZjNkOWU2YzM1MzIyLi5hMzAzYTIxZWI0N2U4MDBlMjIyY2M3YWJlN2IwZmJiNzg5 MDFjOGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBs YXllckNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1l ZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKQEAgLTE4Myw2ICsxODMsMTMgQEAgZmxvYXQgV2ViTWVk aWFQbGF5ZXJDbGllbnRJbXBsOjp2b2x1bWUoKSBjb25zdAogICAgIHJldHVybiAwLjBmOwogfQog Cit1bnNpZ25lZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnByZWxvYWQoKSBjb25zdAorewor ICAgIGlmIChtX21lZGlhUGxheWVyKQorICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KG1fbWVkaWFQbGF5ZXItPnByZWxvYWQoKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PHVu c2lnbmVkPihNZWRpYVBsYXllcjo6TWV0YURhdGEpOworfQorCiAvLyBNZWRpYVBsYXllclByaXZh dGVJbnRlcmZhY2UgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogCiB2b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6bG9hZChjb25zdCBTdHJpbmcm IHVybCkKQEAgLTQzMiwxMCArNDM5LDEwIEBAIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBs OjpwYWludEN1cnJlbnRGcmFtZUluQ29udGV4dChHcmFwaGljc0NvbnRleHQqIGNvbnRlCiAgICAg fQogfQogCi12b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6c2V0QXV0b2J1ZmZlcihib29s IGF1dG9CdWZmZXIpCit2b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6c2V0UHJlbG9hZChN ZWRpYVBsYXllcjo6UHJlbG9hZCBwcmVsb2FkKQogewogICAgIGlmIChtX3dlYk1lZGlhUGxheWVy LmdldCgpKQotICAgICAgICBtX3dlYk1lZGlhUGxheWVyLT5zZXRBdXRvQnVmZmVyKGF1dG9CdWZm ZXIpOworICAgICAgICBtX3dlYk1lZGlhUGxheWVyLT5zZXRQcmVsb2FkKHN0YXRpY19jYXN0PFdl Yk1lZGlhUGxheWVyOjpQcmVsb2FkPihwcmVsb2FkKSk7CiB9CiAKIGJvb2wgV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsOjpoYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpIGNvbnN0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuaCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCmlu ZGV4IDVkNDQ2MjY5MzFkYTgzM2YxN2M5MzM0NzA2ZjZjNzhlNWUwNTQ2ZDYuLjMzZDRkZDUzZjcw NWRmZmEwYmYzZWJiNzIxZDc3ZjMzYTI4ZWQ5MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCkBAIC03Niw2ICs3Niw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2l6ZUNoYW5nZWQoKTsKICAgICB2aXJ0dWFs IHZvaWQgc2F3VW5zdXBwb3J0ZWRUcmFja3MoKTsKICAgICB2aXJ0dWFsIGZsb2F0IHZvbHVtZSgp IGNvbnN0OworICAgIHZpcnR1YWwgdW5zaWduZWQgcHJlbG9hZCgpIGNvbnN0OwogCiAgICAgLy8g TWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlIG1ldGhvZHM6CiAgICAgdmlydHVhbCB2b2lkIGxv YWQoY29uc3QgV1RGOjpTdHJpbmcmIHVybCk7CkBAIC0xMDUsMTMgKzEwNiwxMyBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCBmbG9hdCBtYXhUaW1lU2Vla2FibGUoKSBjb25zdDsKICAgICB2aXJ0dWFs IFdURjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpUaW1lUmFuZ2VzPiBidWZmZXJlZCgpIGNvbnN0Owog ICAgIHZpcnR1YWwgaW50IGRhdGFSYXRlKCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIHNldEF1 dG9idWZmZXIoYm9vbCk7CiAgICAgdmlydHVhbCBib29sIHRvdGFsQnl0ZXNLbm93bigpIGNvbnN0 OwogICAgIHZpcnR1YWwgdW5zaWduZWQgdG90YWxCeXRlcygpIGNvbnN0OwogICAgIHZpcnR1YWwg dW5zaWduZWQgYnl0ZXNMb2FkZWQoKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2l6ZShj b25zdCBXZWJDb3JlOjpJbnRTaXplJik7CiAgICAgdmlydHVhbCB2b2lkIHBhaW50KFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dCosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKICAgICB2aXJ0dWFs IHZvaWQgcGFpbnRDdXJyZW50RnJhbWVJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 KiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOworICAgIHZpcnR1YWwgdm9pZCBzZXRQcmVsb2Fk KFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpQcmVsb2FkKTsKICAgICB2aXJ0dWFsIGJvb2wgaGFzU2lu Z2xlU2VjdXJpdHlPcmlnaW4oKSBjb25zdDsKICAgICB2aXJ0dWFsIFdlYkNvcmU6Ok1lZGlhUGxh eWVyOjpNb3ZpZUxvYWRUeXBlIG1vdmllTG9hZFR5cGUoKSBjb25zdDsKICAgICB2aXJ0dWFsIHVu c2lnbmVkIGRlY29kZWRGcmFtZUNvdW50KCkgY29uc3Q7Cg== 86851 2011-03-24 16:15:21 -0700 2011-03-28 15:48:50 -0700 Patch bug-56983-20110324161520.patch text/plain 10035 vrk U3VidmVyc2lvbiBSZXZpc2lvbjogODE4ODcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiM2RmMWU5NTU3OTlkODRmMWVmYTJk MjY2NmQwNjIzNjdiZTA0MjQ4Li45MjlkZTQ1OTliMzJhOGE0NzUxMzliNWY1ZGQxOGVmY2ExMWE4 ODQ1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMjQgIFZpY3RvcmlhIEtpcnN0ICA8 dnJrQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW2Nocm9taXVtXSBJbXBsZW1lbnQgcHJlbG9hZD1ub25lLCBzZXRQcmVsb2FkIGhv b2tzIHRvIG1lZGlhIHBsYXllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTY5ODMKKworICAgICAgICBSZWVuYWJsaW5nIHZpZGVvLXByZWxvYWQuaHRt bCBsYXlvdXQgdGVzdCBmb3IgY2hyb21pdW0uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1 bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6CisKIDIwMTEtMDMtMjQgIEVucmljYSBDYXN1Y2NpICA8 ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25z LnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4 dAppbmRleCA1NDJhY2FiMjExYjkyNmRkMmU4Zjg5ZWQ2ZDgyZWMzMDdhZTFiMmZkLi5iOGJjMDc1 N2YwNmZjNmMxMDkyZTI5OGU0YTFiZjVhNzY5NDNlZmY3IDEwMDc1NQotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CkBAIC04MzQsMTAgKzgz NCw2IEBAIEJVR0NSMjgzMDEgU0tJUCA6IG1lZGlhL21lZGlhLWNhcHRpb25zLmh0bWwgPSBUSU1F T1VUCiBCVUdDUjMzMDk5IFNLSVAgOiBtZWRpYS92aWRlby1yZXZlcnNlLXBsYXktZHVyYXRpb24u aHRtbCA9IFRJTUVPVVQKIEJVR0NSMzMwOTkgU0tJUCA6IG1lZGlhL3ZpZGVvLXRpbWV1cGRhdGUt cmV2ZXJzZS1wbGF5Lmh0bWwgPSBUSU1FT1VUCiAKLS8vIFdlIGhhdmVuJ3QgaW1wbGVtZW50ZWQg dmlkZW8gcHJlbG9hZGluZyBhbmQgaXQgcGFzc2luZyBpcyBhIGZhbHNlIHBvc2l0aXZlLgotLy8g VU5JTVBMRU1FTlRFRAotQlVHV0sxNjQ4MiBTS0lQIDogbWVkaWEvdmlkZW8tcHJlbG9hZC5odG1s ID0gUEFTUyBGQUlMCi0KIC8vIERvZXMgbm90IGRpc3BsYXkgY291cmllciBmb3IgdGhlIGxldHRl cnMsIGFzIHRoZSB0ZXN0IHJlcXVlc3RzLgogQlVHQ1IxMDI3OCBMSU5VWCA6IGZhc3QvY3NzL2Zv bnQtZmFjZS1pbXBsaWNpdC1sb2NhbC1mb250Lmh0bWwgPSBGQUlMCiBCVUdDUjEwMjc4IExJTlVY IDogZmFzdC9jc3MvZm9udC1mYWNlLXVuaWNvZGUtcmFuZ2UuaHRtbCA9IEZBSUwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKaW5kZXggNGY0YmNjMTFiNjJhYWYwODBkN2FlMzM3NGI0YTMwZmIxMTY2 MGJlMS4uYjdjODMwMDRjYTFjMjMyZWIyOTBkYjY2YzgxNjJkMjkxM2QwMmE5NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMS0wMy0yNCAgVmljdG9yaWEg S2lyc3QgIDx2cmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEltcGxlbWVudCBwcmVsb2FkPW5vbmUsIHNldFBy ZWxvYWQgaG9va3MgdG8gbWVkaWEgcGxheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01Njk4MworCisgICAgICAgIFRoaXMgcGF0Y2ggaW1wbGVtZW50 cyBwcmVsb2FkPW5vbmUgaW4gQ2hyb21pdW0uIEl0IGFsc28gcmVwbGFjZXMKKyAgICAgICAgdGhl IG5vdy1kZXByZWNhdGVkIHNldEF1dG9idWZmZXIgbWV0aG9kIHdpdGggc2V0UHJlbG9hZC4KKwor ICAgICAgICAqIHB1YmxpYy9XZWJNZWRpYVBsYXllci5oOgorICAgICAgICAoV2ViS2l0OjpXZWJN ZWRpYVBsYXllcjo6c2V0UHJlbG9hZCk6CisgICAgICAgICogcHVibGljL1dlYk1lZGlhUGxheWVy Q2xpZW50Lmg6CisgICAgICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6cHJlbG9hZCk6CisgICAg ICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6bG9hZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6bG9hZEludGVybmFsKToKKyAgICAgICAg KFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpwcmVwYXJlVG9QbGF5KToKKyAgICAg ICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzZXRQcmVsb2FkKToKKyAgICAg ICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzdGFydERlbGF5ZWRMb2FkKToK KyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpXZWJNZWRpYVBsYXll ckNsaWVudEltcGwpOgorICAgICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuaDoK KwogMjAxMS0wMy0yNCAgTmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYk1lZGlhUGxheWVyLmgKaW5kZXggYzAwODRkYjlmYzNiMjY5YWY3NmVlYmQ1OTZi N2NiMjFlOGJlMWU3Ny4uOTJkZTBiODg0ZDc2ZjQyY2FkNjI2NWQ1YWM1MmE1YzczZWZjNDhhZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCkBA IC03OSw2ICs3OSwxMiBAQCBwdWJsaWM6CiAgICAgICAgIExpdmVTdHJlYW0sCiAgICAgfTsKIAor ICAgIGVudW0gUHJlbG9hZCB7CisgICAgICAgIE5vbmUsCisgICAgICAgIE1ldGFEYXRhLAorICAg ICAgICBBdXRvLAorICAgIH07CisKICAgICB2aXJ0dWFsIH5XZWJNZWRpYVBsYXllcigpIHt9CiAK ICAgICB2aXJ0dWFsIHZvaWQgbG9hZChjb25zdCBXZWJVUkwmKSA9IDA7CkBAIC05NCw3ICsxMDAs NyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFJhdGUoZmxvYXQpID0gMDsKICAgICB2 aXJ0dWFsIHZvaWQgc2V0Vm9sdW1lKGZsb2F0KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFZp c2libGUoYm9vbCkgPSAwOwotICAgIHZpcnR1YWwgYm9vbCBzZXRBdXRvQnVmZmVyKGJvb2wpID0g MDsKKyAgICB2aXJ0dWFsIGJvb2wgc2V0UHJlbG9hZChQcmVsb2FkKSB7IHJldHVybiBmYWxzZTsg fTsKICAgICB2aXJ0dWFsIGJvb2wgdG90YWxCeXRlc0tub3duKCkgPSAwOwogICAgIHZpcnR1YWwg Y29uc3QgV2ViVGltZVJhbmdlcyYgYnVmZmVyZWQoKSA9IDA7CiAgICAgdmlydHVhbCBmbG9hdCBt YXhUaW1lU2Vla2FibGUoKSBjb25zdCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXJDbGllbnQuaAppbmRleCA3ZTVkZDY4YzkxNjgxNjRh ZDZlY2NiNjEyZmUzMWNmMjhlMGE3MjFlLi5hOGNiY2ZhNzFiNmVjOTMwYzYyYTllMDQ4NTFiYTdh YTFhN2ViNzFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJN ZWRpYVBsYXllckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl Yk1lZGlhUGxheWVyQ2xpZW50LmgKQEAgLTQ5LDYgKzQ5LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBzaXplQ2hhbmdlZCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2F3VW5zdXBwb3J0 ZWRUcmFja3MoKSA9IDA7CiAgICAgdmlydHVhbCBmbG9hdCB2b2x1bWUoKSBjb25zdCA9IDA7Cisg ICAgdmlydHVhbCB1bnNpZ25lZCBwcmVsb2FkKCkgY29uc3QgPSAwOwogCiBwcm90ZWN0ZWQ6CiAg ICAgfldlYk1lZGlhUGxheWVyQ2xpZW50KCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcAppbmRleCBhMWI0Mjhj YjkzNmUxNGY5YzI2ZTYxZWExYmNhZjNkOWU2YzM1MzIyLi5lZWM1Y2JlMmRkNjU2NGM4ODVlMzhh MjhhZTQxMzYxMzY2NTcwMmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKQEAgLTE4MywxMiArMTgzLDE4IEBA IGZsb2F0IFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6dm9sdW1lKCkgY29uc3QKICAgICByZXR1 cm4gMC4wZjsKIH0KIAordW5zaWduZWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpwcmVsb2Fk KCkgY29uc3QKK3sKKyAgICBpZiAobV9tZWRpYVBsYXllcikKKyAgICAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PHVuc2lnbmVkPihtX21lZGlhUGxheWVyLT5wcmVsb2FkKCkpOworICAgIHJldHVybiBz dGF0aWNfY2FzdDx1bnNpZ25lZD4oTWVkaWFQbGF5ZXI6Ok1ldGFEYXRhKTsKK30KKwogLy8gTWVk aWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIAogdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmxvYWQo Y29uc3QgU3RyaW5nJiB1cmwpCiB7Ci0gICAgRnJhbWUqIGZyYW1lID0gc3RhdGljX2Nhc3Q8SFRN TE1lZGlhRWxlbWVudCo+KAotICAgICAgICBtX21lZGlhUGxheWVyLT5tZWRpYVBsYXllckNsaWVu dCgpKS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKKyAgICBtX3VybCA9IHVybDsKIAogICAgIC8vIFZp ZGVvIGZyYW1lIG9iamVjdCBpcyBvd25lZCBieSBXZWJNZWRpYVBsYXllci4gQmVmb3JlIGRlc3Ry b3lpbmcKICAgICAvLyBXZWJNZWRpYVBsYXllciBhbGwgZnJhbWVzIG5lZWQgdG8gYmUgcmVsZWFz ZWQuCkBAIC0xOTcsOSArMjAzLDIwIEBAIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjps b2FkKGNvbnN0IFN0cmluZyYgdXJsKQogICAgICAgICBtX3ZpZGVvTGF5ZXItPnJlbGVhc2VDdXJy ZW50RnJhbWUoKTsKICNlbmRpZgogCisgICAgaWYgKG1fcHJlbG9hZCA9PSBNZWRpYVBsYXllcjo6 Tm9uZSkgeworICAgICAgICBtX3dlYk1lZGlhUGxheWVyLmNsZWFyKCk7CisgICAgICAgIG1fZGVs YXlpbmdMb2FkID0gdHJ1ZTsKKyAgICB9IGVsc2UKKyAgICAgICAgbG9hZEludGVybmFsKCk7Cit9 CisKK3ZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpsb2FkSW50ZXJuYWwoKQoreworICAg IEZyYW1lKiBmcmFtZSA9IHN0YXRpY19jYXN0PEhUTUxNZWRpYUVsZW1lbnQqPigKKyAgICAgICAg bV9tZWRpYVBsYXllci0+bWVkaWFQbGF5ZXJDbGllbnQoKSktPmRvY3VtZW50KCktPmZyYW1lKCk7 CiAgICAgbV93ZWJNZWRpYVBsYXllci5zZXQoY3JlYXRlV2ViTWVkaWFQbGF5ZXIodGhpcywgZnJh bWUpKTsKICAgICBpZiAobV93ZWJNZWRpYVBsYXllci5nZXQoKSkKLSAgICAgICAgbV93ZWJNZWRp YVBsYXllci0+bG9hZChLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSk7CisgICAgICAgIG1fd2Vi TWVkaWFQbGF5ZXItPmxvYWQoS1VSTChQYXJzZWRVUkxTdHJpbmcsIG1fdXJsKSk7CiB9CiAKIHZv aWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpjYW5jZWxMb2FkKCkKQEAgLTIzNiw2ICsyNTMs MTIgQEAgdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnBhdXNlKCkKICAgICAgICAgbV93 ZWJNZWRpYVBsYXllci0+cGF1c2UoKTsKIH0KIAordm9pZCBXZWJNZWRpYVBsYXllckNsaWVudElt cGw6OnByZXBhcmVUb1BsYXkoKQoreworICAgIGlmIChtX2RlbGF5aW5nTG9hZCkKKyAgICAgICAg c3RhcnREZWxheWVkTG9hZCgpOworfQorCiBJbnRTaXplIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1w bDo6bmF0dXJhbFNpemUoKSBjb25zdAogewogICAgIGlmIChtX3dlYk1lZGlhUGxheWVyLmdldCgp KQpAQCAtNDMyLDEwICs0NTUsMTUgQEAgdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnBh aW50Q3VycmVudEZyYW1lSW5Db250ZXh0KEdyYXBoaWNzQ29udGV4dCogY29udGUKICAgICB9CiB9 CiAKLXZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzZXRBdXRvYnVmZmVyKGJvb2wgYXV0 b0J1ZmZlcikKK3ZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzZXRQcmVsb2FkKE1lZGlh UGxheWVyOjpQcmVsb2FkIHByZWxvYWQpCiB7CisgICAgbV9wcmVsb2FkID0gcHJlbG9hZDsKKwog ICAgIGlmIChtX3dlYk1lZGlhUGxheWVyLmdldCgpKQotICAgICAgICBtX3dlYk1lZGlhUGxheWVy LT5zZXRBdXRvQnVmZmVyKGF1dG9CdWZmZXIpOworICAgICAgICBtX3dlYk1lZGlhUGxheWVyLT5z ZXRQcmVsb2FkKHN0YXRpY19jYXN0PFdlYk1lZGlhUGxheWVyOjpQcmVsb2FkPihwcmVsb2FkKSk7 CisKKyAgICBpZiAobV9kZWxheWluZ0xvYWQgJiYgbV9wcmVsb2FkICE9IE1lZGlhUGxheWVyOjpO b25lKQorICAgICAgICBzdGFydERlbGF5ZWRMb2FkKCk7CiB9CiAKIGJvb2wgV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsOjpoYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpIGNvbnN0CkBAIC01NjAsOCAr NTg4LDIwIEBAIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgV2ViTWVkaWFQbGF5ZXJDbGllbnRJ bXBsOjpzdXBwb3J0c1R5cGUoY29uc3QgU3RyaW5nJiB0CiAgICAgcmV0dXJuIE1lZGlhUGxheWVy OjpJc05vdFN1cHBvcnRlZDsKIH0KIAordm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnN0 YXJ0RGVsYXllZExvYWQoKQoreworICAgIEFTU0VSVChtX2RlbGF5aW5nTG9hZCk7CisgICAgQVNT RVJUKCFtX3dlYk1lZGlhUGxheWVyLmdldCgpKTsKKworICAgIG1fZGVsYXlpbmdMb2FkID0gZmFs c2U7CisKKyAgICBsb2FkSW50ZXJuYWwoKTsKK30KKwogV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBs OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGwoKQogICAgIDogbV9tZWRpYVBsYXllcigwKQorICAg ICwgbV9kZWxheWluZ0xvYWQoZmFsc2UpCisgICAgLCBtX3ByZWxvYWQoTWVkaWFQbGF5ZXI6Ok1l dGFEYXRhKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAsIG1fdmlkZW9M YXllcigwKQogICAgICwgbV9zdXBwb3J0c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoZmFsc2UpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVu dEltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50 SW1wbC5oCmluZGV4IDVkNDQ2MjY5MzFkYTgzM2YxN2M5MzM0NzA2ZjZjNzhlNWUwNTQ2ZDYuLjY0 ZTQ3YmRlZmY2OWVmMzI0YjkxZjljYjhhZjM3NGIwMTY5ODZlODkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCkBAIC03 Niw2ICs3Niw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2l6ZUNoYW5nZWQoKTsKICAg ICB2aXJ0dWFsIHZvaWQgc2F3VW5zdXBwb3J0ZWRUcmFja3MoKTsKICAgICB2aXJ0dWFsIGZsb2F0 IHZvbHVtZSgpIGNvbnN0OworICAgIHZpcnR1YWwgdW5zaWduZWQgcHJlbG9hZCgpIGNvbnN0Owog CiAgICAgLy8gTWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlIG1ldGhvZHM6CiAgICAgdmlydHVh bCB2b2lkIGxvYWQoY29uc3QgV1RGOjpTdHJpbmcmIHVybCk7CkBAIC04Niw2ICs4Nyw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIFdlYkNvcmU6OlBsYXRmb3JtTWVkaWEgcGxhdGZvcm1NZWRpYSgp IGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBwbGF5KCk7CiAgICAgdmlydHVhbCB2b2lkIHBhdXNl KCk7CisgICAgdmlydHVhbCB2b2lkIHByZXBhcmVUb1BsYXkoKTsKICAgICB2aXJ0dWFsIGJvb2wg c3VwcG9ydHNGdWxsc2NyZWVuKCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzU2F2 ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50U2l6ZSBuYXR1cmFsU2l6ZSgpIGNv bnN0OwpAQCAtMTA1LDEzICsxMDcsMTMgQEAgcHVibGljOgogICAgIHZpcnR1YWwgZmxvYXQgbWF4 VGltZVNlZWthYmxlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBXVEY6OlBhc3NSZWZQdHI8V2ViQ29y ZTo6VGltZVJhbmdlcz4gYnVmZmVyZWQoKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBkYXRhUmF0 ZSgpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBzZXRBdXRvYnVmZmVyKGJvb2wpOwogICAgIHZp cnR1YWwgYm9vbCB0b3RhbEJ5dGVzS25vd24oKSBjb25zdDsKICAgICB2aXJ0dWFsIHVuc2lnbmVk IHRvdGFsQnl0ZXMoKSBjb25zdDsKICAgICB2aXJ0dWFsIHVuc2lnbmVkIGJ5dGVzTG9hZGVkKCkg Y29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIHNldFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYp OwogICAgIHZpcnR1YWwgdm9pZCBwYWludChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQqLCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHBhaW50Q3VycmVudEZyYW1l SW5Db250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCosIGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UHJlbG9hZChXZWJDb3JlOjpNZWRpYVBsYXllcjo6 UHJlbG9hZCk7CiAgICAgdmlydHVhbCBib29sIGhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luKCkgY29u c3Q7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpNZWRpYVBsYXllcjo6TW92aWVMb2FkVHlwZSBtb3Zp ZUxvYWRUeXBlKCkgY29uc3Q7CiAgICAgdmlydHVhbCB1bnNpZ25lZCBkZWNvZGVkRnJhbWVDb3Vu dCgpIGNvbnN0OwpAQCAtMTI4LDYgKzEzMCw4IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBX ZWJNZWRpYVBsYXllckNsaWVudEltcGwoKTsKKyAgICB2b2lkIHN0YXJ0RGVsYXllZExvYWQoKTsK KyAgICB2b2lkIGxvYWRJbnRlcm5hbCgpOwogCiAgICAgc3RhdGljIFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUludGVyZmFjZSogY3JlYXRlKFdlYkNvcmU6Ok1lZGlhUGxheWVyKik7CiAgICAg c3RhdGljIHZvaWQgZ2V0U3VwcG9ydGVkVHlwZXMoV1RGOjpIYXNoU2V0PFdURjo6U3RyaW5nPiYp OwpAQCAtMTM5LDYgKzE0Myw5IEBAIHByaXZhdGU6CiAKICAgICBXZWJDb3JlOjpNZWRpYVBsYXll ciogbV9tZWRpYVBsYXllcjsKICAgICBPd25QdHI8V2ViTWVkaWFQbGF5ZXI+IG1fd2ViTWVkaWFQ bGF5ZXI7CisgICAgU3RyaW5nIG1fdXJsOworICAgIGJvb2wgbV9kZWxheWluZ0xvYWQ7CisgICAg V2ViQ29yZTo6TWVkaWFQbGF5ZXI6OlByZWxvYWQgbV9wcmVsb2FkOwogI2lmIFVTRShBQ0NFTEVS QVRFRF9DT01QT1NJVElORykKICAgICBSZWZQdHI8V2ViQ29yZTo6VmlkZW9MYXllckNocm9taXVt PiBtX3ZpZGVvTGF5ZXI7CiAgICAgYm9vbCBtX3N1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZzsK 87226 2011-03-28 15:44:59 -0700 2011-06-20 11:56:41 -0700 Patch bug-56983-20110328154458.patch text/plain 10230 vrk U3VidmVyc2lvbiBSZXZpc2lvbjogODE4ODcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiM2RmMWU5NTU3OTlkODRmMWVmYTJk MjY2NmQwNjIzNjdiZTA0MjQ4Li45MjlkZTQ1OTliMzJhOGE0NzUxMzliNWY1ZGQxOGVmY2ExMWE4 ODQ1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMjQgIFZpY3RvcmlhIEtpcnN0ICA8 dnJrQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW2Nocm9taXVtXSBJbXBsZW1lbnQgcHJlbG9hZD1ub25lLCBzZXRQcmVsb2FkIGhv b2tzIHRvIG1lZGlhIHBsYXllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTY5ODMKKworICAgICAgICBSZWVuYWJsaW5nIHZpZGVvLXByZWxvYWQuaHRt bCBsYXlvdXQgdGVzdCBmb3IgY2hyb21pdW0uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1 bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6CisKIDIwMTEtMDMtMjQgIEVucmljYSBDYXN1Y2NpICA8 ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25z LnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4 dAppbmRleCA1NDJhY2FiMjExYjkyNmRkMmU4Zjg5ZWQ2ZDgyZWMzMDdhZTFiMmZkLi5iOGJjMDc1 N2YwNmZjNmMxMDkyZTI5OGU0YTFiZjVhNzY5NDNlZmY3IDEwMDc1NQotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CkBAIC04MzQsMTAgKzgz NCw2IEBAIEJVR0NSMjgzMDEgU0tJUCA6IG1lZGlhL21lZGlhLWNhcHRpb25zLmh0bWwgPSBUSU1F T1VUCiBCVUdDUjMzMDk5IFNLSVAgOiBtZWRpYS92aWRlby1yZXZlcnNlLXBsYXktZHVyYXRpb24u aHRtbCA9IFRJTUVPVVQKIEJVR0NSMzMwOTkgU0tJUCA6IG1lZGlhL3ZpZGVvLXRpbWV1cGRhdGUt cmV2ZXJzZS1wbGF5Lmh0bWwgPSBUSU1FT1VUCiAKLS8vIFdlIGhhdmVuJ3QgaW1wbGVtZW50ZWQg dmlkZW8gcHJlbG9hZGluZyBhbmQgaXQgcGFzc2luZyBpcyBhIGZhbHNlIHBvc2l0aXZlLgotLy8g VU5JTVBMRU1FTlRFRAotQlVHV0sxNjQ4MiBTS0lQIDogbWVkaWEvdmlkZW8tcHJlbG9hZC5odG1s ID0gUEFTUyBGQUlMCi0KIC8vIERvZXMgbm90IGRpc3BsYXkgY291cmllciBmb3IgdGhlIGxldHRl cnMsIGFzIHRoZSB0ZXN0IHJlcXVlc3RzLgogQlVHQ1IxMDI3OCBMSU5VWCA6IGZhc3QvY3NzL2Zv bnQtZmFjZS1pbXBsaWNpdC1sb2NhbC1mb250Lmh0bWwgPSBGQUlMCiBCVUdDUjEwMjc4IExJTlVY IDogZmFzdC9jc3MvZm9udC1mYWNlLXVuaWNvZGUtcmFuZ2UuaHRtbCA9IEZBSUwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKaW5kZXggNGY0YmNjMTFiNjJhYWYwODBkN2FlMzM3NGI0YTMwZmIxMTY2 MGJlMS4uYjdjODMwMDRjYTFjMjMyZWIyOTBkYjY2YzgxNjJkMjkxM2QwMmE5NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMS0wMy0yNCAgVmljdG9yaWEg S2lyc3QgIDx2cmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEltcGxlbWVudCBwcmVsb2FkPW5vbmUsIHNldFBy ZWxvYWQgaG9va3MgdG8gbWVkaWEgcGxheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01Njk4MworCisgICAgICAgIFRoaXMgcGF0Y2ggaW1wbGVtZW50 cyBwcmVsb2FkPW5vbmUgaW4gQ2hyb21pdW0uIEl0IGFsc28gcmVwbGFjZXMKKyAgICAgICAgdGhl IG5vdy1kZXByZWNhdGVkIHNldEF1dG9idWZmZXIgbWV0aG9kIHdpdGggc2V0UHJlbG9hZC4KKwor ICAgICAgICAqIHB1YmxpYy9XZWJNZWRpYVBsYXllci5oOgorICAgICAgICAoV2ViS2l0OjpXZWJN ZWRpYVBsYXllcjo6c2V0UHJlbG9hZCk6CisgICAgICAgICogcHVibGljL1dlYk1lZGlhUGxheWVy Q2xpZW50Lmg6CisgICAgICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6cHJlbG9hZCk6CisgICAg ICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6bG9hZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6bG9hZEludGVybmFsKToKKyAgICAgICAg KFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpwcmVwYXJlVG9QbGF5KToKKyAgICAg ICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzZXRQcmVsb2FkKToKKyAgICAg ICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzdGFydERlbGF5ZWRMb2FkKToK KyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpXZWJNZWRpYVBsYXll ckNsaWVudEltcGwpOgorICAgICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuaDoK KwogMjAxMS0wMy0yNCAgTmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYk1lZGlhUGxheWVyLmgKaW5kZXggYzAwODRkYjlmYzNiMjY5YWY3NmVlYmQ1OTZi N2NiMjFlOGJlMWU3Ny4uM2IyYWFhYWFjNDc1Zjc1OTYxNDI1ZjdkNWRjZjk1Y2NjZjIxOGMyZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCkBA IC03OSw2ICs3OSwxMiBAQCBwdWJsaWM6CiAgICAgICAgIExpdmVTdHJlYW0sCiAgICAgfTsKIAor ICAgIGVudW0gUHJlbG9hZCB7CisgICAgICAgIE5vbmUsCisgICAgICAgIE1ldGFEYXRhLAorICAg ICAgICBBdXRvLAorICAgIH07CisKICAgICB2aXJ0dWFsIH5XZWJNZWRpYVBsYXllcigpIHt9CiAK ICAgICB2aXJ0dWFsIHZvaWQgbG9hZChjb25zdCBXZWJVUkwmKSA9IDA7CkBAIC05NCw3ICsxMDAs NyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFJhdGUoZmxvYXQpID0gMDsKICAgICB2 aXJ0dWFsIHZvaWQgc2V0Vm9sdW1lKGZsb2F0KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFZp c2libGUoYm9vbCkgPSAwOwotICAgIHZpcnR1YWwgYm9vbCBzZXRBdXRvQnVmZmVyKGJvb2wpID0g MDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UHJlbG9hZChQcmVsb2FkKSB7IH07CiAgICAgdmlydHVh bCBib29sIHRvdGFsQnl0ZXNLbm93bigpID0gMDsKICAgICB2aXJ0dWFsIGNvbnN0IFdlYlRpbWVS YW5nZXMmIGJ1ZmZlcmVkKCkgPSAwOwogICAgIHZpcnR1YWwgZmxvYXQgbWF4VGltZVNlZWthYmxl KCkgY29uc3QgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViTWVkaWFQbGF5ZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl Yk1lZGlhUGxheWVyQ2xpZW50LmgKaW5kZXggN2U1ZGQ2OGM5MTY4MTY0YWQ2ZWNjYjYxMmZlMzFj ZjI4ZTBhNzIxZS4uYWY3Y2YxOTBkMWYyYzkxOWE3OTczMzM5NzM0ODI2MWY4ZjVkNmYyYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXJDbGll bnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllckNs aWVudC5oCkBAIC0zMSw2ICszMSw4IEBACiAjaWZuZGVmIFdlYk1lZGlhUGxheWVyQ2xpZW50X2gK ICNkZWZpbmUgV2ViTWVkaWFQbGF5ZXJDbGllbnRfaAogCisjaW5jbHVkZSAiV2ViTWVkaWFQbGF5 ZXIuaCIKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYlJlcXVlc3Q7CkBAIC00OSw2 ICs1MSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2l6ZUNoYW5nZWQoKSA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIHNhd1Vuc3VwcG9ydGVkVHJhY2tzKCkgPSAwOwogICAgIHZpcnR1YWwg ZmxvYXQgdm9sdW1lKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgV2ViTWVkaWFQbGF5ZXI6OlBy ZWxvYWQgcHJlbG9hZCgpIGNvbnN0ID0gMDsKIAogcHJvdGVjdGVkOgogICAgIH5XZWJNZWRpYVBs YXllckNsaWVudCgpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKaW5kZXggYTFiNDI4Y2I5MzZlMTRmOWMyNmU2 MWVhMWJjYWYzZDllNmMzNTMyMi4uZGQ0NzRmNjE3MzY3MjI2OWRkZDkyMzhjYzljM2Q5NWEzMDFl ZTM1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRp YVBsYXllckNsaWVudEltcGwuY3BwCkBAIC0xODMsMTIgKzE4MywxOCBAQCBmbG9hdCBXZWJNZWRp YVBsYXllckNsaWVudEltcGw6OnZvbHVtZSgpIGNvbnN0CiAgICAgcmV0dXJuIDAuMGY7CiB9CiAK K1dlYk1lZGlhUGxheWVyOjpQcmVsb2FkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6cHJlbG9h ZCgpIGNvbnN0Cit7CisgICAgaWYgKG1fbWVkaWFQbGF5ZXIpCisgICAgICAgIHJldHVybiBzdGF0 aWNfY2FzdDxXZWJNZWRpYVBsYXllcjo6UHJlbG9hZD4obV9tZWRpYVBsYXllci0+cHJlbG9hZCgp KTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViTWVkaWFQbGF5ZXI6OlByZWxvYWQ+KG1fcHJl bG9hZCk7Cit9CisKIC8vIE1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZSAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIHZvaWQgV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsOjpsb2FkKGNvbnN0IFN0cmluZyYgdXJsKQogewotICAgIEZyYW1lKiBmcmFt ZSA9IHN0YXRpY19jYXN0PEhUTUxNZWRpYUVsZW1lbnQqPigKLSAgICAgICAgbV9tZWRpYVBsYXll ci0+bWVkaWFQbGF5ZXJDbGllbnQoKSktPmRvY3VtZW50KCktPmZyYW1lKCk7CisgICAgbV91cmwg PSB1cmw7CiAKICAgICAvLyBWaWRlbyBmcmFtZSBvYmplY3QgaXMgb3duZWQgYnkgV2ViTWVkaWFQ bGF5ZXIuIEJlZm9yZSBkZXN0cm95aW5nCiAgICAgLy8gV2ViTWVkaWFQbGF5ZXIgYWxsIGZyYW1l cyBuZWVkIHRvIGJlIHJlbGVhc2VkLgpAQCAtMTk3LDkgKzIwMywxOSBAQCB2b2lkIFdlYk1lZGlh UGxheWVyQ2xpZW50SW1wbDo6bG9hZChjb25zdCBTdHJpbmcmIHVybCkKICAgICAgICAgbV92aWRl b0xheWVyLT5yZWxlYXNlQ3VycmVudEZyYW1lKCk7CiAjZW5kaWYKIAorICAgIGlmIChtX3ByZWxv YWQgPT0gTWVkaWFQbGF5ZXI6Ok5vbmUpIHsKKyAgICAgICAgbV93ZWJNZWRpYVBsYXllci5jbGVh cigpOworICAgICAgICBtX2RlbGF5aW5nTG9hZCA9IHRydWU7CisgICAgfSBlbHNlCisgICAgICAg IGxvYWRJbnRlcm5hbCgpOworfQorCit2b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6bG9h ZEludGVybmFsKCkKK3sKKyAgICBGcmFtZSogZnJhbWUgPSBzdGF0aWNfY2FzdDxIVE1MTWVkaWFF bGVtZW50Kj4obV9tZWRpYVBsYXllci0+bWVkaWFQbGF5ZXJDbGllbnQoKSktPmRvY3VtZW50KCkt PmZyYW1lKCk7CiAgICAgbV93ZWJNZWRpYVBsYXllci5zZXQoY3JlYXRlV2ViTWVkaWFQbGF5ZXIo dGhpcywgZnJhbWUpKTsKICAgICBpZiAobV93ZWJNZWRpYVBsYXllci5nZXQoKSkKLSAgICAgICAg bV93ZWJNZWRpYVBsYXllci0+bG9hZChLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSk7CisgICAg ICAgIG1fd2ViTWVkaWFQbGF5ZXItPmxvYWQoS1VSTChQYXJzZWRVUkxTdHJpbmcsIG1fdXJsKSk7 CiB9CiAKIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpjYW5jZWxMb2FkKCkKQEAgLTIz Niw2ICsyNTIsMTIgQEAgdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnBhdXNlKCkKICAg ICAgICAgbV93ZWJNZWRpYVBsYXllci0+cGF1c2UoKTsKIH0KIAordm9pZCBXZWJNZWRpYVBsYXll ckNsaWVudEltcGw6OnByZXBhcmVUb1BsYXkoKQoreworICAgIGlmIChtX2RlbGF5aW5nTG9hZCkK KyAgICAgICAgc3RhcnREZWxheWVkTG9hZCgpOworfQorCiBJbnRTaXplIFdlYk1lZGlhUGxheWVy Q2xpZW50SW1wbDo6bmF0dXJhbFNpemUoKSBjb25zdAogewogICAgIGlmIChtX3dlYk1lZGlhUGxh eWVyLmdldCgpKQpAQCAtNDMyLDEwICs0NTQsMTUgQEAgdm9pZCBXZWJNZWRpYVBsYXllckNsaWVu dEltcGw6OnBhaW50Q3VycmVudEZyYW1lSW5Db250ZXh0KEdyYXBoaWNzQ29udGV4dCogY29udGUK ICAgICB9CiB9CiAKLXZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzZXRBdXRvYnVmZmVy KGJvb2wgYXV0b0J1ZmZlcikKK3ZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzZXRQcmVs b2FkKE1lZGlhUGxheWVyOjpQcmVsb2FkIHByZWxvYWQpCiB7CisgICAgbV9wcmVsb2FkID0gcHJl bG9hZDsKKwogICAgIGlmIChtX3dlYk1lZGlhUGxheWVyLmdldCgpKQotICAgICAgICBtX3dlYk1l ZGlhUGxheWVyLT5zZXRBdXRvQnVmZmVyKGF1dG9CdWZmZXIpOworICAgICAgICBtX3dlYk1lZGlh UGxheWVyLT5zZXRQcmVsb2FkKHN0YXRpY19jYXN0PFdlYk1lZGlhUGxheWVyOjpQcmVsb2FkPihw cmVsb2FkKSk7CisKKyAgICBpZiAobV9kZWxheWluZ0xvYWQgJiYgbV9wcmVsb2FkICE9IE1lZGlh UGxheWVyOjpOb25lKQorICAgICAgICBzdGFydERlbGF5ZWRMb2FkKCk7CiB9CiAKIGJvb2wgV2Vi TWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpoYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpIGNvbnN0CkBA IC01NjAsOCArNTg3LDIwIEBAIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsOjpzdXBwb3J0c1R5cGUoY29uc3QgU3RyaW5nJiB0CiAgICAgcmV0dXJuIE1l ZGlhUGxheWVyOjpJc05vdFN1cHBvcnRlZDsKIH0KIAordm9pZCBXZWJNZWRpYVBsYXllckNsaWVu dEltcGw6OnN0YXJ0RGVsYXllZExvYWQoKQoreworICAgIEFTU0VSVChtX2RlbGF5aW5nTG9hZCk7 CisgICAgQVNTRVJUKCFtX3dlYk1lZGlhUGxheWVyLmdldCgpKTsKKworICAgIG1fZGVsYXlpbmdM b2FkID0gZmFsc2U7CisKKyAgICBsb2FkSW50ZXJuYWwoKTsKK30KKwogV2ViTWVkaWFQbGF5ZXJD bGllbnRJbXBsOjpXZWJNZWRpYVBsYXllckNsaWVudEltcGwoKQogICAgIDogbV9tZWRpYVBsYXll cigwKQorICAgICwgbV9kZWxheWluZ0xvYWQoZmFsc2UpCisgICAgLCBtX3ByZWxvYWQoTWVkaWFQ bGF5ZXI6Ok1ldGFEYXRhKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAs IG1fdmlkZW9MYXllcigwKQogICAgICwgbV9zdXBwb3J0c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmco ZmFsc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBs YXllckNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxh eWVyQ2xpZW50SW1wbC5oCmluZGV4IDVkNDQ2MjY5MzFkYTgzM2YxN2M5MzM0NzA2ZjZjNzhlNWUw NTQ2ZDYuLjgyYzg1Y2E2YjQ1M2Q0MWE0M2M3ZGJiMGE0OWM3NTI2MzJiN2EzZmEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5o CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1w bC5oCkBAIC03Niw2ICs3Niw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2l6ZUNoYW5n ZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2F3VW5zdXBwb3J0ZWRUcmFja3MoKTsKICAgICB2aXJ0 dWFsIGZsb2F0IHZvbHVtZSgpIGNvbnN0OworICAgIHZpcnR1YWwgV2ViTWVkaWFQbGF5ZXI6OlBy ZWxvYWQgcHJlbG9hZCgpIGNvbnN0OwogCiAgICAgLy8gTWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJm YWNlIG1ldGhvZHM6CiAgICAgdmlydHVhbCB2b2lkIGxvYWQoY29uc3QgV1RGOjpTdHJpbmcmIHVy bCk7CkBAIC04Niw2ICs4Nyw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFdlYkNvcmU6OlBsYXRm b3JtTWVkaWEgcGxhdGZvcm1NZWRpYSgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBwbGF5KCk7 CiAgICAgdmlydHVhbCB2b2lkIHBhdXNlKCk7CisgICAgdmlydHVhbCB2b2lkIHByZXBhcmVUb1Bs YXkoKTsKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNGdWxsc2NyZWVuKCkgY29uc3Q7CiAgICAg dmlydHVhbCBib29sIHN1cHBvcnRzU2F2ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgV2ViQ29yZTo6 SW50U2l6ZSBuYXR1cmFsU2l6ZSgpIGNvbnN0OwpAQCAtMTA1LDEzICsxMDcsMTMgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgZmxvYXQgbWF4VGltZVNlZWthYmxlKCkgY29uc3Q7CiAgICAgdmlydHVh bCBXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6VGltZVJhbmdlcz4gYnVmZmVyZWQoKSBjb25zdDsK ICAgICB2aXJ0dWFsIGludCBkYXRhUmF0ZSgpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBzZXRB dXRvYnVmZmVyKGJvb2wpOwogICAgIHZpcnR1YWwgYm9vbCB0b3RhbEJ5dGVzS25vd24oKSBjb25z dDsKICAgICB2aXJ0dWFsIHVuc2lnbmVkIHRvdGFsQnl0ZXMoKSBjb25zdDsKICAgICB2aXJ0dWFs IHVuc2lnbmVkIGJ5dGVzTG9hZGVkKCkgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIHNldFNpemUo Y29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogICAgIHZpcnR1YWwgdm9pZCBwYWludChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVh bCB2b2lkIHBhaW50Q3VycmVudEZyYW1lSW5Db250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dCosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UHJlbG9h ZChXZWJDb3JlOjpNZWRpYVBsYXllcjo6UHJlbG9hZCk7CiAgICAgdmlydHVhbCBib29sIGhhc1Np bmdsZVNlY3VyaXR5T3JpZ2luKCkgY29uc3Q7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpNZWRpYVBs YXllcjo6TW92aWVMb2FkVHlwZSBtb3ZpZUxvYWRUeXBlKCkgY29uc3Q7CiAgICAgdmlydHVhbCB1 bnNpZ25lZCBkZWNvZGVkRnJhbWVDb3VudCgpIGNvbnN0OwpAQCAtMTI4LDYgKzEzMCw4IEBAIHB1 YmxpYzoKIAogcHJpdmF0ZToKICAgICBXZWJNZWRpYVBsYXllckNsaWVudEltcGwoKTsKKyAgICB2 b2lkIHN0YXJ0RGVsYXllZExvYWQoKTsKKyAgICB2b2lkIGxvYWRJbnRlcm5hbCgpOwogCiAgICAg c3RhdGljIFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZSogY3JlYXRlKFdlYkNv cmU6Ok1lZGlhUGxheWVyKik7CiAgICAgc3RhdGljIHZvaWQgZ2V0U3VwcG9ydGVkVHlwZXMoV1RG OjpIYXNoU2V0PFdURjo6U3RyaW5nPiYpOwpAQCAtMTM5LDYgKzE0Myw5IEBAIHByaXZhdGU6CiAK ICAgICBXZWJDb3JlOjpNZWRpYVBsYXllciogbV9tZWRpYVBsYXllcjsKICAgICBPd25QdHI8V2Vi TWVkaWFQbGF5ZXI+IG1fd2ViTWVkaWFQbGF5ZXI7CisgICAgU3RyaW5nIG1fdXJsOworICAgIGJv b2wgbV9kZWxheWluZ0xvYWQ7CisgICAgV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OlByZWxvYWQgbV9w cmVsb2FkOwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICBSZWZQdHI8V2Vi Q29yZTo6VmlkZW9MYXllckNocm9taXVtPiBtX3ZpZGVvTGF5ZXI7CiAgICAgYm9vbCBtX3N1cHBv cnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZzsK