86763 2012-05-17 11:54:06 -0700 In vertical writing modes, pagination may split a line after a block shifts 2012-05-17 13:01:10 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mitz mitz eric webkit.review.bot oldest_to_newest 626796 0 mitz 2012-05-17 11:54:06 -0700 In vertical writing modes, pagination may split a line after a block shifts 626801 1 mitz 2012-05-17 11:55:33 -0700 <rdar://problem/11151649> 626809 2 142521 mitz 2012-05-17 11:58:22 -0700 Created attachment 142521 Make LayoutState::pageLogicalOffset() writing mode-aware 626886 3 mitz 2012-05-17 13:01:10 -0700 Fixed in <http://trac.webkit.org/r117484>. 142521 2012-05-17 11:58:22 -0700 2012-05-17 12:52:22 -0700 Make LayoutState::pageLogicalOffset() writing mode-aware bug-86763-20120517115825.patch text/plain 13303 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzQ3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA1LTE3ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgSW4gdmVydGljYWwgd3JpdGluZyBt b2RlcywgcGFnaW5hdGlvbiBtYXkgc3BsaXQgYSBsaW5lIGFmdGVyIGEgYmxvY2sgc2hpZnRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njc2MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3Qv bXVsdGljb2wvcGFnZUxvZ2ljYWxPZmZzZXQtdmVydGljYWwuaHRtbAorCisgICAgICAgIExheW91 dFN0YXRlOjpwYWdlTG9naWNhbE9mZnNldCgpIHdhcyByZXR1cm5pbmcgYm9ndXMgcmVzdWx0cyBp biB2ZXJ0aWNhbCB3cml0aW5nIG1vZGVzLAorICAgICAgICBiZWNhdXNlIGl0IHdhcyBhbHdheXMg dXNpbmcgcGh5c2ljYWwgaGVpZ2h0cy4gQ2hhbmdlZCBpdCB0byB0YWtlIGEgUmVuZGVyQm94IGFu ZCB1c2UgaXRzCisgICAgICAgIHdyaXRpbmcgbW9kZSB0byBjaG9vc2UgYmV0d2VlbiBoZWlnaHRz IGFuZCB3aWR0aHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0U3RhdGU6OnBhZ2VMb2dpY2FsT2Zmc2V0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dFN0YXRlOjphZGRGb3JjZWRDb2x1bW5CcmVhayk6CisgICAgICAgICog cmVuZGVyaW5nL0xheW91dFN0YXRlLmg6CisgICAgICAgIChMYXlvdXRTdGF0ZSk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrOjpsYXlvdXRCbG9jayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bWFya0Zv clBhZ2luYXRpb25SZWxheW91dElmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrOjpsYXlvdXRDb2x1bW5zKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjphcHBs eUJlZm9yZUJyZWFrKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjphcHBseUFmdGVy QnJlYWspOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlv dXRCbG9jayk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRhYmxlOjpsYXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJUYWJsZVJvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZVJvdzo6bGF5b3V0 KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6bGF5b3V0Um93cyk6CisKIDIwMTItMDUtMTYg IEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIE1ha2UgUGx1Z2lu SW5mb1N0b3JlIHByb3Blcmx5IHRocmVhZC1zYWZlLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0xheW91dFN0YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvTGF5b3V0U3RhdGUuY3BwCShyZXZpc2lvbiAxMTc0NjApCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTYsMTYgKzE5 NiwxOCBAQCB2b2lkIExheW91dFN0YXRlOjpjbGVhclBhZ2luYXRpb25JbmZvcm1hCiAgICAgbV9j b2x1bW5JbmZvID0gbV9uZXh0LT5tX2NvbHVtbkluZm87CiB9CiAKLUxheW91dFVuaXQgTGF5b3V0 U3RhdGU6OnBhZ2VMb2dpY2FsT2Zmc2V0KExheW91dFVuaXQgY2hpbGRMb2dpY2FsT2Zmc2V0KSBj b25zdAorTGF5b3V0VW5pdCBMYXlvdXRTdGF0ZTo6cGFnZUxvZ2ljYWxPZmZzZXQoUmVuZGVyQm94 KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGlsZExvZ2ljYWxPZmZzZXQpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIG1fbGF5b3V0T2Zmc2V0LmhlaWdodCgpICsgY2hpbGRMb2dpY2FsT2Zmc2V0IC0gbV9wYWdl T2Zmc2V0LmhlaWdodCgpOworICAgIGlmIChjaGlsZC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSkKKyAgICAgICAgcmV0dXJuIG1fbGF5b3V0T2Zmc2V0LmhlaWdodCgpICsgY2hpbGRMb2dpY2Fs T2Zmc2V0IC0gbV9wYWdlT2Zmc2V0LmhlaWdodCgpOworICAgIHJldHVybiBtX2xheW91dE9mZnNl dC53aWR0aCgpICsgY2hpbGRMb2dpY2FsT2Zmc2V0IC0gbV9wYWdlT2Zmc2V0LndpZHRoKCk7CiB9 CiAKLXZvaWQgTGF5b3V0U3RhdGU6OmFkZEZvcmNlZENvbHVtbkJyZWFrKExheW91dFVuaXQgY2hp bGRMb2dpY2FsT2Zmc2V0KQordm9pZCBMYXlvdXRTdGF0ZTo6YWRkRm9yY2VkQ29sdW1uQnJlYWso UmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGlsZExvZ2ljYWxPZmZzZXQpCiB7CiAgICAg aWYgKCFtX2NvbHVtbkluZm8gfHwgbV9jb2x1bW5JbmZvLT5jb2x1bW5IZWlnaHQoKSkKICAgICAg ICAgcmV0dXJuOwotICAgIG1fY29sdW1uSW5mby0+YWRkRm9yY2VkQnJlYWsocGFnZUxvZ2ljYWxP ZmZzZXQoY2hpbGRMb2dpY2FsT2Zmc2V0KSk7CisgICAgbV9jb2x1bW5JbmZvLT5hZGRGb3JjZWRC cmVhayhwYWdlTG9naWNhbE9mZnNldChjaGlsZCwgY2hpbGRMb2dpY2FsT2Zmc2V0KSk7CiB9CiAK IHZvaWQgTGF5b3V0U3RhdGU6OnByb3BhZ2F0ZUxpbmVHcmlkSW5mbyhSZW5kZXJCb3gqIHJlbmRl cmVyKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmgJKHJldmlzaW9u IDExNzQ2MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC03NCw5ICs3NCw5IEBAIHB1YmxpYzoKICAgICAKICAgICAvLyBUaGUgcGFn ZSBsb2dpY2FsIG9mZnNldCBpcyB0aGUgb2JqZWN0J3Mgb2Zmc2V0IGZyb20gdGhlIHRvcCBvZiB0 aGUgcGFnZSBpbiB0aGUgcGFnZSBwcm9ncmVzc2lvbgogICAgIC8vIGRpcmVjdGlvbiAoc28gYW4g eC1vZmZzZXQgaW4gdmVydGljYWwgdGV4dCBhbmQgYSB5LW9mZnNldCBmb3IgaG9yaXpvbnRhbCB0 ZXh0KS4KLSAgICBMYXlvdXRVbml0IHBhZ2VMb2dpY2FsT2Zmc2V0KExheW91dFVuaXQgY2hpbGRM b2dpY2FsT2Zmc2V0KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IHBhZ2VMb2dpY2FsT2Zmc2V0KFJl bmRlckJveCosIExheW91dFVuaXQgY2hpbGRMb2dpY2FsT2Zmc2V0KSBjb25zdDsKIAotICAgIHZv aWQgYWRkRm9yY2VkQ29sdW1uQnJlYWsoTGF5b3V0VW5pdCBjaGlsZExvZ2ljYWxPZmZzZXQpOwor ICAgIHZvaWQgYWRkRm9yY2VkQ29sdW1uQnJlYWsoUmVuZGVyQm94KiwgTGF5b3V0VW5pdCBjaGls ZExvZ2ljYWxPZmZzZXQpOwogICAgIAogICAgIExheW91dFVuaXQgcGFnZUxvZ2ljYWxIZWlnaHQo KSBjb25zdCB7IHJldHVybiBtX3BhZ2VMb2dpY2FsSGVpZ2h0OyB9CiAgICAgYm9vbCBwYWdlTG9n aWNhbEhlaWdodENoYW5nZWQoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VMb2dpY2FsSGVpZ2h0Q2hh bmdlZDsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShy ZXZpc2lvbiAxMTc0NjApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAzLDcgKzE1MDMsNyBAQCB2b2lkIFJlbmRlckJsb2Nr OjpsYXlvdXRCbG9jayhib29sIHJlbGF5CiAgICAgc3RhdGVQdXNoZXIucG9wKCk7CiAKICAgICBp ZiAocmVuZGVyVmlldy0+bGF5b3V0U3RhdGUoKS0+bV9wYWdlTG9naWNhbEhlaWdodCkKLSAgICAg ICAgc2V0UGFnZUxvZ2ljYWxPZmZzZXQocmVuZGVyVmlldy0+bGF5b3V0U3RhdGUoKS0+cGFnZUxv Z2ljYWxPZmZzZXQobG9naWNhbFRvcCgpKSk7CisgICAgICAgIHNldFBhZ2VMb2dpY2FsT2Zmc2V0 KHJlbmRlclZpZXctPmxheW91dFN0YXRlKCktPnBhZ2VMb2dpY2FsT2Zmc2V0KHRoaXMsIGxvZ2lj YWxUb3AoKSkpOwogCiAgICAgdXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKTsKIApAQCAtMjQ3OCw3ICsy NDc4LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bWFya0ZvclBhZ2luYXRpb25SZWxheQogICAgIGlm IChuZWVkc0xheW91dCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAodmlldygpLT5sYXlv dXRTdGF0ZSgpLT5wYWdlTG9naWNhbEhlaWdodENoYW5nZWQoKSB8fCAodmlldygpLT5sYXlvdXRT dGF0ZSgpLT5wYWdlTG9naWNhbEhlaWdodCgpICYmIHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+cGFn ZUxvZ2ljYWxPZmZzZXQobG9naWNhbFRvcCgpKSAhPSBwYWdlTG9naWNhbE9mZnNldCgpKSkKKyAg ICBpZiAodmlldygpLT5sYXlvdXRTdGF0ZSgpLT5wYWdlTG9naWNhbEhlaWdodENoYW5nZWQoKSB8 fCAodmlldygpLT5sYXlvdXRTdGF0ZSgpLT5wYWdlTG9naWNhbEhlaWdodCgpICYmIHZpZXcoKS0+ bGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxPZmZzZXQodGhpcywgbG9naWNhbFRvcCgpKSAhPSBw YWdlTG9naWNhbE9mZnNldCgpKSkKICAgICAgICAgc2V0Q2hpbGROZWVkc0xheW91dCh0cnVlLCBN YXJrT25seVRoaXMpOwogfQogCkBAIC00OTM4LDcgKzQ5MzgsNyBAQCBib29sIFJlbmRlckJsb2Nr OjpsYXlvdXRDb2x1bW5zKGJvb2wgaGFzCiAgICAgICAgICAgICAvLyBtYXhpbXVtIHBhZ2UgYnJl YWsgZGlzdGFuY2UuCiAgICAgICAgICAgICBpZiAoIXBhZ2VMb2dpY2FsSGVpZ2h0KSB7CiAgICAg ICAgICAgICAgICAgTGF5b3V0VW5pdCBkaXN0YW5jZUJldHdlZW5CcmVha3MgPSBtYXg8TGF5b3V0 VW5pdD4oY29sSW5mby0+bWF4aW11bURpc3RhbmNlQmV0d2VlbkZvcmNlZEJyZWFrcygpLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxPZmZzZXQoYm9yZGVyQmVm b3JlKCkgKyBwYWRkaW5nQmVmb3JlKCkgKyBjb250ZW50TG9naWNhbEhlaWdodCgpKSAtIGNvbElu Zm8tPmZvcmNlZEJyZWFrT2Zmc2V0KCkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZpZXcoKS0+bGF5b3V0U3RhdGUo KS0+cGFnZUxvZ2ljYWxPZmZzZXQodGhpcywgYm9yZGVyQmVmb3JlKCkgKyBwYWRkaW5nQmVmb3Jl KCkgKyBjb250ZW50TG9naWNhbEhlaWdodCgpKSAtIGNvbEluZm8tPmZvcmNlZEJyZWFrT2Zmc2V0 KCkpOwogICAgICAgICAgICAgICAgIGNvbHVtbkhlaWdodCA9IG1heChjb2xJbmZvLT5taW5pbXVt Q29sdW1uSGVpZ2h0KCksIGRpc3RhbmNlQmV0d2VlbkJyZWFrcyk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0gZWxzZSBpZiAoY29udGVudExvZ2ljYWxIZWlnaHQoKSA+IGJvdW5kZWRNdWx0aXBs eShwYWdlTG9naWNhbEhlaWdodCwgZGVzaXJlZENvbHVtbkNvdW50KSkgewpAQCAtNjYwMiw3ICs2 NjAyLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJCbG9jazo6YXBwbHlCZWZvcmVCcmVhawogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB8fCAoY2hlY2tSZWdpb25CcmVha3MgJiYgY2hpbGQtPnN0 eWxlKCktPnJlZ2lvbkJyZWFrQmVmb3JlKCkgPT0gUEJBTFdBWVMpOwogICAgIGlmIChjaGVja0Jl Zm9yZUFsd2F5cyAmJiBpbk5vcm1hbEZsb3coY2hpbGQpICYmIGhhc05leHRQYWdlKGxvZ2ljYWxP ZmZzZXQsIEluY2x1ZGVQYWdlQm91bmRhcnkpKSB7CiAgICAgICAgIGlmIChjaGVja0NvbHVtbkJy ZWFrcykKLSAgICAgICAgICAgIHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+YWRkRm9yY2VkQ29sdW1u QnJlYWsobG9naWNhbE9mZnNldCk7CisgICAgICAgICAgICB2aWV3KCktPmxheW91dFN0YXRlKCkt PmFkZEZvcmNlZENvbHVtbkJyZWFrKGNoaWxkLCBsb2dpY2FsT2Zmc2V0KTsKICAgICAgICAgcmV0 dXJuIG5leHRQYWdlTG9naWNhbFRvcChsb2dpY2FsT2Zmc2V0LCBJbmNsdWRlUGFnZUJvdW5kYXJ5 KTsKICAgICB9CiAgICAgcmV0dXJuIGxvZ2ljYWxPZmZzZXQ7CkBAIC02NjE5LDcgKzY2MTksNyBA QCBMYXlvdXRVbml0IFJlbmRlckJsb2NrOjphcHBseUFmdGVyQnJlYWsoCiAgICAgaWYgKGNoZWNr QWZ0ZXJBbHdheXMgJiYgaW5Ob3JtYWxGbG93KGNoaWxkKSAmJiBoYXNOZXh0UGFnZShsb2dpY2Fs T2Zmc2V0LCBJbmNsdWRlUGFnZUJvdW5kYXJ5KSkgewogICAgICAgICBtYXJnaW5JbmZvLnNldE1h cmdpbkFmdGVyUXVpcmsodHJ1ZSk7IC8vIENhdXNlIG1hcmdpbnMgdG8gYmUgZGlzY2FyZGVkIGZv ciBhbnkgZm9sbG93aW5nIGNvbnRlbnQuCiAgICAgICAgIGlmIChjaGVja0NvbHVtbkJyZWFrcykK LSAgICAgICAgICAgIHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+YWRkRm9yY2VkQ29sdW1uQnJlYWso bG9naWNhbE9mZnNldCk7CisgICAgICAgICAgICB2aWV3KCktPmxheW91dFN0YXRlKCktPmFkZEZv cmNlZENvbHVtbkJyZWFrKGNoaWxkLCBsb2dpY2FsT2Zmc2V0KTsKICAgICAgICAgcmV0dXJuIG5l eHRQYWdlTG9naWNhbFRvcChsb2dpY2FsT2Zmc2V0LCBJbmNsdWRlUGFnZUJvdW5kYXJ5KTsKICAg ICB9CiAgICAgcmV0dXJuIGxvZ2ljYWxPZmZzZXQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAkocmV2 aXNpb24gMTE3NDYwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0 ZWRGbGV4aWJsZUJveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwMSw3ICszMDEsNyBAQCB2b2lk IFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0CiAgICAgdXBkYXRlTGF5ZXJUcmFu c2Zvcm0oKTsKIAogICAgIGlmICh2aWV3KCktPmxheW91dFN0YXRlKCktPnBhZ2VMb2dpY2FsSGVp Z2h0KCkpCi0gICAgICAgIHNldFBhZ2VMb2dpY2FsT2Zmc2V0KHZpZXcoKS0+bGF5b3V0U3RhdGUo KS0+cGFnZUxvZ2ljYWxPZmZzZXQobG9naWNhbFRvcCgpKSk7CisgICAgICAgIHNldFBhZ2VMb2dp Y2FsT2Zmc2V0KHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxPZmZzZXQodGhpcywg bG9naWNhbFRvcCgpKSk7CiAKICAgICAvLyBVcGRhdGUgb3VyIHNjcm9sbGJhcnMgaWYgd2UncmUg b3ZlcmZsb3c6YXV0by9zY3JvbGwvaGlkZGVuIG5vdyB0aGF0IHdlIGtub3cgaWYKICAgICAvLyB3 ZSBvdmVyZmxvdyBvciBub3QuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU YWJsZS5jcHAJKHJldmlzaW9uIDExNzQ2MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUYWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1Niw3ICs0NTYsNyBAQCB2b2lkIFJl bmRlclRhYmxlOjpsYXlvdXQoKQogICAgIHN0YXRlUHVzaGVyLnBvcCgpOwogCiAgICAgaWYgKHZp ZXcoKS0+bGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxIZWlnaHQoKSkKLSAgICAgICAgc2V0UGFn ZUxvZ2ljYWxPZmZzZXQodmlldygpLT5sYXlvdXRTdGF0ZSgpLT5wYWdlTG9naWNhbE9mZnNldChs b2dpY2FsVG9wKCkpKTsKKyAgICAgICAgc2V0UGFnZUxvZ2ljYWxPZmZzZXQodmlldygpLT5sYXlv dXRTdGF0ZSgpLT5wYWdlTG9naWNhbE9mZnNldCh0aGlzLCBsb2dpY2FsVG9wKCkpKTsKIAogICAg IGJvb2wgZGlkRnVsbFJlcGFpbnQgPSByZXBhaW50ZXIucmVwYWludEFmdGVyTGF5b3V0KCk7CiAg ICAgLy8gUmVwYWludCB3aXRoIG91ciBuZXcgYm91bmRzIGlmIHRoZXkgYXJlIGRpZmZlcmVudCBm cm9tIG91ciBvbGQgYm91bmRzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRhYmxlUm93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGFibGVSb3cuY3BwCShyZXZpc2lvbiAxMTc0NjApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVSb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDgsNyArMTQ4LDcg QEAgdm9pZCBSZW5kZXJUYWJsZVJvdzo6bGF5b3V0KCkKICAgICBmb3IgKFJlbmRlck9iamVjdCog Y2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygp KSB7CiAgICAgICAgIGlmIChjaGlsZC0+aXNUYWJsZUNlbGwoKSkgewogICAgICAgICAgICAgUmVu ZGVyVGFibGVDZWxsKiBjZWxsID0gdG9SZW5kZXJUYWJsZUNlbGwoY2hpbGQpOwotICAgICAgICAg ICAgaWYgKCFjZWxsLT5uZWVkc0xheW91dCgpICYmIHBhZ2luYXRlZCAmJiB2aWV3KCktPmxheW91 dFN0YXRlKCktPnBhZ2VMb2dpY2FsSGVpZ2h0KCkgJiYgdmlldygpLT5sYXlvdXRTdGF0ZSgpLT5w YWdlTG9naWNhbE9mZnNldChjZWxsLT5sb2dpY2FsVG9wKCkpICE9IGNlbGwtPnBhZ2VMb2dpY2Fs T2Zmc2V0KCkpCisgICAgICAgICAgICBpZiAoIWNlbGwtPm5lZWRzTGF5b3V0KCkgJiYgcGFnaW5h dGVkICYmIHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxIZWlnaHQoKSAmJiB2aWV3 KCktPmxheW91dFN0YXRlKCktPnBhZ2VMb2dpY2FsT2Zmc2V0KGNlbGwsIGNlbGwtPmxvZ2ljYWxU b3AoKSkgIT0gY2VsbC0+cGFnZUxvZ2ljYWxPZmZzZXQoKSkKICAgICAgICAgICAgICAgICBjZWxs LT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUsIE1hcmtPbmx5VGhpcyk7CiAKICAgICAgICAgICAg IGlmIChjaGlsZC0+bmVlZHNMYXlvdXQoKSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAJKHJldmlzaW9uIDExNzQ2MCkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC02NjEsNyArNjYxLDcgQEAgdm9pZCBSZW5kZXJUYWJsZVNlY3Rpb246OmxheW91dFJv d3MoKQogICAgICAgICAgICAgaWYgKGludHJpbnNpY1BhZGRpbmdCZWZvcmUgIT0gb2xkSW50cmlu c2ljUGFkZGluZ0JlZm9yZSB8fCBpbnRyaW5zaWNQYWRkaW5nQWZ0ZXIgIT0gb2xkSW50cmluc2lj UGFkZGluZ0FmdGVyKQogICAgICAgICAgICAgICAgIGNlbGwtPnNldE5lZWRzTGF5b3V0KHRydWUs IE1hcmtPbmx5VGhpcyk7CiAKLSAgICAgICAgICAgIGlmICghY2VsbC0+bmVlZHNMYXlvdXQoKSAm JiB2aWV3KCktPmxheW91dFN0YXRlKCktPnBhZ2VMb2dpY2FsSGVpZ2h0KCkgJiYgdmlldygpLT5s YXlvdXRTdGF0ZSgpLT5wYWdlTG9naWNhbE9mZnNldChjZWxsLT5sb2dpY2FsVG9wKCkpICE9IGNl bGwtPnBhZ2VMb2dpY2FsT2Zmc2V0KCkpCisgICAgICAgICAgICBpZiAoIWNlbGwtPm5lZWRzTGF5 b3V0KCkgJiYgdmlldygpLT5sYXlvdXRTdGF0ZSgpLT5wYWdlTG9naWNhbEhlaWdodCgpICYmIHZp ZXcoKS0+bGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxPZmZzZXQoY2VsbCwgY2VsbC0+bG9naWNh bFRvcCgpKSAhPSBjZWxsLT5wYWdlTG9naWNhbE9mZnNldCgpKQogICAgICAgICAgICAgICAgIGNl bGwtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgTWFya09ubHlUaGlzKTsKIAogICAgICAgICAg ICAgY2VsbC0+bGF5b3V0SWZOZWVkZWQoKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzQ3MikKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisy MDEyLTA1LTE3ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgSW4g dmVydGljYWwgd3JpdGluZyBtb2RlcywgcGFnaW5hdGlvbiBtYXkgc3BsaXQgYSBsaW5lIGFmdGVy IGEgYmxvY2sgc2hpZnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04Njc2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogZmFzdC9tdWx0aWNvbC9wYWdlTG9naWNhbE9mZnNldC12ZXJ0aWNhbC1leHBlY3Rl ZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29sL3BhZ2VMb2dpY2FsT2Zmc2V0 LXZlcnRpY2FsLmh0bWw6IEFkZGVkLgorCiAyMDEyLTA1LTE3ICBSYXBoYWVsIEt1Ym8gZGEgQ29z dGEgIDxyYWt1Y29Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbRUZMXSBHYXJkZW5pbmcsIHVuc2tp cCBhbm90aGVyIHBhc3NpbmcgdGVzdCBhZnRlciByMTE3NDI2LgpJbmRleDogTGF5b3V0VGVzdHMv ZmFzdC9tdWx0aWNvbC9wYWdlTG9naWNhbE9mZnNldC12ZXJ0aWNhbC1leHBlY3RlZC5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvcGFnZUxvZ2ljYWxPZmZzZXQt dmVydGljYWwtZXhwZWN0ZWQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3Qv bXVsdGljb2wvcGFnZUxvZ2ljYWxPZmZzZXQtdmVydGljYWwtZXhwZWN0ZWQuaHRtbAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSwzMiBAQAorPHN0eWxlPg0KKyAgICAuY29udGFpbmVyIHsNCisgICAg ICAgIGJhY2tncm91bmQtY29sb3I6IGxpZ2h0Ymx1ZTsNCisgICAgICAgIGhlaWdodDogMjAwcHg7 DQorICAgICAgICB3aWR0aDogMTAwcHg7DQorICAgICAgICAtd2Via2l0LWNvbHVtbnM6IDI7DQor ICAgICAgICAtd2Via2l0LWNvbHVtbi1nYXA6IDA7DQorICAgICAgICBtYXJnaW46IDhweDsNCisg ICAgfQ0KKw0KKyAgICAubWFyZ2luLWJlZm9yZSB7DQorICAgICAgICB3aWR0aDogOTBweDsNCisg ICAgfQ0KKw0KKyAgICAudGVzdCB7DQorICAgICAgICBmb250OiAyMHB4IGFoZW07DQorICAgICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3c7DQorICAgIH0NCis8L3N0eWxlPg0KKzxkaXYgY2xh c3M9ImNvbnRhaW5lciIgc3R5bGU9Ii13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsi Pg0KKyAgICA8ZGl2Pg0KKyAgICAgICAgPGRpdiBjbGFzcz0ibWFyZ2luLWJlZm9yZSI+PC9kaXY+ DQorICAgICAgICA8ZGl2IGNsYXNzPSJ0ZXN0Ij5UZXN0PC9kaXY+DQorICAgIDwvZGl2Pg0KKzwv ZGl2Pg0KKw0KKzxkaXYgY2xhc3M9ImNvbnRhaW5lciIgc3R5bGU9Ii13ZWJraXQtd3JpdGluZy1t b2RlOiB2ZXJ0aWNhbC1scjsiPg0KKyAgICA8ZGl2Pg0KKyAgICAgICAgPGRpdiBjbGFzcz0ibWFy Z2luLWJlZm9yZSI+PC9kaXY+DQorICAgICAgICA8ZGl2IGNsYXNzPSJ0ZXN0Ij5UZXN0PC9kaXY+ DQorICAgIDwvZGl2Pg0KKzwvZGl2Pg0KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wv cGFnZUxvZ2ljYWxPZmZzZXQtdmVydGljYWwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9mYXN0L211bHRpY29sL3BhZ2VMb2dpY2FsT2Zmc2V0LXZlcnRpY2FsLmh0bWwJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3BhZ2VMb2dpY2FsT2Zmc2V0LXZlcnRp Y2FsLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzMgQEAKKzxzdHlsZT4NCisgICAgLmNv bnRhaW5lciB7DQorICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBsaWdodGJsdWU7DQorICAgICAg ICBoZWlnaHQ6IDIwMHB4Ow0KKyAgICAgICAgd2lkdGg6IDEwMHB4Ow0KKyAgICAgICAgLXdlYmtp dC1jb2x1bW5zOiAyOw0KKyAgICAgICAgLXdlYmtpdC1jb2x1bW4tZ2FwOiAwOw0KKyAgICAgICAg bWFyZ2luOiA4cHg7DQorICAgIH0NCisNCisgICAgLm1hcmdpbi1iZWZvcmUgew0KKyAgICAgICAg LXdlYmtpdC1tYXJnaW4tYmVmb3JlOiAzMHB4Ow0KKyAgICAgICAgd2lkdGg6IDYwcHg7DQorICAg IH0NCisNCisgICAgLnRlc3Qgew0KKyAgICAgICAgZm9udDogMjBweCBhaGVtOw0KKyAgICAgICAg YmFja2dyb3VuZC1jb2xvcjogeWVsbG93Ow0KKyAgICB9DQorPC9zdHlsZT4NCis8ZGl2IGNsYXNz PSJjb250YWluZXIiIHN0eWxlPSItd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7Ij4N CisgICAgPGRpdj4NCisgICAgICAgIDxkaXYgY2xhc3M9Im1hcmdpbi1iZWZvcmUiPjwvZGl2Pg0K KyAgICAgICAgPGRpdiBjbGFzcz0idGVzdCI+VGVzdDwvZGl2Pg0KKyAgICA8L2Rpdj4NCis8L2Rp dj4NCisNCis8ZGl2IGNsYXNzPSJjb250YWluZXIiIHN0eWxlPSItd2Via2l0LXdyaXRpbmctbW9k ZTogdmVydGljYWwtbHI7Ij4NCisgICAgPGRpdj4NCisgICAgICAgIDxkaXYgY2xhc3M9Im1hcmdp bi1iZWZvcmUiPjwvZGl2Pg0KKyAgICAgICAgPGRpdiBjbGFzcz0idGVzdCI+VGVzdDwvZGl2Pg0K KyAgICA8L2Rpdj4NCis8L2Rpdj4NCg==