127852 2014-01-29 13:13:57 -0800 [CSS Shapes] Rounded Insets Let Content Overlap Shape 2014-02-06 17:16:18 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 124173 1 betravis zoltan bjonesbe commit-queue dino esprehn+autocc glenn gyuyoung.kim kondapallykalyan macpherson menard webkit-bug-importer zoltan oldest_to_newest 973452 0 222591 betravis 2014-01-29 13:13:57 -0800 Created attachment 222591 Test case In some cases, inline content overlaps with insets with a round applied. Appears to depend on the size of the float shape. 974368 1 webkit-bug-importer 2014-01-31 11:04:59 -0800 <rdar://problem/15958574> 977444 2 223352 zoltan 2014-02-06 11:21:26 -0800 Created attachment 223352 Patch 977448 3 223354 zoltan 2014-02-06 11:22:27 -0800 Created attachment 223354 Patch 977579 4 223354 bjonesbe 2014-02-06 15:46:57 -0800 Comment on attachment 223354 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223354&action=review > Source/WebCore/css/LengthFunctions.h:41 > +FloatSize floatSizeForLengthSize(const LengthSize&, float maxWidth, float maxHeight); I think it's ok as is, but I could see an argument for using a const FloatSize& instead of two floats. I'll leave that call up to you, since I'm not sure if it's better or not. 977618 5 223405 zoltan 2014-02-06 16:38:46 -0800 Created attachment 223405 Patch for landing I'm landing it with LayoutSize. 977619 6 zoltan 2014-02-06 16:39:26 -0800 I meant FloatSize. 977636 7 223405 commit-queue 2014-02-06 17:16:14 -0800 Comment on attachment 223405 Patch for landing Clearing flags on attachment: 223405 Committed r163585: <http://trac.webkit.org/changeset/163585> 977637 8 commit-queue 2014-02-06 17:16:18 -0800 All reviewed patches have been landed. Closing bug. 222591 2014-01-29 13:13:57 -0800 2014-02-06 16:38:46 -0800 Test case shape-test.html text/html 1391 betravis PGh0bWw+CjxoZWFkPgo8c3R5bGU+Ci5jb250YWluZXIgewogICAgd2lkdGg6IDMwMHB4OwogICAg Zm9udDogMTBweCAvIDEgQWhlbSwgc2Fucy1zZXJpZjsKfQouc2hhcGUtb3V0c2lkZSB7CiAgICBz aGFwZS1vdXRzaWRlOiBpbnNldCgwIHJvdW5kIDUwJSk7CiAgICAtd2Via2l0LXNoYXBlLW91dHNp ZGU6IGluc2V0KDAgcm91bmQgNTAlKTsKICAgIHdpZHRoOiA4MHB4OwogICAgaGVpZ2h0OiA4MHB4 OwogICAgYm9yZGVyLXJhZGl1czogNTAlOwogICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgwLCAw LCAyNTUsIDAuNSk7CiAgICBmbG9hdDogbGVmdDsKfQo8L3N0eWxlPgo8L3NjcmlwdD4KPC9oZWFk Pgo8Ym9keT4KPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KPGRpdiBjbGFzcz0nc2hhcGUtb3V0c2lk ZSc+PC9kaXY+CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4 CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHgg eCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4 IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHgg eCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4 IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHgg eCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4 IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHgg eCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4 IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHgg eCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4 IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4Cngg eCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4 IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHgg eCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4 IHggeCB4IHggeCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHgg eCB4IHggeCB4CnggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4IHggeCB4 CjwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4= 223352 2014-02-06 11:21:26 -0800 2014-02-06 11:22:27 -0800 Patch roundedinset.patch text/plain 8232 zoltan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxMzFmMmUwLi45NGIwNjFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDIt MDYgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBT aGFwZXNdIFJvdW5kZWQgSW5zZXRzIExldCBDb250ZW50IE92ZXJsYXAgU2hhcGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzg1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hh cGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0LWV4cGVjdGVkLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3No YXBlLW91dHNpZGUtcm91bmRlZC1pbnNldC5odG1sOiBBZGRlZC4KKwogMjAxNC0wMi0wNiAgTWlj aGHFgiBQYWt1xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQgRUZMIGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9z aGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0LWV4 cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0 cy9zaGFwZS1vdXRzaWRlLXJvdW5kZWQtaW5zZXQtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5lYzhlNDliCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3Vu ZGVkLWluc2V0LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzNSBAQAorPGh0bWw+Cis8aGVhZD4K KzxzdHlsZT4KKy5zaGFwZS1vdXRzaWRlIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAg dG9wOiAwcHg7CisgICAgbGVmdDogMHB4OworICAgIGZvbnQ6IDEwcHggLyAxIEFoZW0sIHNhbnMt c2VyaWY7CisgICAgd2lkdGg6IDgwcHg7CisgICAgaGVpZ2h0OiA4MHB4OworICAgIGJvcmRlci1y YWRpdXM6IDUwJTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBmbG9hdDogbGVm dDsKK30KKzwvc3R5bGU+Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IGNsYXNz PSdzaGFwZS1vdXRzaWRlJz4KKyAgICA8c3Bhbm4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA2NnB4OyI+ PC9zcGFuPng8YnIvPgorICAgIDxzcGFubiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDc1cHg7Ij48L3Nw YW4+eDxici8+CisgICAgPHNwYW5uIHN0eWxlPSJtYXJnaW4tbGVmdDogNzlweDsiPjwvc3Bhbj54 PGJyLz4KKyAgICA8c3Bhbm4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA4MHB4OyI+PC9zcGFuPng8YnIv PgorICAgIDxzcGFubiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDgwcHg7Ij48L3NwYW4+eDxici8+Cisg ICAgPHNwYW5uIHN0eWxlPSJtYXJnaW4tbGVmdDogNzlweDsiPjwvc3Bhbj54PGJyLz4KKyAgICA8 c3Bhbm4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA3NXB4OyI+PC9zcGFuPng8YnIvPgorICAgIDxzcGFu biBzdHlsZT0ibWFyZ2luLWxlZnQ6IDY2cHg7Ij48L3NwYW4+eDxici8+Cis8L2Rpdj4KKworPHAg c3R5bGU9Im1hcmdpbi10b3A6IDEwMHB4OyI+VGhlIGJsYWNrIHJlY3RhbmdsZXMgc2hvdWxkIHJl c3BlY3QgdGhlIGJvdW5kYXJpZXMgb2YgdGhlIHNoYXBlLW91dHNpZGUgKGdyZWVuIGNpcmNsZSks Cit0aHVzIHRoZXkgc2hvdWxkbid0IG92ZXJsYXAgd2l0aCB0aGUgZ3JlZW4gY2lyY2xlLjwvcD4K KzxwPjxhIGhyZWY9J2h0dHA6Ly93ZWJraXQub3JnL2IvMTI3ODUyJz5CdWcgMTI3ODUyPC9hPjog W0NTUyBTaGFwZXNdIFJvdW5kZWQgSW5zZXRzIExldCBDb250ZW50IE92ZXJsYXAgU2hhcGU8L3A+ Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9z aGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLXJvdW5kZWQtaW5zZXQuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUt cm91bmRlZC1pbnNldC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM1 M2E0NDEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1v dXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLXJvdW5kZWQtaW5zZXQuaHRtbApAQCAtMCwwICsx LDQwIEBACis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLmNvbnRhaW5lciB7CisgICAgcG9zaXRp b246IGFic29sdXRlOworICAgIHRvcDogMHB4OworICAgIGxlZnQ6IDBweDsKKyAgICB3aWR0aDog MTIwcHg7CisgICAgZm9udDogMTBweCAvIDEgQWhlbSwgc2Fucy1zZXJpZjsKK30KKy5zaGFwZS1v dXRzaWRlIHsKKyAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IGluc2V0KDBweCByb3VuZCA1MCUp OworICAgIHdpZHRoOiA4MHB4OworICAgIGhlaWdodDogODBweDsKKyAgICBib3JkZXItcmFkaXVz OiA1MCU7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgZmxvYXQ6IGxlZnQ7Cit9 Cis8L3N0eWxlPgorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgY2xhc3M9J2NvbnRh aW5lcic+CisgICAgPGRpdiBjbGFzcz0nc2hhcGUtb3V0c2lkZSc+PC9kaXY+CisgICAgeDxici8+ CisgICAgeDxici8+CisgICAgeDxici8+CisgICAgeDxici8+CisgICAgeDxici8+CisgICAgeDxi ci8+CisgICAgeDxici8+CisgICAgeDxici8+Cis8L2Rpdj4KKworPHAgc3R5bGU9Im1hcmdpbi10 b3A6IDEwMHB4OyI+VGhlIGJsYWNrIHJlY3RhbmdsZXMgc2hvdWxkIHJlc3BlY3QgdGhlIGJvdW5k YXJpZXMgb2YgdGhlIHNoYXBlLW91dHNpZGUgKGdyZWVuIGNpcmNsZSksCit0aHVzIHRoZXkgc2hv dWxkbid0IG92ZXJsYXAgd2l0aCB0aGUgZ3JlZW4gY2lyY2xlLjwvcD4KKzxwPjxhIGhyZWY9J2h0 dHA6Ly93ZWJraXQub3JnL2IvMTI3ODUyJz5CdWcgMTI3ODUyPC9hPjogW0NTUyBTaGFwZXNdIFJv dW5kZWQgSW5zZXRzIExldCBDb250ZW50IE92ZXJsYXAgU2hhcGU8L3A+Cis8L3A+Cis8L2JvZHk+ Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJlYThlYS4uZjZhMWUxZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIzIEBACisyMDE0LTAyLTA2ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQu b3JnPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBSb3VuZGVkIEluc2V0cyBMZXQgQ29udGVudCBP dmVybGFwIFNoYXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjc4NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2luZyBMZW5ndGhTaXplIHRvIEZsb2F0U2l6ZSBjb252ZXJzaW9uIGZyb20gTGVuZ3Ro U2l6ZS5oIGxlYWQgdG8gbWlzY2FsY3VsYXRlZAorICAgICAgICBpbnNldCBib3JkZXIgcmFkaXVz LCB3aGVuIHRoZSBib3JkZXIgcmFkaXVzIHdhcyBkZWZpbmVkIGJ5IHBlcmNlbnRhZ2VzLiBUaGlz IHBhdGNoCisgICAgICAgIGZpeGVzIHRoZSBiZWhhdmlvciBhbmQgcmVtb3ZlcyB0aGUgaW5jb3Jy ZWN0IGNvbnZlcnNpb24uCisKKyAgICAgICAgVGVzdDogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lk ZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0Lmh0bWwKKworICAgICAgICAqIGNz cy9MZW5ndGhGdW5jdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmxvYXRTaXplRm9yTGVu Z3RoU2l6ZSk6IEFkZCBuZXcgaGVscGVyIGZ1bmN0aW9uIGZvciBMZW5ndGhTaXplIHRvIEZsb2F0 U2l6ZSBjb252ZXJzaW9uLgorICAgICAgICAqIGNzcy9MZW5ndGhGdW5jdGlvbnMuaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9MZW5ndGhTaXplLmg6IFJlbW92ZSBmbG9hdFNpemUgY29udmVyc2lvbi4K KyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNoYXBlOjpjcmVhdGVTaGFwZSk6IFVzZSBuZXcgaGVscGVyIGZ1bmN0aW9uIHRvIGNhbGN1bGF0 ZSB0aGUgcmlnaHQgd2l0aCBmb3IgdGhlIGluc2V0IGJvcmRlciByYWRpdXMuCisKIDIwMTQtMDIt MDYgIEtvb3AgTWFzdCA8a3dtQEZyZWVCU0Qub3JnPgogCiAgICAgICAgIFVzZSBzeXN0ZW0gZGVm YXVsdCBjb21waWxlciBpbnN0ZWFkIG9mIGdjYywgYXMgZmluYWwgZmFsbCB0aHJvdWdoLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0xlbmd0aEZ1bmN0aW9ucy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvTGVuZ3RoRnVuY3Rpb25zLmNwcAppbmRleCBhZGJhMTAwLi42YjNlZTY4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvTGVuZ3RoRnVuY3Rpb25zLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvTGVuZ3RoRnVuY3Rpb25zLmNwcApAQCAtMjUsNyArMjUsNyBAQAog I2luY2x1ZGUgIkxlbmd0aEZ1bmN0aW9ucy5oIgogCiAjaW5jbHVkZSAiTGF5b3V0VW5pdC5oIgot I2luY2x1ZGUgIkxlbmd0aC5oIgorI2luY2x1ZGUgIkxlbmd0aFNpemUuaCIKICNpbmNsdWRlICJS ZW5kZXJWaWV3LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTIxMCw0ICsyMTAsOSBAQCBm bG9hdCBmbG9hdFZhbHVlRm9yTGVuZ3RoKGNvbnN0IExlbmd0aCYgbGVuZ3RoLCBmbG9hdCBtYXhp bXVtVmFsdWUsIFJlbmRlclZpZXcqCiAgICAgcmV0dXJuIDA7CiB9CiAKK0Zsb2F0U2l6ZSBmbG9h dFNpemVGb3JMZW5ndGhTaXplKGNvbnN0IExlbmd0aFNpemUmIGxlbmd0aFNpemUsIGZsb2F0IG1h eFdpZHRoLCBmbG9hdCBtYXhIZWlnaHQpCit7CisgICAgcmV0dXJuIEZsb2F0U2l6ZShmbG9hdFZh bHVlRm9yTGVuZ3RoKGxlbmd0aFNpemUud2lkdGgoKSwgbWF4V2lkdGgpLCBmbG9hdFZhbHVlRm9y TGVuZ3RoKGxlbmd0aFNpemUuaGVpZ2h0KCksIG1heEhlaWdodCkpOworfQorCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvTGVuZ3RoRnVuY3Rp b25zLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvTGVuZ3RoRnVuY3Rpb25zLmgKaW5kZXggOWZjZjJl Zi4uYmQyMDdlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0xlbmd0aEZ1bmN0aW9u cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9MZW5ndGhGdW5jdGlvbnMuaApAQCAtMjYsOSAr MjYsMTEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBGbG9hdFNpemU7CiBjbGFz cyBMYXlvdXRVbml0OwogY2xhc3MgUmVuZGVyVmlldzsKIHN0cnVjdCBMZW5ndGg7CitzdHJ1Y3Qg TGVuZ3RoU2l6ZTsKIAogaW50IG1pbmltdW1JbnRWYWx1ZUZvckxlbmd0aChjb25zdCBMZW5ndGgm LCBMYXlvdXRVbml0IG1heGltdW1WYWx1ZSwgUmVuZGVyVmlldyogPSAwLCBib29sIHJvdW5kUGVy Y2VudGFnZXMgPSBmYWxzZSk7CiBpbnQgaW50VmFsdWVGb3JMZW5ndGgoY29uc3QgTGVuZ3RoJiwg TGF5b3V0VW5pdCBtYXhpbXVtVmFsdWUsIFJlbmRlclZpZXcqID0gMCwgYm9vbCByb3VuZFBlcmNl bnRhZ2VzID0gZmFsc2UpOwpAQCAtMzYsNiArMzgsNyBAQCBMYXlvdXRVbml0IG1pbmltdW1WYWx1 ZUZvckxlbmd0aChjb25zdCBMZW5ndGgmLCBMYXlvdXRVbml0IG1heGltdW1WYWx1ZSwgUmVuZGVy VgogTGF5b3V0VW5pdCB2YWx1ZUZvckxlbmd0aChjb25zdCBMZW5ndGgmLCBMYXlvdXRVbml0IG1h eGltdW1WYWx1ZSwgUmVuZGVyVmlldyogPSAwLCBib29sIHJvdW5kUGVyY2VudGFnZXMgPSBmYWxz ZSk7CiBmbG9hdCBmbG9hdFZhbHVlRm9yTGVuZ3RoKGNvbnN0IExlbmd0aCYsIExheW91dFVuaXQg bWF4aW11bVZhbHVlLCBSZW5kZXJWaWV3KiA9IDApOwogZmxvYXQgZmxvYXRWYWx1ZUZvckxlbmd0 aChjb25zdCBMZW5ndGgmLCBmbG9hdCBtYXhpbXVtVmFsdWUsIFJlbmRlclZpZXcqID0gMCk7CitG bG9hdFNpemUgZmxvYXRTaXplRm9yTGVuZ3RoU2l6ZShjb25zdCBMZW5ndGhTaXplJiwgZmxvYXQg bWF4V2lkdGgsIGZsb2F0IG1heEhlaWdodCk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoU2l6ZS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoU2l6ZS5oCmluZGV4IGI0Y2VkYmMuLmNiYzJkNzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xlbmd0aFNpemUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGhTaXplLmgKQEAgLTIxLDcgKzIxLDYgQEAKICNpZm5k ZWYgTGVuZ3RoU2l6ZV9oCiAjZGVmaW5lIExlbmd0aFNpemVfaAogCi0jaW5jbHVkZSAiRmxvYXRT aXplLmgiCiAjaW5jbHVkZSAiTGVuZ3RoLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTU0 LDExICs1Myw2IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIExlbmd0aFNpemUobV93aWR0aC5i bGVuZChmcm9tLndpZHRoKCksIHByb2dyZXNzKSwgbV9oZWlnaHQuYmxlbmQoZnJvbS5oZWlnaHQo KSwgcHJvZ3Jlc3MpKTsKICAgICB9CiAKLSAgICBGbG9hdFNpemUgZmxvYXRTaXplKCkgY29uc3QK LSAgICB7Ci0gICAgICAgIHJldHVybiBGbG9hdFNpemUobV93aWR0aC52YWx1ZSgpLCBtX2hlaWdo dC52YWx1ZSgpKTsKLSAgICB9Ci0KIHByaXZhdGU6CiAgICAgTGVuZ3RoIG1fd2lkdGg7CiAgICAg TGVuZ3RoIG1faGVpZ2h0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3No YXBlcy9TaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNw cAppbmRleCBjOTEwNjZkLi42NTAzMThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1NoYXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hh cGVzL1NoYXBlLmNwcApAQCAtMjMyLDExICsyMzIsMTMgQEAgUGFzc093blB0cjxTaGFwZT4gU2hh cGU6OmNyZWF0ZVNoYXBlKGNvbnN0IEJhc2ljU2hhcGUqIGJhc2ljU2hhcGUsIGNvbnN0IExheW91 dFMKICAgICAgICAgICAgIGJveEhlaWdodCAtIHRvcCAtIGZsb2F0VmFsdWVGb3JMZW5ndGgoaW5z ZXQuYm90dG9tKCksIGJveEhlaWdodCkpOwogICAgICAgICBGbG9hdFJlY3QgbG9naWNhbFJlY3Qg PSBwaHlzaWNhbFJlY3RUb0xvZ2ljYWwocmVjdCwgbG9naWNhbEJveFNpemUuaGVpZ2h0KCksIHdy aXRpbmdNb2RlKTsKIAotICAgICAgICBzaGFwZSA9IGNyZWF0ZUluc2V0U2hhcGUoRmxvYXRSb3Vu ZGVkUmVjdChsb2dpY2FsUmVjdCwKLSAgICAgICAgICAgIGluc2V0LnRvcExlZnRSYWRpdXMoKS5m bG9hdFNpemUoKSwKLSAgICAgICAgICAgIGluc2V0LnRvcFJpZ2h0UmFkaXVzKCkuZmxvYXRTaXpl KCksCi0gICAgICAgICAgICBpbnNldC5ib3R0b21MZWZ0UmFkaXVzKCkuZmxvYXRTaXplKCksCi0g ICAgICAgICAgICBpbnNldC5ib3R0b21SaWdodFJhZGl1cygpLmZsb2F0U2l6ZSgpKSk7CisgICAg ICAgIEZsb2F0Um91bmRlZFJlY3Q6OlJhZGlpIGNvcm5lclJhZGlpKAorICAgICAgICAgICAgZmxv YXRTaXplRm9yTGVuZ3RoU2l6ZShpbnNldC50b3BMZWZ0UmFkaXVzKCksIGJveFdpZHRoLCBib3hI ZWlnaHQpLAorICAgICAgICAgICAgZmxvYXRTaXplRm9yTGVuZ3RoU2l6ZShpbnNldC50b3BSaWdo dFJhZGl1cygpLCBib3hXaWR0aCwgYm94SGVpZ2h0KSwKKyAgICAgICAgICAgIGZsb2F0U2l6ZUZv ckxlbmd0aFNpemUoaW5zZXQuYm90dG9tTGVmdFJhZGl1cygpLCBib3hXaWR0aCwgYm94SGVpZ2h0 KSwKKyAgICAgICAgICAgIGZsb2F0U2l6ZUZvckxlbmd0aFNpemUoaW5zZXQuYm90dG9tUmlnaHRS YWRpdXMoKSwgYm94V2lkdGgsIGJveEhlaWdodCkpOworCisgICAgICAgIHNoYXBlID0gY3JlYXRl SW5zZXRTaGFwZShGbG9hdFJvdW5kZWRSZWN0KGxvZ2ljYWxSZWN0LCBjb3JuZXJSYWRpaSkpOwog ICAgICAgICBicmVhazsKICAgICB9CiAK 223354 2014-02-06 11:22:27 -0800 2014-02-06 16:38:46 -0800 Patch roundedinset.patch text/plain 8224 zoltan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxMzFmMmUwLi45NGIwNjFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDIt MDYgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBT aGFwZXNdIFJvdW5kZWQgSW5zZXRzIExldCBDb250ZW50IE92ZXJsYXAgU2hhcGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzg1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hh cGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0LWV4cGVjdGVkLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3No YXBlLW91dHNpZGUtcm91bmRlZC1pbnNldC5odG1sOiBBZGRlZC4KKwogMjAxNC0wMi0wNiAgTWlj aGHFgiBQYWt1xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQgRUZMIGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9z aGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0LWV4 cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0 cy9zaGFwZS1vdXRzaWRlLXJvdW5kZWQtaW5zZXQtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5lYzhlNDliCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3Vu ZGVkLWluc2V0LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzNSBAQAorPGh0bWw+Cis8aGVhZD4K KzxzdHlsZT4KKy5zaGFwZS1vdXRzaWRlIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAg dG9wOiAwcHg7CisgICAgbGVmdDogMHB4OworICAgIGZvbnQ6IDEwcHggLyAxIEFoZW0sIHNhbnMt c2VyaWY7CisgICAgd2lkdGg6IDgwcHg7CisgICAgaGVpZ2h0OiA4MHB4OworICAgIGJvcmRlci1y YWRpdXM6IDUwJTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBmbG9hdDogbGVm dDsKK30KKzwvc3R5bGU+Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IGNsYXNz PSdzaGFwZS1vdXRzaWRlJz4KKyAgICA8c3BhbiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDY2cHg7Ij48 L3NwYW4+eDxici8+CisgICAgPHNwYW4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA3NXB4OyI+PC9zcGFu Png8YnIvPgorICAgIDxzcGFuIHN0eWxlPSJtYXJnaW4tbGVmdDogNzlweDsiPjwvc3Bhbj54PGJy Lz4KKyAgICA8c3BhbiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDgwcHg7Ij48L3NwYW4+eDxici8+Cisg ICAgPHNwYW4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA4MHB4OyI+PC9zcGFuPng8YnIvPgorICAgIDxz cGFuIHN0eWxlPSJtYXJnaW4tbGVmdDogNzlweDsiPjwvc3Bhbj54PGJyLz4KKyAgICA8c3BhbiBz dHlsZT0ibWFyZ2luLWxlZnQ6IDc1cHg7Ij48L3NwYW4+eDxici8+CisgICAgPHNwYW4gc3R5bGU9 Im1hcmdpbi1sZWZ0OiA2NnB4OyI+PC9zcGFuPng8YnIvPgorPC9kaXY+CisKKzxwIHN0eWxlPSJt YXJnaW4tdG9wOiAxMDBweDsiPlRoZSBibGFjayByZWN0YW5nbGVzIHNob3VsZCByZXNwZWN0IHRo ZSBib3VuZGFyaWVzIG9mIHRoZSBzaGFwZS1vdXRzaWRlIChncmVlbiBjaXJjbGUpLAordGh1cyB0 aGV5IHNob3VsZG4ndCBvdmVybGFwIHdpdGggdGhlIGdyZWVuIGNpcmNsZS48L3A+Cis8cD48YSBo cmVmPSdodHRwOi8vd2Via2l0Lm9yZy9iLzEyNzg1Mic+QnVnIDEyNzg1MjwvYT46IFtDU1MgU2hh cGVzXSBSb3VuZGVkIEluc2V0cyBMZXQgQ29udGVudCBPdmVybGFwIFNoYXBlPC9wPgorPC9ib2R5 PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0 c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0Lmh0bWwgYi9MYXlvdXRUZXN0 cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLXJvdW5kZWQt aW5zZXQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNTNhNDQxCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0Lmh0bWwKQEAgLTAsMCArMSw0MCBAQAor PGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKKyAgICB0b3A6IDBweDsKKyAgICBsZWZ0OiAwcHg7CisgICAgd2lkdGg6IDEyMHB4Owor ICAgIGZvbnQ6IDEwcHggLyAxIEFoZW0sIHNhbnMtc2VyaWY7Cit9Cisuc2hhcGUtb3V0c2lkZSB7 CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBpbnNldCgwcHggcm91bmQgNTAlKTsKKyAgICB3 aWR0aDogODBweDsKKyAgICBoZWlnaHQ6IDgwcHg7CisgICAgYm9yZGVyLXJhZGl1czogNTAlOwor ICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgIGZsb2F0OiBsZWZ0OworfQorPC9zdHls ZT4KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGNsYXNzPSdjb250YWluZXInPgor ICAgIDxkaXYgY2xhc3M9J3NoYXBlLW91dHNpZGUnPjwvZGl2PgorICAgIHg8YnIvPgorICAgIHg8 YnIvPgorICAgIHg8YnIvPgorICAgIHg8YnIvPgorICAgIHg8YnIvPgorICAgIHg8YnIvPgorICAg IHg8YnIvPgorICAgIHg8YnIvPgorPC9kaXY+CisKKzxwIHN0eWxlPSJtYXJnaW4tdG9wOiAxMDBw eDsiPlRoZSBibGFjayByZWN0YW5nbGVzIHNob3VsZCByZXNwZWN0IHRoZSBib3VuZGFyaWVzIG9m IHRoZSBzaGFwZS1vdXRzaWRlIChncmVlbiBjaXJjbGUpLAordGh1cyB0aGV5IHNob3VsZG4ndCBv dmVybGFwIHdpdGggdGhlIGdyZWVuIGNpcmNsZS48L3A+Cis8cD48YSBocmVmPSdodHRwOi8vd2Vi a2l0Lm9yZy9iLzEyNzg1Mic+QnVnIDEyNzg1MjwvYT46IFtDU1MgU2hhcGVzXSBSb3VuZGVkIElu c2V0cyBMZXQgQ29udGVudCBPdmVybGFwIFNoYXBlPC9wPgorPC9wPgorPC9ib2R5PgorPC9odG1s PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDIyZWE4ZWEuLmY2YTFlMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MyBAQAorMjAxNC0wMi0wNiAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBbQ1NTIFNoYXBlc10gUm91bmRlZCBJbnNldHMgTGV0IENvbnRlbnQgT3ZlcmxhcCBT aGFwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3 ODUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNp bmcgTGVuZ3RoU2l6ZSB0byBGbG9hdFNpemUgY29udmVyc2lvbiBmcm9tIExlbmd0aFNpemUuaCBs ZWFkIHRvIG1pc2NhbGN1bGF0ZWQKKyAgICAgICAgaW5zZXQgYm9yZGVyIHJhZGl1cywgd2hlbiB0 aGUgYm9yZGVyIHJhZGl1cyB3YXMgZGVmaW5lZCBieSBwZXJjZW50YWdlcy4gVGhpcyBwYXRjaAor ICAgICAgICBmaXhlcyB0aGUgYmVoYXZpb3IgYW5kIHJlbW92ZXMgdGhlIGluY29ycmVjdCBjb252 ZXJzaW9uLgorCisgICAgICAgIFRlc3Q6IGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRz L3NoYXBlLW91dHNpZGUtcm91bmRlZC1pbnNldC5odG1sCisKKyAgICAgICAgKiBjc3MvTGVuZ3Ro RnVuY3Rpb25zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZsb2F0U2l6ZUZvckxlbmd0aFNpemUp OiBBZGQgbmV3IGhlbHBlciBmdW5jdGlvbiBmb3IgTGVuZ3RoU2l6ZSB0byBGbG9hdFNpemUgY29u dmVyc2lvbi4KKyAgICAgICAgKiBjc3MvTGVuZ3RoRnVuY3Rpb25zLmg6CisgICAgICAgICogcGxh dGZvcm0vTGVuZ3RoU2l6ZS5oOiBSZW1vdmUgZmxvYXRTaXplIGNvbnZlcnNpb24uCisgICAgICAg ICogcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFwZTo6 Y3JlYXRlU2hhcGUpOiBVc2UgbmV3IGhlbHBlciBmdW5jdGlvbiB0byBjYWxjdWxhdGUgdGhlIHJp Z2h0IHdpdGggZm9yIHRoZSBpbnNldCBib3JkZXIgcmFkaXVzLgorCiAyMDE0LTAyLTA2ICBLb29w IE1hc3QgPGt3bUBGcmVlQlNELm9yZz4KIAogICAgICAgICBVc2Ugc3lzdGVtIGRlZmF1bHQgY29t cGlsZXIgaW5zdGVhZCBvZiBnY2MsIGFzIGZpbmFsIGZhbGwgdGhyb3VnaC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9MZW5ndGhGdW5jdGlvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0xlbmd0aEZ1bmN0aW9ucy5jcHAKaW5kZXggYWRiYTEwMC4uNmIzZWU2OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvY3NzL0xlbmd0aEZ1bmN0aW9ucy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL0xlbmd0aEZ1bmN0aW9ucy5jcHAKQEAgLTI1LDcgKzI1LDcgQEAKICNpbmNsdWRl ICJMZW5ndGhGdW5jdGlvbnMuaCIKIAogI2luY2x1ZGUgIkxheW91dFVuaXQuaCIKLSNpbmNsdWRl ICJMZW5ndGguaCIKKyNpbmNsdWRlICJMZW5ndGhTaXplLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmll dy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0yMTAsNCArMjEwLDkgQEAgZmxvYXQgZmxv YXRWYWx1ZUZvckxlbmd0aChjb25zdCBMZW5ndGgmIGxlbmd0aCwgZmxvYXQgbWF4aW11bVZhbHVl LCBSZW5kZXJWaWV3KgogICAgIHJldHVybiAwOwogfQogCitGbG9hdFNpemUgZmxvYXRTaXplRm9y TGVuZ3RoU2l6ZShjb25zdCBMZW5ndGhTaXplJiBsZW5ndGhTaXplLCBmbG9hdCBtYXhXaWR0aCwg ZmxvYXQgbWF4SGVpZ2h0KQoreworICAgIHJldHVybiBGbG9hdFNpemUoZmxvYXRWYWx1ZUZvckxl bmd0aChsZW5ndGhTaXplLndpZHRoKCksIG1heFdpZHRoKSwgZmxvYXRWYWx1ZUZvckxlbmd0aChs ZW5ndGhTaXplLmhlaWdodCgpLCBtYXhIZWlnaHQpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0xlbmd0aEZ1bmN0aW9ucy5oIGIv U291cmNlL1dlYkNvcmUvY3NzL0xlbmd0aEZ1bmN0aW9ucy5oCmluZGV4IDlmY2YyZWYuLmJkMjA3 ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9MZW5ndGhGdW5jdGlvbnMuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvTGVuZ3RoRnVuY3Rpb25zLmgKQEAgLTI2LDkgKzI2LDExIEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgRmxvYXRTaXplOwogY2xhc3MgTGF5b3V0 VW5pdDsKIGNsYXNzIFJlbmRlclZpZXc7CiBzdHJ1Y3QgTGVuZ3RoOworc3RydWN0IExlbmd0aFNp emU7CiAKIGludCBtaW5pbXVtSW50VmFsdWVGb3JMZW5ndGgoY29uc3QgTGVuZ3RoJiwgTGF5b3V0 VW5pdCBtYXhpbXVtVmFsdWUsIFJlbmRlclZpZXcqID0gMCwgYm9vbCByb3VuZFBlcmNlbnRhZ2Vz ID0gZmFsc2UpOwogaW50IGludFZhbHVlRm9yTGVuZ3RoKGNvbnN0IExlbmd0aCYsIExheW91dFVu aXQgbWF4aW11bVZhbHVlLCBSZW5kZXJWaWV3KiA9IDAsIGJvb2wgcm91bmRQZXJjZW50YWdlcyA9 IGZhbHNlKTsKQEAgLTM2LDYgKzM4LDcgQEAgTGF5b3V0VW5pdCBtaW5pbXVtVmFsdWVGb3JMZW5n dGgoY29uc3QgTGVuZ3RoJiwgTGF5b3V0VW5pdCBtYXhpbXVtVmFsdWUsIFJlbmRlclYKIExheW91 dFVuaXQgdmFsdWVGb3JMZW5ndGgoY29uc3QgTGVuZ3RoJiwgTGF5b3V0VW5pdCBtYXhpbXVtVmFs dWUsIFJlbmRlclZpZXcqID0gMCwgYm9vbCByb3VuZFBlcmNlbnRhZ2VzID0gZmFsc2UpOwogZmxv YXQgZmxvYXRWYWx1ZUZvckxlbmd0aChjb25zdCBMZW5ndGgmLCBMYXlvdXRVbml0IG1heGltdW1W YWx1ZSwgUmVuZGVyVmlldyogPSAwKTsKIGZsb2F0IGZsb2F0VmFsdWVGb3JMZW5ndGgoY29uc3Qg TGVuZ3RoJiwgZmxvYXQgbWF4aW11bVZhbHVlLCBSZW5kZXJWaWV3KiA9IDApOworRmxvYXRTaXpl IGZsb2F0U2l6ZUZvckxlbmd0aFNpemUoY29uc3QgTGVuZ3RoU2l6ZSYsIGZsb2F0IG1heFdpZHRo LCBmbG9hdCBtYXhIZWlnaHQpOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xlbmd0aFNpemUuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0xlbmd0aFNpemUuaAppbmRleCBiNGNlZGJjLi5jYmMyZDc4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGhTaXplLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vTGVuZ3RoU2l6ZS5oCkBAIC0yMSw3ICsyMSw2IEBACiAjaWZuZGVmIExlbmd0 aFNpemVfaAogI2RlZmluZSBMZW5ndGhTaXplX2gKIAotI2luY2x1ZGUgIkZsb2F0U2l6ZS5oIgog I2luY2x1ZGUgIkxlbmd0aC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01NCwxMSArNTMs NiBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBMZW5ndGhTaXplKG1fd2lkdGguYmxlbmQoZnJv bS53aWR0aCgpLCBwcm9ncmVzcyksIG1faGVpZ2h0LmJsZW5kKGZyb20uaGVpZ2h0KCksIHByb2dy ZXNzKSk7CiAgICAgfQogCi0gICAgRmxvYXRTaXplIGZsb2F0U2l6ZSgpIGNvbnN0Ci0gICAgewot ICAgICAgICByZXR1cm4gRmxvYXRTaXplKG1fd2lkdGgudmFsdWUoKSwgbV9oZWlnaHQudmFsdWUo KSk7Ci0gICAgfQotCiBwcml2YXRlOgogICAgIExlbmd0aCBtX3dpZHRoOwogICAgIExlbmd0aCBt X2hlaWdodDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hh cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKaW5kZXgg YzkxMDY2ZC4uNjUwMzE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3No YXBlcy9TaGFwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFw ZS5jcHAKQEAgLTIzMiwxMSArMjMyLDEzIEBAIFBhc3NPd25QdHI8U2hhcGU+IFNoYXBlOjpjcmVh dGVTaGFwZShjb25zdCBCYXNpY1NoYXBlKiBiYXNpY1NoYXBlLCBjb25zdCBMYXlvdXRTCiAgICAg ICAgICAgICBib3hIZWlnaHQgLSB0b3AgLSBmbG9hdFZhbHVlRm9yTGVuZ3RoKGluc2V0LmJvdHRv bSgpLCBib3hIZWlnaHQpKTsKICAgICAgICAgRmxvYXRSZWN0IGxvZ2ljYWxSZWN0ID0gcGh5c2lj YWxSZWN0VG9Mb2dpY2FsKHJlY3QsIGxvZ2ljYWxCb3hTaXplLmhlaWdodCgpLCB3cml0aW5nTW9k ZSk7CiAKLSAgICAgICAgc2hhcGUgPSBjcmVhdGVJbnNldFNoYXBlKEZsb2F0Um91bmRlZFJlY3Qo bG9naWNhbFJlY3QsCi0gICAgICAgICAgICBpbnNldC50b3BMZWZ0UmFkaXVzKCkuZmxvYXRTaXpl KCksCi0gICAgICAgICAgICBpbnNldC50b3BSaWdodFJhZGl1cygpLmZsb2F0U2l6ZSgpLAotICAg ICAgICAgICAgaW5zZXQuYm90dG9tTGVmdFJhZGl1cygpLmZsb2F0U2l6ZSgpLAotICAgICAgICAg ICAgaW5zZXQuYm90dG9tUmlnaHRSYWRpdXMoKS5mbG9hdFNpemUoKSkpOworICAgICAgICBGbG9h dFJvdW5kZWRSZWN0OjpSYWRpaSBjb3JuZXJSYWRpaSgKKyAgICAgICAgICAgIGZsb2F0U2l6ZUZv ckxlbmd0aFNpemUoaW5zZXQudG9wTGVmdFJhZGl1cygpLCBib3hXaWR0aCwgYm94SGVpZ2h0KSwK KyAgICAgICAgICAgIGZsb2F0U2l6ZUZvckxlbmd0aFNpemUoaW5zZXQudG9wUmlnaHRSYWRpdXMo KSwgYm94V2lkdGgsIGJveEhlaWdodCksCisgICAgICAgICAgICBmbG9hdFNpemVGb3JMZW5ndGhT aXplKGluc2V0LmJvdHRvbUxlZnRSYWRpdXMoKSwgYm94V2lkdGgsIGJveEhlaWdodCksCisgICAg ICAgICAgICBmbG9hdFNpemVGb3JMZW5ndGhTaXplKGluc2V0LmJvdHRvbVJpZ2h0UmFkaXVzKCks IGJveFdpZHRoLCBib3hIZWlnaHQpKTsKKworICAgICAgICBzaGFwZSA9IGNyZWF0ZUluc2V0U2hh cGUoRmxvYXRSb3VuZGVkUmVjdChsb2dpY2FsUmVjdCwgY29ybmVyUmFkaWkpKTsKICAgICAgICAg YnJlYWs7CiAgICAgfQogCg== 223405 2014-02-06 16:38:46 -0800 2014-02-06 17:16:14 -0800 Patch for landing roundedinset.patch text/plain 8239 zoltan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjZjE4MzY3Li5kYzk3ZGZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDIt MDYgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBT aGFwZXNdIFJvdW5kZWQgSW5zZXRzIExldCBDb250ZW50IE92ZXJsYXAgU2hhcGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzg1MgorCisgICAgICAg IFJldmlld2VkIGJ5IEJlbSBKb25lcy1CZXkuCisKKyAgICAgICAgKiBmYXN0L3NoYXBlcy9zaGFw ZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLXJvdW5kZWQtaW5zZXQtZXhwZWN0ZWQuaHRt bDogQWRkZWQuCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hh cGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0Lmh0bWw6IEFkZGVkLgorCiAyMDE0LTAyLTA2ICBKb3Nl cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogQWRkIENvbnNvbGUgc3VwcG9ydCB0byBKU0NvbnRleHQgSW5zcGVjdGlvbgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0 c2lkZS1yb3VuZGVkLWluc2V0LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBl cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLXJvdW5kZWQtaW5zZXQtZXhwZWN0 ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44ODg0N2UyCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwz NSBAQAorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy5zaGFwZS1vdXRzaWRlIHsKKyAgICBwb3Np dGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAwcHg7CisgICAgbGVmdDogMHB4OworICAgIGZvbnQ6 IDEwcHggLyAxIEFoZW0sIHNhbnMtc2VyaWY7CisgICAgd2lkdGg6IDgwcHg7CisgICAgaGVpZ2h0 OiA4MHB4OworICAgIGJvcmRlci1yYWRpdXM6IDUwJTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBn cmVlbjsKKyAgICBmbG9hdDogbGVmdDsKK30KKzwvc3R5bGU+Cis8L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5PgorCis8ZGl2IGNsYXNzPSdzaGFwZS1vdXRzaWRlJz4KKyAgICA8c3BhbiBzdHlsZT0i bWFyZ2luLWxlZnQ6IDY2cHg7Ij48L3NwYW4+eDxici8+CisgICAgPHNwYW4gc3R5bGU9Im1hcmdp bi1sZWZ0OiA3NXB4OyI+PC9zcGFuPng8YnIvPgorICAgIDxzcGFuIHN0eWxlPSJtYXJnaW4tbGVm dDogNzlweDsiPjwvc3Bhbj54PGJyLz4KKyAgICA8c3BhbiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDgw cHg7Ij48L3NwYW4+eDxici8+CisgICAgPHNwYW4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA4MHB4OyI+ PC9zcGFuPng8YnIvPgorICAgIDxzcGFuIHN0eWxlPSJtYXJnaW4tbGVmdDogNzlweDsiPjwvc3Bh bj54PGJyLz4KKyAgICA8c3BhbiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDc1cHg7Ij48L3NwYW4+eDxi ci8+CisgICAgPHNwYW4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA2NnB4OyI+PC9zcGFuPng8YnIvPgor PC9kaXY+CisKKzxwIHN0eWxlPSJtYXJnaW4tdG9wOiAxMDBweDsiPlRoZSBibGFjayByZWN0YW5n bGVzIHNob3VsZCByZXNwZWN0IHRoZSBib3VuZGFyaWVzIG9mIHRoZSBzaGFwZS1vdXRzaWRlIChn cmVlbiBjaXJjbGUpLAordGh1cyB0aGV5IHNob3VsZG4ndCBvdmVybGFwIHdpdGggdGhlIGdyZWVu IGNpcmNsZS48L3A+Cis8cD48YSBocmVmPSdodHRwOi8vd2Via2l0Lm9yZy9iLzEyNzg1Mic+QnVn IDEyNzg1MjwvYT46IFtDU1MgU2hhcGVzXSBSb3VuZGVkIEluc2V0cyBMZXQgQ29udGVudCBPdmVy bGFwIFNoYXBlPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWlu c2V0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9z aGFwZS1vdXRzaWRlLXJvdW5kZWQtaW5zZXQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi5jNTNhNDQxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9z aGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0Lmh0 bWwKQEAgLTAsMCArMSw0MCBAQAorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy5jb250YWluZXIg eworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDBweDsKKyAgICBsZWZ0OiAwcHg7 CisgICAgd2lkdGg6IDEyMHB4OworICAgIGZvbnQ6IDEwcHggLyAxIEFoZW0sIHNhbnMtc2VyaWY7 Cit9Cisuc2hhcGUtb3V0c2lkZSB7CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBpbnNldCgw cHggcm91bmQgNTAlKTsKKyAgICB3aWR0aDogODBweDsKKyAgICBoZWlnaHQ6IDgwcHg7CisgICAg Ym9yZGVyLXJhZGl1czogNTAlOworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgIGZs b2F0OiBsZWZ0OworfQorPC9zdHlsZT4KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2 IGNsYXNzPSdjb250YWluZXInPgorICAgIDxkaXYgY2xhc3M9J3NoYXBlLW91dHNpZGUnPjwvZGl2 PgorICAgIHg8YnIvPgorICAgIHg8YnIvPgorICAgIHg8YnIvPgorICAgIHg8YnIvPgorICAgIHg8 YnIvPgorICAgIHg8YnIvPgorICAgIHg8YnIvPgorICAgIHg8YnIvPgorPC9kaXY+CisKKzxwIHN0 eWxlPSJtYXJnaW4tdG9wOiAxMDBweDsiPlRoZSBibGFjayByZWN0YW5nbGVzIHNob3VsZCByZXNw ZWN0IHRoZSBib3VuZGFyaWVzIG9mIHRoZSBzaGFwZS1vdXRzaWRlIChncmVlbiBjaXJjbGUpLAor dGh1cyB0aGV5IHNob3VsZG4ndCBvdmVybGFwIHdpdGggdGhlIGdyZWVuIGNpcmNsZS48L3A+Cis8 cD48YSBocmVmPSdodHRwOi8vd2Via2l0Lm9yZy9iLzEyNzg1Mic+QnVnIDEyNzg1MjwvYT46IFtD U1MgU2hhcGVzXSBSb3VuZGVkIEluc2V0cyBMZXQgQ29udGVudCBPdmVybGFwIFNoYXBlPC9wPgor PC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDJkMzA4YTYuLmM4M2IzZDcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxNC0wMi0wNiAgWm9sdGFuIEhvcnZhdGggIDx6 b2x0YW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBbQ1NTIFNoYXBlc10gUm91bmRlZCBJbnNldHMg TGV0IENvbnRlbnQgT3ZlcmxhcCBTaGFwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI3ODUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQmVtIEpvbmVz LUJleS4KKworICAgICAgICBVc2luZyBMZW5ndGhTaXplIHRvIEZsb2F0U2l6ZSBjb252ZXJzaW9u IGZyb20gTGVuZ3RoU2l6ZS5oIGxlYWQgdG8gbWlzY2FsY3VsYXRlZAorICAgICAgICBpbnNldCBi b3JkZXIgcmFkaXVzLCB3aGVuIHRoZSBib3JkZXIgcmFkaXVzIHdhcyBkZWZpbmVkIGJ5IHBlcmNl bnRhZ2VzLiBUaGlzIHBhdGNoCisgICAgICAgIGZpeGVzIHRoZSBiZWhhdmlvciBhbmQgcmVtb3Zl cyB0aGUgaW5jb3JyZWN0IGNvbnZlcnNpb24uCisKKyAgICAgICAgVGVzdDogZmFzdC9zaGFwZXMv c2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWluc2V0Lmh0bWwKKwor ICAgICAgICAqIGNzcy9MZW5ndGhGdW5jdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zmxv YXRTaXplRm9yTGVuZ3RoU2l6ZSk6IEFkZCBuZXcgaGVscGVyIGZ1bmN0aW9uIGZvciBMZW5ndGhT aXplIHRvIEZsb2F0U2l6ZSBjb252ZXJzaW9uLgorICAgICAgICAqIGNzcy9MZW5ndGhGdW5jdGlv bnMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9MZW5ndGhTaXplLmg6IFJlbW92ZSBmbG9hdFNpemUg Y29udmVyc2lvbi4KKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNoYXBlOjpjcmVhdGVTaGFwZSk6IFVzZSBuZXcgaGVscGVyIGZ1bmN0aW9u IHRvIGNhbGN1bGF0ZSB0aGUgcmlnaHQgd2l0aCBmb3IgdGhlIGluc2V0IGJvcmRlciByYWRpdXMu CisKIDIwMTQtMDItMDYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgQ29uc29sZSBzdXBwb3J0IHRvIEpTQ29udGV4dCBJ bnNwZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvTGVuZ3RoRnVuY3Rpb25z LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9MZW5ndGhGdW5jdGlvbnMuY3BwCmluZGV4IGFkYmEx MDAuLmE1MWJkNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9MZW5ndGhGdW5jdGlv bnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9MZW5ndGhGdW5jdGlvbnMuY3BwCkBAIC0y NSw3ICsyNSw3IEBACiAjaW5jbHVkZSAiTGVuZ3RoRnVuY3Rpb25zLmgiCiAKICNpbmNsdWRlICJM YXlvdXRVbml0LmgiCi0jaW5jbHVkZSAiTGVuZ3RoLmgiCisjaW5jbHVkZSAiTGVuZ3RoU2l6ZS5o IgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMjEw LDQgKzIxMCw5IEBAIGZsb2F0IGZsb2F0VmFsdWVGb3JMZW5ndGgoY29uc3QgTGVuZ3RoJiBsZW5n dGgsIGZsb2F0IG1heGltdW1WYWx1ZSwgUmVuZGVyVmlldyoKICAgICByZXR1cm4gMDsKIH0KIAor RmxvYXRTaXplIGZsb2F0U2l6ZUZvckxlbmd0aFNpemUoY29uc3QgTGVuZ3RoU2l6ZSYgbGVuZ3Ro U2l6ZSwgY29uc3QgRmxvYXRTaXplJiBib3hTaXplKQoreworICAgIHJldHVybiBGbG9hdFNpemUo ZmxvYXRWYWx1ZUZvckxlbmd0aChsZW5ndGhTaXplLndpZHRoKCksIGJveFNpemUud2lkdGgoKSks IGZsb2F0VmFsdWVGb3JMZW5ndGgobGVuZ3RoU2l6ZS5oZWlnaHQoKSwgYm94U2l6ZS5oZWlnaHQo KSkpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvTGVuZ3RoRnVuY3Rpb25zLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvTGVuZ3RoRnVu Y3Rpb25zLmgKaW5kZXggOWZjZjJlZi4uNmI0MTAyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL0xlbmd0aEZ1bmN0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9MZW5ndGhG dW5jdGlvbnMuaApAQCAtMjYsOSArMjYsMTEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitj bGFzcyBGbG9hdFNpemU7CiBjbGFzcyBMYXlvdXRVbml0OwogY2xhc3MgUmVuZGVyVmlldzsKIHN0 cnVjdCBMZW5ndGg7CitzdHJ1Y3QgTGVuZ3RoU2l6ZTsKIAogaW50IG1pbmltdW1JbnRWYWx1ZUZv ckxlbmd0aChjb25zdCBMZW5ndGgmLCBMYXlvdXRVbml0IG1heGltdW1WYWx1ZSwgUmVuZGVyVmll dyogPSAwLCBib29sIHJvdW5kUGVyY2VudGFnZXMgPSBmYWxzZSk7CiBpbnQgaW50VmFsdWVGb3JM ZW5ndGgoY29uc3QgTGVuZ3RoJiwgTGF5b3V0VW5pdCBtYXhpbXVtVmFsdWUsIFJlbmRlclZpZXcq ID0gMCwgYm9vbCByb3VuZFBlcmNlbnRhZ2VzID0gZmFsc2UpOwpAQCAtMzYsNiArMzgsNyBAQCBM YXlvdXRVbml0IG1pbmltdW1WYWx1ZUZvckxlbmd0aChjb25zdCBMZW5ndGgmLCBMYXlvdXRVbml0 IG1heGltdW1WYWx1ZSwgUmVuZGVyVgogTGF5b3V0VW5pdCB2YWx1ZUZvckxlbmd0aChjb25zdCBM ZW5ndGgmLCBMYXlvdXRVbml0IG1heGltdW1WYWx1ZSwgUmVuZGVyVmlldyogPSAwLCBib29sIHJv dW5kUGVyY2VudGFnZXMgPSBmYWxzZSk7CiBmbG9hdCBmbG9hdFZhbHVlRm9yTGVuZ3RoKGNvbnN0 IExlbmd0aCYsIExheW91dFVuaXQgbWF4aW11bVZhbHVlLCBSZW5kZXJWaWV3KiA9IDApOwogZmxv YXQgZmxvYXRWYWx1ZUZvckxlbmd0aChjb25zdCBMZW5ndGgmLCBmbG9hdCBtYXhpbXVtVmFsdWUs IFJlbmRlclZpZXcqID0gMCk7CitGbG9hdFNpemUgZmxvYXRTaXplRm9yTGVuZ3RoU2l6ZShjb25z dCBMZW5ndGhTaXplJiwgY29uc3QgRmxvYXRTaXplJik7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoU2l6ZS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoU2l6ZS5oCmluZGV4IGI0Y2VkYmMuLmNiYzJk NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xlbmd0aFNpemUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGhTaXplLmgKQEAgLTIxLDcgKzIxLDYgQEAK ICNpZm5kZWYgTGVuZ3RoU2l6ZV9oCiAjZGVmaW5lIExlbmd0aFNpemVfaAogCi0jaW5jbHVkZSAi RmxvYXRTaXplLmgiCiAjaW5jbHVkZSAiTGVuZ3RoLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK QEAgLTU0LDExICs1Myw2IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIExlbmd0aFNpemUobV93 aWR0aC5ibGVuZChmcm9tLndpZHRoKCksIHByb2dyZXNzKSwgbV9oZWlnaHQuYmxlbmQoZnJvbS5o ZWlnaHQoKSwgcHJvZ3Jlc3MpKTsKICAgICB9CiAKLSAgICBGbG9hdFNpemUgZmxvYXRTaXplKCkg Y29uc3QKLSAgICB7Ci0gICAgICAgIHJldHVybiBGbG9hdFNpemUobV93aWR0aC52YWx1ZSgpLCBt X2hlaWdodC52YWx1ZSgpKTsKLSAgICB9Ci0KIHByaXZhdGU6CiAgICAgTGVuZ3RoIG1fd2lkdGg7 CiAgICAgTGVuZ3RoIG1faGVpZ2h0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3NoYXBlcy9TaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1No YXBlLmNwcAppbmRleCBjOTEwNjZkLi5lYjE4NTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc2hhcGVzL1NoYXBlLmNwcApAQCAtMjMyLDExICsyMzIsMTQgQEAgUGFzc093blB0cjxTaGFw ZT4gU2hhcGU6OmNyZWF0ZVNoYXBlKGNvbnN0IEJhc2ljU2hhcGUqIGJhc2ljU2hhcGUsIGNvbnN0 IExheW91dFMKICAgICAgICAgICAgIGJveEhlaWdodCAtIHRvcCAtIGZsb2F0VmFsdWVGb3JMZW5n dGgoaW5zZXQuYm90dG9tKCksIGJveEhlaWdodCkpOwogICAgICAgICBGbG9hdFJlY3QgbG9naWNh bFJlY3QgPSBwaHlzaWNhbFJlY3RUb0xvZ2ljYWwocmVjdCwgbG9naWNhbEJveFNpemUuaGVpZ2h0 KCksIHdyaXRpbmdNb2RlKTsKIAotICAgICAgICBzaGFwZSA9IGNyZWF0ZUluc2V0U2hhcGUoRmxv YXRSb3VuZGVkUmVjdChsb2dpY2FsUmVjdCwKLSAgICAgICAgICAgIGluc2V0LnRvcExlZnRSYWRp dXMoKS5mbG9hdFNpemUoKSwKLSAgICAgICAgICAgIGluc2V0LnRvcFJpZ2h0UmFkaXVzKCkuZmxv YXRTaXplKCksCi0gICAgICAgICAgICBpbnNldC5ib3R0b21MZWZ0UmFkaXVzKCkuZmxvYXRTaXpl KCksCi0gICAgICAgICAgICBpbnNldC5ib3R0b21SaWdodFJhZGl1cygpLmZsb2F0U2l6ZSgpKSk7 CisgICAgICAgIEZsb2F0U2l6ZSBib3hTaXplKGJveFdpZHRoLCBib3hIZWlnaHQpOworICAgICAg ICBGbG9hdFJvdW5kZWRSZWN0OjpSYWRpaSBjb3JuZXJSYWRpaSgKKyAgICAgICAgICAgIGZsb2F0 U2l6ZUZvckxlbmd0aFNpemUoaW5zZXQudG9wTGVmdFJhZGl1cygpLCBib3hTaXplKSwKKyAgICAg ICAgICAgIGZsb2F0U2l6ZUZvckxlbmd0aFNpemUoaW5zZXQudG9wUmlnaHRSYWRpdXMoKSwgYm94 U2l6ZSksCisgICAgICAgICAgICBmbG9hdFNpemVGb3JMZW5ndGhTaXplKGluc2V0LmJvdHRvbUxl ZnRSYWRpdXMoKSwgYm94U2l6ZSksCisgICAgICAgICAgICBmbG9hdFNpemVGb3JMZW5ndGhTaXpl KGluc2V0LmJvdHRvbVJpZ2h0UmFkaXVzKCksIGJveFNpemUpKTsKKworICAgICAgICBzaGFwZSA9 IGNyZWF0ZUluc2V0U2hhcGUoRmxvYXRSb3VuZGVkUmVjdChsb2dpY2FsUmVjdCwgY29ybmVyUmFk aWkpKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogCg==