124416 2013-11-15 09:29:43 -0800 [CSS Shapes] Refactor RectangleShape 2013-11-19 12:13:20 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 124368 1 giles_joplin webkit-unassigned commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 951087 0 giles_joplin 2013-11-15 09:29:43 -0800 Currently RectangleShape includes a FloatRoundedRect class which is effectively private. To make way for a public FloatRoundedRect class, which will be the basis for both RectangleShape and TBD BoxShape, the existing FloatRoundedRect class should be renamed and made private to RectangleShape. 951118 1 217064 giles_joplin 2013-11-15 10:47:28 -0800 Created attachment 217064 Patch Privatize and rename the FloatRoundedRect class defined in RectangleShape.h. The new class is called RectangleShape::ShapeBounds. This change enables creating a proper FloatRoundedRect analog of the existing RoundedRect class; part of adding support for box shapes, per the latest CSS spec (see https://bugs.webkit.org/show_bug.cgi?id=124368). 952173 2 217064 commit-queue 2013-11-19 12:13:18 -0800 Comment on attachment 217064 Patch Clearing flags on attachment: 217064 Committed r159513: <http://trac.webkit.org/changeset/159513> 952174 3 commit-queue 2013-11-19 12:13:20 -0800 All reviewed patches have been landed. Closing bug. 217064 2013-11-15 10:47:28 -0800 2013-11-19 12:13:18 -0800 Patch tmp.patch text/plain 8805 giles_joplin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZmE2YzQ0Li40MmY5Y2M1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTMtMTEtMTUgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAg ICAgW0NTUyBTaGFwZXNdIFJlZmFjdG9yIFJlY3RhbmdsZVNoYXBlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ0MTYKKworICAgICAgICBQcml2YXRp emUgYW5kIHJlbmFtZSB0aGUgRmxvYXRSb3VuZGVkUmVjdCBjbGFzcyBkZWZpbmVkIGluIFJlY3Rh bmdsZVNoYXBlLmguCisgICAgICAgIFRoZSBuZXcgY2xhc3MgaXMgY2FsbGVkIFJlY3RhbmdsZVNo YXBlOjpTaGFwZUJvdW5kcy4gVGhpcyBjaGFuZ2UgZW5hYmxlcworICAgICAgICBjcmVhdGluZyBh IHByb3BlciBGbG9hdFJvdW5kZWRSZWN0IGFuYWxvZyBvZiB0aGUgZXhpc3RpbmcgUm91bmRlZFJl Y3QgY2xhc3M7CisgICAgICAgIHBhcnQgb2YgYWRkaW5nIHN1cHBvcnQgZm9yIGJveCBzaGFwZXMs IHBlciB0aGUgbGF0ZXN0IENTUyBzcGVjLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywganVzdCByZWZhY3RvcmluZy4KKworICAg ICAgICAqIHJlbmRlcmluZy9zaGFwZXMvUmVjdGFuZ2xlU2hhcGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVjdGFuZ2xlU2hhcGU6OlNoYXBlQm91bmRzOjpwYWRkaW5nQm91bmRzKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlY3RhbmdsZVNoYXBlOjpTaGFwZUJvdW5kczo6bWFyZ2luQm91bmRzKToK KyAgICAgICAgKFdlYkNvcmU6OlJlY3RhbmdsZVNoYXBlOjpTaGFwZUJvdW5kczo6Y29ybmVySW50 ZXJjZXB0Rm9yV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVjdGFuZ2xlU2hhcGU6OnNoYXBl UGFkZGluZ0JvdW5kcyk6CisgICAgICAgIChXZWJDb3JlOjpSZWN0YW5nbGVTaGFwZTo6c2hhcGVN YXJnaW5Cb3VuZHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVjdGFuZ2xlU2hhcGU6OmdldEV4Y2x1 ZGVkSW50ZXJ2YWxzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlY3RhbmdsZVNoYXBlOjpnZXRJbmNs dWRlZEludGVydmFscyk6CisgICAgICAgIChXZWJDb3JlOjpSZWN0YW5nbGVTaGFwZTo6Zmlyc3RJ bmNsdWRlZEludGVydmFsTG9naWNhbFRvcCk6CisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9S ZWN0YW5nbGVTaGFwZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVjdGFuZ2xlU2hhcGU6OlNoYXBl Qm91bmRzOjpTaGFwZUJvdW5kcyk6CisgICAgICAgIChXZWJDb3JlOjpSZWN0YW5nbGVTaGFwZTo6 U2hhcGVCb3VuZHM6OnJ4KToKKyAgICAgICAgKFdlYkNvcmU6OlJlY3RhbmdsZVNoYXBlOjpTaGFw ZUJvdW5kczo6cnkpOgorCiAyMDEzLTExLTE1ICBSYWR1IFN0YXZpbGEgIDxzdGF2aWxhQGFkb2Jl LmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIEltcGxlbWVudCB2aXN1YWwgb3ZlcmZsb3cg Zm9yIGZpcnN0ICYgbGFzdCByZWdpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1JlY3RhbmdsZVNoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zaGFwZXMvUmVjdGFuZ2xlU2hhcGUuY3BwCmluZGV4IDc1MjdmY2YuLjliODQyMGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmVjdGFuZ2xlU2hhcGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmVjdGFuZ2xlU2hhcGUuY3Bw CkBAIC00Niw0NCArNDYsNDQgQEAgc3RhdGljIGlubGluZSBmbG9hdCBlbGxpcHNlWUludGVyY2Vw dChmbG9hdCB4LCBmbG9hdCByeCwgZmxvYXQgcnkpCiAgICAgcmV0dXJuIHJ5ICogc3FydCgxIC0g KHggKiB4KSAvIChyeCAqIHJ4KSk7CiB9CiAKLUZsb2F0Um91bmRlZFJlY3QgRmxvYXRSb3VuZGVk UmVjdDo6cGFkZGluZ0JvdW5kcyhmbG9hdCBwYWRkaW5nKSBjb25zdAorUmVjdGFuZ2xlU2hhcGU6 OlNoYXBlQm91bmRzIFJlY3RhbmdsZVNoYXBlOjpTaGFwZUJvdW5kczo6cGFkZGluZ0JvdW5kcyhm bG9hdCBzaGFwZVBhZGRpbmcpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKHBhZGRpbmcgPj0gMCk7Ci0g ICAgaWYgKCFwYWRkaW5nIHx8IGlzRW1wdHkoKSkKKyAgICBBU1NFUlQoc2hhcGVQYWRkaW5nID49 IDApOworICAgIGlmICghc2hhcGVQYWRkaW5nIHx8IGlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJu ICp0aGlzOwogCi0gICAgZmxvYXQgYm91bmRzWCA9IHgoKSArIHN0ZDo6bWluKHdpZHRoKCkgLyAy LCBwYWRkaW5nKTsKLSAgICBmbG9hdCBib3VuZHNZID0geSgpICsgc3RkOjptaW4oaGVpZ2h0KCkg LyAyLCBwYWRkaW5nKTsKLSAgICBmbG9hdCBib3VuZHNXaWR0aCA9IHN0ZDo6bWF4KDAuMGYsIHdp ZHRoKCkgLSBwYWRkaW5nICogMik7Ci0gICAgZmxvYXQgYm91bmRzSGVpZ2h0ID0gc3RkOjptYXgo MC4wZiwgaGVpZ2h0KCkgLSBwYWRkaW5nICogMik7Ci0gICAgZmxvYXQgYm91bmRzUmFkaXVzWCA9 IHN0ZDo6bWF4KDAuMGYsIHJ4KCkgLSBwYWRkaW5nKTsKLSAgICBmbG9hdCBib3VuZHNSYWRpdXNZ ID0gc3RkOjptYXgoMC4wZiwgcnkoKSAtIHBhZGRpbmcpOwotICAgIHJldHVybiBGbG9hdFJvdW5k ZWRSZWN0KEZsb2F0UmVjdChib3VuZHNYLCBib3VuZHNZLCBib3VuZHNXaWR0aCwgYm91bmRzSGVp Z2h0KSwgRmxvYXRTaXplKGJvdW5kc1JhZGl1c1gsIGJvdW5kc1JhZGl1c1kpKTsKKyAgICBmbG9h dCBib3VuZHNYID0geCgpICsgc3RkOjptaW4od2lkdGgoKSAvIDIsIHNoYXBlUGFkZGluZyk7Cisg ICAgZmxvYXQgYm91bmRzWSA9IHkoKSArIHN0ZDo6bWluKGhlaWdodCgpIC8gMiwgc2hhcGVQYWRk aW5nKTsKKyAgICBmbG9hdCBib3VuZHNXaWR0aCA9IHN0ZDo6bWF4KDAuMGYsIHdpZHRoKCkgLSBz aGFwZVBhZGRpbmcgKiAyKTsKKyAgICBmbG9hdCBib3VuZHNIZWlnaHQgPSBzdGQ6Om1heCgwLjBm LCBoZWlnaHQoKSAtIHNoYXBlUGFkZGluZyAqIDIpOworICAgIGZsb2F0IGJvdW5kc1JhZGl1c1gg PSBzdGQ6Om1heCgwLjBmLCByeCgpIC0gc2hhcGVQYWRkaW5nKTsKKyAgICBmbG9hdCBib3VuZHNS YWRpdXNZID0gc3RkOjptYXgoMC4wZiwgcnkoKSAtIHNoYXBlUGFkZGluZyk7CisgICAgcmV0dXJu IFJlY3RhbmdsZVNoYXBlOjpTaGFwZUJvdW5kcyhGbG9hdFJlY3QoYm91bmRzWCwgYm91bmRzWSwg Ym91bmRzV2lkdGgsIGJvdW5kc0hlaWdodCksIEZsb2F0U2l6ZShib3VuZHNSYWRpdXNYLCBib3Vu ZHNSYWRpdXNZKSk7CiB9CiAKLUZsb2F0Um91bmRlZFJlY3QgRmxvYXRSb3VuZGVkUmVjdDo6bWFy Z2luQm91bmRzKGZsb2F0IG1hcmdpbikgY29uc3QKK1JlY3RhbmdsZVNoYXBlOjpTaGFwZUJvdW5k cyBSZWN0YW5nbGVTaGFwZTo6U2hhcGVCb3VuZHM6Om1hcmdpbkJvdW5kcyhmbG9hdCBzaGFwZU1h cmdpbikgY29uc3QKIHsKLSAgICBBU1NFUlQobWFyZ2luID49IDApOwotICAgIGlmICghbWFyZ2lu KQorICAgIEFTU0VSVChzaGFwZU1hcmdpbiA+PSAwKTsKKyAgICBpZiAoIXNoYXBlTWFyZ2luKQog ICAgICAgICByZXR1cm4gKnRoaXM7CiAKLSAgICBmbG9hdCBib3VuZHNYID0geCgpIC0gbWFyZ2lu OwotICAgIGZsb2F0IGJvdW5kc1kgPSB5KCkgLSBtYXJnaW47Ci0gICAgZmxvYXQgYm91bmRzV2lk dGggPSB3aWR0aCgpICsgbWFyZ2luICogMjsKLSAgICBmbG9hdCBib3VuZHNIZWlnaHQgPSBoZWln aHQoKSArIG1hcmdpbiAqIDI7Ci0gICAgZmxvYXQgYm91bmRzUmFkaXVzWCA9IHJ4KCkgKyBtYXJn aW47Ci0gICAgZmxvYXQgYm91bmRzUmFkaXVzWSA9IHJ5KCkgKyBtYXJnaW47Ci0gICAgcmV0dXJu IEZsb2F0Um91bmRlZFJlY3QoRmxvYXRSZWN0KGJvdW5kc1gsIGJvdW5kc1ksIGJvdW5kc1dpZHRo LCBib3VuZHNIZWlnaHQpLCBGbG9hdFNpemUoYm91bmRzUmFkaXVzWCwgYm91bmRzUmFkaXVzWSkp OworICAgIGZsb2F0IGJvdW5kc1ggPSB4KCkgLSBzaGFwZU1hcmdpbjsKKyAgICBmbG9hdCBib3Vu ZHNZID0geSgpIC0gc2hhcGVNYXJnaW47CisgICAgZmxvYXQgYm91bmRzV2lkdGggPSB3aWR0aCgp ICsgc2hhcGVNYXJnaW4gKiAyOworICAgIGZsb2F0IGJvdW5kc0hlaWdodCA9IGhlaWdodCgpICsg c2hhcGVNYXJnaW4gKiAyOworICAgIGZsb2F0IGJvdW5kc1JhZGl1c1ggPSByeCgpICsgc2hhcGVN YXJnaW47CisgICAgZmxvYXQgYm91bmRzUmFkaXVzWSA9IHJ5KCkgKyBzaGFwZU1hcmdpbjsKKyAg ICByZXR1cm4gUmVjdGFuZ2xlU2hhcGU6OlNoYXBlQm91bmRzKEZsb2F0UmVjdChib3VuZHNYLCBi b3VuZHNZLCBib3VuZHNXaWR0aCwgYm91bmRzSGVpZ2h0KSwgRmxvYXRTaXplKGJvdW5kc1JhZGl1 c1gsIGJvdW5kc1JhZGl1c1kpKTsKIH0KIAotRmxvYXRQb2ludCBGbG9hdFJvdW5kZWRSZWN0Ojpj b3JuZXJJbnRlcmNlcHRGb3JXaWR0aChmbG9hdCB3aWR0aEF0SW50ZXJjZXB0KSBjb25zdAorRmxv YXRQb2ludCBSZWN0YW5nbGVTaGFwZTo6U2hhcGVCb3VuZHM6OmNvcm5lckludGVyY2VwdEZvcldp ZHRoKGZsb2F0IHdpZHRoQXRJbnRlcmNlcHQpIGNvbnN0CiB7CiAgICAgZmxvYXQgeGkgPSAod2lk dGgoKSAtIHdpZHRoQXRJbnRlcmNlcHQpIC8gMjsKICAgICBmbG9hdCB5aSA9IHJ5KCkgLSBlbGxp cHNlWUludGVyY2VwdChyeCgpIC0geGksIHJ4KCksIHJ5KCkpOwogICAgIHJldHVybiBGbG9hdFBv aW50KHhpLCB5aSk7CiB9CiAKLUZsb2F0Um91bmRlZFJlY3QgUmVjdGFuZ2xlU2hhcGU6OnNoYXBl UGFkZGluZ0JvdW5kcygpIGNvbnN0CitSZWN0YW5nbGVTaGFwZTo6U2hhcGVCb3VuZHMgUmVjdGFu Z2xlU2hhcGU6OnNoYXBlUGFkZGluZ0JvdW5kcygpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2hhdmVJ bml0aWFsaXplZFBhZGRpbmdCb3VuZHMpIHsKICAgICAgICAgbV9oYXZlSW5pdGlhbGl6ZWRQYWRk aW5nQm91bmRzID0gdHJ1ZTsKQEAgLTkyLDcgKzkyLDcgQEAgRmxvYXRSb3VuZGVkUmVjdCBSZWN0 YW5nbGVTaGFwZTo6c2hhcGVQYWRkaW5nQm91bmRzKCkgY29uc3QKICAgICByZXR1cm4gbV9wYWRk aW5nQm91bmRzOwogfQogCi1GbG9hdFJvdW5kZWRSZWN0IFJlY3RhbmdsZVNoYXBlOjpzaGFwZU1h cmdpbkJvdW5kcygpIGNvbnN0CitSZWN0YW5nbGVTaGFwZTo6U2hhcGVCb3VuZHMgUmVjdGFuZ2xl U2hhcGU6OnNoYXBlTWFyZ2luQm91bmRzKCkgY29uc3QKIHsKICAgICBpZiAoIW1faGF2ZUluaXRp YWxpemVkTWFyZ2luQm91bmRzKSB7CiAgICAgICAgIG1faGF2ZUluaXRpYWxpemVkTWFyZ2luQm91 bmRzID0gdHJ1ZTsKQEAgLTEwMyw3ICsxMDMsNyBAQCBGbG9hdFJvdW5kZWRSZWN0IFJlY3Rhbmds ZVNoYXBlOjpzaGFwZU1hcmdpbkJvdW5kcygpIGNvbnN0CiAKIHZvaWQgUmVjdGFuZ2xlU2hhcGU6 OmdldEV4Y2x1ZGVkSW50ZXJ2YWxzKExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBs b2dpY2FsSGVpZ2h0LCBTZWdtZW50TGlzdCYgcmVzdWx0KSBjb25zdAogewotICAgIGNvbnN0IEZs b2F0Um91bmRlZFJlY3QmIGJvdW5kcyA9IHNoYXBlTWFyZ2luQm91bmRzKCk7CisgICAgY29uc3Qg UmVjdGFuZ2xlU2hhcGU6OlNoYXBlQm91bmRzJiBib3VuZHMgPSBzaGFwZU1hcmdpbkJvdW5kcygp OwogICAgIGlmIChib3VuZHMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKQEAgLTEzNSw3 ICsxMzUsNyBAQCB2b2lkIFJlY3RhbmdsZVNoYXBlOjpnZXRFeGNsdWRlZEludGVydmFscyhMYXlv dXRVbml0IGxvZ2ljYWxUb3AsIExheW91dFVuaXQgbG9naQogCiB2b2lkIFJlY3RhbmdsZVNoYXBl OjpnZXRJbmNsdWRlZEludGVydmFscyhMYXlvdXRVbml0IGxvZ2ljYWxUb3AsIExheW91dFVuaXQg bG9naWNhbEhlaWdodCwgU2VnbWVudExpc3QmIHJlc3VsdCkgY29uc3QKIHsKLSAgICBjb25zdCBG bG9hdFJvdW5kZWRSZWN0JiBib3VuZHMgPSBzaGFwZVBhZGRpbmdCb3VuZHMoKTsKKyAgICBjb25z dCBSZWN0YW5nbGVTaGFwZTo6U2hhcGVCb3VuZHMmIGJvdW5kcyA9IHNoYXBlUGFkZGluZ0JvdW5k cygpOwogICAgIGlmIChib3VuZHMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKQEAgLTE4 NCw3ICsxODQsNyBAQCBib29sIFJlY3RhbmdsZVNoYXBlOjpmaXJzdEluY2x1ZGVkSW50ZXJ2YWxM b2dpY2FsVG9wKExheW91dFVuaXQgbWluTG9naWNhbEludGVydgogICAgIGZsb2F0IG1pbkludGVy dmFsSGVpZ2h0ID0gbWluTG9naWNhbEludGVydmFsU2l6ZS5oZWlnaHQoKTsKICAgICBmbG9hdCBt aW5JbnRlcnZhbFdpZHRoID0gbWluTG9naWNhbEludGVydmFsU2l6ZS53aWR0aCgpOwogCi0gICAg Y29uc3QgRmxvYXRSb3VuZGVkUmVjdCYgYm91bmRzID0gc2hhcGVQYWRkaW5nQm91bmRzKCk7Cisg ICAgY29uc3QgUmVjdGFuZ2xlU2hhcGU6OlNoYXBlQm91bmRzJiBib3VuZHMgPSBzaGFwZVBhZGRp bmdCb3VuZHMoKTsKICAgICBpZiAoYm91bmRzLmlzRW1wdHkoKSB8fCBtaW5JbnRlcnZhbFdpZHRo ID4gYm91bmRzLndpZHRoKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9SZWN0YW5nbGVTaGFwZS5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9SZWN0YW5nbGVTaGFwZS5oCmluZGV4IDAwMDc4Yjgu LjdmMjUwNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmVj dGFuZ2xlU2hhcGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1JlY3Rh bmdsZVNoYXBlLmgKQEAgLTM5LDI1ICszOSw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot Y2xhc3MgRmxvYXRSb3VuZGVkUmVjdCA6IHB1YmxpYyBGbG9hdFJlY3QgewotcHVibGljOgotICAg IEZsb2F0Um91bmRlZFJlY3QoKSB7IH0KLSAgICBGbG9hdFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0 UmVjdCYgYm91bmRzLCBjb25zdCBGbG9hdFNpemUmIHJhZGlpKQotICAgICAgICA6IEZsb2F0UmVj dChib3VuZHMpCi0gICAgICAgICwgbV9yYWRpaShyYWRpaSkKLSAgICB7Ci0gICAgfQotCi0gICAg ZmxvYXQgcngoKSBjb25zdCB7IHJldHVybiBtX3JhZGlpLndpZHRoKCk7IH0KLSAgICBmbG9hdCBy eSgpIGNvbnN0IHsgcmV0dXJuIG1fcmFkaWkuaGVpZ2h0KCk7IH0KLSAgICBGbG9hdFJvdW5kZWRS ZWN0IG1hcmdpbkJvdW5kcyhmbG9hdCBtYXJnaW4pIGNvbnN0OwotICAgIEZsb2F0Um91bmRlZFJl Y3QgcGFkZGluZ0JvdW5kcyhmbG9hdCBwYWRkaW5nKSBjb25zdDsKLSAgICBGbG9hdFBvaW50IGNv cm5lckludGVyY2VwdEZvcldpZHRoKGZsb2F0IHdpZHRoKSBjb25zdDsKLQotcHJpdmF0ZToKLSAg ICBGbG9hdFNpemUgbV9yYWRpaTsKLX07Ci0KIGNsYXNzIFJlY3RhbmdsZVNoYXBlIDogcHVibGlj IFNoYXBlIHsKIHB1YmxpYzoKICAgICBSZWN0YW5nbGVTaGFwZShjb25zdCBGbG9hdFJlY3QmIGJv dW5kcywgY29uc3QgRmxvYXRTaXplJiByYWRpaSkKQEAgLTgxLDEyICs2MiwzMSBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCBTaGFwZVR5cGUgdHlwZSgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIFNo YXBlOjpSb3VuZGVkUmVjdGFuZ2xlVHlwZTsgfQogCiBwcml2YXRlOgotICAgIEZsb2F0Um91bmRl ZFJlY3Qgc2hhcGVNYXJnaW5Cb3VuZHMoKSBjb25zdDsKLSAgICBGbG9hdFJvdW5kZWRSZWN0IHNo YXBlUGFkZGluZ0JvdW5kcygpIGNvbnN0OworICAgIGNsYXNzIFNoYXBlQm91bmRzIDogcHVibGlj IEZsb2F0UmVjdCB7CisgICAgcHVibGljOgorICAgICAgICBTaGFwZUJvdW5kcygpIHsgfQorICAg ICAgICBTaGFwZUJvdW5kcyhjb25zdCBGbG9hdFJlY3QmIGJvdW5kcywgY29uc3QgRmxvYXRTaXpl JiByYWRpaSkKKyAgICAgICAgICAgIDogRmxvYXRSZWN0KGJvdW5kcykKKyAgICAgICAgICAgICwg bV9yYWRpaShyYWRpaSkKKyAgICAgICAgeworICAgICAgICB9CisKKyAgICAgICAgZmxvYXQgcngo KSBjb25zdCB7IHJldHVybiBtX3JhZGlpLndpZHRoKCk7IH0KKyAgICAgICAgZmxvYXQgcnkoKSBj b25zdCB7IHJldHVybiBtX3JhZGlpLmhlaWdodCgpOyB9CisgICAgICAgIFNoYXBlQm91bmRzIG1h cmdpbkJvdW5kcyhmbG9hdCBzaGFwZU1hcmdpbikgY29uc3Q7CisgICAgICAgIFNoYXBlQm91bmRz IHBhZGRpbmdCb3VuZHMoZmxvYXQgc2hhcGVQYWRkaW5nKSBjb25zdDsKKyAgICAgICAgRmxvYXRQ b2ludCBjb3JuZXJJbnRlcmNlcHRGb3JXaWR0aChmbG9hdCB3aWR0aCkgY29uc3Q7CisKKyAgICBw cml2YXRlOgorICAgICAgICBGbG9hdFNpemUgbV9yYWRpaTsKKyAgICB9OworCisgICAgU2hhcGVC b3VuZHMgc2hhcGVNYXJnaW5Cb3VuZHMoKSBjb25zdDsKKyAgICBTaGFwZUJvdW5kcyBzaGFwZVBh ZGRpbmdCb3VuZHMoKSBjb25zdDsKIAotICAgIEZsb2F0Um91bmRlZFJlY3QgbV9ib3VuZHM7Ci0g ICAgbXV0YWJsZSBGbG9hdFJvdW5kZWRSZWN0IG1fbWFyZ2luQm91bmRzOwotICAgIG11dGFibGUg RmxvYXRSb3VuZGVkUmVjdCBtX3BhZGRpbmdCb3VuZHM7CisgICAgU2hhcGVCb3VuZHMgbV9ib3Vu ZHM7CisgICAgbXV0YWJsZSBTaGFwZUJvdW5kcyBtX21hcmdpbkJvdW5kczsKKyAgICBtdXRhYmxl IFNoYXBlQm91bmRzIG1fcGFkZGluZ0JvdW5kczsKICAgICBtdXRhYmxlIGJvb2wgbV9oYXZlSW5p dGlhbGl6ZWRNYXJnaW5Cb3VuZHMgOiAxOwogICAgIG11dGFibGUgYm9vbCBtX2hhdmVJbml0aWFs aXplZFBhZGRpbmdCb3VuZHMgOiAxOwogfTsK