95595 2012-08-31 11:26:06 -0700 Make computeBlockDirectionMargins const 2012-08-31 17:59:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 94982 1 tony tony eric hyatt ojan webkit.review.bot oldest_to_newest 709832 0 tony 2012-08-31 11:26:06 -0700 Make computeBlockDirectionMargins const 709837 1 161742 tony 2012-08-31 11:31:16 -0700 Created attachment 161742 Patch 709887 2 161742 ojan 2012-08-31 12:28:05 -0700 Comment on attachment 161742 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161742&action=review > Source/WebCore/rendering/RenderBox.cpp:2415 > + computeBlockDirectionMargins(containingBlock, > + marginBefore, marginAfter); Meh to wrapping this. 709999 3 161778 tony 2012-08-31 14:41:20 -0700 Created attachment 161778 Patch for landing 710106 4 161778 webkit.review.bot 2012-08-31 17:59:46 -0700 Comment on attachment 161778 Patch for landing Clearing flags on attachment: 161778 Committed r127346: <http://trac.webkit.org/changeset/127346> 710107 5 webkit.review.bot 2012-08-31 17:59:50 -0700 All reviewed patches have been landed. Closing bug. 161742 2012-08-31 11:31:16 -0700 2012-08-31 14:41:17 -0700 Patch bug-95595-20120831113104.patch text/plain 10072 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3Mjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDVlOTZiMWJmMmQwNDlh MDNhNzY1YjljMTEzY2YxOWE5NzBlNjIwNi4uY2JlMTZhNTdlZDZlYTRjMDIxMDU0NWM2NmI2MTg5 MjY1ZGMxZTY2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTMxICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSBjb21wdXRlQmxvY2tE aXJlY3Rpb25NYXJnaW5zIGNvbnN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NTU5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgaXMgYSBzdGVwIGluIG1ha2luZyBjb21wdXRlTG9naWNhbEhlaWdo dCBjb25zdC4KKyAgICAgICAgUmVmYWN0b3IgUmVuZGVyQm94Ojpjb21wdXRlQmxvY2tEaXJlY3Rp b25NYXJnaW5zIGFuZCBtYWtlIGl0IGNvbnN0LgorICAgICAgICBBZGQgYSBoZWxwZXIgbWV0aG9k IGNvbXB1dGVBbmRTZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnMgZm9yIHRoZSBjYWxsZXJzIG91dHNp ZGUgb2YKKyAgICAgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQgdGhhdCBhcmUgY2FsbGluZyB0aGlz LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyBpcyBhbHJlYWR5IGNvdmVyZWQgYnkgdGVz dHMgaW4gZmFzdC93cml0aW5nLW1vZGUgYW5kIGZhc3QvbXVsdGljb2wuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6 Om1hcmdpbkJlZm9yZUVzdGltYXRlRm9yQ2hpbGQpOiBTd2l0Y2ggdG8gY29tcHV0ZUFuZFNldEJs b2NrRGlyZWN0aW9uTWFyZ2lucworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmxheW91 dEJsb2NrQ2hpbGQpOiBTd2l0Y2ggdG8gY29tcHV0ZUFuZFNldEJsb2NrRGlyZWN0aW9uTWFyZ2lu cworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6Omluc2VydEZsb2F0aW5nT2JqZWN0KTog U3dpdGNoIHRvIGNvbXB1dGVBbmRTZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnMKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29t cHV0ZUxvZ2ljYWxIZWlnaHQpOiBVc2UgY29uc3QgdmVyc2lvbiBhbmQgZmlsbCBpbiBhIE1hcmdp blZhbHVlcyBzdHJ1Y3QgKHRvIGJlIG1lcmdlZCBpbiB0aGUgbmV4dCBwYXRjaCkuCisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMpOiBQYXNz IGluIG91dCBwYXJhbXMuCisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29tcHV0ZUFuZFNldEJsb2NrRGlyZWN0aW9uTWFyZ2lucyk6IERvZXMgdGhlIHNh bWUgYXMgdGhlIG9sZCBjb21wdXRlQmxvY2tEaXJlY3Rpb25NYXJnaW5zLgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFJlbmRlckJveCk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmxheW91dEhvcml6b250YWxCb3gpOiBTd2l0 Y2ggdG8gY29tcHV0ZUFuZFNldEJsb2NrRGlyZWN0aW9uTWFyZ2lucworICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJveCk6IFN3aXRj aCB0byBjb21wdXRlQW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRhYmxlUm93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlUm93 OjpsYXlvdXQpOiBTd2l0Y2ggdG8gY29tcHV0ZUFuZFNldEJsb2NrRGlyZWN0aW9uTWFyZ2lucwor CiAyMDEyLTA4LTMxICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBb TmV3IE11bHRpY29sdW1uXSBNYWtlIFJlbmRlckZsb3dUaHJlYWRzIGludG8gc2VsZWN0aW9uIHJv b3RzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggNmQ1MWZi ZjQ1MTdjNDllZWVlYzlmYWYwYzI3MWVhMDk2NzMzNGY4OS4uOTA5MDBkMDQ3ZjU3NzUwYmU1MTU4 OWM5NWFjNTM1NDgxNmU1ZTEwYyAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCkBAIC0yMTY0LDcgKzIxNjQsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjptYXJnaW5CZWZv cmVFc3RpbWF0ZUZvckNoaWxkKFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQmIHBvcwogCiAg ICAgLy8gTWFrZSBzdXJlIHRvIHVwZGF0ZSB0aGUgYmxvY2sgbWFyZ2lucyBub3cgZm9yIHRoZSBn cmFuZGNoaWxkIGJveCBzbyB0aGF0IHdlJ3JlIGxvb2tpbmcgYXQgY3VycmVudCB2YWx1ZXMuCiAg ICAgaWYgKGdyYW5kY2hpbGRCb3gtPm5lZWRzTGF5b3V0KCkpIHsKLSAgICAgICAgZ3JhbmRjaGls ZEJveC0+Y29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFyZ2lucyh0aGlzKTsgCisgICAgICAgIGdyYW5k Y2hpbGRCb3gtPmNvbXB1dGVBbmRTZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnModGhpcyk7CiAgICAg ICAgIGdyYW5kY2hpbGRCb3gtPnNldE1hcmdpbkJlZm9yZVF1aXJrKGdyYW5kY2hpbGRCb3gtPnN0 eWxlKCktPm1hcmdpbkJlZm9yZSgpLnF1aXJrKCkpOwogICAgICAgICBncmFuZGNoaWxkQm94LT5z ZXRNYXJnaW5BZnRlclF1aXJrKGdyYW5kY2hpbGRCb3gtPnN0eWxlKCktPm1hcmdpbkFmdGVyKCku cXVpcmsoKSk7CiAgICAgfQpAQCAtMjQxMSw3ICsyNDExLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6 bGF5b3V0QmxvY2tDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBNYXJnaW5JbmZvJiBtYXJnaW5JbmZv LCBMYXkKICAgICBMYXlvdXRVbml0IG9sZE5lZ01hcmdpbkJlZm9yZSA9IG1heE5lZ2F0aXZlTWFy Z2luQmVmb3JlKCk7CiAKICAgICAvLyBUaGUgY2hpbGQgaXMgYSBub3JtYWwgZmxvdyBvYmplY3Qu ICBDb21wdXRlIHRoZSBtYXJnaW5zIHdlIHdpbGwgdXNlIGZvciBjb2xsYXBzaW5nIG5vdy4KLSAg ICBjaGlsZC0+Y29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFyZ2lucyh0aGlzKTsKKyAgICBjaGlsZC0+ Y29tcHV0ZUFuZFNldEJsb2NrRGlyZWN0aW9uTWFyZ2lucyh0aGlzKTsKIAogICAgIC8vIERvIG5v dCBhbGxvdyBhIGNvbGxhcHNlIGlmIHRoZSBtYXJnaW4tYmVmb3JlLWNvbGxhcHNlIHN0eWxlIGlz IHNldCB0byBTRVBBUkFURS4KICAgICBSZW5kZXJTdHlsZSogY2hpbGRTdHlsZSA9IGNoaWxkLT5z dHlsZSgpOwpAQCAtMzc2MSw3ICszNzYxLDcgQEAgUmVuZGVyQmxvY2s6OkZsb2F0aW5nT2JqZWN0 KiBSZW5kZXJCbG9jazo6aW5zZXJ0RmxvYXRpbmdPYmplY3QoUmVuZGVyQm94KiBvKQogICAgICAg ICBvLT5sYXlvdXRJZk5lZWRlZCgpOwogICAgIGVsc2UgewogICAgICAgICBvLT5jb21wdXRlTG9n aWNhbFdpZHRoKCk7Ci0gICAgICAgIG8tPmNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnModGhp cyk7CisgICAgICAgIG8tPmNvbXB1dGVBbmRTZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnModGhpcyk7 CiAgICAgfQogICAgIHNldExvZ2ljYWxXaWR0aEZvckZsb2F0KG5ld09iaiwgbG9naWNhbFdpZHRo Rm9yQ2hpbGQobykgKyBtYXJnaW5TdGFydEZvckNoaWxkKG8pICsgbWFyZ2luRW5kRm9yQ2hpbGQo bykpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGM1Yzk3OTBm MTM3MDFkMzgyZGJjZTkxNGI0NzYyNmFjMjQxODdmZDIuLjUwMGU1ZDY5OGVjMmUzNjJlNDE1NWEw YjBkOTVlZjMxNDZlMWI4MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CkBAIC0yMDA0LDggKzIwMDQsMTUgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVp Z2h0KCkKICAgICAgICAgUmVuZGVyQmxvY2sqIGNiID0gY29udGFpbmluZ0Jsb2NrKCk7CiAgICAg ICAgIGJvb2wgaGFzUGVycGVuZGljdWxhckNvbnRhaW5pbmdCbG9jayA9IGNiLT5pc0hvcml6b250 YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAgICAgCi0gICAg ICAgIGlmICghaGFzUGVycGVuZGljdWxhckNvbnRhaW5pbmdCbG9jaykKLSAgICAgICAgICAgIGNv bXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY2IpOworICAgICAgICBpZiAoIWhhc1BlcnBlbmRp Y3VsYXJDb250YWluaW5nQmxvY2spIHsKKyAgICAgICAgICAgIENvbXB1dGVkTWFyZ2luVmFsdWVz IG1hcmdpblZhbHVlczsKKyAgICAgICAgICAgIGJvb2wgc2hvdWxkRmxpcEJlZm9yZUFmdGVyID0g Y2ItPnN0eWxlKCktPndyaXRpbmdNb2RlKCkgIT0gc3R5bGUoKS0+d3JpdGluZ01vZGUoKTsKKyAg ICAgICAgICAgIGNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY2IsCisgICAgICAgICAgICAg ICAgc2hvdWxkRmxpcEJlZm9yZUFmdGVyID8gbWFyZ2luVmFsdWVzLm1fYWZ0ZXIgOiBtYXJnaW5W YWx1ZXMubV9iZWZvcmUsCisgICAgICAgICAgICAgICAgc2hvdWxkRmxpcEJlZm9yZUFmdGVyID8g bWFyZ2luVmFsdWVzLm1fYmVmb3JlIDogbWFyZ2luVmFsdWVzLm1fYWZ0ZXIpOworICAgICAgICAg ICAgc2V0TWFyZ2luQmVmb3JlKG1hcmdpblZhbHVlcy5tX2JlZm9yZSk7CisgICAgICAgICAgICBz ZXRNYXJnaW5BZnRlcihtYXJnaW5WYWx1ZXMubV9hZnRlcik7CisgICAgICAgIH0KIAogICAgICAg ICAvLyBGb3IgdGFibGVzLCBjYWxjdWxhdGUgbWFyZ2lucyBvbmx5LgogICAgICAgICBpZiAoaXNU YWJsZSgpKSB7CkBAIC0yMzgxLDEzICsyMzg4LDEzIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojph dmFpbGFibGVMb2dpY2FsSGVpZ2h0VXNpbmcoY29uc3QgTGVuZ3RoJiBoKSBjb25zdAogICAgIHJl dHVybiBjb250YWluaW5nQmxvY2soKS0+YXZhaWxhYmxlTG9naWNhbEhlaWdodCgpOwogfQogCi12 b2lkIFJlbmRlckJveDo6Y29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFyZ2lucyhjb25zdCBSZW5kZXJC bG9jayogY29udGFpbmluZ0Jsb2NrKQordm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVCbG9ja0RpcmVj dGlvbk1hcmdpbnMoY29uc3QgUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jaywgTGF5b3V0VW5p dCYgbWFyZ2luQmVmb3JlLCBMYXlvdXRVbml0JiBtYXJnaW5BZnRlcikgY29uc3QKIHsKICAgICBp ZiAoaXNUYWJsZUNlbGwoKSkgewogICAgICAgICAvLyBGSVhNRTogTm90IHJpZ2h0IGlmIHdlIGFs bG93IGNlbGxzIHRvIGhhdmUgZGlmZmVyZW50IGRpcmVjdGlvbmFsaXR5IHRoYW4gdGhlIHRhYmxl LiAgSWYgd2UgZG8gYWxsb3cgdGhpcywgdGhvdWdoLAogICAgICAgICAvLyB3ZSBtYXkganVzdCBk byBpdCB3aXRoIGFuIGV4dHJhIGFub255bW91cyBibG9jayBpbnNpZGUgdGhlIGNlbGwuCi0gICAg ICAgIHNldE1hcmdpbkJlZm9yZSgwKTsKLSAgICAgICAgc2V0TWFyZ2luQWZ0ZXIoMCk7CisgICAg ICAgIG1hcmdpbkJlZm9yZSA9IDA7CisgICAgICAgIG1hcmdpbkFmdGVyID0gMDsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIApAQCAtMjM5Niw4ICsyNDAzLDE4IEBAIHZvaWQgUmVuZGVyQm94Ojpj b21wdXRlQmxvY2tEaXJlY3Rpb25NYXJnaW5zKGNvbnN0IFJlbmRlckJsb2NrKiBjb250YWluaW5n QmxvY2spCiAgICAgTGF5b3V0VW5pdCBjdyA9IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZv ckNvbnRlbnQoKTsKICAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdmlldygpOwogICAgIFJl bmRlclN0eWxlKiBjb250YWluaW5nQmxvY2tTdHlsZSA9IGNvbnRhaW5pbmdCbG9jay0+c3R5bGUo KTsKLSAgICBjb250YWluaW5nQmxvY2stPnNldE1hcmdpbkJlZm9yZUZvckNoaWxkKHRoaXMsIG1p bmltdW1WYWx1ZUZvckxlbmd0aChzdHlsZSgpLT5tYXJnaW5CZWZvcmVVc2luZyhjb250YWluaW5n QmxvY2tTdHlsZSksIGN3LCByZW5kZXJWaWV3KSk7Ci0gICAgY29udGFpbmluZ0Jsb2NrLT5zZXRN YXJnaW5BZnRlckZvckNoaWxkKHRoaXMsIG1pbmltdW1WYWx1ZUZvckxlbmd0aChzdHlsZSgpLT5t YXJnaW5BZnRlclVzaW5nKGNvbnRhaW5pbmdCbG9ja1N0eWxlKSwgY3csIHJlbmRlclZpZXcpKTsK KyAgICBtYXJnaW5CZWZvcmUgPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoc3R5bGUoKS0+bWFyZ2lu QmVmb3JlVXNpbmcoY29udGFpbmluZ0Jsb2NrU3R5bGUpLCBjdywgcmVuZGVyVmlldyk7CisgICAg bWFyZ2luQWZ0ZXIgPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoc3R5bGUoKS0+bWFyZ2luQWZ0ZXJV c2luZyhjb250YWluaW5nQmxvY2tTdHlsZSksIGN3LCByZW5kZXJWaWV3KTsKK30KKwordm9pZCBS ZW5kZXJCb3g6OmNvbXB1dGVBbmRTZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY29uc3QgUmVuZGVy QmxvY2sqIGNvbnRhaW5pbmdCbG9jaykKK3sKKyAgICBMYXlvdXRVbml0IG1hcmdpbkJlZm9yZTsK KyAgICBMYXlvdXRVbml0IG1hcmdpbkFmdGVyOworICAgIGNvbXB1dGVCbG9ja0RpcmVjdGlvbk1h cmdpbnMoY29udGFpbmluZ0Jsb2NrLAorICAgICAgICBtYXJnaW5CZWZvcmUsIG1hcmdpbkFmdGVy KTsKKyAgICBjb250YWluaW5nQmxvY2stPnNldE1hcmdpbkJlZm9yZUZvckNoaWxkKHRoaXMsIG1h cmdpbkJlZm9yZSk7CisgICAgY29udGFpbmluZ0Jsb2NrLT5zZXRNYXJnaW5BZnRlckZvckNoaWxk KHRoaXMsIG1hcmdpbkFmdGVyKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnRhaW5p bmdCbG9ja0xvZ2ljYWxXaWR0aEZvclBvc2l0aW9uZWQoY29uc3QgUmVuZGVyQm94TW9kZWxPYmpl Y3QqIGNvbnRhaW5pbmdCbG9jaywgUmVuZGVyUmVnaW9uKiByZWdpb24sCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggYzYxMDM1ZjU1ZDk0MmVmMzc5NGUxYjNjNTAwYzA3NDQ4 N2ZmYjdmZS4uMmExNjNjMmMwNTIxNTMzZTFkNDVlNzcyY2ExNmU1MmZlNWEwMjk5OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtMzM1LDcgKzMzNSw4IEBAIHB1YmxpYzoK ICAgICB2b2lkIGNvbXB1dGVJbmxpbmVEaXJlY3Rpb25NYXJnaW5zKFJlbmRlckJsb2NrKiBjb250 YWluaW5nQmxvY2ssIExheW91dFVuaXQgY29udGFpbmVyV2lkdGgsIExheW91dFVuaXQgY2hpbGRX aWR0aCwgTGF5b3V0VW5pdCYgbWFyZ2luU3RhcnQsIExheW91dFVuaXQmIG1hcmdpbkVuZCkgY29u c3Q7CiAKICAgICAvLyBVc2VkIHRvIHJlc29sdmUgbWFyZ2lucyBpbiB0aGUgY29udGFpbmluZyBi bG9jaydzIGJsb2NrLWZsb3cgZGlyZWN0aW9uLgotICAgIHZvaWQgY29tcHV0ZUJsb2NrRGlyZWN0 aW9uTWFyZ2lucyhjb25zdCBSZW5kZXJCbG9jayogY29udGFpbmluZ0Jsb2NrKTsKKyAgICB2b2lk IGNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY29uc3QgUmVuZGVyQmxvY2sqIGNvbnRhaW5p bmdCbG9jaywgTGF5b3V0VW5pdCYgbWFyZ2luQmVmb3JlLCBMYXlvdXRVbml0JiBtYXJnaW5BZnRl cikgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlQW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zKGNv bnN0IFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2spOwogCiAgICAgZW51bSBSZW5kZXJCb3hS ZWdpb25JbmZvRmxhZ3MgeyBDYWNoZVJlbmRlckJveFJlZ2lvbkluZm8sIERvTm90Q2FjaGVSZW5k ZXJCb3hSZWdpb25JbmZvIH07CiAgICAgTGF5b3V0UmVjdCBib3JkZXJCb3hSZWN0SW5SZWdpb24o UmVuZGVyUmVnaW9uKiwgTGF5b3V0VW5pdCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdl ID0gMCwgUmVuZGVyQm94UmVnaW9uSW5mb0ZsYWdzID0gQ2FjaGVSZW5kZXJCb3hSZWdpb25JbmZv KSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXBy ZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRl cHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggOGZhNzNhZTRmM2Q3NTFiMWY1MmZhYTUyMDI1 M2ZkNGFlNDg0NWM5Ni4uZTJmZTFjZjVjMWU3MWE1YWFmMmNkMWYzOTlhMDk0ZDE4NDJkZDcyZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4 aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0 ZWRGbGV4aWJsZUJveC5jcHAKQEAgLTM3OSw3ICszNzksNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0 ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4p CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIC8vIENvbXB1dGUgdGhl IGNoaWxkJ3MgdmVydGljYWwgbWFyZ2lucy4KLSAgICAgICAgICAgIGNoaWxkLT5jb21wdXRlQmxv Y2tEaXJlY3Rpb25NYXJnaW5zKHRoaXMpOworICAgICAgICAgICAgY2hpbGQtPmNvbXB1dGVBbmRT ZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnModGhpcyk7CiAKICAgICAgICAgICAgIGlmICghY2hpbGQt Pm5lZWRzTGF5b3V0KCkpCiAgICAgICAgICAgICAgICAgY2hpbGQtPm1hcmtGb3JQYWdpbmF0aW9u UmVsYXlvdXRJZk5lZWRlZCgpOwpAQCAtNjg0LDcgKzY4NCw3IEBAIHZvaWQgUmVuZGVyRGVwcmVj YXRlZEZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4p CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIENvbXB1dGUgdGhlIGNoaWxkJ3MgdmVy dGljYWwgbWFyZ2lucy4KLSAgICAgICAgICAgIGNoaWxkLT5jb21wdXRlQmxvY2tEaXJlY3Rpb25N YXJnaW5zKHRoaXMpOworICAgICAgICAgICAgY2hpbGQtPmNvbXB1dGVBbmRTZXRCbG9ja0RpcmVj dGlvbk1hcmdpbnModGhpcyk7CiAKICAgICAgICAgICAgIC8vIEFkZCBpbiB0aGUgY2hpbGQncyBt YXJnaW5Ub3AgdG8gb3VyIGhlaWdodC4KICAgICAgICAgICAgIHNldEhlaWdodChoZWlnaHQoKSAr IGNoaWxkLT5tYXJnaW5Ub3AoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGVSb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRh YmxlUm93LmNwcAppbmRleCBmNTc1YTg4ZTNkZWJjNjQ3ZGI0ZjJmNzcwYTVlM2JhMmMwNzEzMzk5 Li4yYjgzZmFhNWE0ODY5NmE1YjM3YzIyMTllMzI2NTAxMTYwNTQ0NzJmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVSb3cuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHAKQEAgLTE1MSw3ICsxNTEsNyBAQCB2 b2lkIFJlbmRlclRhYmxlUm93OjpsYXlvdXQoKQogICAgICAgICAgICAgICAgIGNlbGwtPnNldENo aWxkTmVlZHNMYXlvdXQodHJ1ZSwgTWFya09ubHlUaGlzKTsKIAogICAgICAgICAgICAgaWYgKGNo aWxkLT5uZWVkc0xheW91dCgpKSB7Ci0gICAgICAgICAgICAgICAgY2VsbC0+Y29tcHV0ZUJsb2Nr RGlyZWN0aW9uTWFyZ2lucyh0YWJsZSgpKTsKKyAgICAgICAgICAgICAgICBjZWxsLT5jb21wdXRl QW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zKHRhYmxlKCkpOwogICAgICAgICAgICAgICAgIGNl bGwtPmxheW91dCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9Cg== 161778 2012-08-31 14:41:20 -0700 2012-08-31 17:59:46 -0700 Patch for landing bug-95595-20120831144107.patch text/plain 10033 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U3N2FkMmQ0MzM1MDNm Yjg0NTgyYTk0OWQ5MDZlZTU2MzdmMTIzOS4uODU5YzNhZmFhNTM1OGQ4ZDYwNWQzODVkYWE1ZjJh MTU4YTJkYzdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTMxICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSBjb21wdXRlQmxvY2tE aXJlY3Rpb25NYXJnaW5zIGNvbnN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NTU5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCisK KyAgICAgICAgVGhpcyBpcyBhIHN0ZXAgaW4gbWFraW5nIGNvbXB1dGVMb2dpY2FsSGVpZ2h0IGNv bnN0LgorICAgICAgICBSZWZhY3RvciBSZW5kZXJCb3g6OmNvbXB1dGVCbG9ja0RpcmVjdGlvbk1h cmdpbnMgYW5kIG1ha2UgaXQgY29uc3QuCisgICAgICAgIEFkZCBhIGhlbHBlciBtZXRob2QgY29t cHV0ZUFuZFNldEJsb2NrRGlyZWN0aW9uTWFyZ2lucyBmb3IgdGhlIGNhbGxlcnMgb3V0c2lkZSBv ZgorICAgICAgICBjb21wdXRlTG9naWNhbEhlaWdodCB0aGF0IGFyZSBjYWxsaW5nIHRoaXMuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLCB0aGlzIGlzIGFscmVhZHkgY292ZXJlZCBieSB0ZXN0cyBp biBmYXN0L3dyaXRpbmctbW9kZSBhbmQgZmFzdC9tdWx0aWNvbC4KKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bWFy Z2luQmVmb3JlRXN0aW1hdGVGb3JDaGlsZCk6IFN3aXRjaCB0byBjb21wdXRlQW5kU2V0QmxvY2tE aXJlY3Rpb25NYXJnaW5zCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0Qmxv Y2tDaGlsZCk6IFN3aXRjaCB0byBjb21wdXRlQW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zCisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6aW5zZXJ0RmxvYXRpbmdPYmplY3QpOiBTd2l0 Y2ggdG8gY29tcHV0ZUFuZFNldEJsb2NrRGlyZWN0aW9uTWFyZ2lucworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRl TG9naWNhbEhlaWdodCk6IFVzZSBjb25zdCB2ZXJzaW9uIGFuZCBmaWxsIGluIGEgTWFyZ2luVmFs dWVzIHN0cnVjdCAodG8gYmUgbWVyZ2VkIGluIHRoZSBuZXh0IHBhdGNoKS4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFyZ2lucyk6IFBhc3MgaW4g b3V0IHBhcmFtcy4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94Ojpjb21wdXRlQW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zKTogRG9lcyB0aGUgc2FtZSBh cyB0aGUgb2xkIGNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMuCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckJveC5oOgorICAgICAgICAoUmVuZGVyQm94KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbEJveCk6IFN3aXRjaCB0 byBjb21wdXRlQW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmxheW91dFZlcnRpY2FsQm94KTogU3dpdGNoIHRv IGNvbXB1dGVBbmRTZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnMKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGFibGVSb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVSb3c6Omxh eW91dCk6IFN3aXRjaCB0byBjb21wdXRlQW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zCisKIDIw MTItMDgtMzEgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAgICAgIG9uZGlzcGxh eSBldmVudCBoYW5kbGVycyBhcmUgbm90IGNhbGxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKaW5kZXggNmQ1MWZiZjQ1MTdjNDllZWVlYzlmYWYwYzI3MWVhMDk2NzMz NGY4OS4uOTA5MDBkMDQ3ZjU3NzUwYmU1MTU4OWM5NWFjNTM1NDgxNmU1ZTEwYyAxMDA3NTUKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0yMTY0LDcgKzIxNjQsNyBAQCB2 b2lkIFJlbmRlckJsb2NrOjptYXJnaW5CZWZvcmVFc3RpbWF0ZUZvckNoaWxkKFJlbmRlckJveCog Y2hpbGQsIExheW91dFVuaXQmIHBvcwogCiAgICAgLy8gTWFrZSBzdXJlIHRvIHVwZGF0ZSB0aGUg YmxvY2sgbWFyZ2lucyBub3cgZm9yIHRoZSBncmFuZGNoaWxkIGJveCBzbyB0aGF0IHdlJ3JlIGxv b2tpbmcgYXQgY3VycmVudCB2YWx1ZXMuCiAgICAgaWYgKGdyYW5kY2hpbGRCb3gtPm5lZWRzTGF5 b3V0KCkpIHsKLSAgICAgICAgZ3JhbmRjaGlsZEJveC0+Y29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFy Z2lucyh0aGlzKTsgCisgICAgICAgIGdyYW5kY2hpbGRCb3gtPmNvbXB1dGVBbmRTZXRCbG9ja0Rp cmVjdGlvbk1hcmdpbnModGhpcyk7CiAgICAgICAgIGdyYW5kY2hpbGRCb3gtPnNldE1hcmdpbkJl Zm9yZVF1aXJrKGdyYW5kY2hpbGRCb3gtPnN0eWxlKCktPm1hcmdpbkJlZm9yZSgpLnF1aXJrKCkp OwogICAgICAgICBncmFuZGNoaWxkQm94LT5zZXRNYXJnaW5BZnRlclF1aXJrKGdyYW5kY2hpbGRC b3gtPnN0eWxlKCktPm1hcmdpbkFmdGVyKCkucXVpcmsoKSk7CiAgICAgfQpAQCAtMjQxMSw3ICsy NDExLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2tDaGlsZChSZW5kZXJCb3gqIGNo aWxkLCBNYXJnaW5JbmZvJiBtYXJnaW5JbmZvLCBMYXkKICAgICBMYXlvdXRVbml0IG9sZE5lZ01h cmdpbkJlZm9yZSA9IG1heE5lZ2F0aXZlTWFyZ2luQmVmb3JlKCk7CiAKICAgICAvLyBUaGUgY2hp bGQgaXMgYSBub3JtYWwgZmxvdyBvYmplY3QuICBDb21wdXRlIHRoZSBtYXJnaW5zIHdlIHdpbGwg dXNlIGZvciBjb2xsYXBzaW5nIG5vdy4KLSAgICBjaGlsZC0+Y29tcHV0ZUJsb2NrRGlyZWN0aW9u TWFyZ2lucyh0aGlzKTsKKyAgICBjaGlsZC0+Y29tcHV0ZUFuZFNldEJsb2NrRGlyZWN0aW9uTWFy Z2lucyh0aGlzKTsKIAogICAgIC8vIERvIG5vdCBhbGxvdyBhIGNvbGxhcHNlIGlmIHRoZSBtYXJn aW4tYmVmb3JlLWNvbGxhcHNlIHN0eWxlIGlzIHNldCB0byBTRVBBUkFURS4KICAgICBSZW5kZXJT dHlsZSogY2hpbGRTdHlsZSA9IGNoaWxkLT5zdHlsZSgpOwpAQCAtMzc2MSw3ICszNzYxLDcgQEAg UmVuZGVyQmxvY2s6OkZsb2F0aW5nT2JqZWN0KiBSZW5kZXJCbG9jazo6aW5zZXJ0RmxvYXRpbmdP YmplY3QoUmVuZGVyQm94KiBvKQogICAgICAgICBvLT5sYXlvdXRJZk5lZWRlZCgpOwogICAgIGVs c2UgewogICAgICAgICBvLT5jb21wdXRlTG9naWNhbFdpZHRoKCk7Ci0gICAgICAgIG8tPmNvbXB1 dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnModGhpcyk7CisgICAgICAgIG8tPmNvbXB1dGVBbmRTZXRC bG9ja0RpcmVjdGlvbk1hcmdpbnModGhpcyk7CiAgICAgfQogICAgIHNldExvZ2ljYWxXaWR0aEZv ckZsb2F0KG5ld09iaiwgbG9naWNhbFdpZHRoRm9yQ2hpbGQobykgKyBtYXJnaW5TdGFydEZvckNo aWxkKG8pICsgbWFyZ2luRW5kRm9yQ2hpbGQobykpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwCmluZGV4IGRhN2Q0Nzk4OThmY2UwMzRmYTc4ZGRmNzIzZDA1ODY3Y2RkM2Y4 ODEuLjM4ZGNmMmYyYjI3ZTkxODhmYzRkYWQ2ODIwOTY4YTk1YmY1MTgxY2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0xOTg0LDggKzE5ODQsMTUgQEAgdm9pZCBS ZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KCkKICAgICAgICAgUmVuZGVyQmxvY2sqIGNi ID0gY29udGFpbmluZ0Jsb2NrKCk7CiAgICAgICAgIGJvb2wgaGFzUGVycGVuZGljdWxhckNvbnRh aW5pbmdCbG9jayA9IGNiLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCk7CiAgICAgCi0gICAgICAgIGlmICghaGFzUGVycGVuZGljdWxhckNvbnRh aW5pbmdCbG9jaykKLSAgICAgICAgICAgIGNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY2Ip OworICAgICAgICBpZiAoIWhhc1BlcnBlbmRpY3VsYXJDb250YWluaW5nQmxvY2spIHsKKyAgICAg ICAgICAgIENvbXB1dGVkTWFyZ2luVmFsdWVzIG1hcmdpblZhbHVlczsKKyAgICAgICAgICAgIGJv b2wgc2hvdWxkRmxpcEJlZm9yZUFmdGVyID0gY2ItPnN0eWxlKCktPndyaXRpbmdNb2RlKCkgIT0g c3R5bGUoKS0+d3JpdGluZ01vZGUoKTsKKyAgICAgICAgICAgIGNvbXB1dGVCbG9ja0RpcmVjdGlv bk1hcmdpbnMoY2IsCisgICAgICAgICAgICAgICAgc2hvdWxkRmxpcEJlZm9yZUFmdGVyID8gbWFy Z2luVmFsdWVzLm1fYWZ0ZXIgOiBtYXJnaW5WYWx1ZXMubV9iZWZvcmUsCisgICAgICAgICAgICAg ICAgc2hvdWxkRmxpcEJlZm9yZUFmdGVyID8gbWFyZ2luVmFsdWVzLm1fYmVmb3JlIDogbWFyZ2lu VmFsdWVzLm1fYWZ0ZXIpOworICAgICAgICAgICAgc2V0TWFyZ2luQmVmb3JlKG1hcmdpblZhbHVl cy5tX2JlZm9yZSk7CisgICAgICAgICAgICBzZXRNYXJnaW5BZnRlcihtYXJnaW5WYWx1ZXMubV9h ZnRlcik7CisgICAgICAgIH0KIAogICAgICAgICAvLyBGb3IgdGFibGVzLCBjYWxjdWxhdGUgbWFy Z2lucyBvbmx5LgogICAgICAgICBpZiAoaXNUYWJsZSgpKSB7CkBAIC0yMzYxLDEzICsyMzY4LDEz IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0VXNpbmcoY29u c3QgTGVuZ3RoJiBoKSBjb25zdAogICAgIHJldHVybiBjb250YWluaW5nQmxvY2soKS0+YXZhaWxh YmxlTG9naWNhbEhlaWdodCgpOwogfQogCi12b2lkIFJlbmRlckJveDo6Y29tcHV0ZUJsb2NrRGly ZWN0aW9uTWFyZ2lucyhjb25zdCBSZW5kZXJCbG9jayogY29udGFpbmluZ0Jsb2NrKQordm9pZCBS ZW5kZXJCb3g6OmNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY29uc3QgUmVuZGVyQmxvY2sq IGNvbnRhaW5pbmdCbG9jaywgTGF5b3V0VW5pdCYgbWFyZ2luQmVmb3JlLCBMYXlvdXRVbml0JiBt YXJnaW5BZnRlcikgY29uc3QKIHsKICAgICBpZiAoaXNUYWJsZUNlbGwoKSkgewogICAgICAgICAv LyBGSVhNRTogTm90IHJpZ2h0IGlmIHdlIGFsbG93IGNlbGxzIHRvIGhhdmUgZGlmZmVyZW50IGRp cmVjdGlvbmFsaXR5IHRoYW4gdGhlIHRhYmxlLiAgSWYgd2UgZG8gYWxsb3cgdGhpcywgdGhvdWdo LAogICAgICAgICAvLyB3ZSBtYXkganVzdCBkbyBpdCB3aXRoIGFuIGV4dHJhIGFub255bW91cyBi bG9jayBpbnNpZGUgdGhlIGNlbGwuCi0gICAgICAgIHNldE1hcmdpbkJlZm9yZSgwKTsKLSAgICAg ICAgc2V0TWFyZ2luQWZ0ZXIoMCk7CisgICAgICAgIG1hcmdpbkJlZm9yZSA9IDA7CisgICAgICAg IG1hcmdpbkFmdGVyID0gMDsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMjM3Niw4ICsy MzgzLDE3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlQmxvY2tEaXJlY3Rpb25NYXJnaW5zKGNv bnN0IFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2spCiAgICAgTGF5b3V0VW5pdCBjdyA9IGNv bnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKTsKICAgICBSZW5kZXJWaWV3KiBy ZW5kZXJWaWV3ID0gdmlldygpOwogICAgIFJlbmRlclN0eWxlKiBjb250YWluaW5nQmxvY2tTdHls ZSA9IGNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKTsKLSAgICBjb250YWluaW5nQmxvY2stPnNldE1h cmdpbkJlZm9yZUZvckNoaWxkKHRoaXMsIG1pbmltdW1WYWx1ZUZvckxlbmd0aChzdHlsZSgpLT5t YXJnaW5CZWZvcmVVc2luZyhjb250YWluaW5nQmxvY2tTdHlsZSksIGN3LCByZW5kZXJWaWV3KSk7 Ci0gICAgY29udGFpbmluZ0Jsb2NrLT5zZXRNYXJnaW5BZnRlckZvckNoaWxkKHRoaXMsIG1pbmlt dW1WYWx1ZUZvckxlbmd0aChzdHlsZSgpLT5tYXJnaW5BZnRlclVzaW5nKGNvbnRhaW5pbmdCbG9j a1N0eWxlKSwgY3csIHJlbmRlclZpZXcpKTsKKyAgICBtYXJnaW5CZWZvcmUgPSBtaW5pbXVtVmFs dWVGb3JMZW5ndGgoc3R5bGUoKS0+bWFyZ2luQmVmb3JlVXNpbmcoY29udGFpbmluZ0Jsb2NrU3R5 bGUpLCBjdywgcmVuZGVyVmlldyk7CisgICAgbWFyZ2luQWZ0ZXIgPSBtaW5pbXVtVmFsdWVGb3JM ZW5ndGgoc3R5bGUoKS0+bWFyZ2luQWZ0ZXJVc2luZyhjb250YWluaW5nQmxvY2tTdHlsZSksIGN3 LCByZW5kZXJWaWV3KTsKK30KKwordm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVBbmRTZXRCbG9ja0Rp cmVjdGlvbk1hcmdpbnMoY29uc3QgUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jaykKK3sKKyAg ICBMYXlvdXRVbml0IG1hcmdpbkJlZm9yZTsKKyAgICBMYXlvdXRVbml0IG1hcmdpbkFmdGVyOwor ICAgIGNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY29udGFpbmluZ0Jsb2NrLCBtYXJnaW5C ZWZvcmUsIG1hcmdpbkFmdGVyKTsKKyAgICBjb250YWluaW5nQmxvY2stPnNldE1hcmdpbkJlZm9y ZUZvckNoaWxkKHRoaXMsIG1hcmdpbkJlZm9yZSk7CisgICAgY29udGFpbmluZ0Jsb2NrLT5zZXRN YXJnaW5BZnRlckZvckNoaWxkKHRoaXMsIG1hcmdpbkFmdGVyKTsKIH0KIAogTGF5b3V0VW5pdCBS ZW5kZXJCb3g6OmNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvclBvc2l0aW9uZWQoY29uc3Qg UmVuZGVyQm94TW9kZWxPYmplY3QqIGNvbnRhaW5pbmdCbG9jaywgUmVuZGVyUmVnaW9uKiByZWdp b24sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggYzYxMDM1ZjU1ZDk0MmVm Mzc5NGUxYjNjNTAwYzA3NDQ4N2ZmYjdmZS4uMmExNjNjMmMwNTIxNTMzZTFkNDVlNzcyY2ExNmU1 MmZlNWEwMjk5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtMzM1LDcg KzMzNSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGNvbXB1dGVJbmxpbmVEaXJlY3Rpb25NYXJnaW5z KFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2ssIExheW91dFVuaXQgY29udGFpbmVyV2lkdGgs IExheW91dFVuaXQgY2hpbGRXaWR0aCwgTGF5b3V0VW5pdCYgbWFyZ2luU3RhcnQsIExheW91dFVu aXQmIG1hcmdpbkVuZCkgY29uc3Q7CiAKICAgICAvLyBVc2VkIHRvIHJlc29sdmUgbWFyZ2lucyBp biB0aGUgY29udGFpbmluZyBibG9jaydzIGJsb2NrLWZsb3cgZGlyZWN0aW9uLgotICAgIHZvaWQg Y29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFyZ2lucyhjb25zdCBSZW5kZXJCbG9jayogY29udGFpbmlu Z0Jsb2NrKTsKKyAgICB2b2lkIGNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY29uc3QgUmVu ZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jaywgTGF5b3V0VW5pdCYgbWFyZ2luQmVmb3JlLCBMYXlv dXRVbml0JiBtYXJnaW5BZnRlcikgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlQW5kU2V0QmxvY2tE aXJlY3Rpb25NYXJnaW5zKGNvbnN0IFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2spOwogCiAg ICAgZW51bSBSZW5kZXJCb3hSZWdpb25JbmZvRmxhZ3MgeyBDYWNoZVJlbmRlckJveFJlZ2lvbklu Zm8sIERvTm90Q2FjaGVSZW5kZXJCb3hSZWdpb25JbmZvIH07CiAgICAgTGF5b3V0UmVjdCBib3Jk ZXJCb3hSZWN0SW5SZWdpb24oUmVuZGVyUmVnaW9uKiwgTGF5b3V0VW5pdCBvZmZzZXRGcm9tTG9n aWNhbFRvcE9mRmlyc3RQYWdlID0gMCwgUmVuZGVyQm94UmVnaW9uSW5mb0ZsYWdzID0gQ2FjaGVS ZW5kZXJCb3hSZWdpb25JbmZvKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggOGZhNzNhZTRm M2Q3NTFiMWY1MmZhYTUyMDI1M2ZkNGFlNDg0NWM5Ni4uZTJmZTFjZjVjMWU3MWE1YWFmMmNkMWYz OTlhMDk0ZDE4NDJkZDcyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKQEAgLTM3OSw3ICszNzksNyBAQCB2 b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbEJveChib29s IHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAg ICAgIC8vIENvbXB1dGUgdGhlIGNoaWxkJ3MgdmVydGljYWwgbWFyZ2lucy4KLSAgICAgICAgICAg IGNoaWxkLT5jb21wdXRlQmxvY2tEaXJlY3Rpb25NYXJnaW5zKHRoaXMpOworICAgICAgICAgICAg Y2hpbGQtPmNvbXB1dGVBbmRTZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnModGhpcyk7CiAKICAgICAg ICAgICAgIGlmICghY2hpbGQtPm5lZWRzTGF5b3V0KCkpCiAgICAgICAgICAgICAgICAgY2hpbGQt Pm1hcmtGb3JQYWdpbmF0aW9uUmVsYXlvdXRJZk5lZWRlZCgpOwpAQCAtNjg0LDcgKzY4NCw3IEBA IHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJveChib29s IHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIENvbXB1 dGUgdGhlIGNoaWxkJ3MgdmVydGljYWwgbWFyZ2lucy4KLSAgICAgICAgICAgIGNoaWxkLT5jb21w dXRlQmxvY2tEaXJlY3Rpb25NYXJnaW5zKHRoaXMpOworICAgICAgICAgICAgY2hpbGQtPmNvbXB1 dGVBbmRTZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnModGhpcyk7CiAKICAgICAgICAgICAgIC8vIEFk ZCBpbiB0aGUgY2hpbGQncyBtYXJnaW5Ub3AgdG8gb3VyIGhlaWdodC4KICAgICAgICAgICAgIHNl dEhlaWdodChoZWlnaHQoKSArIGNoaWxkLT5tYXJnaW5Ub3AoKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVSb3cuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmNwcAppbmRleCBmNTc1YTg4ZTNkZWJjNjQ3ZGI0ZjJm NzcwYTVlM2JhMmMwNzEzMzk5Li4yYjgzZmFhNWE0ODY5NmE1YjM3YzIyMTllMzI2NTAxMTYwNTQ0 NzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVSb3cu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHAKQEAg LTE1MSw3ICsxNTEsNyBAQCB2b2lkIFJlbmRlclRhYmxlUm93OjpsYXlvdXQoKQogICAgICAgICAg ICAgICAgIGNlbGwtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgTWFya09ubHlUaGlzKTsKIAog ICAgICAgICAgICAgaWYgKGNoaWxkLT5uZWVkc0xheW91dCgpKSB7Ci0gICAgICAgICAgICAgICAg Y2VsbC0+Y29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFyZ2lucyh0YWJsZSgpKTsKKyAgICAgICAgICAg ICAgICBjZWxsLT5jb21wdXRlQW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zKHRhYmxlKCkpOwog ICAgICAgICAgICAgICAgIGNlbGwtPmxheW91dCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9 Cg==