78868 2012-02-16 19:25:29 -0800 Move textDirectionForSelection from Editor to EditingStyle 2012-02-17 15:57:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa darin enrica koivisto oldest_to_newest 558815 0 rniwa 2012-02-16 19:25:29 -0800 Move textDirectionForSelection from Editor to EditingStyle 558816 1 127499 rniwa 2012-02-16 19:26:35 -0800 Created attachment 127499 Patch 558822 2 rniwa 2012-02-16 19:29:43 -0800 Per discussion we had on Tue, I'm moving all editing code's dependency on CSStyleDeclaration into EditingStyle so that we can get rid of them more easily. 559446 3 127499 enrica 2012-02-17 12:57:04 -0800 Comment on attachment 127499 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127499&action=review Looks good to me. Please make sure you don't check in the changes to the project. File. > Source/WebCore/ChangeLog:11 > + * WebCore.xcodeproj/project.pbxproj: This should be removed > Source/WebCore/ChangeLog:16 > + (EditingStyle): I normally remove these lines, since they don't add any valuable information. > Source/WebCore/WebCore.xcodeproj/project.pbxproj:7388 > + 1C435CD514E8545B004E10EA /* Inspector-1.0.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Inspector-1.0.json"; sourceTree = "<group>"; }; I don't think this is part of this patch. 559616 4 rniwa 2012-02-17 15:57:13 -0800 Committed r108137: <http://trac.webkit.org/changeset/108137> 127499 2012-02-16 19:26:35 -0800 2012-02-17 12:57:04 -0800 Patch bug-78868-20120216192634.patch text/plain 15213 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwODAxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAyLTE2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgdGV4dERpcmVjdGlvbkZv clNlbGVjdGlvbiBmcm9tIEVkaXRvciB0byBFZGl0aW5nU3R5bGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4ODY4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0ZXh0RGlyZWN0aW9uRm9yU2VsZWN0 aW9uIGZyb20gRWRpdG9yIHRvIEVkaXRpbmdTdHlsZSB0byBjZW50cmFsaXplIHRoZSBlZGl0aW5n IGNvZGUncworICAgICAgICBkZXBlbmRlbmN5IG9uIENTU1N0eWxlRGVjbGFyYXRpb24uCisKKyAg ICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogZWRp dGluZy9FZGl0aW5nU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0eWxlOjp0 ZXh0RGlyZWN0aW9uRm9yU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAq IGVkaXRpbmcvRWRpdGluZ1N0eWxlLmg6CisgICAgICAgIChFZGl0aW5nU3R5bGUpOgorICAgICAg ICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGVk aXRpbmcvRWRpdG9yLmg6CisgICAgICAgIChFZGl0b3IpOgorICAgICAgICAqIGVkaXRpbmcvRWRp dG9yQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzdGF0ZVRleHRXcml0aW5nRGlyZWN0 aW9uKToKKyAgICAgICAgKiBlZGl0aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcDoKKyAg ICAgICAgKiBlZGl0aW5nL21hcmt1cC5jcHA6CisKIDIwMTItMDItMTUgIE1pY2hhZWwgTm9yZG1h biAgPG1pY2hhZWxuQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBGaXggYnVncyBp biB0aGUgaW1wbGVtZW50YXRpb24gb2YgV2ViRGF0YWJhc2U6OmNsb3NlRGF0YWJhc2VJbW1lZGlh dGVseS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oJKHJldmlzaW9uIDEwODAwOSkKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNzM4Myw5ICs3Mzgz LDkgQEAKIAkJMUFGRTExOTgwQ0JGRkNDNDAwMzAxN0ZBIC8qIEpTU1FMUmVzdWx0U2V0Um93TGlz dC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1NRTFJlc3VsdFNldFJvd0xp c3QuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUMyNjQ5NzkwRDdFMjQ4QTAwQkQx MEYyIC8qIERvY3VtZW50TG9hZGVyTWFjLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IERvY3VtZW50TG9hZGVyTWFjLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJMUMyNjQ5N0IwRDdFMjRFQzAwQkQxMEYyIC8qIFBhZ2VNYWMuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUGFnZU1hYy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07Ci0JCTFDNDM1Q0QzMTRFODU0NEYwMDRFMTBFQSAvKiBJbnNwZWN0b3IuanNvbiAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuanNv bjsgcGF0aCA9IEluc3BlY3Rvci5qc29uOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQkx QzQzNUNENDE0RTg1NDVCMDA0RTEwRUEgLyogSW5zcGVjdG9yLTAuMS5qc29uICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5qc29uOyBwYXRoID0g Ikluc3BlY3Rvci0wLjEuanNvbiI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTFDNDM1 Q0Q1MTRFODU0NUIwMDRFMTBFQSAvKiBJbnNwZWN0b3ItMS4wLmpzb24gKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmpzb247IHBhdGggPSAiSW5z cGVjdG9yLTEuMC5qc29uIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUM0MzVDRDMx NEU4NTQ0RjAwNEUxMEVBIC8qIEluc3BlY3Rvci5qc29uICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IEluc3BlY3Rvci5qc29uOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQzQzNUNENDE0RTg1NDVCMDA0RTEwRUEgLyog SW5zcGVjdG9yLTAuMS5qc29uICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93 bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9ICJJbnNwZWN0b3ItMC4xLmpzb24iOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OworCQkxQzQzNUNENTE0RTg1NDVCMDA0RTEwRUEgLyogSW5zcGVjdG9y LTEuMC5qc29uICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBl ID0gdGV4dDsgcGF0aCA9ICJJbnNwZWN0b3ItMS4wLmpzb24iOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQkxQzRDOEVGRjBBRDg1RDg3MDA5NDc1Q0UgLyogRGVsZXRlQnV0dG9uQ29udHJv bGxlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBEZWxldGVCdXR0 b25Db250cm9sbGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1 c2VzVGFicyA9IDA7IH07CiAJCTFDNEM4RjAwMEFEODVEODcwMDk0NzVDRSAvKiBEZWxldGVCdXR0 b25Db250cm9sbGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IERlbGV0ZUJ1 dHRvbkNvbnRyb2xsZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1 c2VzVGFicyA9IDA7IH07CiAJCTFDNEM4RjYzMEFEODY1NUQwMDk0NzVDRSAvKiBEZWxldGVCdXR0 b24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRGVsZXRlQnV0dG9u LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9IDA7 IH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCShyZXZpc2lv biAxMDgwMDkpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTExODIsNiArMTE4Miw5MSBAQCBQYXNzUmVmUHRyPEVkaXRpbmdTdHls ZT4gRWRpdGluZ1N0eWxlOjpzCiAgICAgcmV0dXJuIHN0eWxlOwogfQogCitXcml0aW5nRGlyZWN0 aW9uIEVkaXRpbmdTdHlsZTo6dGV4dERpcmVjdGlvbkZvclNlbGVjdGlvbihjb25zdCBWaXNpYmxl U2VsZWN0aW9uJiBzZWxlY3Rpb24sIEVkaXRpbmdTdHlsZSogdHlwaW5nU3R5bGUsIGJvb2wmIGhh c05lc3RlZE9yTXVsdGlwbGVFbWJlZGRpbmdzKQoreworICAgIGhhc05lc3RlZE9yTXVsdGlwbGVF bWJlZGRpbmdzID0gdHJ1ZTsKKworICAgIGlmIChzZWxlY3Rpb24uaXNOb25lKCkpCisgICAgICAg IHJldHVybiBOYXR1cmFsV3JpdGluZ0RpcmVjdGlvbjsKKworICAgIFBvc2l0aW9uIHBvc2l0aW9u ID0gc2VsZWN0aW9uLnN0YXJ0KCkuZG93bnN0cmVhbSgpOworCisgICAgTm9kZSogbm9kZSA9IHBv c2l0aW9uLmRlcHJlY2F0ZWROb2RlKCk7CisgICAgaWYgKCFub2RlKQorICAgICAgICByZXR1cm4g TmF0dXJhbFdyaXRpbmdEaXJlY3Rpb247CisKKyAgICBQb3NpdGlvbiBlbmQ7CisgICAgaWYgKHNl bGVjdGlvbi5pc1JhbmdlKCkpIHsKKyAgICAgICAgZW5kID0gc2VsZWN0aW9uLmVuZCgpLnVwc3Ry ZWFtKCk7CisKKyAgICAgICAgTm9kZSogcGFzdExhc3QgPSBSYW5nZTo6Y3JlYXRlKGVuZC5kb2N1 bWVudCgpLCBwb3NpdGlvbi5wYXJlbnRBbmNob3JlZEVxdWl2YWxlbnQoKSwgZW5kLnBhcmVudEFu Y2hvcmVkRXF1aXZhbGVudCgpKS0+cGFzdExhc3ROb2RlKCk7CisgICAgICAgIGZvciAoTm9kZSog biA9IG5vZGU7IG4gJiYgbiAhPSBwYXN0TGFzdDsgbiA9IG4tPnRyYXZlcnNlTmV4dE5vZGUoKSkg eworICAgICAgICAgICAgaWYgKCFuLT5pc1N0eWxlZEVsZW1lbnQoKSkKKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKworICAgICAgICAgICAgUmVmUHRyPENTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbj4gc3R5bGUgPSBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmNyZWF0ZShuKTsKKyAg ICAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gdW5pY29kZUJpZGkgPSBzdHlsZS0+Z2V0UHJvcGVy dHlDU1NWYWx1ZShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpKTsKKyAgICAgICAgICAgIGlmICghdW5p Y29kZUJpZGkgfHwgIXVuaWNvZGVCaWRpLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAgICAgICAg ICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIGludCB1bmljb2RlQmlkaVZhbHVlID0gc3Rh dGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih1bmljb2RlQmlkaS5nZXQoKSktPmdldElkZW50 KCk7CisgICAgICAgICAgICBpZiAodW5pY29kZUJpZGlWYWx1ZSA9PSBDU1NWYWx1ZUVtYmVkIHx8 IHVuaWNvZGVCaWRpVmFsdWUgPT0gQ1NTVmFsdWVCaWRpT3ZlcnJpZGUpCisgICAgICAgICAgICAg ICAgcmV0dXJuIE5hdHVyYWxXcml0aW5nRGlyZWN0aW9uOworICAgICAgICB9CisgICAgfQorCisg ICAgaWYgKHNlbGVjdGlvbi5pc0NhcmV0KCkpIHsKKyAgICAgICAgV3JpdGluZ0RpcmVjdGlvbiBk aXJlY3Rpb247CisgICAgICAgIGlmICh0eXBpbmdTdHlsZSAmJiB0eXBpbmdTdHlsZS0+dGV4dERp cmVjdGlvbihkaXJlY3Rpb24pKSB7CisgICAgICAgICAgICBoYXNOZXN0ZWRPck11bHRpcGxlRW1i ZWRkaW5ncyA9IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIGRpcmVjdGlvbjsKKyAgICAgICAg fQorICAgICAgICBub2RlID0gc2VsZWN0aW9uLnZpc2libGVTdGFydCgpLmRlZXBFcXVpdmFsZW50 KCkuZGVwcmVjYXRlZE5vZGUoKTsKKyAgICB9CisKKyAgICAvLyBUaGUgc2VsZWN0aW9uIGlzIGVp dGhlciBhIGNhcmV0IHdpdGggbm8gdHlwaW5nIGF0dHJpYnV0ZXMgb3IgYSByYW5nZSBpbiB3aGlj aCBubyBlbWJlZGRpbmcgaXMgYWRkZWQsIHNvIGp1c3QgdXNlIHRoZSBzdGFydCBwb3NpdGlvbgor ICAgIC8vIHRvIGRlY2lkZS4KKyAgICBOb2RlKiBibG9jayA9IGVuY2xvc2luZ0Jsb2NrKG5vZGUp OworICAgIFdyaXRpbmdEaXJlY3Rpb24gZm91bmREaXJlY3Rpb24gPSBOYXR1cmFsV3JpdGluZ0Rp cmVjdGlvbjsKKworICAgIGZvciAoOyBub2RlICE9IGJsb2NrOyBub2RlID0gbm9kZS0+cGFyZW50 Tm9kZSgpKSB7CisgICAgICAgIGlmICghbm9kZS0+aXNTdHlsZWRFbGVtZW50KCkpCisgICAgICAg ICAgICBjb250aW51ZTsKKworICAgICAgICBSZWZQdHI8Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0 aW9uPiBzdHlsZSA9IENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Y3JlYXRlKG5vZGUpOwor ICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+IHVuaWNvZGVCaWRpID0gc3R5bGUtPmdldFByb3BlcnR5 Q1NTVmFsdWUoQ1NTUHJvcGVydHlVbmljb2RlQmlkaSk7CisgICAgICAgIGlmICghdW5pY29kZUJp ZGkgfHwgIXVuaWNvZGVCaWRpLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAgICAgICAgICBjb250 aW51ZTsKKworICAgICAgICBpbnQgdW5pY29kZUJpZGlWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1By aW1pdGl2ZVZhbHVlKj4odW5pY29kZUJpZGkuZ2V0KCkpLT5nZXRJZGVudCgpOworICAgICAgICBp ZiAodW5pY29kZUJpZGlWYWx1ZSA9PSBDU1NWYWx1ZU5vcm1hbCkKKyAgICAgICAgICAgIGNvbnRp bnVlOworCisgICAgICAgIGlmICh1bmljb2RlQmlkaVZhbHVlID09IENTU1ZhbHVlQmlkaU92ZXJy aWRlKQorICAgICAgICAgICAgcmV0dXJuIE5hdHVyYWxXcml0aW5nRGlyZWN0aW9uOworCisgICAg ICAgIEFTU0VSVCh1bmljb2RlQmlkaVZhbHVlID09IENTU1ZhbHVlRW1iZWQpOworICAgICAgICBS ZWZQdHI8Q1NTVmFsdWU+IGRpcmVjdGlvbiA9IHN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENT U1Byb3BlcnR5RGlyZWN0aW9uKTsKKyAgICAgICAgaWYgKCFkaXJlY3Rpb24gfHwgIWRpcmVjdGlv bi0+aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAg aW50IGRpcmVjdGlvblZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihkaXJl Y3Rpb24uZ2V0KCkpLT5nZXRJZGVudCgpOworICAgICAgICBpZiAoZGlyZWN0aW9uVmFsdWUgIT0g Q1NTVmFsdWVMdHIgJiYgZGlyZWN0aW9uVmFsdWUgIT0gQ1NTVmFsdWVSdGwpCisgICAgICAgICAg ICBjb250aW51ZTsKKworICAgICAgICBpZiAoZm91bmREaXJlY3Rpb24gIT0gTmF0dXJhbFdyaXRp bmdEaXJlY3Rpb24pCisgICAgICAgICAgICByZXR1cm4gTmF0dXJhbFdyaXRpbmdEaXJlY3Rpb247 CisKKyAgICAgICAgLy8gSW4gdGhlIHJhbmdlIGNhc2UsIG1ha2Ugc3VyZSB0aGF0IHRoZSBlbWJl ZGRpbmcgZWxlbWVudCBwZXJzaXN0cyB1bnRpbCB0aGUgZW5kIG9mIHRoZSByYW5nZS4KKyAgICAg ICAgaWYgKHNlbGVjdGlvbi5pc1JhbmdlKCkgJiYgIWVuZC5kZXByZWNhdGVkTm9kZSgpLT5pc0Rl c2NlbmRhbnRPZihub2RlKSkKKyAgICAgICAgICAgIHJldHVybiBOYXR1cmFsV3JpdGluZ0RpcmVj dGlvbjsKKyAgICAgICAgCisgICAgICAgIGZvdW5kRGlyZWN0aW9uID0gZGlyZWN0aW9uVmFsdWUg PT0gQ1NTVmFsdWVMdHIgPyBMZWZ0VG9SaWdodFdyaXRpbmdEaXJlY3Rpb24gOiBSaWdodFRvTGVm dFdyaXRpbmdEaXJlY3Rpb247CisgICAgfQorICAgIGhhc05lc3RlZE9yTXVsdGlwbGVFbWJlZGRp bmdzID0gZmFsc2U7CisgICAgcmV0dXJuIGZvdW5kRGlyZWN0aW9uOworfQorCiBzdGF0aWMgdm9p ZCByZWNvbmNpbGVUZXh0RGVjb3JhdGlvblByb3BlcnRpZXMoU3R5bGVQcm9wZXJ0eVNldCogc3R5 bGUpCiB7ICAgIAogICAgIFJlZlB0cjxDU1NWYWx1ZT4gdGV4dERlY29yYXRpb25zSW5FZmZlY3Qg PSBzdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0 aW9uc0luRWZmZWN0KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuaAko cmV2aXNpb24gMTA4MDA5KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUu aAkod29ya2luZyBjb3B5KQpAQCAtMTQ1LDYgKzE0NSw3IEBAIHB1YmxpYzoKICAgICBib29sIHNo b3VsZFVzZUZpeGVkRGVmYXVsdEZvbnRTaXplKCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRVc2VG aXhlZERlZmF1bHRGb250U2l6ZTsgfQogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RWRpdGluZ1N0 eWxlPiBzdHlsZUF0U2VsZWN0aW9uU3RhcnQoY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYsIGJvb2wg c2hvdWxkVXNlQmFja2dyb3VuZENvbG9ySW5FZmZlY3QgPSBmYWxzZSk7CisgICAgc3RhdGljIFdy aXRpbmdEaXJlY3Rpb24gdGV4dERpcmVjdGlvbkZvclNlbGVjdGlvbihjb25zdCBWaXNpYmxlU2Vs ZWN0aW9uJiwgRWRpdGluZ1N0eWxlKiB0eXBpbmdTdHlsZSwgYm9vbCYgaGFzTmVzdGVkT3JNdWx0 aXBsZUVtYmVkZGluZ3MpOwogcHJpdmF0ZToKICAgICBFZGl0aW5nU3R5bGUoKTsKICAgICBFZGl0 aW5nU3R5bGUoTm9kZSosIFByb3BlcnRpZXNUb0luY2x1ZGUpOwpJbmRleDogU291cmNlL1dlYkNv cmUvZWRpdGluZy9FZGl0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmNwcAkocmV2aXNpb24gMTA4MDA5KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9FZGl0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OTksOTIgKzQ5OSw2IEBAIHZvaWQgRWRp dG9yOjpyZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoY28KICAgICAgICAgY2xpZW50KCktPnJlc3Bv bmRUb0NoYW5nZWRDb250ZW50cygpOwogfQogCi1Xcml0aW5nRGlyZWN0aW9uIEVkaXRvcjo6dGV4 dERpcmVjdGlvbkZvclNlbGVjdGlvbihib29sJiBoYXNOZXN0ZWRPck11bHRpcGxlRW1iZWRkaW5n cykgY29uc3QKLXsKLSAgICBoYXNOZXN0ZWRPck11bHRpcGxlRW1iZWRkaW5ncyA9IHRydWU7Ci0K LSAgICBpZiAobV9mcmFtZS0+c2VsZWN0aW9uKCktPmlzTm9uZSgpKQotICAgICAgICByZXR1cm4g TmF0dXJhbFdyaXRpbmdEaXJlY3Rpb247Ci0KLSAgICBQb3NpdGlvbiBwb3NpdGlvbiA9IG1fZnJh bWUtPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKS5zdGFydCgpLmRvd25zdHJlYW0oKTsKLQotICAg IE5vZGUqIG5vZGUgPSBwb3NpdGlvbi5kZXByZWNhdGVkTm9kZSgpOwotICAgIGlmICghbm9kZSkK LSAgICAgICAgcmV0dXJuIE5hdHVyYWxXcml0aW5nRGlyZWN0aW9uOwotCi0gICAgUG9zaXRpb24g ZW5kOwotICAgIGlmIChtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+aXNSYW5nZSgpKSB7Ci0gICAgICAg IGVuZCA9IG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKS5lbmQoKS51cHN0cmVhbSgp OwotCi0gICAgICAgIE5vZGUqIHBhc3RMYXN0ID0gUmFuZ2U6OmNyZWF0ZShtX2ZyYW1lLT5kb2N1 bWVudCgpLCBwb3NpdGlvbi5wYXJlbnRBbmNob3JlZEVxdWl2YWxlbnQoKSwgZW5kLnBhcmVudEFu Y2hvcmVkRXF1aXZhbGVudCgpKS0+cGFzdExhc3ROb2RlKCk7Ci0gICAgICAgIGZvciAoTm9kZSog biA9IG5vZGU7IG4gJiYgbiAhPSBwYXN0TGFzdDsgbiA9IG4tPnRyYXZlcnNlTmV4dE5vZGUoKSkg ewotICAgICAgICAgICAgaWYgKCFuLT5pc1N0eWxlZEVsZW1lbnQoKSkKLSAgICAgICAgICAgICAg ICBjb250aW51ZTsKLQotICAgICAgICAgICAgUmVmUHRyPENTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbj4gc3R5bGUgPSBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmNyZWF0ZShuKTsKLSAg ICAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gdW5pY29kZUJpZGkgPSBzdHlsZS0+Z2V0UHJvcGVy dHlDU1NWYWx1ZShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpKTsKLSAgICAgICAgICAgIGlmICghdW5p Y29kZUJpZGkgfHwgIXVuaWNvZGVCaWRpLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCi0gICAgICAgICAg ICAgICAgY29udGludWU7Ci0KLSAgICAgICAgICAgIGludCB1bmljb2RlQmlkaVZhbHVlID0gc3Rh dGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih1bmljb2RlQmlkaS5nZXQoKSktPmdldElkZW50 KCk7Ci0gICAgICAgICAgICBpZiAodW5pY29kZUJpZGlWYWx1ZSA9PSBDU1NWYWx1ZUVtYmVkIHx8 IHVuaWNvZGVCaWRpVmFsdWUgPT0gQ1NTVmFsdWVCaWRpT3ZlcnJpZGUpCi0gICAgICAgICAgICAg ICAgcmV0dXJuIE5hdHVyYWxXcml0aW5nRGlyZWN0aW9uOwotICAgICAgICB9Ci0gICAgfQotCi0g ICAgaWYgKG1fZnJhbWUtPnNlbGVjdGlvbigpLT5pc0NhcmV0KCkpIHsKLSAgICAgICAgUmVmUHRy PEVkaXRpbmdTdHlsZT4gdHlwaW5nU3R5bGUgPSBtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+dHlwaW5n U3R5bGUoKTsKLSAgICAgICAgV3JpdGluZ0RpcmVjdGlvbiBkaXJlY3Rpb247Ci0gICAgICAgIGlm ICh0eXBpbmdTdHlsZSAmJiB0eXBpbmdTdHlsZS0+dGV4dERpcmVjdGlvbihkaXJlY3Rpb24pKSB7 Ci0gICAgICAgICAgICBoYXNOZXN0ZWRPck11bHRpcGxlRW1iZWRkaW5ncyA9IGZhbHNlOwotICAg ICAgICAgICAgcmV0dXJuIGRpcmVjdGlvbjsKLSAgICAgICAgfQotICAgICAgICBub2RlID0gbV9m cmFtZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlvbigpLnZpc2libGVTdGFydCgpLmRlZXBFcXVpdmFs ZW50KCkuZGVwcmVjYXRlZE5vZGUoKTsKLSAgICB9Ci0KLSAgICAvLyBUaGUgc2VsZWN0aW9uIGlz IGVpdGhlciBhIGNhcmV0IHdpdGggbm8gdHlwaW5nIGF0dHJpYnV0ZXMgb3IgYSByYW5nZSBpbiB3 aGljaCBubyBlbWJlZGRpbmcgaXMgYWRkZWQsIHNvIGp1c3QgdXNlIHRoZSBzdGFydCBwb3NpdGlv bgotICAgIC8vIHRvIGRlY2lkZS4KLSAgICBOb2RlKiBibG9jayA9IGVuY2xvc2luZ0Jsb2NrKG5v ZGUpOwotICAgIFdyaXRpbmdEaXJlY3Rpb24gZm91bmREaXJlY3Rpb24gPSBOYXR1cmFsV3JpdGlu Z0RpcmVjdGlvbjsKLQotICAgIGZvciAoOyBub2RlICE9IGJsb2NrOyBub2RlID0gbm9kZS0+cGFy ZW50Tm9kZSgpKSB7Ci0gICAgICAgIGlmICghbm9kZS0+aXNTdHlsZWRFbGVtZW50KCkpCi0gICAg ICAgICAgICBjb250aW51ZTsKLQotICAgICAgICBSZWZQdHI8Q1NTQ29tcHV0ZWRTdHlsZURlY2xh cmF0aW9uPiBzdHlsZSA9IENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Y3JlYXRlKG5vZGUp OwotICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+IHVuaWNvZGVCaWRpID0gc3R5bGUtPmdldFByb3Bl cnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlVbmljb2RlQmlkaSk7Ci0gICAgICAgIGlmICghdW5pY29k ZUJpZGkgfHwgIXVuaWNvZGVCaWRpLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCi0gICAgICAgICAgICBj b250aW51ZTsKLQotICAgICAgICBpbnQgdW5pY29kZUJpZGlWYWx1ZSA9IHN0YXRpY19jYXN0PENT U1ByaW1pdGl2ZVZhbHVlKj4odW5pY29kZUJpZGkuZ2V0KCkpLT5nZXRJZGVudCgpOwotICAgICAg ICBpZiAodW5pY29kZUJpZGlWYWx1ZSA9PSBDU1NWYWx1ZU5vcm1hbCkKLSAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgIGlmICh1bmljb2RlQmlkaVZhbHVlID09IENTU1ZhbHVlQmlkaU92 ZXJyaWRlKQotICAgICAgICAgICAgcmV0dXJuIE5hdHVyYWxXcml0aW5nRGlyZWN0aW9uOwotCi0g ICAgICAgIEFTU0VSVCh1bmljb2RlQmlkaVZhbHVlID09IENTU1ZhbHVlRW1iZWQpOwotICAgICAg ICBSZWZQdHI8Q1NTVmFsdWU+IGRpcmVjdGlvbiA9IHN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVl KENTU1Byb3BlcnR5RGlyZWN0aW9uKTsKLSAgICAgICAgaWYgKCFkaXJlY3Rpb24gfHwgIWRpcmVj dGlvbi0+aXNQcmltaXRpdmVWYWx1ZSgpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAg ICAgaW50IGRpcmVjdGlvblZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihk aXJlY3Rpb24uZ2V0KCkpLT5nZXRJZGVudCgpOwotICAgICAgICBpZiAoZGlyZWN0aW9uVmFsdWUg IT0gQ1NTVmFsdWVMdHIgJiYgZGlyZWN0aW9uVmFsdWUgIT0gQ1NTVmFsdWVSdGwpCi0gICAgICAg ICAgICBjb250aW51ZTsKLQotICAgICAgICBpZiAoZm91bmREaXJlY3Rpb24gIT0gTmF0dXJhbFdy aXRpbmdEaXJlY3Rpb24pCi0gICAgICAgICAgICByZXR1cm4gTmF0dXJhbFdyaXRpbmdEaXJlY3Rp b247Ci0KLSAgICAgICAgLy8gSW4gdGhlIHJhbmdlIGNhc2UsIG1ha2Ugc3VyZSB0aGF0IHRoZSBl bWJlZGRpbmcgZWxlbWVudCBwZXJzaXN0cyB1bnRpbCB0aGUgZW5kIG9mIHRoZSByYW5nZS4KLSAg ICAgICAgaWYgKG1fZnJhbWUtPnNlbGVjdGlvbigpLT5pc1JhbmdlKCkgJiYgIWVuZC5kZXByZWNh dGVkTm9kZSgpLT5pc0Rlc2NlbmRhbnRPZihub2RlKSkKLSAgICAgICAgICAgIHJldHVybiBOYXR1 cmFsV3JpdGluZ0RpcmVjdGlvbjsKLQotICAgICAgICBmb3VuZERpcmVjdGlvbiA9IGRpcmVjdGlv blZhbHVlID09IENTU1ZhbHVlTHRyID8gTGVmdFRvUmlnaHRXcml0aW5nRGlyZWN0aW9uIDogUmln aHRUb0xlZnRXcml0aW5nRGlyZWN0aW9uOwotICAgIH0KLSAgICBoYXNOZXN0ZWRPck11bHRpcGxl RW1iZWRkaW5ncyA9IGZhbHNlOwotICAgIHJldHVybiBmb3VuZERpcmVjdGlvbjsKLX0KLQogYm9v bCBFZGl0b3I6Omhhc0JpZGlTZWxlY3Rpb24oKSBjb25zdAogewogICAgIGlmIChtX2ZyYW1lLT5z ZWxlY3Rpb24oKS0+aXNOb25lKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRv ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJKHJldmlz aW9uIDEwODAwOSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJKHdvcmtpbmcg Y29weSkKQEAgLTEzOCw3ICsxMzgsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBzZWxlY3Rpb25TdGFy dEhhc1N0eWxlKGludCBwcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHZhbHVlKSBjb25zdDsKICAg ICBUcmlTdGF0ZSBzZWxlY3Rpb25IYXNTdHlsZShpbnQgcHJvcGVydHlJRCwgY29uc3QgU3RyaW5n JiB2YWx1ZSkgY29uc3Q7CiAgICAgU3RyaW5nIHNlbGVjdGlvblN0YXJ0Q1NTUHJvcGVydHlWYWx1 ZShpbnQgcHJvcGVydHlJRCk7Ci0gICAgV3JpdGluZ0RpcmVjdGlvbiB0ZXh0RGlyZWN0aW9uRm9y U2VsZWN0aW9uKGJvb2wmKSBjb25zdDsKICAgICAKICAgICBUcmlTdGF0ZSBzZWxlY3Rpb25Vbm9y ZGVyZWRMaXN0U3RhdGUoKSBjb25zdDsKICAgICBUcmlTdGF0ZSBzZWxlY3Rpb25PcmRlcmVkTGlz dFN0YXRlKCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvckNvbW1h bmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yQ29tbWFu ZC5jcHAJKHJldmlzaW9uIDEwODAwOSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9y Q29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0MSw3ICsyNDEsOSBAQCBzdGF0aWMgU3Ry aW5nIHZhbHVlU3R5bGUoRnJhbWUqIGZyYW1lLCBpCiBzdGF0aWMgVHJpU3RhdGUgc3RhdGVUZXh0 V3JpdGluZ0RpcmVjdGlvbihGcmFtZSogZnJhbWUsIFdyaXRpbmdEaXJlY3Rpb24gZGlyZWN0aW9u KQogewogICAgIGJvb2wgaGFzTmVzdGVkT3JNdWx0aXBsZUVtYmVkZGluZ3M7Ci0gICAgV3JpdGlu Z0RpcmVjdGlvbiBzZWxlY3Rpb25EaXJlY3Rpb24gPSBmcmFtZS0+ZWRpdG9yKCktPnRleHREaXJl Y3Rpb25Gb3JTZWxlY3Rpb24oaGFzTmVzdGVkT3JNdWx0aXBsZUVtYmVkZGluZ3MpOworICAgIFdy aXRpbmdEaXJlY3Rpb24gc2VsZWN0aW9uRGlyZWN0aW9uID0gRWRpdGluZ1N0eWxlOjp0ZXh0RGly ZWN0aW9uRm9yU2VsZWN0aW9uKGZyYW1lLT5zZWxlY3Rpb24oKS0+c2VsZWN0aW9uKCksCisgICAg ICAgIGZyYW1lLT5zZWxlY3Rpb24oKS0+dHlwaW5nU3R5bGUoKSwgaGFzTmVzdGVkT3JNdWx0aXBs ZUVtYmVkZGluZ3MpOworICAgIC8vIEZYSU1FOiBXZSBzaG91bGQgYmUgcmV0dXJuaW5nIE1peGVk VHJpU3RhdGUgd2hlbiBzZWxlY3Rpb25EaXJlY3Rpb24gPT0gZGlyZWN0aW9uICYmIGhhc05lc3Rl ZE9yTXVsdGlwbGVFbWJlZGRpbmdzCiAgICAgcmV0dXJuIChzZWxlY3Rpb25EaXJlY3Rpb24gPT0g ZGlyZWN0aW9uICYmICFoYXNOZXN0ZWRPck11bHRpcGxlRW1iZWRkaW5ncykgPyBUcnVlVHJpU3Rh dGUgOiBGYWxzZVRyaVN0YXRlOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Jl cGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcAkocmV2aXNpb24gMTA4MDA5KQorKysg U291cmNlL1dlYkNvcmUvZWRpdGluZy9SZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMwLDcgKzMwLDYgQEAKICNpbmNsdWRlICJBcHBseVN0eWxlQ29tbWFuZC5o IgogI2luY2x1ZGUgIkJlZm9yZVRleHRJbnNlcnRlZEV2ZW50LmgiCiAjaW5jbHVkZSAiQnJlYWtC bG9ja3F1b3RlQ29tbWFuZC5oIgotI2luY2x1ZGUgIkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlv bi5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIKICNpbmNsdWRlICJDU1NWYWx1ZUtl eXdvcmRzLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvbWFya3VwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21h cmt1cC5jcHAJKHJldmlzaW9uIDEwODAwOSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFy a3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNyArMzAsNiBAQAogI2luY2x1ZGUgIm1hcmt1 cC5oIgogCiAjaW5jbHVkZSAiQ0RBVEFTZWN0aW9uLmgiCi0jaW5jbHVkZSAiQ1NTQ29tcHV0ZWRT dHlsZURlY2xhcmF0aW9uLmgiCiAjaW5jbHVkZSAiQ1NTUHJpbWl0aXZlVmFsdWUuaCIKICNpbmNs dWRlICJDU1NQcm9wZXJ0eS5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIK