98677 2012-10-08 11:42:53 -0700 Replace 2 uses of updateLogicalHeight with computeLogicalHeight 2012-10-08 15:35:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96804 1 tony tony donggwan.kim eric fmalita mifenton ojan pdr schenney tkent webkit.review.bot oldest_to_newest 736859 0 tony 2012-10-08 11:42:53 -0700 Replace 2 uses of updateLogicalHeight with computeLogicalHeight 736876 1 167576 tony 2012-10-08 11:51:43 -0700 Created attachment 167576 Patch 736893 2 167576 ojan 2012-10-08 11:58:34 -0700 Comment on attachment 167576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167576&action=review > Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp:115 > +void RenderSVGForeignObject::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const I assume foreignObject is forced into horizontal-tb? Not really related to this patch, but I feel like we should have asserts at the top of all the layout/computeLogicalHeight/computeLogicalWidth methods for RenderObject subclasses that don't support vertical writing mode. Either that, or a FIXME to support it. 736911 3 167576 tony 2012-10-08 12:10:32 -0700 Comment on attachment 167576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167576&action=review >> Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp:115 >> +void RenderSVGForeignObject::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const > > I assume foreignObject is forced into horizontal-tb? > > Not really related to this patch, but I feel like we should have asserts at the top of all the layout/computeLogicalHeight/computeLogicalWidth methods for RenderObject subclasses that don't support vertical writing mode. Either that, or a FIXME to support it. Oh, no, they're not forced into horizontal-tb. Let me see if I can make a test case for that. 736923 4 167584 tony 2012-10-08 12:20:23 -0700 Created attachment 167584 Patch for landing 736924 5 tony 2012-10-08 12:21:23 -0700 (In reply to comment #3) > Oh, no, they're not forced into horizontal-tb. Let me see if I can make a test case for that. Actually, I can't seem to get an inline svg to render in vertical-rl. I'm not sure what's supposed to happen here. 737029 6 167584 webkit.review.bot 2012-10-08 14:16:25 -0700 Comment on attachment 167584 Patch for landing Clearing flags on attachment: 167584 Committed r130686: <http://trac.webkit.org/changeset/130686> 737031 7 webkit.review.bot 2012-10-08 14:16:29 -0700 All reviewed patches have been landed. Closing bug. 167576 2012-10-08 11:51:43 -0700 2012-10-08 12:20:21 -0700 Patch bug-98677-20121008115045.patch text/plain 5842 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGJhYTEwZjkzNjMzZjFi ZmZmMTAxMTA3N2FlMGE5ZjFhMjgwYmIyNi4uMjRlNGVhNTEzNzg2YTk5ODA5YmFiN2U4OWE4ZjYx NDYwMGUyNzk1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTEwLTA4ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVwbGFjZSAyIHVzZXMgb2Yg dXBkYXRlTG9naWNhbEhlaWdodCB3aXRoIGNvbXB1dGVMb2dpY2FsSGVpZ2h0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODY3NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgcGFydCBvZiBidWcg OTY4MDQuICBDb252ZXJ0IFJlbmRlclRleHRDb250cm9sIGFuZCBSZW5kZXJTVkdGb3JlaWduT2Jq ZWN0IHRvCisgICAgICAgIG92ZXJyaWRlIHRoZSBjb25zdCBjb21wdXRlTG9naWNhbEhlaWdodCBt ZXRob2QgcmF0aGVyIHRoYW4gdGhlIHVwZGF0ZUxvZ2ljYWxIZWlnaHQKKyAgICAgICAgc2V0dGVy IG1ldGhvZC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRoZXJlIHNob3VsZCBiZSBubyBiZWhh dmlvciBjaGFuZ2UgYXMgdGhpcyBpcyBqdXN0IGEgcmVmYWN0b3IuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4 dENvbnRyb2w6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KTogUGFzcyBsb2dpY2FsSGVpZ2h0IHRocm91 Z2ggcmF0aGVyIHRoYW4gc2V0dGluZyBoZWlnaHQuCisgICAgICAgIFRoaXMgaXMgYSBzbGlnaHQg Y29ycmVjdG5lc3MgZml4LCBhbHRob3VnaCB3ZSBkb24ndCBzdXBwb3J0IHZlcnRpY2FsIGlucHV0 cyB5ZXQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmg6CisgICAgICAg IChSZW5kZXJUZXh0Q29udHJvbCk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdG b3JlaWduT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR0ZvcmVpZ25PYmpl Y3Q6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRl clNWR0ZvcmVpZ25PYmplY3QuaDoKKyAgICAgICAgKFJlbmRlclNWR0ZvcmVpZ25PYmplY3QpOgor CiAyMDEyLTEwLTA4ICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgTG9hZGVyIGNsZWFudXAgOiBTaW1wbGlmeSBGcmFtZUxvYWRlci9Eb2N1bWVudExvYWRlciBz ZXR1cEZvclJlcGxhY2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHRDb250cm9sLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbC5jcHAKaW5kZXggYzBkNzJjZGE5MTc1Njg5ZjY4NDNkMzYxZDE5ZGYyMTVkMzMwMjFm YS4uMzVkYTcwNDU1ZTU1MDhiMzUxNjUwMjMwYWE1MDNhZTU5ZGQ1ZDYxMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCkBAIC0xNDQsMjAgKzE0 NCwyMCBAQCBpbnQgUmVuZGVyVGV4dENvbnRyb2w6OnNjcm9sbGJhclRoaWNrbmVzcygpIGNvbnN0 CiAgICAgcmV0dXJuIFNjcm9sbGJhclRoZW1lOjp0aGVtZSgpLT5zY3JvbGxiYXJUaGlja25lc3Mo KTsKIH0KIAotdm9pZCBSZW5kZXJUZXh0Q29udHJvbDo6dXBkYXRlTG9naWNhbEhlaWdodCgpCit2 b2lkIFJlbmRlclRleHRDb250cm9sOjpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbml0IGxv Z2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNhbEV4dGVudENvbXB1dGVk VmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKIHsKICAgICBIVE1MRWxlbWVudCogaW5uZXJU ZXh0ID0gaW5uZXJUZXh0RWxlbWVudCgpOwogICAgIEFTU0VSVChpbm5lclRleHQpOwogICAgIGlm IChSZW5kZXJCb3gqIGlubmVyVGV4dEJveCA9IGlubmVyVGV4dC0+cmVuZGVyQm94KCkpIHsKICAg ICAgICAgTGF5b3V0VW5pdCBub25Db250ZW50SGVpZ2h0ID0gaW5uZXJUZXh0Qm94LT5ib3JkZXJB bmRQYWRkaW5nSGVpZ2h0KCkgKyBpbm5lclRleHRCb3gtPm1hcmdpbkhlaWdodCgpOwotICAgICAg ICBzZXRIZWlnaHQoY29tcHV0ZUNvbnRyb2xIZWlnaHQoaW5uZXJUZXh0Qm94LT5saW5lSGVpZ2h0 KHRydWUsIEhvcml6b250YWxMaW5lLCBQb3NpdGlvbk9mSW50ZXJpb3JMaW5lQm94ZXMpLCBub25D b250ZW50SGVpZ2h0KSArIGJvcmRlckFuZFBhZGRpbmdIZWlnaHQoKSk7CisgICAgICAgIGxvZ2lj YWxIZWlnaHQgPSBjb21wdXRlQ29udHJvbEhlaWdodChpbm5lclRleHRCb3gtPmxpbmVIZWlnaHQo dHJ1ZSwgSG9yaXpvbnRhbExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcyksIG5vbkNv bnRlbnRIZWlnaHQpICsgYm9yZGVyQW5kUGFkZGluZ0hlaWdodCgpOwogCiAgICAgICAgIC8vIFdl IGFyZSBhYmxlIHRvIGhhdmUgYSBob3Jpem9udGFsIHNjcm9sbGJhciBpZiB0aGUgb3ZlcmZsb3cg c3R5bGUgaXMgc2Nyb2xsLCBvciBpZiBpdHMgYXV0byBhbmQgdGhlcmUncyBubyB3b3JkIHdyYXAu CiAgICAgICAgIGlmIChzdHlsZSgpLT5vdmVyZmxvd1goKSA9PSBPU0NST0xMIHx8ICAoc3R5bGUo KS0+b3ZlcmZsb3dYKCkgPT0gT0FVVE8gJiYgaW5uZXJUZXh0LT5yZW5kZXJlcigpLT5zdHlsZSgp LT5vdmVyZmxvd1dyYXAoKSA9PSBOb3JtYWxPdmVyZmxvd1dyYXApKQotICAgICAgICAgICAgc2V0 SGVpZ2h0KGhlaWdodCgpICsgc2Nyb2xsYmFyVGhpY2tuZXNzKCkpOworICAgICAgICAgICAgbG9n aWNhbEhlaWdodCArPSBzY3JvbGxiYXJUaGlja25lc3MoKTsKICAgICB9CiAKLSAgICBSZW5kZXJC bG9jazo6dXBkYXRlTG9naWNhbEhlaWdodCgpOworICAgIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2lj YWxIZWlnaHQobG9naWNhbEhlaWdodCwgbG9naWNhbFRvcCwgY29tcHV0ZWRWYWx1ZXMpOwogfQog CiB2b2lkIFJlbmRlclRleHRDb250cm9sOjpoaXRJbm5lclRleHRFbGVtZW50KEhpdFRlc3RSZXN1 bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGNvbnN0IExh eW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHRDb250cm9sLmgKaW5kZXggNGZlNGRhNTcxZjE2OGVhYzYyNWM1ZTI3Mjc0N2Ex ZjNmNjIzODU0MS4uNjJjZjVhZjVmZWU0YmQyY2JhM2Q3MGM2OTIwM2Y3YzAzNDRmMTZhOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmgKQEAgLTYyLDcg KzYyLDcgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgUmVuZGVyU3R5bGUqIHRleHRCYXNlU3R5 bGUoKSBjb25zdCA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRnJvbUVsZW1lbnQoKTsK LSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTG9naWNhbEhlaWdodCgpIE9WRVJSSURFOworICAgIHZp cnR1YWwgdm9pZCBjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQs IExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJikgY29u c3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBSZW5kZXJPYmplY3QqIGxheW91dFNwZWNpYWxFeGNs dWRlZENoaWxkKGJvb2wgcmVsYXlvdXRDaGlsZHJlbik7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ZvcmVpZ25PYmplY3QuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdGb3JlaWduT2JqZWN0LmNw cAppbmRleCAzNDMwYjU1NzU0MmFlNzM2MTExYTFmMzg1NDcyZDUxNTE5MjVjMDhiLi5hYWRlMDVj NDlmNjNjMmZjMWE4MTA1YTdiNTU2OTIwYjA3NWE2N2EwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ZvcmVpZ25PYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHRm9yZWlnbk9iamVjdC5jcHAKQEAgLTEx MiwxMSArMTEyLDEyIEBAIHZvaWQgUmVuZGVyU1ZHRm9yZWlnbk9iamVjdDo6dXBkYXRlTG9naWNh bFdpZHRoKCkKICAgICBzZXRXaWR0aChzdGF0aWNfY2FzdDxpbnQ+KHJvdW5kZihtX3ZpZXdwb3J0 LndpZHRoKCkpKSk7CiB9CiAKLXZvaWQgUmVuZGVyU1ZHRm9yZWlnbk9iamVjdDo6dXBkYXRlTG9n aWNhbEhlaWdodCgpCit2b2lkIFJlbmRlclNWR0ZvcmVpZ25PYmplY3Q6OmNvbXB1dGVMb2dpY2Fs SGVpZ2h0KExheW91dFVuaXQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNhbEV4dGVudENv bXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKIHsKICAgICAvLyBGSVhNRTogSW52 ZXN0aWdhdGUgaW4gc2l6ZSByb3VuZGluZyBpc3N1ZXMKICAgICAvLyBGSVhNRTogUmVtb3ZlIHVu bmVjZXNzYXJ5IHJvdW5kaW5nIHdoZW4gbGF5b3V0IGlzIG9mZiBpbnRzOiB3ZWJraXQub3JnL2Iv NjM2NTYKLSAgICBzZXRIZWlnaHQoc3RhdGljX2Nhc3Q8aW50Pihyb3VuZGYobV92aWV3cG9ydC5o ZWlnaHQoKSkpKTsKKyAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA9IHN0YXRpY19jYXN0PGlu dD4ocm91bmRmKG1fdmlld3BvcnQuaGVpZ2h0KCkpKTsKKyAgICBjb21wdXRlZFZhbHVlcy5tX3Bv c2l0aW9uID0gbG9naWNhbFRvcDsKIH0KIAogdm9pZCBSZW5kZXJTVkdGb3JlaWduT2JqZWN0Ojps YXlvdXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdGb3JlaWduT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R0ZvcmVpZ25PYmplY3QuaAppbmRleCAyYmJiMTVlZDEzOGMyNTE1ZGE5MTY4OTIyYTNiM2JkNzU3 MzBjMmIxLi5jODgzNmFlYjE3ZmQwZmExNTViOWJhMmMzYzAyMTY3YThlNjRjYWUxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ZvcmVpZ25PYmplY3Qu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ZvcmVpZ25PYmpl Y3QuaApAQCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCB2 b2lkIHVwZGF0ZUxvZ2ljYWxXaWR0aCgpIE9WRVJSSURFOwotICAgIHZpcnR1YWwgdm9pZCB1cGRh dGVMb2dpY2FsSGVpZ2h0KCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVMb2dp Y2FsSGVpZ2h0KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9w LCBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmKSBjb25zdCBPVkVSUklERTsKIAogICAgIHZp cnR1YWwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBsb2NhbFRvUGFyZW50VHJhbnNmb3JtKCkgY29u c3Q7CiAgICAgdmlydHVhbCBBZmZpbmVUcmFuc2Zvcm0gbG9jYWxUcmFuc2Zvcm0oKSBjb25zdCB7 IHJldHVybiBtX2xvY2FsVHJhbnNmb3JtOyB9Cg== 167584 2012-10-08 12:20:23 -0700 2012-10-08 14:16:25 -0700 Patch for landing bug-98677-20121008121926.patch text/plain 5896 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGJhYTEwZjkzNjMzZjFi ZmZmMTAxMTA3N2FlMGE5ZjFhMjgwYmIyNi4uMzk0MTJhZTI0NTUyNDFhM2IxY2JhNzcxY2E2NWIw ZTJkNDdmY2Q0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTEwLTA4ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVwbGFjZSAyIHVzZXMgb2Yg dXBkYXRlTG9naWNhbEhlaWdodCB3aXRoIGNvbXB1dGVMb2dpY2FsSGVpZ2h0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODY3NworCisgICAgICAgIFJl dmlld2VkIGJ5IE9qYW4gVmFmYWkuCisKKyAgICAgICAgVGhpcyBpcyBwYXJ0IG9mIGJ1ZyA5Njgw NC4gIENvbnZlcnQgUmVuZGVyVGV4dENvbnRyb2wgYW5kIFJlbmRlclNWR0ZvcmVpZ25PYmplY3Qg dG8KKyAgICAgICAgb3ZlcnJpZGUgdGhlIGNvbnN0IGNvbXB1dGVMb2dpY2FsSGVpZ2h0IG1ldGhv ZCByYXRoZXIgdGhhbiB0aGUgdXBkYXRlTG9naWNhbEhlaWdodAorICAgICAgICBzZXR0ZXIgbWV0 aG9kLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhlcmUgc2hvdWxkIGJlIG5vIGJlaGF2aW9y IGNoYW5nZSBhcyB0aGlzIGlzIGp1c3QgYSByZWZhY3Rvci4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29u dHJvbDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOiBQYXNzIGxvZ2ljYWxIZWlnaHQgdGhyb3VnaCBy YXRoZXIgdGhhbiBzZXR0aW5nIGhlaWdodC4KKyAgICAgICAgVGhpcyBpcyBhIHNsaWdodCBjb3Jy ZWN0bmVzcyBmaXgsIGFsdGhvdWdoIHdlIGRvbid0IHN1cHBvcnQgdmVydGljYWwgaW5wdXRzIHll dC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuaDoKKyAgICAgICAgKFJl bmRlclRleHRDb250cm9sKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ZvcmVp Z25PYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHRm9yZWlnbk9iamVjdDo6 Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZH Rm9yZWlnbk9iamVjdC5oOgorICAgICAgICAoUmVuZGVyU1ZHRm9yZWlnbk9iamVjdCk6CisKIDIw MTItMTAtMDggIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBM b2FkZXIgY2xlYW51cCA6IFNpbXBsaWZ5IEZyYW1lTG9hZGVyL0RvY3VtZW50TG9hZGVyIHNldHVw Rm9yUmVwbGFjZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGV4dENvbnRyb2wuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sLmNwcAppbmRleCBjMGQ3MmNkYTkxNzU2ODlmNjg0M2QzNjFkMTlkZjIxNWQzMzAyMWZhLi4z NWRhNzA0NTVlNTUwOGIzNTE2NTAyMzBhYTUwM2FlNTlkZDVkNjEyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAKQEAgLTE0NCwyMCArMTQ0LDIw IEBAIGludCBSZW5kZXJUZXh0Q29udHJvbDo6c2Nyb2xsYmFyVGhpY2tuZXNzKCkgY29uc3QKICAg ICByZXR1cm4gU2Nyb2xsYmFyVGhlbWU6OnRoZW1lKCktPnNjcm9sbGJhclRoaWNrbmVzcygpOwog fQogCi12b2lkIFJlbmRlclRleHRDb250cm9sOjp1cGRhdGVMb2dpY2FsSGVpZ2h0KCkKK3ZvaWQg UmVuZGVyVGV4dENvbnRyb2w6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KExheW91dFVuaXQgbG9naWNh bEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1 ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdAogewogICAgIEhUTUxFbGVtZW50KiBpbm5lclRleHQg PSBpbm5lclRleHRFbGVtZW50KCk7CiAgICAgQVNTRVJUKGlubmVyVGV4dCk7CiAgICAgaWYgKFJl bmRlckJveCogaW5uZXJUZXh0Qm94ID0gaW5uZXJUZXh0LT5yZW5kZXJCb3goKSkgewogICAgICAg ICBMYXlvdXRVbml0IG5vbkNvbnRlbnRIZWlnaHQgPSBpbm5lclRleHRCb3gtPmJvcmRlckFuZFBh ZGRpbmdIZWlnaHQoKSArIGlubmVyVGV4dEJveC0+bWFyZ2luSGVpZ2h0KCk7Ci0gICAgICAgIHNl dEhlaWdodChjb21wdXRlQ29udHJvbEhlaWdodChpbm5lclRleHRCb3gtPmxpbmVIZWlnaHQodHJ1 ZSwgSG9yaXpvbnRhbExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcyksIG5vbkNvbnRl bnRIZWlnaHQpICsgYm9yZGVyQW5kUGFkZGluZ0hlaWdodCgpKTsKKyAgICAgICAgbG9naWNhbEhl aWdodCA9IGNvbXB1dGVDb250cm9sSGVpZ2h0KGlubmVyVGV4dEJveC0+bGluZUhlaWdodCh0cnVl LCBIb3Jpem9udGFsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJveGVzKSwgbm9uQ29udGVu dEhlaWdodCkgKyBib3JkZXJBbmRQYWRkaW5nSGVpZ2h0KCk7CiAKICAgICAgICAgLy8gV2UgYXJl IGFibGUgdG8gaGF2ZSBhIGhvcml6b250YWwgc2Nyb2xsYmFyIGlmIHRoZSBvdmVyZmxvdyBzdHls ZSBpcyBzY3JvbGwsIG9yIGlmIGl0cyBhdXRvIGFuZCB0aGVyZSdzIG5vIHdvcmQgd3JhcC4KICAg ICAgICAgaWYgKHN0eWxlKCktPm92ZXJmbG93WCgpID09IE9TQ1JPTEwgfHwgIChzdHlsZSgpLT5v dmVyZmxvd1goKSA9PSBPQVVUTyAmJiBpbm5lclRleHQtPnJlbmRlcmVyKCktPnN0eWxlKCktPm92 ZXJmbG93V3JhcCgpID09IE5vcm1hbE92ZXJmbG93V3JhcCkpCi0gICAgICAgICAgICBzZXRIZWln aHQoaGVpZ2h0KCkgKyBzY3JvbGxiYXJUaGlja25lc3MoKSk7CisgICAgICAgICAgICBsb2dpY2Fs SGVpZ2h0ICs9IHNjcm9sbGJhclRoaWNrbmVzcygpOwogICAgIH0KIAotICAgIFJlbmRlckJsb2Nr Ojp1cGRhdGVMb2dpY2FsSGVpZ2h0KCk7CisgICAgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbEhl aWdodChsb2dpY2FsSGVpZ2h0LCBsb2dpY2FsVG9wLCBjb21wdXRlZFZhbHVlcyk7CiB9CiAKIHZv aWQgUmVuZGVyVGV4dENvbnRyb2w6OmhpdElubmVyVGV4dEVsZW1lbnQoSGl0VGVzdFJlc3VsdCYg cmVzdWx0LCBjb25zdCBMYXlvdXRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0 UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dENvbnRyb2wuaAppbmRleCA0ZmU0ZGE1NzFmMTY4ZWFjNjI1YzVlMjcyNzQ3YTFmM2Y2 MjM4NTQxLi42MmNmNWFmNWZlZTRiZDJjYmEzZDcwYzY5MjAzZjdjMDM0NGYxNmE5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuaApAQCAtNjIsNyArNjIs NyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBSZW5kZXJTdHlsZSogdGV4dEJhc2VTdHlsZSgp IGNvbnN0ID0gMDsKIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVGcm9tRWxlbWVudCgpOwotICAg IHZpcnR1YWwgdm9pZCB1cGRhdGVMb2dpY2FsSGVpZ2h0KCkgT1ZFUlJJREU7CisgICAgdmlydHVh bCB2b2lkIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5 b3V0VW5pdCBsb2dpY2FsVG9wLCBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmKSBjb25zdCBP VkVSUklERTsKICAgICB2aXJ0dWFsIFJlbmRlck9iamVjdCogbGF5b3V0U3BlY2lhbEV4Y2x1ZGVk Q2hpbGQoYm9vbCByZWxheW91dENoaWxkcmVuKTsKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHRm9yZWlnbk9iamVjdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ZvcmVpZ25PYmplY3QuY3BwCmlu ZGV4IDM0MzBiNTU3NTQyYWU3MzYxMTFhMWYzODU0NzJkNTE1MTkyNWMwOGIuLjJlZmRkZDI0NjYy Njc1NjA0N2Y2MGNiNWU0YjAyOWQ5MGUzZDRlM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHRm9yZWlnbk9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdGb3JlaWduT2JqZWN0LmNwcApAQCAtMTEyLDEx ICsxMTIsMTMgQEAgdm9pZCBSZW5kZXJTVkdGb3JlaWduT2JqZWN0Ojp1cGRhdGVMb2dpY2FsV2lk dGgoKQogICAgIHNldFdpZHRoKHN0YXRpY19jYXN0PGludD4ocm91bmRmKG1fdmlld3BvcnQud2lk dGgoKSkpKTsKIH0KIAotdm9pZCBSZW5kZXJTVkdGb3JlaWduT2JqZWN0Ojp1cGRhdGVMb2dpY2Fs SGVpZ2h0KCkKK3ZvaWQgUmVuZGVyU1ZHRm9yZWlnbk9iamVjdDo6Y29tcHV0ZUxvZ2ljYWxIZWln aHQoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMb2dpY2FsRXh0ZW50Q29tcHV0 ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdAogewogICAgIC8vIEZJWE1FOiBJbnZlc3Rp Z2F0ZSBpbiBzaXplIHJvdW5kaW5nIGlzc3VlcwogICAgIC8vIEZJWE1FOiBSZW1vdmUgdW5uZWNl c3Nhcnkgcm91bmRpbmcgd2hlbiBsYXlvdXQgaXMgb2ZmIGludHM6IHdlYmtpdC5vcmcvYi82MzY1 NgotICAgIHNldEhlaWdodChzdGF0aWNfY2FzdDxpbnQ+KHJvdW5kZihtX3ZpZXdwb3J0LmhlaWdo dCgpKSkpOworICAgIC8vIEZJWE1FOiBJcyB0aGlzIGNvcnJlY3QgZm9yIHZlcnRpY2FsIHdyaXRp bmcgbW9kZT8KKyAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA9IHN0YXRpY19jYXN0PGludD4o cm91bmRmKG1fdmlld3BvcnQuaGVpZ2h0KCkpKTsKKyAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0 aW9uID0gbG9naWNhbFRvcDsKIH0KIAogdm9pZCBSZW5kZXJTVkdGb3JlaWduT2JqZWN0OjpsYXlv dXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdG b3JlaWduT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0Zv cmVpZ25PYmplY3QuaAppbmRleCAyYmJiMTVlZDEzOGMyNTE1ZGE5MTY4OTIyYTNiM2JkNzU3MzBj MmIxLi5jODgzNmFlYjE3ZmQwZmExNTViOWJhMmMzYzAyMTY3YThlNjRjYWUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ZvcmVpZ25PYmplY3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ZvcmVpZ25PYmplY3Qu aApAQCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lk IHVwZGF0ZUxvZ2ljYWxXaWR0aCgpIE9WRVJSSURFOwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVM b2dpY2FsSGVpZ2h0KCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVMb2dpY2Fs SGVpZ2h0KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBM b2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmKSBjb25zdCBPVkVSUklERTsKIAogICAgIHZpcnR1 YWwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBsb2NhbFRvUGFyZW50VHJhbnNmb3JtKCkgY29uc3Q7 CiAgICAgdmlydHVhbCBBZmZpbmVUcmFuc2Zvcm0gbG9jYWxUcmFuc2Zvcm0oKSBjb25zdCB7IHJl dHVybiBtX2xvY2FsVHJhbnNmb3JtOyB9Cg==