55460 2011-03-01 05:03:26 -0800 [EFL] New mediaControl css file for EFL 2011-03-10 21:30:38 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 55463 1 gyuyoung.kim gyuyoung.kim abarth commit-queue eric kenneth leandro lucas.de.marchi tonikitoo oldest_to_newest 359816 0 gyuyoung.kim 2011-03-01 05:03:26 -0800 We need to make new mediaControl file for EFL port. Layout of media controller is decided by the mediaControl file. So, I make it referencing to mediaControls.css. 359821 1 84216 gyuyoung.kim 2011-03-01 05:07:19 -0800 Created attachment 84216 Proposed Patch 360712 2 84216 lucas.de.marchi 2011-03-02 03:52:35 -0800 Comment on attachment 84216 Proposed Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84216&action=review > Source/WebCore/CMakeLists.txt:1544 > SET(WebCore_USER_AGENT_STYLE_SHEETS > ${WEBCORE_DIR}/css/html.css > ${WEBCORE_DIR}/css/mathml.css > ${WEBCORE_DIR}/css/mediaControls.css > - ${WEBCORE_DIR}/css/mediaControlsGtk.css > + ${WEBCORE_DIR}/css/mediaControlsEfl.css Shouldn't this be part of WebCore/CMakeListsEfl.txt? 361277 3 gyuyoung.kim 2011-03-02 18:11:00 -0800 (In reply to comment #2) > (From update of attachment 84216 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=84216&action=review > > > Source/WebCore/CMakeLists.txt:1544 > > SET(WebCore_USER_AGENT_STYLE_SHEETS > > ${WEBCORE_DIR}/css/html.css > > ${WEBCORE_DIR}/css/mathml.css > > ${WEBCORE_DIR}/css/mediaControls.css > > - ${WEBCORE_DIR}/css/mediaControlsGtk.css > > + ${WEBCORE_DIR}/css/mediaControlsEfl.css > > Shouldn't this be part of WebCore/CMakeListsEfl.txt? If I move it to CMakeListEfl.txt, the UserAgentStyleSheets.h file doesn't include "mediaControlsEflUserAgentStyleSheet" used by RenderThemeEfl.cpp. Because, CMakeLists.txt generates the UserAgentStyleSheets.h, UserAgentStyleSheets.h can't include mediaControlsEfl.css. CMakeLists.h ... 2204 # Generate user agent styles 2205 ADD_CUSTOM_COMMAND( 2206 OUTPUT ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h 2207 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl 2208 DEPENDS ${WebCore_USER_AGENT_STYLE_SHEETS} 2209 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${WebCo re_USER_AGENT_STYLE_SHEETS} 2210 VERBATIM) 2211 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp) 2212 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h) 2213 361287 4 gyuyoung.kim 2011-03-02 18:31:10 -0800 (In reply to comment #3) > > CMakeLists.h Oops. I mean CMakeLists.txt file. 362102 5 gyuyoung.kim 2011-03-03 17:13:46 -0800 I need this patch to add media control UI. WebKit EFL doesn't display any media control buttons now. Please review this patch. 364617 6 84216 commit-queue 2011-03-09 11:02:13 -0800 Comment on attachment 84216 Proposed Patch Rejecting attachment 84216 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-8', 'apply-..." exit_code: 1 Last 500 characters of output: rks/Python.framework/Versions/2.6/lib/python2.6/urllib2.py", line 361, in _call_chain result = func(*args) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_http.py", line 756, in https_open return self.do_open(conn_factory, req) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_http.py", line 706, in do_open raise URLError(err) urllib2.URLError: <urlopen error [Errno 60] Operation timed out> Full output: http://queues.webkit.org/results/8110932 364619 7 84216 eric 2011-03-09 11:05:52 -0800 Comment on attachment 84216 Proposed Patch This is the second time we've seen bugzilla attachment fetching time out in the last 24 hours. Perhaps Bill has been restarting servers? Obviously we could make webkit-patch more robust against this type of failure (And probably should!) 364886 8 84216 gyuyoung.kim 2011-03-09 16:52:36 -0800 Comment on attachment 84216 Proposed Patch Changelog is wrong. 364906 9 85264 gyuyoung.kim 2011-03-09 17:27:20 -0800 Created attachment 85264 Patch 365791 10 85264 commit-queue 2011-03-10 20:31:39 -0800 Comment on attachment 85264 Patch Clearing flags on attachment: 85264 Committed r80809: <http://trac.webkit.org/changeset/80809> 84216 2011-03-01 05:07:19 -0800 2011-03-09 16:52:36 -0800 Proposed Patch patch-mediacontrol.txt text/plain 10187 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYkNv cmUvQ01ha2VMaXN0cy50eHQKaW5kZXggYzAyMjY1Yy4uNjkzZmU4YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0 cy50eHQKQEAgLTE1NDEsNyArMTU0MSw3IEBAIFNFVChXZWJDb3JlX1VTRVJfQUdFTlRfU1RZTEVf U0hFRVRTCiAgICAgJHtXRUJDT1JFX0RJUn0vY3NzL2h0bWwuY3NzCiAgICAgJHtXRUJDT1JFX0RJ Un0vY3NzL21hdGhtbC5jc3MKICAgICAke1dFQkNPUkVfRElSfS9jc3MvbWVkaWFDb250cm9scy5j c3MKLSAgICAke1dFQkNPUkVfRElSfS9jc3MvbWVkaWFDb250cm9sc0d0ay5jc3MKKyAgICAke1dF QkNPUkVfRElSfS9jc3MvbWVkaWFDb250cm9sc0VmbC5jc3MKICAgICAke1dFQkNPUkVfRElSfS9j c3MvcXVpcmtzLmNzcwogICAgICR7V0VCQ09SRV9ESVJ9L2Nzcy9zdmcuY3NzCiAgICAgJHtXRUJD T1JFX0RJUn0vY3NzL3ZpZXctc291cmNlLmNzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q01ha2VMaXN0c0VmbC50eHQgYi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzRWZsLnR4dAppbmRl eCBiYTdiNTU0Li43YmYyZmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3Rz RWZsLnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzRWZsLnR4dApAQCAtMTMsNiAr MTMsNyBAQCBMSVNUKEFQUEVORCBXZWJDb3JlX0lOQ0xVREVfRElSRUNUT1JJRVMKICAgIiR7V0VC Q09SRV9ESVJ9L2FjY2Vzc2liaWxpdHkvZWZsIgogICAiJHtXRUJLSVRfRElSfS9lZmwvV2ViQ29y ZVN1cHBvcnQiCiAgICIke1dFQktJVF9ESVJ9L2VmbC9ld2siCisgICIke0RFUklWRURfU09VUkNF U19ESVJ9IgogKQogCiBMSVNUKEFQUEVORCBXZWJDb3JlX1NPVVJDRVMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4 NDAxYmMzLi42Njk4MmFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDMtMDEg IEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIGEgc2hvcnQgZGVzY3JpcHRp b24gYW5kIGJ1ZyBVUkwgKE9PUFMhKQorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQor CisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICogQ01ha2VMaXN0c0VmbC50eHQ6 CisgICAgICAgICogY3NzL21lZGlhQ29udHJvbHNFZmwuY3NzOiBBZGRlZC4KKyAgICAgICAgKGF1 ZGlvKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsLCB2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCk6CisgICAgICAgICh2aWRlbzotd2Via2l0 LWZ1bGwtcGFnZS1tZWRpYTo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCk6CisgICAgICAg IChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRvbiwgdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtbXV0ZS1idXR0b24pOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtcGxheS1idXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LXBsYXktYnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRp bWVsaW5lLWNvbnRhaW5lciwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUt Y29udGFpbmVyKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJl bnQtdGltZS1kaXNwbGF5LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRp bWUtZGlzcGxheSk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1l LXJlbWFpbmluZy1kaXNwbGF5LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJl bWFpbmluZy1kaXNwbGF5KToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LXRpbWVsaW5lLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZSk6CisgICAg ICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5l ciwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRlci1jb250YWluZXIp OgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRlciwg dmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRlcik6CisgICAgICAgIChh dWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zZWVrLWJhY2stYnV0dG9uLCB2aWRlbzo6LXdl YmtpdC1tZWRpYS1jb250cm9scy1zZWVrLWJhY2stYnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstZm9yd2FyZC1idXR0b24sIHZpZGVvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXNlZWstZm9yd2FyZC1idXR0b24pOgorICAgICAgICAoYXVkaW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1idXR0b24sIHZpZGVvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLWZ1bGxzY3JlZW4tYnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXJld2luZC1idXR0b24pOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtcmV0dXJuLXRvLXJlYWx0aW1lLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtcmV0dXJuLXRvLXJlYWx0aW1lLWJ1dHRvbik6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy10b2dnbGUtY2xvc2VkLWNhcHRpb25zLWJ1dHRvbiwgdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtdG9nZ2xlLWNsb3NlZC1jYXB0aW9ucy1idXR0b24pOgorICAgICAg ICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRlci1tdXRlLWJ1dHRv biwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRlci1tdXRlLWJ1dHRv bik6CisgICAgICAgICogcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lRWZsOjpleHRyYU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0KToK KwogMjAxMS0wMy0wMSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL21lZGlhQ29udHJvbHNFZmwuY3NzIGIvU291cmNlL1dlYkNvcmUvY3NzL21lZGlhQ29u dHJvbHNFZmwuY3NzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkzOGQ3ZTgK LS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250cm9sc0VmbC5j c3MKQEAgLTAsMCArMSwxNzQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTAgQXBw bGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSBTYW1z dW5nIEVsZWN0cm9uaWNzCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBt ZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBDT01QVVRFUiwgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUK KyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S IEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIENPTVBVVEVSLCBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZP UiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFS WSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywKKyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LiAKKyAqLworCisvKiBFRkxXZWJLaXQgbWVkaWEgY29udHJvbHMuIEV4dGVuZHMgbWVkaWFDb250 cm9scy5jc3MgKi8KKworYXVkaW8geworICAgIHdpZHRoOiAyMDBweDsKKyAgICBoZWlnaHQ6IDI1 cHg7Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsLCB2aWRlbzo6LXdl YmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCB7CisgICAgZGlzcGxheTogLXdlYmtpdC1ib3g7Cisg ICAgLXdlYmtpdC1ib3gtb3JpZW50OiBob3Jpem9udGFsOworICAgIC13ZWJraXQtYm94LWFsaWdu OiBjZW50ZXI7CisgICAgLXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZTsKKyAgICBwb3NpdGlvbjog YWJzb2x1dGU7CisgICAgYm90dG9tOiAwOworICAgIHdpZHRoOiAxMDAlOworICAgIHotaW5kZXg6 IDA7CisgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICBoZWlnaHQ6IDI1cHg7CisgICAgdGV4dC1h bGlnbjogcmlnaHQ7Cit9CisKK3ZpZGVvOi13ZWJraXQtZnVsbC1wYWdlLW1lZGlhOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXBhbmVsIHsKKyAgICBib3R0b206IC0yNXB4OworfQorCithdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtbXV0ZS1idXR0b24geworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtbXV0 ZS1idXR0b247CisgICAgZGlzcGxheTogLXdlYmtpdC1ib3g7CisgICAgd2lkdGg6IDI1cHg7Cisg ICAgaGVpZ2h0OiAyNXB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGluaXRpYWw7CisgICAgYm9y ZGVyOiBpbml0aWFsOworICAgIGNvbG9yOiBpbmhlcml0OworfQorCithdWRpbzo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy1wbGF5LWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt cGxheS1idXR0b24geworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtcGxheS1idXR0b247 CisgICAgZGlzcGxheTogLXdlYmtpdC1ib3g7CisgICAgd2lkdGg6IDI1cHg7CisgICAgaGVpZ2h0 OiAyNXB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGluaXRpYWw7CisgICAgYm9yZGVyOiBpbml0 aWFsOworICAgIGNvbG9yOiBpbmhlcml0OworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy10aW1lbGluZS1jb250YWluZXIsIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRp bWVsaW5lLWNvbnRhaW5lciB7CisgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBtZWRpYS1jb250cm9s cy1iYWNrZ3JvdW5kOworICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94 LW9yaWVudDogaG9yaXpvbnRhbDsKKyAgICAtd2Via2l0LWJveC1hbGlnbjogY2VudGVyOworICAg IC13ZWJraXQtYm94LXBhY2s6IGVuZDsKKyAgICAtd2Via2l0LWJveC1mbGV4OiAxOworICAgIC13 ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmU7CisgICAgaGVpZ2h0OiAyNXB4OworfQorCithdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSwgdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtY3VycmVudC10aW1lLWRpc3BsYXkgeworICAgIGRpc3BsYXk6IG5v bmU7Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWUtcmVtYWluaW5nLWRp c3BsYXksIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWUtcmVtYWluaW5nLWRpc3Bs YXkgeworICAgIGRpc3BsYXk6IG5vbmU7Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXRpbWVsaW5lLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZSB7Cisg ICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBtZWRpYS1zbGlkZXI7CisgICAgZGlzcGxheTogLXdlYmtp dC1ib3g7CisgICAgLXdlYmtpdC1ib3gtZmxleDogMTsKKyAgICBoZWlnaHQ6IDI1cHg7CisgICAg cGFkZGluZzogMHB4IDJweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBpbml0aWFsOworICAgIGJv cmRlcjogaW5pdGlhbDsKKyAgICBjb2xvcjogaW5oZXJpdDsKKyAgICBtYXJnaW46IGluaXRpYWw7 Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFp bmVyLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5l ciB7CisgICAgZGlzcGxheTogbm9uZTsKK30KKworYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtdm9sdW1lLXNsaWRlciwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNs aWRlciB7CisgICAgZGlzcGxheTogbm9uZTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBpbml0aWFs OworICAgIGJvcmRlcjogaW5pdGlhbDsKKyAgICBjb2xvcjogaW5oZXJpdDsKKyAgICBtYXJnaW46 IGluaXRpYWw7Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstYmFjay1i dXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstYmFjay1idXR0b24gewor ICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtc2Vlay1iYWNrLWJ1dHRvbjsKKyAgICBkaXNw bGF5OiAtd2Via2l0LWJveDsKKyAgICB3aWR0aDogMjVweDsKKyAgICBoZWlnaHQ6IDI1cHg7Cisg ICAgYmFja2dyb3VuZC1jb2xvcjogaW5pdGlhbDsKKyAgICBib3JkZXI6IGluaXRpYWw7CisgICAg Y29sb3I6IGluaGVyaXQ7Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWst Zm9yd2FyZC1idXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstZm9yd2Fy ZC1idXR0b24geworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtc2Vlay1mb3J3YXJkLWJ1 dHRvbjsKKyAgICBkaXNwbGF5OiAtd2Via2l0LWJveDsKKyAgICB3aWR0aDogMjVweDsKKyAgICBo ZWlnaHQ6IDI1cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogaW5pdGlhbDsKKyAgICBib3JkZXI6 IGluaXRpYWw7CisgICAgY29sb3I6IGluaGVyaXQ7Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlh LWNvbnRyb2xzLWZ1bGxzY3JlZW4tYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy1mdWxsc2NyZWVuLWJ1dHRvbiB7CisgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBtZWRpYS1mdWxs c2NyZWVuLWJ1dHRvbjsKKyAgICBkaXNwbGF5OiAtd2Via2l0LWJveDsKKyAgICB3aWR0aDogMjVw eDsKKyAgICBoZWlnaHQ6IDI1cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogaW5pdGlhbDsKKyAg ICBib3JkZXI6IGluaXRpYWw7CisgICAgY29sb3I6IGluaGVyaXQ7Cit9CisKK2F1ZGlvOjotd2Vi a2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNv bnRyb2xzLXJld2luZC1idXR0b24geworICAgIGRpc3BsYXk6IG5vbmU7CisgICAgYmFja2dyb3Vu ZC1jb2xvcjogaW5pdGlhbDsKKyAgICBib3JkZXI6IGluaXRpYWw7CisgICAgY29sb3I6IGluaGVy aXQ7Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJldHVybi10by1yZWFsdGlt ZS1idXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJldHVybi10by1yZWFsdGlt ZS1idXR0b24geworICAgIGRpc3BsYXk6IG5vbmU7CisgICAgYmFja2dyb3VuZC1jb2xvcjogaW5p dGlhbDsKKyAgICBib3JkZXI6IGluaXRpYWw7CisgICAgY29sb3I6IGluaGVyaXQ7Cit9CisKK2F1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRvZ2dsZS1jbG9zZWQtY2FwdGlvbnMtYnV0dG9u LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10b2dnbGUtY2xvc2VkLWNhcHRpb25zLWJ1 dHRvbiB7CisgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBtZWRpYS10b2dnbGUtY2xvc2VkLWNhcHRp b25zLWJ1dHRvbjsKKyAgICBkaXNwbGF5OiAtd2Via2l0LWJveDsKKyAgICB3aWR0aDogMjVweDsK KyAgICBoZWlnaHQ6IDI1cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogaW5pdGlhbDsKKyAgICBi b3JkZXI6IGluaXRpYWw7CisgICAgY29sb3I6IGluaGVyaXQ7Cit9CisKK2F1ZGlvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItbXV0ZS1idXR0b24sIHZpZGVvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItbXV0ZS1idXR0b24geworICAgIC13ZWJraXQt YXBwZWFyYW5jZTogbWVkaWEtdm9sdW1lLXNsaWRlci1tdXRlLWJ1dHRvbjsKKyAgICBkaXNwbGF5 OiBub25lOworICAgIGJhY2tncm91bmQtY29sb3I6IGluaXRpYWw7CisgICAgYm9yZGVyOiBpbml0 aWFsOworICAgIGNvbG9yOiBpbmhlcml0OworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAKaW5kZXggOTEwMmQxNy4uN2Y4N2YwYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCkBAIC0zOCw2ICsz OCw3IEBACiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyUHJvZ3Jl c3MuaCIKICNpbmNsdWRlICJSZW5kZXJTbGlkZXIuaCIKKyNpbmNsdWRlICJVc2VyQWdlbnRTdHls ZVNoZWV0cy5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogI2luY2x1ZGUgPEVj b3JlX0V2YXMuaD4KQEAgLTEwNDYsOCArMTA0Nyw3IEBAIGJvb2wgUmVuZGVyVGhlbWVFZmw6OnBh aW50UHJvZ3Jlc3NCYXIoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIGksIGNvbnN0 CiAjaWYgRU5BQkxFKFZJREVPKQogU3RyaW5nIFJlbmRlclRoZW1lRWZsOjpleHRyYU1lZGlhQ29u dHJvbHNTdHlsZVNoZWV0KCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBT dHJpbmcoKTsKKyAgICByZXR1cm4gU3RyaW5nKG1lZGlhQ29udHJvbHNFZmxVc2VyQWdlbnRTdHls ZVNoZWV0LCBzaXplb2YobWVkaWFDb250cm9sc0VmbFVzZXJBZ2VudFN0eWxlU2hlZXQpKTsKIH0K IAogU3RyaW5nIFJlbmRlclRoZW1lRWZsOjpmb3JtYXRNZWRpYUNvbnRyb2xzQ3VycmVudFRpbWUo ZmxvYXQgY3VycmVudFRpbWUsIGZsb2F0IGR1cmF0aW9uKSBjb25zdAo= 85264 2011-03-09 17:27:20 -0800 2011-03-10 20:31:39 -0800 Patch patch-mediacontrol.txt text/plain 10269 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYkNv cmUvQ01ha2VMaXN0cy50eHQKaW5kZXggNDhmMjM3YS4uNDU2NWNkMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0 cy50eHQKQEAgLTE1NDgsNyArMTU0OCw3IEBAIFNFVChXZWJDb3JlX1VTRVJfQUdFTlRfU1RZTEVf U0hFRVRTCiAgICAgJHtXRUJDT1JFX0RJUn0vY3NzL2h0bWwuY3NzCiAgICAgJHtXRUJDT1JFX0RJ Un0vY3NzL21hdGhtbC5jc3MKICAgICAke1dFQkNPUkVfRElSfS9jc3MvbWVkaWFDb250cm9scy5j c3MKLSAgICAke1dFQkNPUkVfRElSfS9jc3MvbWVkaWFDb250cm9sc0d0ay5jc3MKKyAgICAke1dF QkNPUkVfRElSfS9jc3MvbWVkaWFDb250cm9sc0VmbC5jc3MKICAgICAke1dFQkNPUkVfRElSfS9j c3MvcXVpcmtzLmNzcwogICAgICR7V0VCQ09SRV9ESVJ9L2Nzcy9zdmcuY3NzCiAgICAgJHtXRUJD T1JFX0RJUn0vY3NzL3ZpZXctc291cmNlLmNzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q01ha2VMaXN0c0VmbC50eHQgYi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzRWZsLnR4dAppbmRl eCBiYTdiNTU0Li43YmYyZmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3Rz RWZsLnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzRWZsLnR4dApAQCAtMTMsNiAr MTMsNyBAQCBMSVNUKEFQUEVORCBXZWJDb3JlX0lOQ0xVREVfRElSRUNUT1JJRVMKICAgIiR7V0VC Q09SRV9ESVJ9L2FjY2Vzc2liaWxpdHkvZWZsIgogICAiJHtXRUJLSVRfRElSfS9lZmwvV2ViQ29y ZVN1cHBvcnQiCiAgICIke1dFQktJVF9ESVJ9L2VmbC9ld2siCisgICIke0RFUklWRURfU09VUkNF U19ESVJ9IgogKQogCiBMSVNUKEFQUEVORCBXZWJDb3JlX1NPVVJDRVMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBh YjZjYjJjLi44ZTkwN2RlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDMtMDkg IEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAgICBbRUZMXSBOZXcg bWVkaWFDb250cm9sIGNzcyBmaWxlIGZvciBFRkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU1NDYwCisKKyAgICAgICAgQWRkIG5ldyBtZWRpYUNvbnRy b2wgY3NzIGZpbGUgZm9yIGh0bWw1IHZpZGVvIFVJLgorCisgICAgICAgICogQ01ha2VMaXN0cy50 eHQ6CisgICAgICAgICogQ01ha2VMaXN0c0VmbC50eHQ6CisgICAgICAgICogY3NzL21lZGlhQ29u dHJvbHNFZmwuY3NzOiBBZGRlZC4KKyAgICAgICAgKGF1ZGlvKToKKyAgICAgICAgKGF1ZGlvOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy1wYW5lbCk6CisgICAgICAgICh2aWRlbzotd2Via2l0LWZ1bGwtcGFnZS1tZWRpYTo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1wYW5lbCk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1tdXRlLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtbXV0ZS1i dXR0b24pOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGxheS1idXR0 b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBsYXktYnV0dG9uKToKKyAgICAgICAg KGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLWNvbnRhaW5lciwgdmlkZW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyKToKKyAgICAgICAgKGF1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5LCB2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSk6CisgICAgICAgIChh dWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5LCB2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5KToKKyAgICAg ICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLCB2aWRlbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy10aW1lbGluZSk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lciwgdmlkZW86Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtdm9sdW1lLXNsaWRlci1jb250YWluZXIpOgorICAgICAgICAoYXVkaW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRlciwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtdm9sdW1lLXNsaWRlcik6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy1zZWVrLWJhY2stYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zZWVr LWJhY2stYnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNl ZWstZm9yd2FyZC1idXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstZm9y d2FyZC1idXR0b24pOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtZnVs bHNjcmVlbi1idXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWZ1bGxzY3JlZW4t YnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1i dXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24pOgorICAg ICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcmV0dXJuLXRvLXJlYWx0aW1lLWJ1 dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcmV0dXJuLXRvLXJlYWx0aW1lLWJ1 dHRvbik6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10b2dnbGUtY2xv c2VkLWNhcHRpb25zLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdG9nZ2xl LWNsb3NlZC1jYXB0aW9ucy1idXR0b24pOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtdm9sdW1lLXNsaWRlci1tdXRlLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtdm9sdW1lLXNsaWRlci1tdXRlLWJ1dHRvbik6CisgICAgICAgICogcGxhdGZvcm0v ZWZsL1JlbmRlclRoZW1lRWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lRWZs OjpleHRyYU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0KToKKwogMjAxMS0wMy0wOSAgQW5keSBFc3Rl cyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzRWZsLmNzcyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzRWZsLmNzcwpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi45MzhkN2U4Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL21lZGlhQ29udHJvbHNFZmwuY3NzCkBAIC0wLDAgKzEsMTc0IEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDA5LCAyMDEwIEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiBDb3B5cmlnaHQgKEMpIDIwMTEgU2Ftc3VuZyBFbGVjdHJvbmljcworICoKKyAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAq IDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9v ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJ UycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgorICog Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRF UlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCisgKi8KKworLyogRUZMV2ViS2l0IG1lZGlhIGNv bnRyb2xzLiBFeHRlbmRzIG1lZGlhQ29udHJvbHMuY3NzICovCisKK2F1ZGlvIHsKKyAgICB3aWR0 aDogMjAwcHg7CisgICAgaGVpZ2h0OiAyNXB4OworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1wYW5lbCwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgeworICAg IGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94LW9yaWVudDogaG9yaXpvbnRh bDsKKyAgICAtd2Via2l0LWJveC1hbGlnbjogY2VudGVyOworICAgIC13ZWJraXQtdXNlci1zZWxl Y3Q6IG5vbmU7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGJvdHRvbTogMDsKKyAgICB3 aWR0aDogMTAwJTsKKyAgICB6LWluZGV4OiAwOworICAgIG92ZXJmbG93OiBoaWRkZW47CisgICAg aGVpZ2h0OiAyNXB4OworICAgIHRleHQtYWxpZ246IHJpZ2h0OworfQorCit2aWRlbzotd2Via2l0 LWZ1bGwtcGFnZS1tZWRpYTo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCB7CisgICAgYm90 dG9tOiAtMjVweDsKK30KKworYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtbXV0ZS1idXR0 b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLW11dGUtYnV0dG9uIHsKKyAgICAtd2Vi a2l0LWFwcGVhcmFuY2U6IG1lZGlhLW11dGUtYnV0dG9uOworICAgIGRpc3BsYXk6IC13ZWJraXQt Ym94OworICAgIHdpZHRoOiAyNXB4OworICAgIGhlaWdodDogMjVweDsKKyAgICBiYWNrZ3JvdW5k LWNvbG9yOiBpbml0aWFsOworICAgIGJvcmRlcjogaW5pdGlhbDsKKyAgICBjb2xvcjogaW5oZXJp dDsKK30KKworYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGxheS1idXR0b24sIHZpZGVv Ojotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBsYXktYnV0dG9uIHsKKyAgICAtd2Via2l0LWFwcGVh cmFuY2U6IG1lZGlhLXBsYXktYnV0dG9uOworICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OworICAg IHdpZHRoOiAyNXB4OworICAgIGhlaWdodDogMjVweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBp bml0aWFsOworICAgIGJvcmRlcjogaW5pdGlhbDsKKyAgICBjb2xvcjogaW5oZXJpdDsKK30KKwor YXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyLCB2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZS1jb250YWluZXIgeworICAgIC13ZWJraXQt YXBwZWFyYW5jZTogbWVkaWEtY29udHJvbHMtYmFja2dyb3VuZDsKKyAgICBkaXNwbGF5OiAtd2Vi a2l0LWJveDsKKyAgICAtd2Via2l0LWJveC1vcmllbnQ6IGhvcml6b250YWw7CisgICAgLXdlYmtp dC1ib3gtYWxpZ246IGNlbnRlcjsKKyAgICAtd2Via2l0LWJveC1wYWNrOiBlbmQ7CisgICAgLXdl YmtpdC1ib3gtZmxleDogMTsKKyAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOworICAgIGhl aWdodDogMjVweDsKK30KKworYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtY3VycmVudC10 aW1lLWRpc3BsYXksIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1k aXNwbGF5IHsKKyAgICBkaXNwbGF5OiBub25lOworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5IHsKKyAgICBkaXNwbGF5OiBub25lOworfQorCith dWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZSwgdmlkZW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtdGltZWxpbmUgeworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtc2xp ZGVyOworICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94LWZsZXg6IDE7 CisgICAgaGVpZ2h0OiAyNXB4OworICAgIHBhZGRpbmc6IDBweCAycHg7CisgICAgYmFja2dyb3Vu ZC1jb2xvcjogaW5pdGlhbDsKKyAgICBib3JkZXI6IGluaXRpYWw7CisgICAgY29sb3I6IGluaGVy aXQ7CisgICAgbWFyZ2luOiBpbml0aWFsOworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lciwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtdm9sdW1lLXNsaWRlci1jb250YWluZXIgeworICAgIGRpc3BsYXk6IG5vbmU7Cit9CisKK2F1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXIsIHZpZGVvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXIgeworICAgIGRpc3BsYXk6IG5vbmU7CisgICAg YmFja2dyb3VuZC1jb2xvcjogaW5pdGlhbDsKKyAgICBib3JkZXI6IGluaXRpYWw7CisgICAgY29s b3I6IGluaGVyaXQ7CisgICAgbWFyZ2luOiBpbml0aWFsOworfQorCithdWRpbzo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy1zZWVrLWJhY2stYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy1zZWVrLWJhY2stYnV0dG9uIHsKKyAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG1lZGlhLXNl ZWstYmFjay1idXR0b247CisgICAgZGlzcGxheTogLXdlYmtpdC1ib3g7CisgICAgd2lkdGg6IDI1 cHg7CisgICAgaGVpZ2h0OiAyNXB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGluaXRpYWw7Cisg ICAgYm9yZGVyOiBpbml0aWFsOworICAgIGNvbG9yOiBpbmhlcml0OworfQorCithdWRpbzo6LXdl YmtpdC1tZWRpYS1jb250cm9scy1zZWVrLWZvcndhcmQtYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy1zZWVrLWZvcndhcmQtYnV0dG9uIHsKKyAgICAtd2Via2l0LWFwcGVhcmFu Y2U6IG1lZGlhLXNlZWstZm9yd2FyZC1idXR0b247CisgICAgZGlzcGxheTogLXdlYmtpdC1ib3g7 CisgICAgd2lkdGg6IDI1cHg7CisgICAgaGVpZ2h0OiAyNXB4OworICAgIGJhY2tncm91bmQtY29s b3I6IGluaXRpYWw7CisgICAgYm9yZGVyOiBpbml0aWFsOworICAgIGNvbG9yOiBpbmhlcml0Owor fQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLWJ1dHRvbiwgdmlk ZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1idXR0b24geworICAgIC13ZWJr aXQtYXBwZWFyYW5jZTogbWVkaWEtZnVsbHNjcmVlbi1idXR0b247CisgICAgZGlzcGxheTogLXdl YmtpdC1ib3g7CisgICAgd2lkdGg6IDI1cHg7CisgICAgaGVpZ2h0OiAyNXB4OworICAgIGJhY2tn cm91bmQtY29sb3I6IGluaXRpYWw7CisgICAgYm9yZGVyOiBpbml0aWFsOworICAgIGNvbG9yOiBp bmhlcml0OworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXdpbmQtYnV0dG9u LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXdpbmQtYnV0dG9uIHsKKyAgICBkaXNw bGF5OiBub25lOworICAgIGJhY2tncm91bmQtY29sb3I6IGluaXRpYWw7CisgICAgYm9yZGVyOiBp bml0aWFsOworICAgIGNvbG9yOiBpbmhlcml0OworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1yZXR1cm4tdG8tcmVhbHRpbWUtYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1yZXR1cm4tdG8tcmVhbHRpbWUtYnV0dG9uIHsKKyAgICBkaXNwbGF5OiBub25lOwor ICAgIGJhY2tncm91bmQtY29sb3I6IGluaXRpYWw7CisgICAgYm9yZGVyOiBpbml0aWFsOworICAg IGNvbG9yOiBpbmhlcml0OworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10b2dn bGUtY2xvc2VkLWNhcHRpb25zLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt dG9nZ2xlLWNsb3NlZC1jYXB0aW9ucy1idXR0b24geworICAgIC13ZWJraXQtYXBwZWFyYW5jZTog bWVkaWEtdG9nZ2xlLWNsb3NlZC1jYXB0aW9ucy1idXR0b247CisgICAgZGlzcGxheTogLXdlYmtp dC1ib3g7CisgICAgd2lkdGg6IDI1cHg7CisgICAgaGVpZ2h0OiAyNXB4OworICAgIGJhY2tncm91 bmQtY29sb3I6IGluaXRpYWw7CisgICAgYm9yZGVyOiBpbml0aWFsOworICAgIGNvbG9yOiBpbmhl cml0OworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLW11 dGUtYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLW11 dGUtYnV0dG9uIHsKKyAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG1lZGlhLXZvbHVtZS1zbGlkZXIt bXV0ZS1idXR0b247CisgICAgZGlzcGxheTogbm9uZTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBp bml0aWFsOworICAgIGJvcmRlcjogaW5pdGlhbDsKKyAgICBjb2xvcjogaW5oZXJpdDsKK30KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCmluZGV4IDNl OGE2NDYuLjM3NDk3YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9S ZW5kZXJUaGVtZUVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRl clRoZW1lRWZsLmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIlJlbmRlck9iamVjdC5o IgogI2luY2x1ZGUgIlJlbmRlclByb2dyZXNzLmgiCiAjaW5jbHVkZSAiUmVuZGVyU2xpZGVyLmgi CisjaW5jbHVkZSAiVXNlckFnZW50U3R5bGVTaGVldHMuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9D U3RyaW5nLmg+CiAKICNpbmNsdWRlIDxFY29yZV9FdmFzLmg+CkBAIC0xMDQ2LDggKzEwNDcsNyBA QCBib29sIFJlbmRlclRoZW1lRWZsOjpwYWludFByb2dyZXNzQmFyKFJlbmRlck9iamVjdCogb2Jq ZWN0LCBjb25zdCBQYWludEluZm8mIGluZgogI2lmIEVOQUJMRShWSURFTykKIFN0cmluZyBSZW5k ZXJUaGVtZUVmbDo6ZXh0cmFNZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpCiB7Ci0gICAgbm90SW1w bGVtZW50ZWQoKTsKLSAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgcmV0dXJuIFN0cmluZyhtZWRp YUNvbnRyb2xzRWZsVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKG1lZGlhQ29udHJvbHNFZmxV c2VyQWdlbnRTdHlsZVNoZWV0KSk7CiB9CiAKIFN0cmluZyBSZW5kZXJUaGVtZUVmbDo6Zm9ybWF0 TWVkaWFDb250cm9sc0N1cnJlbnRUaW1lKGZsb2F0IGN1cnJlbnRUaW1lLCBmbG9hdCBkdXJhdGlv bikgY29uc3QK