26828 2009-06-29 22:02:02 -0700 Confusing method naming: createRoot[Inline]Box, create[Inline]FlowBox 2009-07-02 18:29:12 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P5 Trivial --- 1 rolandsteiner webkit-unassigned oldest_to_newest 128950 0 rolandsteiner 2009-06-29 22:02:02 -0700 RenderBlock and RenderInline have confusingly named object creation methods: RenderBlock::createRootBox/createRootInlineBox RenderInline::createFlowBox/createInlineFlowBox where the 2nd method in both cases just calls the first and then appends the created object, i.e., is not really a different object creation method, and doesn't create different objects. Also confusing because there are no "RootBox" or "FlowBox" classes. 128951 1 32032 rolandsteiner 2009-06-29 22:03:01 -0700 Created attachment 32032 patch: rename methods to createAndAppend...() 128975 2 32032 eric 2009-06-30 00:48:03 -0700 Comment on attachment 32032 patch: rename methods to createAndAppend...() Looks great! 129252 3 rolandsteiner 2009-06-30 21:55:12 -0700 (In reply to comment #2) > (From update of attachment 32032 [review]) > Looks great! Thanks! Could you please commit the patch for me? 129648 4 eric 2009-07-02 18:28:43 -0700 There were tab characters in the ChangeLog, and the ChangeLog was missing the bug URL. I corrected these when landing. 129649 5 eric 2009-07-02 18:29:12 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/rendering/RenderBlock.cpp M WebCore/rendering/RenderBlock.h M WebCore/rendering/RenderInline.cpp M WebCore/rendering/RenderInline.h M WebCore/rendering/RenderSVGInline.cpp M WebCore/rendering/RenderSVGInline.h M WebCore/rendering/RenderSVGText.cpp M WebCore/rendering/RenderSVGText.h M WebCore/rendering/bidi.cpp Committed r45517 M WebCore/ChangeLog M WebCore/rendering/RenderSVGInline.h M WebCore/rendering/RenderSVGText.h M WebCore/rendering/RenderInline.cpp M WebCore/rendering/RenderBlock.cpp M WebCore/rendering/bidi.cpp M WebCore/rendering/RenderInline.h M WebCore/rendering/RenderBlock.h M WebCore/rendering/RenderSVGText.cpp M WebCore/rendering/RenderSVGInline.cpp r45517 = a2815d0bab937dd4b3bfc42ffd13b5d7a3b7a0fc (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/45517 32032 2009-06-29 22:03:01 -0700 2009-06-30 00:48:03 -0700 patch: rename methods to createAndAppend...() RenameMethods.patch text/plain 8168 rolandsteiner SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTMzNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMDktMDYtMjkgIFJvbGFuZCBTdGVpbmVyICA8cm9sYW5kc3RlaW5l ckBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFJlbmRlckJsb2NrIGFuZCBSZW5kZXJJbmxpbmUgaGF2ZSBjb25mdXNpbmdseSBuYW1l ZCBvYmplY3QgY3JlYXRpb24gbWV0aG9kczoKKyAgICAgICAgICAgIFJlbmRlckJsb2NrOjpjcmVh dGVSb290Qm94L2NyZWF0ZVJvb3RJbmxpbmVCb3gKKyAgICAgICAgICAgIFJlbmRlcklubGluZTo6 Y3JlYXRlRmxvd0JveC9jcmVhdGVJbmxpbmVGbG93Qm94CisJCXdoZXJlIHRoZSAybmQgbWV0aG9k IGluIGJvdGggY2FzZXMganVzdCBjYWxscyB0aGUgZmlyc3QgYW5kIHRoZW4gYXBwZW5kcyB0aGUg Y3JlYXRlZCBvYmplY3QuCisJCUkgdGhlcmVmb3JlIHJlbmFtZWQgdGhvc2UgbWV0aG9kcyB0byBz b21ldGhpbmcgSU1ITyBtb3JlIGluZm9ybWF0aXZlOgorICAgICAgICAKKyAgICAgICAgY3JlYXRl Um9vdEJveCgpICAgICAgICAgLT4gY3JlYXRlUm9vdElubGluZUJveCgpCisgICAgICAgIGNyZWF0 ZVJvb3RJbmxpbmVCb3goKSAgIC0+IGNyZWF0ZUFuZEFwcGVuZFJvb3RJbmxpbmVCb3goKTsKKyAg ICAgICAgY3JlYXRlRmxvd0JveCgpICAgICAgICAgLT4gY3JlYXRlSW5saW5lRmxvd0JveCgpOwor ICAgICAgICBjcmVhdGVJbmxpbmVGbG93Qm94KCkgICAtPiBjcmVhdGVBbmRBcHBlbmRJbmxpbmVG bG93Qm94KCk7CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNyZWF0ZVJvb3RJbmxpbmVCb3gpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNyZWF0ZUFuZEFwcGVuZFJvb3RJbmxpbmVCb3gpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjpjcmVhdGVJbmxp bmVGbG93Qm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklubGluZTo6Y3JlYXRlQW5kQXBw ZW5kSW5saW5lRmxvd0JveCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5oOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJTVkdJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyU1ZHSW5saW5lOjpjcmVhdGVJbmxpbmVGbG93Qm94KToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyU1ZHSW5saW5lLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNWR1Rl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHVGV4dDo6Y3JlYXRlUm9vdElubGlu ZUJveCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNWR1RleHQuaDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvYmlkaS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVJbmxpbmVCb3hGb3JS ZW5kZXJlcik6CisKIDIwMDktMDYtMjYgIEpvaG4gU3VsbGl2YW4gIDxzdWxsaXZhbkBhcHBsZS5j b20+CiAKICAgICAgICAgQWRkZWQgU3BlZWNoIHN1Ym1lbnUgdG8gY29udGV4dCBtZW51IG9uIE1h YyB3aGVuIHRoZXJlJ3MgYSBub24tZWRpdGFibGUgc2VsZWN0aW9uCkluZGV4OiBXZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA0NTMzMykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzg5LDE0ICszODksMTQgQEAgdm9pZCBS ZW5kZXJCbG9jazo6ZGVsZXRlTGluZUJveFRyZWUoKQogICAgIG1fbGluZUJveGVzLmRlbGV0ZUxp bmVCb3hUcmVlKHJlbmRlckFyZW5hKCkpOwogfQogCi1Sb290SW5saW5lQm94KiBSZW5kZXJCbG9j azo6Y3JlYXRlUm9vdEJveCgpCitSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6Y3JlYXRlUm9v dElubGluZUJveCgpIAogewogICAgIHJldHVybiBuZXcgKHJlbmRlckFyZW5hKCkpIFJvb3RJbmxp bmVCb3godGhpcyk7CiB9CiAKLVJvb3RJbmxpbmVCb3gqIFJlbmRlckJsb2NrOjpjcmVhdGVSb290 SW5saW5lQm94KCkKK1Jvb3RJbmxpbmVCb3gqIFJlbmRlckJsb2NrOjpjcmVhdGVBbmRBcHBlbmRS b290SW5saW5lQm94KCkKIHsKLSAgICBSb290SW5saW5lQm94KiByb290Qm94ID0gY3JlYXRlUm9v dEJveCgpOworICAgIFJvb3RJbmxpbmVCb3gqIHJvb3RCb3ggPSBjcmVhdGVSb290SW5saW5lQm94 KCk7CiAgICAgbV9saW5lQm94ZXMuYXBwZW5kTGluZUJveChyb290Qm94KTsKICAgICByZXR1cm4g cm9vdEJveDsKIH0KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAkocmV2aXNpb24gNDUzMzMp CisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC0x NDIsNyArMTQyLDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUJlZm9yZUFm dGVyQ29udGVudChQc2V1ZG9JZCk7CiAKLSAgICBSb290SW5saW5lQm94KiBjcmVhdGVSb290SW5s aW5lQm94KCk7CisgICAgUm9vdElubGluZUJveCogY3JlYXRlQW5kQXBwZW5kUm9vdElubGluZUJv eCgpOworICAgIHZpcnR1YWwgUm9vdElubGluZUJveCogY3JlYXRlUm9vdElubGluZUJveCgpOyAv LyBTdWJjbGFzc2VkIGJ5IFNWRyBhbmQgUnVieS4KIAogICAgIC8vIENhbGxlZCB0byBsYXkgb3V0 IHRoZSBsZWdlbmQgZm9yIGEgZmllbGRzZXQuCiAgICAgdmlydHVhbCBSZW5kZXJPYmplY3QqIGxh eW91dExlZ2VuZChib29sIC8qcmVsYXlvdXRDaGlsZHJlbiovKSB7IHJldHVybiAwOyB9CkBAIC0z NDIsNyArMzQzLDYgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgYm9vbCBoYXNMaW5lSWZFbXB0 eSgpIGNvbnN0OwogICAgIGJvb2wgbGF5b3V0T25seVBvc2l0aW9uZWRPYmplY3RzKCk7CiAKLSAg ICB2aXJ0dWFsIFJvb3RJbmxpbmVCb3gqIGNyZWF0ZVJvb3RCb3goKTsgLy8gU3ViY2xhc3NlZCBi eSBTVkcuCiAgICAgCiBwcml2YXRlOgogICAgIFBvc2l0aW9uIHBvc2l0aW9uRm9yQm94KElubGlu ZUJveCosIGJvb2wgc3RhcnQgPSB0cnVlKSBjb25zdDsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SW5saW5lLmNwcAkocmV2aXNpb24gNDUzMzMpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bmxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NDksMTQgKzc0OSwxNCBAQCB2b2lkIFJlbmRl cklubGluZTo6ZGlydHlMaW5lQm94ZXMoYm9vbCBmCiAgICAgICAgIG1fbGluZUJveGVzLmRpcnR5 TGluZUJveGVzKCk7CiB9CiAKLUlubGluZUZsb3dCb3gqIFJlbmRlcklubGluZTo6Y3JlYXRlRmxv d0JveCgpCitJbmxpbmVGbG93Qm94KiBSZW5kZXJJbmxpbmU6OmNyZWF0ZUlubGluZUZsb3dCb3go KSAKIHsKICAgICByZXR1cm4gbmV3IChyZW5kZXJBcmVuYSgpKSBJbmxpbmVGbG93Qm94KHRoaXMp OwogfQogCi1JbmxpbmVGbG93Qm94KiBSZW5kZXJJbmxpbmU6OmNyZWF0ZUlubGluZUZsb3dCb3go KQorSW5saW5lRmxvd0JveCogUmVuZGVySW5saW5lOjpjcmVhdGVBbmRBcHBlbmRJbmxpbmVGbG93 Qm94KCkKIHsKLSAgICBJbmxpbmVGbG93Qm94KiBmbG93Qm94ID0gY3JlYXRlRmxvd0JveCgpOwor ICAgIElubGluZUZsb3dCb3gqIGZsb3dCb3ggPSBjcmVhdGVJbmxpbmVGbG93Qm94KCk7CiAgICAg bV9saW5lQm94ZXMuYXBwZW5kTGluZUJveChmbG93Qm94KTsKICAgICByZXR1cm4gZmxvd0JveDsK IH0KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5oCShyZXZpc2lvbiA0NTMzMykKKysrIFdl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5oCSh3b3JraW5nIGNvcHkpCkBAIC05Myw3ICs5 Myw5IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIEludFJlY3QoMCwgMCwgYm91bmRpbmdCb3gu d2lkdGgoKSwgYm91bmRpbmdCb3guaGVpZ2h0KCkpOwogICAgIH0KIAotICAgIElubGluZUZsb3dC b3gqIGNyZWF0ZUlubGluZUZsb3dCb3goKTsgICAgCisgICAgSW5saW5lRmxvd0JveCogY3JlYXRl QW5kQXBwZW5kSW5saW5lRmxvd0JveCgpOyAgICAKKyAgICB2aXJ0dWFsIElubGluZUZsb3dCb3gq IGNyZWF0ZUlubGluZUZsb3dCb3goKTsgLy8gU3ViY2xhc3NlZCBieSBTVkcgYW5kIFJ1YnkKKwog ICAgIHZvaWQgZGlydHlMaW5lQm94ZXMoYm9vbCBmdWxsTGF5b3V0KTsKICAgICB2aXJ0dWFsIHZv aWQgZGlydHlMaW5lc0Zyb21DaGFuZ2VkQ2hpbGQoUmVuZGVyT2JqZWN0KiBjaGlsZCkgeyBtX2xp bmVCb3hlcy5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZCh0aGlzLCBjaGlsZCk7IH0KIApAQCAt MTMyLDcgKzEzNCw2IEBAIHB1YmxpYzoKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgc3R5 bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUp OwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVCb3hNb2RlbEluZm9Gcm9tU3R5bGUoKTsKLSAgICB2 aXJ0dWFsIElubGluZUZsb3dCb3gqIGNyZWF0ZUZsb3dCb3goKTsgLy8gU3ViY2xhc3NlZCBieSBT VkcKICAgICAKICAgICBzdGF0aWMgUmVuZGVySW5saW5lKiBjbG9uZUlubGluZShSZW5kZXJJbmxp bmUqIHNyYyk7CiAKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNWR0lubGluZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU1ZHSW5saW5lLmNwcAkocmV2 aXNpb24gNDUzMzMpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdJbmxpbmUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIFJlbmRlclNWR0lubGluZTo6UmVuZGVyU1ZH SW5saW5lKE5vZGUqIG4KIHsKIH0KIAotSW5saW5lRmxvd0JveCogUmVuZGVyU1ZHSW5saW5lOjpj cmVhdGVGbG93Qm94KCkKK0lubGluZUZsb3dCb3gqIFJlbmRlclNWR0lubGluZTo6Y3JlYXRlSW5s aW5lRmxvd0JveCgpCiB7CiAgICAgSW5saW5lRmxvd0JveCogYm94ID0gbmV3IChyZW5kZXJBcmVu YSgpKSBTVkdJbmxpbmVGbG93Qm94KHRoaXMpOwogICAgIGJveC0+c2V0SXNTVkcodHJ1ZSk7Cklu ZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdJbmxpbmUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdJbmxpbmUuaAkocmV2aXNpb24gNDUzMzMpCisrKyBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdJbmxpbmUuaAkod29ya2luZyBjb3B5KQpAQCAtNDAs NyArNDAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGFic29sdXRlUXVhZHMoVmVjdG9y PEZsb2F0UXVhZD4mKTsKICAgICAKIHByaXZhdGU6Ci0gICAgdmlydHVhbCBJbmxpbmVGbG93Qm94 KiBjcmVhdGVGbG93Qm94KCk7CisgICAgdmlydHVhbCBJbmxpbmVGbG93Qm94KiBjcmVhdGVJbmxp bmVGbG93Qm94KCk7CiB9OwogCiB9CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdU ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdUZXh0LmNw cAkocmV2aXNpb24gNDUzMzMpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdUZXh0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtODksNyArODksNyBAQCB2b2lkIFJlbmRlclNWR1RleHQ6Omxh eW91dCgpCiAgICAgc2V0TmVlZHNMYXlvdXQoZmFsc2UpOwogfQogCi1Sb290SW5saW5lQm94KiBS ZW5kZXJTVkdUZXh0OjpjcmVhdGVSb290Qm94KCkKK1Jvb3RJbmxpbmVCb3gqIFJlbmRlclNWR1Rl eHQ6OmNyZWF0ZVJvb3RJbmxpbmVCb3goKSAKIHsKICAgICBSb290SW5saW5lQm94KiBib3ggPSBu ZXcgKHJlbmRlckFyZW5hKCkpIFNWR1Jvb3RJbmxpbmVCb3godGhpcyk7CiAgICAgYm94LT5zZXRJ c1NWRyh0cnVlKTsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNWR1RleHQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdUZXh0LmgJKHJldmlzaW9uIDQ1 MzMzKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU1ZHVGV4dC5oCSh3b3JraW5nIGNvcHkp CkBAIC02NSw3ICs2NSw3IEBAIHByaXZhdGU6CiAgICAgLy8gRklYTUU6IFRoaXMgY2FuIGJlIHJl bW92ZWQgd2hlbiBsb2NhbFRyYW5zZm9ybSgpIGlzIHJlbW92ZWQgZnJvbSBSZW5kZXJPYmplY3QK ICAgICB2aXJ0dWFsIFRyYW5zZm9ybWF0aW9uTWF0cml4IGxvY2FsVHJhbnNmb3JtKCkgY29uc3Qg eyByZXR1cm4gbV9sb2NhbFRyYW5zZm9ybTsgfQogCi0gICAgdmlydHVhbCBSb290SW5saW5lQm94 KiBjcmVhdGVSb290Qm94KCk7CisgICAgdmlydHVhbCBSb290SW5saW5lQm94KiBjcmVhdGVSb290 SW5saW5lQm94KCk7CiAKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX2xvY2FsVHJhbnNmb3Jt OwogfTsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL2JpZGkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcmVuZGVyaW5nL2JpZGkuY3BwCShyZXZpc2lvbiA0NTMzMykKKysrIFdlYkNvcmUvcmVu ZGVyaW5nL2JpZGkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NDksNyArNDQ5LDcgQEAgdm9pZCBJ bmxpbmVCaWRpUmVzb2x2ZXI6OmFwcGVuZFJ1bigpCiBzdGF0aWMgaW5saW5lIElubGluZUJveCog Y3JlYXRlSW5saW5lQm94Rm9yUmVuZGVyZXIoUmVuZGVyT2JqZWN0KiBvYmosIGJvb2wgaXNSb290 TGluZUJveCwgYm9vbCBpc09ubHlSdW4gPSBmYWxzZSkKIHsKICAgICBpZiAoaXNSb290TGluZUJv eCkKLSAgICAgICAgcmV0dXJuIHRvUmVuZGVyQmxvY2sob2JqKS0+Y3JlYXRlUm9vdElubGluZUJv eCgpOworICAgICAgICByZXR1cm4gdG9SZW5kZXJCbG9jayhvYmopLT5jcmVhdGVBbmRBcHBlbmRS b290SW5saW5lQm94KCk7CiAgICAgCiAgICAgaWYgKG9iai0+aXNUZXh0KCkpIHsKICAgICAgICAg SW5saW5lVGV4dEJveCogdGV4dEJveCA9IHRvUmVuZGVyVGV4dChvYmopLT5jcmVhdGVJbmxpbmVU ZXh0Qm94KCk7CkBAIC00NjMsNyArNDYzLDcgQEAgc3RhdGljIGlubGluZSBJbmxpbmVCb3gqIGNy ZWF0ZUlubGluZUJveAogICAgIGlmIChvYmotPmlzQm94KCkpCiAgICAgICAgIHJldHVybiB0b1Jl bmRlckJveChvYmopLT5jcmVhdGVJbmxpbmVCb3goKTsKICAgICAKLSAgICByZXR1cm4gdG9SZW5k ZXJJbmxpbmUob2JqKS0+Y3JlYXRlSW5saW5lRmxvd0JveCgpOworICAgIHJldHVybiB0b1JlbmRl cklubGluZShvYmopLT5jcmVhdGVBbmRBcHBlbmRJbmxpbmVGbG93Qm94KCk7CiB9CiAKIHN0YXRp YyBpbmxpbmUgdm9pZCBkaXJ0eUxpbmVCb3hlc0ZvclJlbmRlcmVyKFJlbmRlck9iamVjdCogbywg Ym9vbCBmdWxsTGF5b3V0KQo=