46824 2010-09-29 11:16:04 -0700 Convert layoutBlockChild to be block-flow-aware. 2010-09-29 12:32:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt oldest_to_newest 287005 0 hyatt 2010-09-29 11:16:04 -0700 Convert layoutBlockChild to be block-flow-aware. None of the functions it calls are converted yet. 287007 1 69225 hyatt 2010-09-29 11:18:01 -0700 Created attachment 69225 Patch 287060 2 hyatt 2010-09-29 12:32:54 -0700 Fixed in r68678. 69225 2010-09-29 11:18:01 -0700 2010-09-29 12:08:25 -0700 Patch patch.txt text/plain 14968 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODY2OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDktMjkgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjgyNAorICAgICAgICAKKyAgICAg ICAgQ29udmVydCBsYXlvdXRCbG9ja0NoaWxkIChidXQgbm90IHRoZSBmdW5jdGlvbnMgaXQgY2Fs bHMpIHRvIGJlIGJsb2NrLWZsb3ctYXdhcmUuCisKKyAgICAgICAgZmFzdC9ibG9ja2Zsb3cvcm9v dC1sci5odG1sIHByb2dyZXNzZXMgYXMgYSByZXN1bHQgb2YgdGhpcyBjaGFuZ2UuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy QmxvY2s6OmVzdGltYXRlTG9naWNhbFRvcFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjpkZXRlcm1pbmVMb2dpY2FsTGVmdFBvc2l0aW9uRm9yQ2hpbGQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnNldExvZ2ljYWxUb3BGb3JDaGlsZCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2tDaGlsZCk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bG9n aWNhbEhlaWdodEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsb2dp Y2FsVG9wRm9yQ2hpbGQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAx MC0wOS0yOSAgTWF0dCBQZXJyeSAgPG1wY29tcGxldGVAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAJKHJldmlzaW9uIDY4NjU0KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xNjEwLDcgKzE2MTAsNyBAQCBpbnQgUmVuZGVyQmxvY2s6OmNs ZWFyRmxvYXRzSWZOZWVkZWQoUmVuCiAgICAgcmV0dXJuIHlQb3MgKyBoZWlnaHRJbmNyZWFzZTsK IH0KIAotaW50IFJlbmRlckJsb2NrOjplc3RpbWF0ZVZlcnRpY2FsUG9zaXRpb24oUmVuZGVyQm94 KiBjaGlsZCwgY29uc3QgTWFyZ2luSW5mbyYgbWFyZ2luSW5mbykKK2ludCBSZW5kZXJCbG9jazo6 ZXN0aW1hdGVMb2dpY2FsVG9wUG9zaXRpb24oUmVuZGVyQm94KiBjaGlsZCwgY29uc3QgTWFyZ2lu SW5mbyYgbWFyZ2luSW5mbykKIHsKICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBlbGltaW5hdGUg dGhlIGVzdGltYXRpb24gb2YgdmVydGljYWwgcG9zaXRpb24sIGJlY2F1c2Ugd2hlbiBpdCdzIHdy b25nIHdlIHNvbWV0aW1lcyB0cmlnZ2VyIGEgcGF0aG9sb2dpY2FsCiAgICAgLy8gcmVsYXlvdXQg aWYgdGhlcmUgYXJlIGludHJ1ZGluZyBmbG9hdHMuCkBAIC0xNjQzLDcgKzE2NDMsNyBAQCBpbnQg UmVuZGVyQmxvY2s6OmVzdGltYXRlVmVydGljYWxQb3NpdGlvCiAgICAgcmV0dXJuIHlQb3NFc3Rp bWF0ZTsKIH0KIAotdm9pZCBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lSG9yaXpvbnRhbFBvc2l0aW9u KFJlbmRlckJveCogY2hpbGQpCit2b2lkIFJlbmRlckJsb2NrOjpkZXRlcm1pbmVMb2dpY2FsTGVm dFBvc2l0aW9uRm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCkKIHsKICAgICBpbnQgeFBvcyA9IGJv cmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCk7CiAgICAgaWYgKHN0eWxlKCktPmRpcmVjdGlvbigp ID09IExUUikgewpAQCAtMTczMyw2ICsxNzMzLDE3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmhhbmRs ZUFmdGVyU2lkZU9mQmxvY2sKICAgICBzZXRDb2xsYXBzZWRCb3R0b21NYXJnaW4obWFyZ2luSW5m byk7CiB9CiAKK3ZvaWQgUmVuZGVyQmxvY2s6OnNldExvZ2ljYWxUb3BGb3JDaGlsZChSZW5kZXJC b3gqIGNoaWxkLCBpbnQgbG9naWNhbFRvcCkKK3sKKyAgICBpZiAoc3R5bGUoKS0+aXNWZXJ0aWNh bEJsb2NrRmxvdygpKSB7CisgICAgICAgIHZpZXcoKS0+YWRkTGF5b3V0RGVsdGEoSW50U2l6ZSgw LCBjaGlsZC0+eSgpIC0gbG9naWNhbFRvcCkpOworICAgICAgICBjaGlsZC0+c2V0TG9jYXRpb24o Y2hpbGQtPngoKSwgbG9naWNhbFRvcCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgdmlldygpLT5h ZGRMYXlvdXREZWx0YShJbnRTaXplKGNoaWxkLT54KCkgLSBsb2dpY2FsVG9wLCAwKSk7CisgICAg ICAgIGNoaWxkLT5zZXRMb2NhdGlvbihsb2dpY2FsVG9wLCBjaGlsZC0+eSgpKTsKKyAgICB9Cit9 CisKIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dEJsb2NrQ2hpbGRyZW4oYm9vbCByZWxheW91dENo aWxkcmVuLCBpbnQmIG1heEZsb2F0Qm90dG9tKQogewogICAgIGlmIChnUGVyY2VudEhlaWdodERl c2NlbmRhbnRzTWFwKSB7CkBAIC0xODA1LDQ4ICsxODE2LDUwIEBAIHZvaWQgUmVuZGVyQmxvY2s6 OmxheW91dEJsb2NrQ2hpbGRyZW4oYm8KIAogdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2tD aGlsZChSZW5kZXJCb3gqIGNoaWxkLCBNYXJnaW5JbmZvJiBtYXJnaW5JbmZvLCBpbnQmIHByZXZp b3VzRmxvYXRCb3R0b20sIGludCYgbWF4RmxvYXRCb3R0b20pCiB7Ci0gICAgaW50IG9sZFRvcFBv c01hcmdpbiA9IG1heFBvc01hcmdpbkJlZm9yZSgpOwotICAgIGludCBvbGRUb3BOZWdNYXJnaW4g PSBtYXhOZWdNYXJnaW5CZWZvcmUoKTsKKyAgICBpbnQgb2xkUG9zTWFyZ2luQmVmb3JlID0gbWF4 UG9zTWFyZ2luQmVmb3JlKCk7CisgICAgaW50IG9sZE5lZ01hcmdpbkJlZm9yZSA9IG1heE5lZ01h cmdpbkJlZm9yZSgpOwogCi0gICAgLy8gVGhlIGNoaWxkIGlzIGEgbm9ybWFsIGZsb3cgb2JqZWN0 LiAgQ29tcHV0ZSBpdHMgdmVydGljYWwgbWFyZ2lucyBub3cuCisgICAgLy8gVGhlIGNoaWxkIGlz IGEgbm9ybWFsIGZsb3cgb2JqZWN0LiAgQ29tcHV0ZSB0aGUgbWFyZ2lucyB3ZSB3aWxsIHVzZSBm b3IgY29sbGFwc2luZyBub3cuCiAgICAgY2hpbGQtPmNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdp bnModGhpcyk7CiAKLSAgICAvLyBEbyBub3QgYWxsb3cgYSBjb2xsYXBzZSBpZiB0aGUgbWFyZ2lu IHRvcCBjb2xsYXBzZSBzdHlsZSBpcyBzZXQgdG8gU0VQQVJBVEUuCisgICAgLy8gRG8gbm90IGFs bG93IGEgY29sbGFwc2UgaWYgdGhlIG1hcmdpbi1iZWZvcmUtY29sbGFwc2Ugc3R5bGUgaXMgc2V0 IHRvIFNFUEFSQVRFLgogICAgIGlmIChjaGlsZC0+c3R5bGUoKS0+bWFyZ2luQmVmb3JlQ29sbGFw c2UoKSA9PSBNU0VQQVJBVEUpIHsKICAgICAgICAgbWFyZ2luSW5mby5zZXRBdEJlZm9yZVNpZGVP ZkJsb2NrKGZhbHNlKTsKICAgICAgICAgbWFyZ2luSW5mby5jbGVhck1hcmdpbigpOwogICAgIH0K IAotICAgIC8vIFRyeSB0byBndWVzcyBvdXIgY29ycmVjdCB5IHBvc2l0aW9uLiAgSW4gbW9zdCBj YXNlcyB0aGlzIGd1ZXNzIHdpbGwKLSAgICAvLyBiZSBjb3JyZWN0LiAgT25seSBpZiB3ZSdyZSB3 cm9uZyAod2hlbiB3ZSBjb21wdXRlIHRoZSByZWFsIHkgcG9zaXRpb24pCisgICAgLy8gVHJ5IHRv IGd1ZXNzIG91ciBjb3JyZWN0IGxvZ2ljYWwgdG9wIHBvc2l0aW9uLiAgSW4gbW9zdCBjYXNlcyB0 aGlzIGd1ZXNzIHdpbGwKKyAgICAvLyBiZSBjb3JyZWN0LiAgT25seSBpZiB3ZSdyZSB3cm9uZyAo d2hlbiB3ZSBjb21wdXRlIHRoZSByZWFsIGxvZ2ljYWwgdG9wIHBvc2l0aW9uKQogICAgIC8vIHdp bGwgd2UgaGF2ZSB0byBwb3RlbnRpYWxseSByZWxheW91dC4KLSAgICBpbnQgeVBvc0VzdGltYXRl ID0gZXN0aW1hdGVWZXJ0aWNhbFBvc2l0aW9uKGNoaWxkLCBtYXJnaW5JbmZvKTsKKyAgICBpbnQg bG9naWNhbFRvcEVzdGltYXRlID0gZXN0aW1hdGVMb2dpY2FsVG9wUG9zaXRpb24oY2hpbGQsIG1h cmdpbkluZm8pOwogCiAgICAgLy8gQ2FjaGUgb3VyIG9sZCByZWN0IHNvIHRoYXQgd2UgY2FuIGRp cnR5IHRoZSBwcm9wZXIgcmVwYWludCByZWN0cyBpZiB0aGUgY2hpbGQgbW92ZXMuCiAgICAgSW50 UmVjdCBvbGRSZWN0KGNoaWxkLT54KCksIGNoaWxkLT55KCkgLCBjaGlsZC0+d2lkdGgoKSwgY2hp bGQtPmhlaWdodCgpKTsKKyAgICBpbnQgb2xkTG9naWNhbFRvcCA9IGxvZ2ljYWxUb3BGb3JDaGls ZChjaGlsZCk7CisKICNpZm5kZWYgTkRFQlVHCiAgICAgSW50U2l6ZSBvbGRMYXlvdXREZWx0YSA9 IHZpZXcoKS0+bGF5b3V0RGVsdGEoKTsKICNlbmRpZgogICAgIC8vIEdvIGFoZWFkIGFuZCBwb3Np dGlvbiB0aGUgY2hpbGQgYXMgdGhvdWdoIGl0IGRpZG4ndCBjb2xsYXBzZSB3aXRoIHRoZSB0b3Au Ci0gICAgdmlldygpLT5hZGRMYXlvdXREZWx0YShJbnRTaXplKDAsIGNoaWxkLT55KCkgLSB5UG9z RXN0aW1hdGUpKTsKLSAgICBjaGlsZC0+c2V0TG9jYXRpb24oY2hpbGQtPngoKSwgeVBvc0VzdGlt YXRlKTsKKyAgICBzZXRMb2dpY2FsVG9wRm9yQ2hpbGQoY2hpbGQsIGxvZ2ljYWxUb3BFc3RpbWF0 ZSk7CiAKICAgICBSZW5kZXJCbG9jayogY2hpbGRSZW5kZXJCbG9jayA9IGNoaWxkLT5pc1JlbmRl ckJsb2NrKCkgPyB0b1JlbmRlckJsb2NrKGNoaWxkKSA6IDA7CiAgICAgYm9vbCBtYXJrRGVzY2Vu ZGFudHNXaXRoRmxvYXRzID0gZmFsc2U7Ci0gICAgaWYgKHlQb3NFc3RpbWF0ZSAhPSBvbGRSZWN0 LnkoKSAmJiAhY2hpbGQtPmF2b2lkc0Zsb2F0cygpICYmIGNoaWxkUmVuZGVyQmxvY2sgJiYgY2hp bGRSZW5kZXJCbG9jay0+Y29udGFpbnNGbG9hdHMoKSkKKyAgICBpZiAobG9naWNhbFRvcEVzdGlt YXRlICE9IG9sZExvZ2ljYWxUb3AgJiYgIWNoaWxkLT5hdm9pZHNGbG9hdHMoKSAmJiBjaGlsZFJl bmRlckJsb2NrICYmIGNoaWxkUmVuZGVyQmxvY2stPmNvbnRhaW5zRmxvYXRzKCkpCiAgICAgICAg IG1hcmtEZXNjZW5kYW50c1dpdGhGbG9hdHMgPSB0cnVlOwogICAgIGVsc2UgaWYgKCFjaGlsZC0+ YXZvaWRzRmxvYXRzKCkgfHwgY2hpbGQtPnNocmlua1RvQXZvaWRGbG9hdHMoKSkgewogICAgICAg ICAvLyBJZiBhbiBlbGVtZW50IG1pZ2h0IGJlIGFmZmVjdGVkIGJ5IHRoZSBwcmVzZW5jZSBvZiBm bG9hdHMsIHRoZW4gYWx3YXlzIG1hcmsgaXQgZm9yCiAgICAgICAgIC8vIGxheW91dC4KICAgICAg ICAgaW50IGZiID0gbWF4KHByZXZpb3VzRmxvYXRCb3R0b20sIGZsb2F0Qm90dG9tKCkpOwotICAg ICAgICBpZiAoZmIgPiB5UG9zRXN0aW1hdGUpCisgICAgICAgIGlmIChmYiA+IGxvZ2ljYWxUb3BF c3RpbWF0ZSkKICAgICAgICAgICAgIG1hcmtEZXNjZW5kYW50c1dpdGhGbG9hdHMgPSB0cnVlOwog ICAgIH0KIAogICAgIGlmIChjaGlsZFJlbmRlckJsb2NrKSB7CiAgICAgICAgIGlmIChtYXJrRGVz Y2VuZGFudHNXaXRoRmxvYXRzKQogICAgICAgICAgICAgY2hpbGRSZW5kZXJCbG9jay0+bWFya0Fs bERlc2NlbmRhbnRzV2l0aEZsb2F0c0ZvckxheW91dCgpOwotICAgICAgICBwcmV2aW91c0Zsb2F0 Qm90dG9tID0gbWF4KHByZXZpb3VzRmxvYXRCb3R0b20sIG9sZFJlY3QueSgpICsgdG9SZW5kZXJC bG9jayhjaGlsZCktPmZsb2F0Qm90dG9tKCkpOworICAgICAgICBpZiAoIWNoaWxkLT5pc0Jsb2Nr Rmxvd1Jvb3QoKSkKKyAgICAgICAgICAgIHByZXZpb3VzRmxvYXRCb3R0b20gPSBtYXgocHJldmlv dXNGbG9hdEJvdHRvbSwgb2xkTG9naWNhbFRvcCArIGNoaWxkUmVuZGVyQmxvY2stPmZsb2F0Qm90 dG9tKCkpOwogICAgIH0KIAogICAgIGJvb2wgcGFnaW5hdGVkID0gdmlldygpLT5sYXlvdXRTdGF0 ZSgpLT5pc1BhZ2luYXRlZCgpOwpAQCAtMTg2MywyMyArMTg3NiwyMyBAQCB2b2lkIFJlbmRlckJs b2NrOjpsYXlvdXRCbG9ja0NoaWxkKFJlbmRlCiAKICAgICAvLyBOb3cgZGV0ZXJtaW5lIHRoZSBj b3JyZWN0IHlwb3MgYmFzZWQgb2ZmIGV4YW1pbmF0aW9uIG9mIGNvbGxhcHNpbmcgbWFyZ2luCiAg ICAgLy8gdmFsdWVzLgotICAgIGludCB5QmVmb3JlQ2xlYXIgPSBjb2xsYXBzZU1hcmdpbnMoY2hp bGQsIG1hcmdpbkluZm8pOworICAgIGludCBsb2dpY2FsVG9wQmVmb3JlQ2xlYXIgPSBjb2xsYXBz ZU1hcmdpbnMoY2hpbGQsIG1hcmdpbkluZm8pOwogCiAgICAgLy8gTm93IGNoZWNrIGZvciBjbGVh ci4KLSAgICBpbnQgeUFmdGVyQ2xlYXIgPSBjbGVhckZsb2F0c0lmTmVlZGVkKGNoaWxkLCBtYXJn aW5JbmZvLCBvbGRUb3BQb3NNYXJnaW4sIG9sZFRvcE5lZ01hcmdpbiwgeUJlZm9yZUNsZWFyKTsK KyAgICBpbnQgbG9naWNhbFRvcEFmdGVyQ2xlYXIgPSBjbGVhckZsb2F0c0lmTmVlZGVkKGNoaWxk LCBtYXJnaW5JbmZvLCBvbGRQb3NNYXJnaW5CZWZvcmUsIG9sZE5lZ01hcmdpbkJlZm9yZSwgbG9n aWNhbFRvcEJlZm9yZUNsZWFyKTsKICAgICAKICAgICBpZiAocGFnaW5hdGVkKSB7Ci0gICAgICAg IGludCBvbGRZID0geUFmdGVyQ2xlYXI7CisgICAgICAgIGludCBvbGRUb3AgPSBsb2dpY2FsVG9w QWZ0ZXJDbGVhcjsKICAgICAgICAgCiAgICAgICAgIC8vIElmIHRoZSBvYmplY3QgaGFzIGEgcGFn ZSBvciBjb2x1bW4gYnJlYWsgdmFsdWUgb2YgImJlZm9yZSIsIHRoZW4gd2Ugc2hvdWxkIHNoaWZ0 IHRvIHRoZSB0b3Agb2YgdGhlIG5leHQgcGFnZS4KLSAgICAgICAgeUFmdGVyQ2xlYXIgPSBhcHBs eUJlZm9yZUJyZWFrKGNoaWxkLCB5QWZ0ZXJDbGVhcik7CisgICAgICAgIGxvZ2ljYWxUb3BBZnRl ckNsZWFyID0gYXBwbHlCZWZvcmVCcmVhayhjaGlsZCwgbG9naWNhbFRvcEFmdGVyQ2xlYXIpOwog ICAgIAogICAgICAgICAvLyBGb3IgcmVwbGFjZWQgZWxlbWVudHMgYW5kIHNjcm9sbGVkIGVsZW1l bnRzLCB3ZSB3YW50IHRvIHNoaWZ0IHRoZW0gdG8gdGhlIG5leHQgcGFnZSBpZiB0aGV5IGRvbid0 IGZpdCBvbiB0aGUgY3VycmVudCBvbmUuCi0gICAgICAgIGludCB5QmVmb3JlVW5zcGxpdHRhYmxl QWRqdXN0bWVudCA9IHlBZnRlckNsZWFyOwotICAgICAgICBpbnQgeUFmdGVyVW5zcGxpdHRhYmxl QWRqdXN0bWVudCA9IGFkanVzdEZvclVuc3BsaXR0YWJsZUNoaWxkKGNoaWxkLCB5QWZ0ZXJDbGVh cik7CisgICAgICAgIGludCBsb2dpY2FsVG9wQmVmb3JlVW5zcGxpdHRhYmxlQWRqdXN0bWVudCA9 IGxvZ2ljYWxUb3BBZnRlckNsZWFyOworICAgICAgICBpbnQgbG9naWNhbFRvcEFmdGVyVW5zcGxp dHRhYmxlQWRqdXN0bWVudCA9IGFkanVzdEZvclVuc3BsaXR0YWJsZUNoaWxkKGNoaWxkLCBsb2dp Y2FsVG9wQWZ0ZXJDbGVhcik7CiAgICAgICAgIAogICAgICAgICBpbnQgcGFnaW5hdGlvblN0cnV0 ID0gMDsKLSAgICAgICAgaW50IHVuc3BsaXR0YWJsZUFkanVzdG1lbnREZWx0YSA9IHlBZnRlclVu c3BsaXR0YWJsZUFkanVzdG1lbnQgLSB5QmVmb3JlVW5zcGxpdHRhYmxlQWRqdXN0bWVudDsKKyAg ICAgICAgaW50IHVuc3BsaXR0YWJsZUFkanVzdG1lbnREZWx0YSA9IGxvZ2ljYWxUb3BBZnRlclVu c3BsaXR0YWJsZUFkanVzdG1lbnQgLSBsb2dpY2FsVG9wQmVmb3JlVW5zcGxpdHRhYmxlQWRqdXN0 bWVudDsKICAgICAgICAgaWYgKHVuc3BsaXR0YWJsZUFkanVzdG1lbnREZWx0YSkKICAgICAgICAg ICAgIHBhZ2luYXRpb25TdHJ1dCA9IHVuc3BsaXR0YWJsZUFkanVzdG1lbnREZWx0YTsKICAgICAg ICAgZWxzZSBpZiAoY2hpbGRSZW5kZXJCbG9jayAmJiBjaGlsZFJlbmRlckJsb2NrLT5wYWdpbmF0 aW9uU3RydXQoKSkKQEAgLTE4ODgsMjYgKzE5MDEsMjUgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5 b3V0QmxvY2tDaGlsZChSZW5kZQogICAgICAgICBpZiAocGFnaW5hdGlvblN0cnV0KSB7CiAgICAg ICAgICAgICAvLyBXZSBhcmUgd2lsbGluZyB0byBwcm9wYWdhdGUgb3V0IHRvIG91ciBwYXJlbnQg YmxvY2sgYXMgbG9uZyBhcyB3ZSB3ZXJlIGF0IHRoZSB0b3Agb2YgdGhlIGJsb2NrIHByaW9yCiAg ICAgICAgICAgICAvLyB0byBjb2xsYXBzaW5nIG91ciBtYXJnaW5zLCBhbmQgYXMgbG9uZyBhcyB3 ZSBkaWRuJ3QgY2xlYXIgb3IgbW92ZSBhcyBhIHJlc3VsdCBvZiBvdGhlciBwYWdpbmF0aW9uLgot ICAgICAgICAgICAgaWYgKGF0QmVmb3JlU2lkZU9mQmxvY2sgJiYgb2xkWSA9PSB5QmVmb3JlQ2xl YXIgJiYgIWlzUG9zaXRpb25lZCgpICYmICFpc1RhYmxlQ2VsbCgpKSB7CisgICAgICAgICAgICBp ZiAoYXRCZWZvcmVTaWRlT2ZCbG9jayAmJiBvbGRUb3AgPT0gbG9naWNhbFRvcEJlZm9yZUNsZWFy ICYmICFpc1Bvc2l0aW9uZWQoKSAmJiAhaXNUYWJsZUNlbGwoKSkgewogICAgICAgICAgICAgICAg IC8vIEZJWE1FOiBTaG91bGQgcmVhbGx5IGNoZWNrIGlmIHdlJ3JlIGV4Y2VlZGluZyB0aGUgcGFn ZSBoZWlnaHQgYmVmb3JlIHByb3BhZ2F0aW5nIHRoZSBzdHJ1dCwgYnV0IHdlIGRvbid0CiAgICAg ICAgICAgICAgICAgLy8gaGF2ZSBhbGwgdGhlIGluZm9ybWF0aW9uIHRvIGRvIHNvICh0aGUgc3Ry dXQgb25seSBoYXMgdGhlIHJlbWFpbmluZyBhbW91bnQgdG8gcHVzaCkuICBHZWNrbyBnZXRzIHRo aXMgd3JvbmcgdG9vCiAgICAgICAgICAgICAgICAgLy8gYW5kIHB1c2hlcyB0byB0aGUgbmV4dCBw YWdlIGFueXdheSwgc28gbm90IHRvbyBjb25jZXJuZWQgYWJvdXQgaXQuCi0gICAgICAgICAgICAg ICAgc2V0UGFnaW5hdGlvblN0cnV0KHlBZnRlckNsZWFyICsgcGFnaW5hdGlvblN0cnV0KTsKKyAg ICAgICAgICAgICAgICBzZXRQYWdpbmF0aW9uU3RydXQobG9naWNhbFRvcEFmdGVyQ2xlYXIgKyBw YWdpbmF0aW9uU3RydXQpOwogICAgICAgICAgICAgICAgIGlmIChjaGlsZFJlbmRlckJsb2NrKQog ICAgICAgICAgICAgICAgICAgICBjaGlsZFJlbmRlckJsb2NrLT5zZXRQYWdpbmF0aW9uU3RydXQo MCk7CiAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICB5QWZ0ZXJDbGVhciArPSBw YWdpbmF0aW9uU3RydXQ7CisgICAgICAgICAgICAgICAgbG9naWNhbFRvcEFmdGVyQ2xlYXIgKz0g cGFnaW5hdGlvblN0cnV0OwogICAgICAgICB9CiAKICAgICAgICAgLy8gU2ltaWxhciB0byBob3cg d2UgYXBwbHkgY2xlYXJhbmNlLiAgR28gYWhlYWQgYW5kIGJvb3N0IGhlaWdodCgpIHRvIGJlIHRo ZSBwbGFjZSB3aGVyZSB3ZSdyZSBnb2luZyB0byBwb3NpdGlvbiB0aGUgY2hpbGQuCi0gICAgICAg IHNldExvZ2ljYWxIZWlnaHQoaGVpZ2h0KCkgKyAoeUFmdGVyQ2xlYXIgLSBvbGRZKSk7CisgICAg ICAgIHNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgpICsgKGxvZ2ljYWxUb3BBZnRlckNs ZWFyIC0gb2xkVG9wKSk7CiAgICAgfQogCi0gICAgdmlldygpLT5hZGRMYXlvdXREZWx0YShJbnRT aXplKDAsIHlQb3NFc3RpbWF0ZSAtIHlBZnRlckNsZWFyKSk7Ci0gICAgY2hpbGQtPnNldExvY2F0 aW9uKGNoaWxkLT54KCksIHlBZnRlckNsZWFyKTsKKyAgICBzZXRMb2dpY2FsVG9wRm9yQ2hpbGQo Y2hpbGQsIGxvZ2ljYWxUb3BBZnRlckNsZWFyKTsKIAotICAgIC8vIE5vdyB3ZSBoYXZlIGEgZmlu YWwgeSBwb3NpdGlvbi4gIFNlZSBpZiBpdCByZWFsbHkgZG9lcyBlbmQgdXAgYmVpbmcgZGlmZmVy ZW50IGZyb20gb3VyIGVzdGltYXRlLgotICAgIGlmICh5QWZ0ZXJDbGVhciAhPSB5UG9zRXN0aW1h dGUpIHsKKyAgICAvLyBOb3cgd2UgaGF2ZSBhIGZpbmFsIHRvcCBwb3NpdGlvbi4gIFNlZSBpZiBp dCByZWFsbHkgZG9lcyBlbmQgdXAgYmVpbmcgZGlmZmVyZW50IGZyb20gb3VyIGVzdGltYXRlLgor ICAgIGlmIChsb2dpY2FsVG9wQWZ0ZXJDbGVhciAhPSBsb2dpY2FsVG9wRXN0aW1hdGUpIHsKICAg ICAgICAgaWYgKGNoaWxkLT5zaHJpbmtUb0F2b2lkRmxvYXRzKCkpIHsKICAgICAgICAgICAgIC8v IFRoZSBjaGlsZCdzIHdpZHRoIGRlcGVuZHMgb24gdGhlIGxpbmUgd2lkdGguCiAgICAgICAgICAg ICAvLyBXaGVuIHRoZSBjaGlsZCBzaGlmdHMgdG8gY2xlYXIgYW4gaXRlbSwgaXRzIHdpZHRoIGNh bgpAQCAtMTkzMSwxMyArMTk0MywxMyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRCbG9ja0No aWxkKFJlbmRlCiAgICAgaWYgKG1hcmdpbkluZm8uYXRCZWZvcmVTaWRlT2ZCbG9jaygpICYmICFj aGlsZC0+aXNTZWxmQ29sbGFwc2luZ0Jsb2NrKCkpCiAgICAgICAgIG1hcmdpbkluZm8uc2V0QXRC ZWZvcmVTaWRlT2ZCbG9jayhmYWxzZSk7CiAKLSAgICAvLyBOb3cgcGxhY2UgdGhlIGNoaWxkIGlu IHRoZSBjb3JyZWN0IGhvcml6b250YWwgcG9zaXRpb24KLSAgICBkZXRlcm1pbmVIb3Jpem9udGFs UG9zaXRpb24oY2hpbGQpOworICAgIC8vIE5vdyBwbGFjZSB0aGUgY2hpbGQgaW4gdGhlIGNvcnJl Y3QgbGVmdCBwb3NpdGlvbgorICAgIGRldGVybWluZUxvZ2ljYWxMZWZ0UG9zaXRpb25Gb3JDaGls ZChjaGlsZCk7CiAKICAgICAvLyBVcGRhdGUgb3VyIGhlaWdodCBub3cgdGhhdCB0aGUgY2hpbGQg aGFzIGJlZW4gcGxhY2VkIGluIHRoZSBjb3JyZWN0IHBvc2l0aW9uLgotICAgIHNldExvZ2ljYWxI ZWlnaHQoaGVpZ2h0KCkgKyBjaGlsZC0+aGVpZ2h0KCkpOworICAgIHNldExvZ2ljYWxIZWlnaHQo bG9naWNhbEhlaWdodCgpICsgbG9naWNhbEhlaWdodEZvckNoaWxkKGNoaWxkKSk7CiAgICAgaWYg KGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5BZnRlckNvbGxhcHNlKCkgPT0gTVNFUEFSQVRFKSB7Ci0g ICAgICAgIHNldExvZ2ljYWxIZWlnaHQoaGVpZ2h0KCkgKyBjaGlsZC0+bWFyZ2luQm90dG9tKCkp OworICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSArIGNoaWxkLT5tYXJn aW5BZnRlclVzaW5nKHN0eWxlKCkpKTsKICAgICAgICAgbWFyZ2luSW5mby5jbGVhck1hcmdpbigp OwogICAgIH0KICAgICAvLyBJZiB0aGUgY2hpbGQgaGFzIG92ZXJoYW5naW5nIGZsb2F0cyB0aGF0 IGludHJ1ZGUgaW50byBmb2xsb3dpbmcgc2libGluZ3MgKG9yIHBvc3NpYmx5IG91dApJbmRleDog V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5oCShyZXZpc2lvbiA2ODY1NCkKKysrIFdlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTU2NiwxMCArNTY2LDEzIEBAIHBy aXZhdGU6CiAgICAgYm9vbCBoYW5kbGVSdW5JbkNoaWxkKFJlbmRlckJveCogY2hpbGQpOwogICAg IGludCBjb2xsYXBzZU1hcmdpbnMoUmVuZGVyQm94KiBjaGlsZCwgTWFyZ2luSW5mbyYpOwogICAg IGludCBjbGVhckZsb2F0c0lmTmVlZGVkKFJlbmRlckJveCogY2hpbGQsIE1hcmdpbkluZm8mLCBp bnQgb2xkVG9wUG9zTWFyZ2luLCBpbnQgb2xkVG9wTmVnTWFyZ2luLCBpbnQgeVBvcyk7Ci0gICAg aW50IGVzdGltYXRlVmVydGljYWxQb3NpdGlvbihSZW5kZXJCb3gqIGNoaWxkLCBjb25zdCBNYXJn aW5JbmZvJik7Ci0gICAgdm9pZCBkZXRlcm1pbmVIb3Jpem9udGFsUG9zaXRpb24oUmVuZGVyQm94 KiBjaGlsZCk7CisgICAgaW50IGVzdGltYXRlTG9naWNhbFRvcFBvc2l0aW9uKFJlbmRlckJveCog Y2hpbGQsIGNvbnN0IE1hcmdpbkluZm8mKTsKKyAgICB2b2lkIGRldGVybWluZUxvZ2ljYWxMZWZ0 UG9zaXRpb25Gb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkKTsKICAgICB2b2lkIGhhbmRsZUFmdGVy U2lkZU9mQmxvY2soaW50IHRvcCwgaW50IGJvdHRvbSwgTWFyZ2luSW5mbyYpOwogICAgIHZvaWQg c2V0Q29sbGFwc2VkQm90dG9tTWFyZ2luKGNvbnN0IE1hcmdpbkluZm8mKTsKKyAgICB2b2lkIHNl dExvZ2ljYWxUb3BGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBpbnQgbG9naWNhbFRvcCk7Cisg ICAgaW50IGxvZ2ljYWxIZWlnaHRGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkKSB7IHJldHVybiBz dHlsZSgpLT5pc1ZlcnRpY2FsQmxvY2tGbG93KCkgPyBjaGlsZC0+aGVpZ2h0KCkgOiBjaGlsZC0+ d2lkdGgoKTsgfQorICAgIGludCBsb2dpY2FsVG9wRm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCkg eyByZXR1cm4gc3R5bGUoKS0+aXNWZXJ0aWNhbEJsb2NrRmxvdygpID8gY2hpbGQtPnkoKSA6IGNo aWxkLT54KCk7IH0KICAgICAvLyBFbmQgaGVscGVyIGZ1bmN0aW9ucyBhbmQgc3RydWN0cyB1c2Vk IGJ5IGxheW91dEJsb2NrQ2hpbGRyZW4uCiAKICAgICAvLyBQYWdpbmF0aW9uIHJvdXRpbmVzLgpJ bmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHJldmlzaW9uIDY4NjU0KQorKysgV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTE4OSw3ICsxODksMTIgQEAgcHVi bGljOgogICAgIHZvaWQgc2V0TWFyZ2luRW5kKGludCk7CiAgICAgdm9pZCBzZXRNYXJnaW5CZWZv cmUoaW50KTsKICAgICB2b2lkIHNldE1hcmdpbkFmdGVyKGludCk7Ci0gICAgCisKKyAgICBpbnQg bWFyZ2luU3RhcnRVc2luZyhjb25zdCBSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIGludCBtYXJn aW5FbmRVc2luZyhjb25zdCBSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIGludCBtYXJnaW5CZWZv cmVVc2luZyhjb25zdCBSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIGludCBtYXJnaW5BZnRlclVz aW5nKGNvbnN0IFJlbmRlclN0eWxlKikgY29uc3Q7CisKICAgICAvLyBUaGUgZm9sbG93aW5nIGZp dmUgZnVuY3Rpb25zIGFyZSB1c2VkIHRvIGltcGxlbWVudCBjb2xsYXBzaW5nIG1hcmdpbnMuCiAg ICAgLy8gQWxsIG9iamVjdHMga25vdyB0aGVpciBtYXhpbWFsIHBvc2l0aXZlIGFuZCBuZWdhdGl2 ZSBtYXJnaW5zLiAgVGhlCiAgICAgLy8gZm9ybXVsYSBmb3IgY29tcHV0aW5nIGEgY29sbGFwc2Vk IG1hcmdpbiBpcyB8bWF4UG9zTWFyZ2lufCAtIHxtYXhOZWdtYXJnaW58LgpAQCAtNDI4LDExICs0 MzMsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0TWFyZ2luQmVmb3JlVXNpbmcoY29uc3QgUmVu ZGVyU3R5bGUqLCBpbnQpOwogICAgIHZvaWQgc2V0TWFyZ2luQWZ0ZXJVc2luZyhjb25zdCBSZW5k ZXJTdHlsZSosIGludCk7CiAKLSAgICBpbnQgbWFyZ2luU3RhcnRVc2luZyhjb25zdCBSZW5kZXJT dHlsZSopIGNvbnN0OwotICAgIGludCBtYXJnaW5FbmRVc2luZyhjb25zdCBSZW5kZXJTdHlsZSop IGNvbnN0OwotICAgIGludCBtYXJnaW5CZWZvcmVVc2luZyhjb25zdCBSZW5kZXJTdHlsZSopIGNv bnN0OwotICAgIGludCBtYXJnaW5BZnRlclVzaW5nKGNvbnN0IFJlbmRlclN0eWxlKikgY29uc3Q7 Ci0KIHByaXZhdGU6CiAgICAgLy8gVGhlIHdpZHRoL2hlaWdodCBvZiB0aGUgY29udGVudHMgKyBi b3JkZXJzICsgcGFkZGluZy4gIFRoZSB4L3kgbG9jYXRpb24gaXMgcmVsYXRpdmUgdG8gb3VyIGNv bnRhaW5lciAod2hpY2ggaXMgbm90IGFsd2F5cyBvdXIgcGFyZW50KS4KICAgICBJbnRSZWN0IG1f ZnJhbWVSZWN0OwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNjg2NjkpCisrKyBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wOS0yOSAgRGF2aWQg SHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ2ODI0CisgICAgICAgIAorICAgICAgICBDb252ZXJ0IGxheW91dEJsb2NrQ2hpbGQgKGJ1dCBu b3QgdGhlIGZ1bmN0aW9ucyBpdCBjYWxscykgdG8gYmUgYmxvY2stZmxvdy1hd2FyZS4KKworICAg ICAgICBmYXN0L2Jsb2NrZmxvdy9yb290LWxyLmh0bWwgcHJvZ3Jlc3NlcyBhcyBhIHJlc3VsdCBv ZiB0aGlzIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9mYXN0L2Jsb2NrZmxvdy9y b290LWxyLWJhc2ljLWV4cGVjdGVkLnR4dDoKKwogMjAxMC0wOS0yOSAgTWFydGluIFJvYmluc29u ICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxl aXphY2guCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9ibG9ja2Zsb3cvcm9v dC1sci1iYXNpYy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL2Zhc3QvYmxvY2tmbG93L3Jvb3QtbHItYmFzaWMtZXhwZWN0ZWQudHh0CShyZXZpc2lv biA2ODU2MSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2Jsb2NrZmxvdy9yb290 LWxyLWJhc2ljLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKLWxh eWVyIGF0ICgwLDApIHNpemUgODAweDExODAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAog ICBSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMAotbGF5ZXIgYXQgKDAsMCkgc2l6ZSA1 OTB4MTE4MAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA1OTB4NjAwCiAgIFJlbmRlckJsb2NrIHtIVE1M fSBhdCAoMCwwKSBzaXplIDEwNHg2MDAgW2JvcmRlcjogKDJweCBzb2xpZCAjMDAwMDAwKV0KLSAg ICBSZW5kZXJCb2R5IHtCT0RZfSBhdCAoMTAsNjAwKSBzaXplIDU4MHg1ODAKKyAgICBSZW5kZXJC b2R5IHtCT0RZfSBhdCAoMTAsMCkgc2l6ZSA1ODB4NTgwCg==