131300 2014-04-07 07:58:50 -0700 [GTK] Remove media controls dead code 2014-04-08 01:16:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 calvaris calvaris bunhere commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble mrobinson philipj rakuco sergio oldest_to_newest 998141 0 calvaris 2014-04-07 07:58:50 -0700 [GTK] Remove media controls dead code 998142 1 228735 calvaris 2014-04-07 08:03:47 -0700 Created attachment 228735 Patch 998491 2 228735 commit-queue 2014-04-08 01:16:05 -0700 Comment on attachment 228735 Patch Clearing flags on attachment: 228735 Committed r166919: <http://trac.webkit.org/changeset/166919> 998492 3 commit-queue 2014-04-08 01:16:10 -0700 All reviewed patches have been landed. Closing bug. 228735 2014-04-07 08:03:47 -0700 2014-04-08 01:16:05 -0700 Patch wk131300.patch text/plain 14817 calvaris ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjOGRjMzcxLi5mYjJjYjNmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDE0LTA0LTA3ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxp YS5jb20+CisKKyAgICAgICAgW0dUS10gUmVtb3ZlIG1lZGlhIGNvbnRyb2xzIGRlYWQgY29kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMzAwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWVkaWFDb250 cm9sc0d0ay5jcHAgaXMgbm8gbG9uZ2VyIHVzZWQgc28gd2UgY2FuIHJlbW92ZSBpdCBmcm9tCisg ICAgICAgIHRoZSByZXBvLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAgICAg ICAgKiBQbGF0Zm9ybUdUSy5jbWFrZTogUmVtb3ZlIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbHNH dGsuY3BwIGZyb20KKyAgICAgICAgY29tcGlsYXRpb24uCisgICAgICAgICogaHRtbC9zaGFkb3cv TWVkaWFDb250cm9sc0d0ay5jcHA6IFJlbW92ZWQuCisKIDIwMTQtMDQtMDUgIEJyaWFuIEouIEJ1 cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJl bW92ZSB1bnVzZWQgdGVzdCBob29rIHNldEluc3BlY3RvclJlc291cmNlc0RhdGFTaXplTGltaXRz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9X ZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4IGVmOTc5ZGMuLmNiMjkxMWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3Jl L1BsYXRmb3JtR1RLLmNtYWtlCkBAIC0yNyw4ICsyNyw2IEBAIGxpc3QoQVBQRU5EIFdlYkNvcmVf SU5DTFVERV9ESVJFQ1RPUklFUwogbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCiAgICAgZWRp dGluZy9TbWFydFJlcGxhY2UuY3BwCiAKLSAgICBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzR3Rr LmNwcAotCiAgICAgbG9hZGVyL3NvdXAvQ2FjaGVkUmF3UmVzb3VyY2VTb3VwLmNwcAogICAgIGxv YWRlci9zb3VwL1N1YnJlc291cmNlTG9hZGVyU291cC5jcHAKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0d0ay5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzR3RrLmNwcApkZWxldGVkIGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggZDZlMWQ5MS4uMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xzR3RrLmNwcAorKysgL2Rldi9udWxsCkBAIC0xLDM3OCArMCwwIEBACi0v KgotICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5LCAyMDEwIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiBHb29nbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDEyIFphbiBEb2JlcnNl ayA8emFuZG9iZXJzZWtAZ21haWwuY29tPgotICogQ29weXJpZ2h0IChDKSAyMDEyIElnYWxpYSBT LkwuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIGBgQVMgSVMnJyBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQotICogSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgotICog Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsCi0gKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRF IEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKLSAqIFBST0ZJVFM7IE9S IEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkK LSAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLSNpbmNsdWRl ICJjb25maWcuaCIKLQotI2lmIEVOQUJMRShWSURFTykKLSNpbmNsdWRlICJNZWRpYUNvbnRyb2xz R3RrLmgiCi0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotY2xhc3MgTWVkaWFDb250cm9sc0d0a0V2 ZW50TGlzdGVuZXIgOiBwdWJsaWMgRXZlbnRMaXN0ZW5lciB7Ci1wdWJsaWM6Ci0gICAgc3RhdGlj IFBhc3NSZWZQdHI8TWVkaWFDb250cm9sc0d0a0V2ZW50TGlzdGVuZXI+IGNyZWF0ZShNZWRpYUNv bnRyb2xzR3RrKiBtZWRpYUNvbnRyb2xzKSB7IHJldHVybiBhZG9wdFJlZihuZXcgTWVkaWFDb250 cm9sc0d0a0V2ZW50TGlzdGVuZXIobWVkaWFDb250cm9scykpOyB9Ci0gICAgc3RhdGljIGNvbnN0 IE1lZGlhQ29udHJvbHNHdGtFdmVudExpc3RlbmVyKiBjYXN0KGNvbnN0IEV2ZW50TGlzdGVuZXIq IGxpc3RlbmVyKQotICAgIHsKLSAgICAgICAgcmV0dXJuIGxpc3RlbmVyLT50eXBlKCkgPT0gR09i amVjdEV2ZW50TGlzdGVuZXJUeXBlCi0gICAgICAgICAgICA/IHN0YXRpY19jYXN0PGNvbnN0IE1l ZGlhQ29udHJvbHNHdGtFdmVudExpc3RlbmVyKj4obGlzdGVuZXIpCi0gICAgICAgICAgICA6IDA7 Ci0gICAgfQotCi0gICAgdmlydHVhbCBib29sIG9wZXJhdG9yPT0oY29uc3QgRXZlbnRMaXN0ZW5l ciYgb3RoZXIpOwotCi1wcml2YXRlOgotICAgIE1lZGlhQ29udHJvbHNHdGtFdmVudExpc3RlbmVy KE1lZGlhQ29udHJvbHNHdGsqIG1lZGlhQ29udHJvbHMpCi0gICAgICAgIDogRXZlbnRMaXN0ZW5l cihHT2JqZWN0RXZlbnRMaXN0ZW5lclR5cGUpCi0gICAgICAgICwgbV9tZWRpYUNvbnRyb2xzKG1l ZGlhQ29udHJvbHMpCi0gICAgewotICAgIH0KLQotICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVFdmVu dChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgRXZlbnQqKTsKLQotICAgIE1lZGlhQ29udHJvbHNH dGsqIG1fbWVkaWFDb250cm9sczsKLX07Ci0KLU1lZGlhQ29udHJvbHNHdGs6Ok1lZGlhQ29udHJv bHNHdGsoRG9jdW1lbnQmIGRvY3VtZW50KQotICAgIDogTWVkaWFDb250cm9scyhkb2N1bWVudCkK LSAgICAsIG1fZHVyYXRpb25EaXNwbGF5KDApCi0gICAgLCBtX2VuY2xvc3VyZSgwKQotICAgICwg bV9jbG9zZWRDYXB0aW9uc1RyYWNrTGlzdCgwKQotICAgICwgbV9jbG9zZWRDYXB0aW9uc0NvbnRh aW5lcigwKQotICAgICwgbV9ldmVudExpc3RlbmVyKDApCi17Ci19Ci0KLVBhc3NSZWZQdHI8TWVk aWFDb250cm9scz4gTWVkaWFDb250cm9sczo6Y3JlYXRlKERvY3VtZW50JiBkb2N1bWVudCkKLXsK LSAgICByZXR1cm4gTWVkaWFDb250cm9sc0d0azo6Y3JlYXRlQ29udHJvbHMoZG9jdW1lbnQpOwot fQotCi1QYXNzUmVmUHRyPE1lZGlhQ29udHJvbHNHdGs+IE1lZGlhQ29udHJvbHNHdGs6OmNyZWF0 ZUNvbnRyb2xzKERvY3VtZW50JiBkb2N1bWVudCkKLXsKLSAgICBpZiAoIWRvY3VtZW50LnBhZ2Uo KSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBSZWZQdHI8TWVkaWFDb250cm9sc0d0az4gY29u dHJvbHMgPSBhZG9wdFJlZihuZXcgTWVkaWFDb250cm9sc0d0ayhkb2N1bWVudCkpOwotCi0gICAg aWYgKGNvbnRyb2xzLT5pbml0aWFsaXplQ29udHJvbHMoZG9jdW1lbnQpKQotICAgICAgICByZXR1 cm4gY29udHJvbHMucmVsZWFzZSgpOwotCi0gICAgcmV0dXJuIDA7Ci19Ci0KLWJvb2wgTWVkaWFD b250cm9sc0d0azo6aW5pdGlhbGl6ZUNvbnRyb2xzKERvY3VtZW50JiBkb2N1bWVudCkKLXsKLSAg ICAvLyBDcmVhdGUgYW4gZW5jbG9zaW5nIGVsZW1lbnQgZm9yIHRoZSBwYW5lbCBzbyB3ZSBjYW4g dmlzdWFsbHkgb2Zmc2V0IHRoZSBjb250cm9scyBjb3JyZWN0bHkuCi0gICAgUmVmUHRyPE1lZGlh Q29udHJvbFBhbmVsRW5jbG9zdXJlRWxlbWVudD4gZW5jbG9zdXJlID0gTWVkaWFDb250cm9sUGFu ZWxFbmNsb3N1cmVFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQpOwotICAgIFJlZlB0cjxNZWRpYUNv bnRyb2xQYW5lbEVsZW1lbnQ+IHBhbmVsID0gTWVkaWFDb250cm9sUGFuZWxFbGVtZW50OjpjcmVh dGUoZG9jdW1lbnQpOwotICAgIEV4Y2VwdGlvbkNvZGUgZXhjZXB0aW9uQ29kZTsKLQotICAgIFJl ZlB0cjxNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudD4gcGxheUJ1dHRvbiA9IE1lZGlhQ29u dHJvbFBsYXlCdXR0b25FbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQpOwotICAgIG1fcGxheUJ1dHRv biA9IHBsYXlCdXR0b24uZ2V0KCk7Ci0gICAgcGFuZWwtPmFwcGVuZENoaWxkKHBsYXlCdXR0b24u cmVsZWFzZSgpLCBleGNlcHRpb25Db2RlKTsKLSAgICBpZiAoZXhjZXB0aW9uQ29kZSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotCi0gICAgUmVmUHRyPE1lZGlhQ29udHJvbFRpbWVsaW5lRWxlbWVu dD4gdGltZWxpbmUgPSBNZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVu dCwgdGhpcyk7Ci0gICAgbV90aW1lbGluZSA9IHRpbWVsaW5lLmdldCgpOwotICAgIHBhbmVsLT5h cHBlbmRDaGlsZCh0aW1lbGluZS5yZWxlYXNlKCksIGV4Y2VwdGlvbkNvZGUpOwotICAgIGlmIChl eGNlcHRpb25Db2RlKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBSZWZQdHI8TWVkaWFD b250cm9sQ3VycmVudFRpbWVEaXNwbGF5RWxlbWVudD4gY3VycmVudFRpbWVEaXNwbGF5ID0gTWVk aWFDb250cm9sQ3VycmVudFRpbWVEaXNwbGF5RWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsKLSAg ICBtX2N1cnJlbnRUaW1lRGlzcGxheSA9IGN1cnJlbnRUaW1lRGlzcGxheS5nZXQoKTsKLSAgICBt X2N1cnJlbnRUaW1lRGlzcGxheS0+aGlkZSgpOwotICAgIHBhbmVsLT5hcHBlbmRDaGlsZChjdXJy ZW50VGltZURpc3BsYXkucmVsZWFzZSgpLCBleGNlcHRpb25Db2RlKTsKLSAgICBpZiAoZXhjZXB0 aW9uQ29kZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgUmVmUHRyPE1lZGlhQ29udHJv bFRpbWVSZW1haW5pbmdEaXNwbGF5RWxlbWVudD4gZHVyYXRpb25EaXNwbGF5ID0gTWVkaWFDb250 cm9sVGltZVJlbWFpbmluZ0Rpc3BsYXlFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQpOwotICAgIG1f ZHVyYXRpb25EaXNwbGF5ID0gZHVyYXRpb25EaXNwbGF5LmdldCgpOwotICAgIHBhbmVsLT5hcHBl bmRDaGlsZChkdXJhdGlvbkRpc3BsYXkucmVsZWFzZSgpLCBleGNlcHRpb25Db2RlKTsKLSAgICBp ZiAoZXhjZXB0aW9uQ29kZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKGRvY3Vt ZW50LnBhZ2UoKS0+dGhlbWUoKS5zdXBwb3J0c0Nsb3NlZENhcHRpb25pbmcoKSkgewotICAgICAg ICBSZWZQdHI8TWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNDb250YWluZXJFbGVtZW50PiBjbG9z ZWRDYXB0aW9uc0NvbnRhaW5lciA9IE1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zQ29udGFpbmVy RWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsKLQotICAgICAgICBSZWZQdHI8TWVkaWFDb250cm9s Q2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50PiBjbG9zZWRDYXB0aW9uc1RyYWNrTGlzdCA9 IE1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zVHJhY2tMaXN0RWxlbWVudDo6Y3JlYXRlKGRvY3Vt ZW50LCB0aGlzKTsKLSAgICAgICAgbV9jbG9zZWRDYXB0aW9uc1RyYWNrTGlzdCA9IGNsb3NlZENh cHRpb25zVHJhY2tMaXN0LmdldCgpOwotICAgICAgICBjbG9zZWRDYXB0aW9uc0NvbnRhaW5lci0+ YXBwZW5kQ2hpbGQoY2xvc2VkQ2FwdGlvbnNUcmFja0xpc3QucmVsZWFzZSgpLCBleGNlcHRpb25D b2RlKTsKLSAgICAgICAgaWYgKGV4Y2VwdGlvbkNvZGUpCi0gICAgICAgICAgICByZXR1cm4gZmFs c2U7Ci0KLSAgICAgICAgUmVmUHRyPE1lZGlhQ29udHJvbFRvZ2dsZUNsb3NlZENhcHRpb25zQnV0 dG9uRWxlbWVudD4gdG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b24gPSBNZWRpYUNvbnRyb2xUb2dn bGVDbG9zZWRDYXB0aW9uc0J1dHRvbkVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCwgdGhpcyk7Ci0g ICAgICAgIG1fdG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b24gPSB0b2dnbGVDbG9zZWRDYXB0aW9u c0J1dHRvbi5nZXQoKTsKLSAgICAgICAgcGFuZWwtPmFwcGVuZENoaWxkKHRvZ2dsZUNsb3NlZENh cHRpb25zQnV0dG9uLnJlbGVhc2UoKSwgZXhjZXB0aW9uQ29kZSk7Ci0gICAgICAgIGlmIChleGNl cHRpb25Db2RlKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgIG1fY2xvc2Vk Q2FwdGlvbnNDb250YWluZXIgPSBjbG9zZWRDYXB0aW9uc0NvbnRhaW5lci5nZXQoKTsKLSAgICAg ICAgYXBwZW5kQ2hpbGQoY2xvc2VkQ2FwdGlvbnNDb250YWluZXIucmVsZWFzZSgpLCBleGNlcHRp b25Db2RlKTsKLSAgICAgICAgaWYgKGV4Y2VwdGlvbkNvZGUpCi0gICAgICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgfQotCi0gICAgUmVmUHRyPE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0b25F bGVtZW50PiBmdWxsc2NyZWVuQnV0dG9uID0gTWVkaWFDb250cm9sRnVsbHNjcmVlbkJ1dHRvbkVs ZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCk7Ci0gICAgbV9mdWxsU2NyZWVuQnV0dG9uID0gZnVsbHNj cmVlbkJ1dHRvbi5nZXQoKTsKLSAgICBwYW5lbC0+YXBwZW5kQ2hpbGQoZnVsbHNjcmVlbkJ1dHRv bi5yZWxlYXNlKCksIGV4Y2VwdGlvbkNvZGUpOwotICAgIGlmIChleGNlcHRpb25Db2RlKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBSZWZQdHI8TWVkaWFDb250cm9sUGFuZWxNdXRlQnV0 dG9uRWxlbWVudD4gcGFuZWxNdXRlQnV0dG9uID0gTWVkaWFDb250cm9sUGFuZWxNdXRlQnV0dG9u RWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50LCB0aGlzKTsKLSAgICBtX3BhbmVsTXV0ZUJ1dHRvbiA9 IHBhbmVsTXV0ZUJ1dHRvbi5nZXQoKTsKLSAgICBwYW5lbC0+YXBwZW5kQ2hpbGQocGFuZWxNdXRl QnV0dG9uLnJlbGVhc2UoKSwgZXhjZXB0aW9uQ29kZSk7Ci0gICAgaWYgKGV4Y2VwdGlvbkNvZGUp Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xWb2x1bWVT bGlkZXJDb250YWluZXJFbGVtZW50PiBzbGlkZXJDb250YWluZXIgPSBNZWRpYUNvbnRyb2xWb2x1 bWVTbGlkZXJDb250YWluZXJFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQpOwotICAgIG1fdm9sdW1l U2xpZGVyQ29udGFpbmVyID0gc2xpZGVyQ29udGFpbmVyLmdldCgpOwotICAgIHBhbmVsLT5hcHBl bmRDaGlsZChzbGlkZXJDb250YWluZXIucmVsZWFzZSgpLCBleGNlcHRpb25Db2RlKTsKLSAgICBp ZiAoZXhjZXB0aW9uQ29kZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgUmVmUHRyPE1l ZGlhQ29udHJvbFBhbmVsVm9sdW1lU2xpZGVyRWxlbWVudD4gc2xpZGVyID0gTWVkaWFDb250cm9s UGFuZWxWb2x1bWVTbGlkZXJFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQpOwotICAgIG1fdm9sdW1l U2xpZGVyID0gc2xpZGVyLmdldCgpOwotICAgIG1fdm9sdW1lU2xpZGVyLT5zZXRDbGVhck11dGVk T25Vc2VySW50ZXJhY3Rpb24odHJ1ZSk7Ci0gICAgbV92b2x1bWVTbGlkZXJDb250YWluZXItPmFw cGVuZENoaWxkKHNsaWRlci5yZWxlYXNlKCksIGV4Y2VwdGlvbkNvZGUpOwotICAgIGlmIChleGNl cHRpb25Db2RlKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBtX3BhbmVsID0gcGFuZWwu Z2V0KCk7Ci0gICAgZW5jbG9zdXJlLT5hcHBlbmRDaGlsZChwYW5lbC5yZWxlYXNlKCksIGV4Y2Vw dGlvbkNvZGUpOwotICAgIGlmIChleGNlcHRpb25Db2RlKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0KLSAgICBtX2VuY2xvc3VyZSA9IGVuY2xvc3VyZS5nZXQoKTsKLSAgICBhcHBlbmRDaGlsZChl bmNsb3N1cmUucmVsZWFzZSgpLCBleGNlcHRpb25Db2RlKTsKLSAgICBpZiAoZXhjZXB0aW9uQ29k ZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLXZvaWQg TWVkaWFDb250cm9sc0d0azo6c2V0TWVkaWFDb250cm9sbGVyKE1lZGlhQ29udHJvbGxlckludGVy ZmFjZSogY29udHJvbGxlcikKLXsKLSAgICBpZiAobV9tZWRpYUNvbnRyb2xsZXIgPT0gY29udHJv bGxlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTWVkaWFDb250cm9sczo6c2V0TWVkaWFDb250 cm9sbGVyKGNvbnRyb2xsZXIpOwotCi0gICAgaWYgKG1fZHVyYXRpb25EaXNwbGF5KQotICAgICAg ICBtX2R1cmF0aW9uRGlzcGxheS0+c2V0TWVkaWFDb250cm9sbGVyKGNvbnRyb2xsZXIpOwotICAg IGlmIChtX2VuY2xvc3VyZSkKLSAgICAgICAgbV9lbmNsb3N1cmUtPnNldE1lZGlhQ29udHJvbGxl cihjb250cm9sbGVyKTsKLSAgICBpZiAobV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lcikKLSAgICAg ICAgbV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lci0+c2V0TWVkaWFDb250cm9sbGVyKGNvbnRyb2xs ZXIpOwotICAgIGlmIChtX2Nsb3NlZENhcHRpb25zVHJhY2tMaXN0KQotICAgICAgICBtX2Nsb3Nl ZENhcHRpb25zVHJhY2tMaXN0LT5zZXRNZWRpYUNvbnRyb2xsZXIoY29udHJvbGxlcik7Ci19Ci0K LXZvaWQgTWVkaWFDb250cm9sc0d0azo6cmVzZXQoKQotewotICAgIFBhZ2UqIHBhZ2UgPSBkb2N1 bWVudCgpLnBhZ2UoKTsKLSAgICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVybjsKLQotICAgIGRv dWJsZSBkdXJhdGlvbiA9IG1fbWVkaWFDb250cm9sbGVyLT5kdXJhdGlvbigpOwotICAgIG1fZHVy YXRpb25EaXNwbGF5LT5zZXRJbm5lclRleHQocGFnZS0+dGhlbWUoKS5mb3JtYXRNZWRpYUNvbnRy b2xzVGltZShkdXJhdGlvbiksIEFTU0VSVF9OT19FWENFUFRJT04pOwotICAgIG1fZHVyYXRpb25E aXNwbGF5LT5zZXRDdXJyZW50VmFsdWUoZHVyYXRpb24pOwotCi0gICAgaWYgKG1fdG9nZ2xlQ2xv c2VkQ2FwdGlvbnNCdXR0b24pIHsKLSAgICAgICAgaWYgKG1fbWVkaWFDb250cm9sbGVyLT5oYXND bG9zZWRDYXB0aW9ucygpKQotICAgICAgICAgICAgbV90b2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRv bi0+c2hvdygpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3RvZ2dsZUNsb3NlZENhcHRp b25zQnV0dG9uLT5oaWRlKCk7Ci0gICAgfQotCi0gICAgTWVkaWFDb250cm9sczo6cmVzZXQoKTsK LX0KLQotdm9pZCBNZWRpYUNvbnRyb2xzR3RrOjpwbGF5YmFja1N0YXJ0ZWQoKQotewotICAgIG1f Y3VycmVudFRpbWVEaXNwbGF5LT5zaG93KCk7Ci0gICAgbV9kdXJhdGlvbkRpc3BsYXktPmhpZGUo KTsKLQotICAgIE1lZGlhQ29udHJvbHM6OnBsYXliYWNrU3RhcnRlZCgpOwotfQotCi12b2lkIE1l ZGlhQ29udHJvbHNHdGs6OnVwZGF0ZUN1cnJlbnRUaW1lRGlzcGxheSgpCi17Ci0gICAgZG91Ymxl IG5vdyA9IG1fbWVkaWFDb250cm9sbGVyLT5jdXJyZW50VGltZSgpOwotICAgIGRvdWJsZSBkdXJh dGlvbiA9IG1fbWVkaWFDb250cm9sbGVyLT5kdXJhdGlvbigpOwotCi0gICAgUGFnZSogcGFnZSA9 IGRvY3VtZW50KCkucGFnZSgpOwotICAgIGlmICghcGFnZSkKLSAgICAgICAgcmV0dXJuOwotCi0g ICAgLy8gQWZ0ZXIgc2VlaywgaGlkZSBkdXJhdGlvbiBkaXNwbGF5IGFuZCBzaG93IGN1cnJlbnQg dGltZS4KLSAgICBpZiAobm93ID4gMCkgewotICAgICAgICBtX2N1cnJlbnRUaW1lRGlzcGxheS0+ c2hvdygpOwotICAgICAgICBtX2R1cmF0aW9uRGlzcGxheS0+aGlkZSgpOwotICAgIH0KLQotICAg IC8vIEFsbG93IHRoZSB0aGVtZSB0byBmb3JtYXQgdGhlIHRpbWUuCi0gICAgRXhjZXB0aW9uQ29k ZSBleGNlcHRpb25Db2RlOwotICAgIG1fY3VycmVudFRpbWVEaXNwbGF5LT5zZXRJbm5lclRleHQo cGFnZS0+dGhlbWUoKS5mb3JtYXRNZWRpYUNvbnRyb2xzQ3VycmVudFRpbWUobm93LCBkdXJhdGlv biksIGV4Y2VwdGlvbkNvZGUpOwotICAgIG1fY3VycmVudFRpbWVEaXNwbGF5LT5zZXRDdXJyZW50 VmFsdWUobm93KTsKLX0KLQotdm9pZCBNZWRpYUNvbnRyb2xzR3RrOjpjaGFuZ2VkTXV0ZSgpCi17 Ci0gICAgTWVkaWFDb250cm9sczo6Y2hhbmdlZE11dGUoKTsKLQotICAgIGlmIChtX21lZGlhQ29u dHJvbGxlci0+bXV0ZWQoKSkKLSAgICAgICAgbV92b2x1bWVTbGlkZXItPnNldFZvbHVtZSgwKTsK LSAgICBlbHNlCi0gICAgICAgIG1fdm9sdW1lU2xpZGVyLT5zZXRWb2x1bWUobV9tZWRpYUNvbnRy b2xsZXItPnZvbHVtZSgpKTsKLX0KLQotCi12b2lkIE1lZGlhQ29udHJvbHNHdGs6Om1ha2VUcmFu c3BhcmVudCgpCi17Ci0gICAgTWVkaWFDb250cm9sczo6bWFrZVRyYW5zcGFyZW50KCk7Ci0KLSAg ICBpZiAobV92b2x1bWVTbGlkZXJDb250YWluZXIpCi0gICAgICAgIG1fdm9sdW1lU2xpZGVyQ29u dGFpbmVyLT5oaWRlKCk7Ci0KLSAgICBoaWRlQ2xvc2VkQ2FwdGlvblRyYWNrTGlzdCgpOwotfQot Ci12b2lkIE1lZGlhQ29udHJvbHNHdGs6OnNob3dWb2x1bWVTbGlkZXIoKQotewotICAgIGlmICgh bV9tZWRpYUNvbnRyb2xsZXItPmhhc0F1ZGlvKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlm IChtX3ZvbHVtZVNsaWRlckNvbnRhaW5lcikKLSAgICAgICAgbV92b2x1bWVTbGlkZXJDb250YWlu ZXItPnNob3coKTsKLX0KLQotI2lmIEVOQUJMRShWSURFT19UUkFDSykKLXZvaWQgTWVkaWFDb250 cm9sc0d0azo6Y3JlYXRlVGV4dFRyYWNrRGlzcGxheSgpCi17Ci0gICAgaWYgKG1fdGV4dERpc3Bs YXlDb250YWluZXIpCi0gICAgICAgIHJldHVybjsKLQotICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xU ZXh0VHJhY2tDb250YWluZXJFbGVtZW50PiB0ZXh0RGlzcGxheUNvbnRhaW5lciA9IE1lZGlhQ29u dHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCgpKTsKLSAgICBt X3RleHREaXNwbGF5Q29udGFpbmVyID0gdGV4dERpc3BsYXlDb250YWluZXIuZ2V0KCk7Ci0KLSAg ICBpZiAobV9tZWRpYUNvbnRyb2xsZXIpCi0gICAgICAgIG1fdGV4dERpc3BsYXlDb250YWluZXIt PnNldE1lZGlhQ29udHJvbGxlcihtX21lZGlhQ29udHJvbGxlcik7Ci0KLSAgICAvLyBJbnNlcnQg aXQgYmVmb3JlIHRoZSBmaXJzdCBjb250cm9sbGVyIGVsZW1lbnQgc28gaXQgYWx3YXlzIGRpc3Bs YXlzIGJlaGluZCB0aGUgY29udHJvbHMuCi0gICAgaW5zZXJ0QmVmb3JlKHRleHREaXNwbGF5Q29u dGFpbmVyLnJlbGVhc2UoKSwgbV9lbmNsb3N1cmUsIEFTU0VSVF9OT19FWENFUFRJT04pOwotfQot I2VuZGlmCi0KLXZvaWQgTWVkaWFDb250cm9sc0d0azo6dG9nZ2xlQ2xvc2VkQ2FwdGlvblRyYWNr TGlzdCgpCi17Ci0gICAgaWYgKCFtX21lZGlhQ29udHJvbGxlci0+aGFzQ2xvc2VkQ2FwdGlvbnMo KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKCFtX2Nsb3NlZENhcHRpb25zQ29udGFpbmVy IHx8ICFtX2Nsb3NlZENhcHRpb25zVHJhY2tMaXN0KQotICAgICAgICByZXR1cm47Ci0KLSAgICBp ZiAobV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lci0+aXNTaG93aW5nKCkpIHsKLSAgICAgICAgaGlk ZUNsb3NlZENhcHRpb25UcmFja0xpc3QoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAg IG1fY2xvc2VkQ2FwdGlvbnNUcmFja0xpc3QtPnVwZGF0ZURpc3BsYXkoKTsKLSAgICBzaG93Q2xv c2VkQ2FwdGlvblRyYWNrTGlzdCgpOwotfQotCi12b2lkIE1lZGlhQ29udHJvbHNHdGs6OnNob3dD bG9zZWRDYXB0aW9uVHJhY2tMaXN0KCkKLXsKLSAgICBtX3ZvbHVtZVNsaWRlckNvbnRhaW5lci0+ aGlkZSgpOwotCi0gICAgaWYgKCFtX2Nsb3NlZENhcHRpb25zQ29udGFpbmVyIHx8IG1fY2xvc2Vk Q2FwdGlvbnNDb250YWluZXItPmlzU2hvd2luZygpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBt X2Nsb3NlZENhcHRpb25zQ29udGFpbmVyLT5zaG93KCk7Ci0gICAgbV9wYW5lbC0+c2V0SW5saW5l U3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVBvaW50ZXJFdmVudHMsIENTU1ZhbHVlTm9uZSk7Ci0K LSAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBldmVudExpc3RlbmVyKCk7Ci0K LSAgICAvLyBDaGVjayBmb3IgY2xpY2tzIG91dHNpZGUgdGhlIG1lZGlhLWNvbnRyb2wKLSAgICBk b2N1bWVudCgpLmFkZEV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLmNsaWNrRXZlbnQsIGxpc3Rl bmVyLCB0cnVlKTsKLSAgICAvLyBDaGVjayBmb3IgY2xpY2tzIGluc2lkZSB0aGUgbWVkaWEtY29u dHJvbCBib3gKLSAgICBhZGRFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50LCBs aXN0ZW5lciwgdHJ1ZSk7Ci19Ci0KLXZvaWQgTWVkaWFDb250cm9sc0d0azo6aGlkZUNsb3NlZENh cHRpb25UcmFja0xpc3QoKQotewotICAgIGlmICghbV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lciB8 fCAhbV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lci0+aXNTaG93aW5nKCkpCi0gICAgICAgIHJldHVy bjsKLQotICAgIG1fY2xvc2VkQ2FwdGlvbnNDb250YWluZXItPmhpZGUoKTsKLSAgICBtX3BhbmVs LT5yZW1vdmVJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UG9pbnRlckV2ZW50cyk7Ci0K LSAgICBFdmVudExpc3RlbmVyKiBsaXN0ZW5lciA9IGV2ZW50TGlzdGVuZXIoKS5nZXQoKTsKLQot ICAgIGRvY3VtZW50KCkucmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkuY2xpY2tFdmVu dCwgbGlzdGVuZXIsIHRydWUpOwotICAgIHJlbW92ZUV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygp LmNsaWNrRXZlbnQsIGxpc3RlbmVyLCB0cnVlKTsKLX0KLQotdm9pZCBNZWRpYUNvbnRyb2xzR3Rr OjpoYW5kbGVDbGlja0V2ZW50KEV2ZW50ICpldmVudCkKLXsKLSAgICBOb2RlKiBjdXJyZW50VGFy Z2V0ID0gZXZlbnQtPmN1cnJlbnRUYXJnZXQoKS0+dG9Ob2RlKCk7Ci0gICAgTm9kZSogdGFyZ2V0 ID0gZXZlbnQtPnRhcmdldCgpLT50b05vZGUoKTsKLQotICAgIGlmICgoY3VycmVudFRhcmdldCA9 PSAmZG9jdW1lbnQoKSAmJiAhc2hhZG93SG9zdCgpLT5jb250YWlucyh0YXJnZXQpKQotICAgICAg ICB8fCAoY3VycmVudFRhcmdldCA9PSB0aGlzICYmICFtX2Nsb3NlZENhcHRpb25zQ29udGFpbmVy LT5jb250YWlucyh0YXJnZXQpKSkgewotICAgICAgICBoaWRlQ2xvc2VkQ2FwdGlvblRyYWNrTGlz dCgpOwotICAgICAgICBldmVudC0+c3RvcEltbWVkaWF0ZVByb3BhZ2F0aW9uKCk7Ci0gICAgICAg IGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOwotICAgIH0KLX0KLQotUGFzc1JlZlB0cjxNZWRp YUNvbnRyb2xzR3RrRXZlbnRMaXN0ZW5lcj4gTWVkaWFDb250cm9sc0d0azo6ZXZlbnRMaXN0ZW5l cigpCi17Ci0gICAgaWYgKCFtX2V2ZW50TGlzdGVuZXIpCi0gICAgICAgIG1fZXZlbnRMaXN0ZW5l ciA9IE1lZGlhQ29udHJvbHNHdGtFdmVudExpc3RlbmVyOjpjcmVhdGUodGhpcyk7Ci0KLSAgICBy ZXR1cm4gbV9ldmVudExpc3RlbmVyOwotfQotCi12b2lkIE1lZGlhQ29udHJvbHNHdGtFdmVudExp c3RlbmVyOjpoYW5kbGVFdmVudChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgRXZlbnQqIGV2ZW50 KQotewotICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50KQot ICAgICAgICBtX21lZGlhQ29udHJvbHMtPmhhbmRsZUNsaWNrRXZlbnQoZXZlbnQpOwotCi0gICAg cmV0dXJuOwotfQotCi1ib29sIE1lZGlhQ29udHJvbHNHdGtFdmVudExpc3RlbmVyOjpvcGVyYXRv cj09KGNvbnN0IEV2ZW50TGlzdGVuZXImIGxpc3RlbmVyKQotewotICAgIGlmIChjb25zdCBNZWRp YUNvbnRyb2xzR3RrRXZlbnRMaXN0ZW5lciogbWVkaWFDb250cm9sc0d0a0V2ZW50TGlzdGVuZXIg PSBNZWRpYUNvbnRyb2xzR3RrRXZlbnRMaXN0ZW5lcjo6Y2FzdCgmbGlzdGVuZXIpKQotICAgICAg ICByZXR1cm4gbV9tZWRpYUNvbnRyb2xzID09IG1lZGlhQ29udHJvbHNHdGtFdmVudExpc3RlbmVy LT5tX21lZGlhQ29udHJvbHM7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCi19Ci0jZW5kaWYK