74645 2011-12-15 13:15:10 -0800 m_hasCounterNodeMap and m_everHadLayout should be private to RenderObject 2011-12-16 07:35:54 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74646 1 rniwa rniwa arv darin eric hyatt koivisto mitz ojan paroga simon.fraser tony oldest_to_newest 522184 0 rniwa 2011-12-15 13:15:10 -0800 No brainer. Public member variable is bad. 522187 1 119490 rniwa 2011-12-15 13:18:31 -0800 Created attachment 119490 cleanup 522192 2 119490 eric 2011-12-15 13:22:23 -0800 Comment on attachment 119490 cleanup OK. 522200 3 rniwa 2011-12-15 13:30:26 -0800 Committed r102979: <http://trac.webkit.org/changeset/102979> 522683 4 paroga 2011-12-16 04:23:26 -0800 r102979 <http://trac.webkit.org/changeset/102979> broke WinCE build. I've commited r103056 <http://trac.webkit.org/changeset/103056> to fix it, but I'm not 100% sure if my fix is ok. The MSVC2005 compiler for WinCE implements an old behaviour (maybe compiler bug), where the nested classes don't have full access to the enclosing class. 522750 5 rniwa 2011-12-16 07:27:05 -0800 (In reply to comment #4) > r102979 <http://trac.webkit.org/changeset/102979> broke WinCE build. > I've commited r103056 <http://trac.webkit.org/changeset/103056> to fix it, but I'm not 100% sure if my fix is ok. > The MSVC2005 compiler for WinCE implements an old behaviour (maybe compiler bug), where the nested classes don't have full access to the enclosing class. Thanks for the fix but the fix doesn't make much sense. What's nested class to do with everHadLayout being protected? Nothing in RenderObjectBitfields should be accessing anything in RenderObject. 522752 6 paroga 2011-12-16 07:35:54 -0800 (In reply to comment #5) > (In reply to comment #4) > > r102979 <http://trac.webkit.org/changeset/102979> broke WinCE build. > > I've commited r103056 <http://trac.webkit.org/changeset/103056> to fix it, but I'm not 100% sure if my fix is ok. > > The MSVC2005 compiler for WinCE implements an old behaviour (maybe compiler bug), where the nested classes don't have full access to the enclosing class. > > Thanks for the fix but the fix doesn't make much sense. What's nested class to do with everHadLayout being protected? Nothing in RenderObjectBitfields should be accessing anything in RenderObject. The problem is/was that RenderBlock::FloatWithRect wants to access everHadLayout() at http://trac.webkit.org/browser/trunk/Source/WebCore/rendering/RenderBlock.h?rev=103030#L483, but the WinCE compiler doesn't allow it since the nested class doesn't get the required rights to access protected members. 119490 2011-12-15 13:18:31 -0800 2011-12-15 13:22:23 -0800 cleanup bug-74645-20111215131829.patch text/plain 11902 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjk3NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDExLTEyLTE1ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIG1faGFzQ291bnRlck5vZGVNYXAg YW5kIG1fZXZlckhhZExheW91dCBzaG91bGQgYmUgcHJpdmF0ZSB0byBSZW5kZXJPYmplY3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0NjQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFkZSB0aGVtIHBy aXZhdGUgYW5kIGFkZGVkIGdldHRlcnMgYW5kIHNldHRlcnMgYXMgbmVlZGVkLgorCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bWFrZUNv dW50ZXJOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckNvdW50ZXI6OmRlc3Ryb3lDb3Vu dGVyTm9kZXMpOgorICAgICAgICAoV2ViQ29yZTo6dXBkYXRlQ291bnRlcnMpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQ291bnRlcjo6cmVuZGVyZXJTdHlsZUNoYW5nZWQpOgorICAgICAgICAo c2hvd0NvdW50ZXJSZW5kZXJlclRyZWUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbG93 VGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmxheW91dCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyT2JqZWN0OjpoYXNDb3VudGVyTm9kZU1hcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJPYmplY3Q6OnNldEhhc0NvdW50ZXJOb2RlTWFwKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck9iamVjdDo6ZXZlckhhZExheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdGb3JlaWduT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR0ZvcmVpZ25P YmplY3Q6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbWFnZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdJbWFnZTo6bGF5b3V0KToKKyAgICAgICAg KiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyOjpsYXlvdXQpOgorICAgICAgICAq IHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXI6OmxheW91dCk6CisgICAgICAgICogcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jv b3Q6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdTaGFwZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdTaGFwZTo6bGF5b3V0KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy U1ZHVGV4dDo6bGF5b3V0KToKKwogMjAxMS0xMi0xNSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlr QGNocm9taXVtLm9yZz4KIAogICAgICAgICBOb3QgYWJsZSB0byBuYXZpZ2F0ZSB0aGUgUmVzb3Vy Y2UgdGFiIG9wdGlvbnMgcHJvcGVybHkgd2l0aCBhcnJvdyBrZXlzIGFmdGVyIGFkZGluZyB0aGUg c3RpY2t5LW5vdGVzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvdW50 ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJDb3Vu dGVyLmNwcAkocmV2aXNpb24gMTAyOTA2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckNvdW50ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTYsNyArNDE2LDcgQEAgc3RhdGlj IENvdW50ZXJOb2RlKiBtYWtlQ291bnRlck5vZGUoUmVuZAogewogICAgIEFTU0VSVChvYmplY3Qp OwogCi0gICAgaWYgKG9iamVjdC0+bV9oYXNDb3VudGVyTm9kZU1hcCkgeworICAgIGlmIChvYmpl Y3QtPmhhc0NvdW50ZXJOb2RlTWFwKCkpIHsKICAgICAgICAgaWYgKENvdW50ZXJNYXAqIG5vZGVN YXAgPSBjb3VudGVyTWFwcygpLmdldChvYmplY3QpKSB7CiAgICAgICAgICAgICBpZiAoQ291bnRl ck5vZGUqIG5vZGUgPSBub2RlTWFwLT5nZXQoaWRlbnRpZmllci5pbXBsKCkpLmdldCgpKQogICAg ICAgICAgICAgICAgIHJldHVybiBub2RlOwpAQCAtNDM0LDEyICs0MzQsMTIgQEAgc3RhdGljIENv dW50ZXJOb2RlKiBtYWtlQ291bnRlck5vZGUoUmVuZAogICAgIGlmIChmaW5kUGxhY2VGb3JDb3Vu dGVyKG9iamVjdCwgaWRlbnRpZmllciwgaXNSZXNldCwgbmV3UGFyZW50LCBuZXdQcmV2aW91c1Np YmxpbmcpKQogICAgICAgICBuZXdQYXJlbnQtPmluc2VydEFmdGVyKG5ld05vZGUuZ2V0KCksIG5l d1ByZXZpb3VzU2libGluZywgaWRlbnRpZmllcik7CiAgICAgQ291bnRlck1hcCogbm9kZU1hcDsK LSAgICBpZiAob2JqZWN0LT5tX2hhc0NvdW50ZXJOb2RlTWFwKQorICAgIGlmIChvYmplY3QtPmhh c0NvdW50ZXJOb2RlTWFwKCkpCiAgICAgICAgIG5vZGVNYXAgPSBjb3VudGVyTWFwcygpLmdldChv YmplY3QpOwogICAgIGVsc2UgewogICAgICAgICBub2RlTWFwID0gbmV3IENvdW50ZXJNYXA7CiAg ICAgICAgIGNvdW50ZXJNYXBzKCkuc2V0KG9iamVjdCwgbm9kZU1hcCk7Ci0gICAgICAgIG9iamVj dC0+bV9oYXNDb3VudGVyTm9kZU1hcCA9IHRydWU7CisgICAgICAgIG9iamVjdC0+c2V0SGFzQ291 bnRlck5vZGVNYXAodHJ1ZSk7CiAgICAgfQogICAgIG5vZGVNYXAtPnNldChpZGVudGlmaWVyLmlt cGwoKSwgbmV3Tm9kZSk7CiAgICAgaWYgKG5ld05vZGUtPnBhcmVudCgpKQpAQCAtNDUxLDcgKzQ1 MSw3IEBAIHN0YXRpYyBDb3VudGVyTm9kZSogbWFrZUNvdW50ZXJOb2RlKFJlbmQKICAgICBib29s IHNraXBEZXNjZW5kYW50czsKICAgICBmb3IgKFJlbmRlck9iamVjdCogY3VycmVudFJlbmRlcmVy ID0gbmV4dEluUHJlT3JkZXIob2JqZWN0LCBzdGF5V2l0aGluKTsgY3VycmVudFJlbmRlcmVyOyBj dXJyZW50UmVuZGVyZXIgPSBuZXh0SW5QcmVPcmRlcihjdXJyZW50UmVuZGVyZXIsIHN0YXlXaXRo aW4sIHNraXBEZXNjZW5kYW50cykpIHsKICAgICAgICAgc2tpcERlc2NlbmRhbnRzID0gZmFsc2U7 Ci0gICAgICAgIGlmICghY3VycmVudFJlbmRlcmVyLT5tX2hhc0NvdW50ZXJOb2RlTWFwKQorICAg ICAgICBpZiAoIWN1cnJlbnRSZW5kZXJlci0+aGFzQ291bnRlck5vZGVNYXAoKSkKICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAgICAgICBDb3VudGVyTm9kZSogY3VycmVudENvdW50ZXIgPSBtYXBz LmdldChjdXJyZW50UmVuZGVyZXIpLT5nZXQoaWRlbnRpZmllci5pbXBsKCkpLmdldCgpOwogICAg ICAgICBpZiAoIWN1cnJlbnRDb3VudGVyKQpAQCAtNTY5LDcgKzU2OSw3IEBAIHZvaWQgUmVuZGVy Q291bnRlcjo6ZGVzdHJveUNvdW50ZXJOb2RlcygKICAgICB9CiAgICAgbWFwcy5yZW1vdmUobWFw c0l0ZXJhdG9yKTsKICAgICBkZWxldGUgbWFwOwotICAgIG93bmVyLT5tX2hhc0NvdW50ZXJOb2Rl TWFwID0gZmFsc2U7CisgICAgb3duZXItPnNldEhhc0NvdW50ZXJOb2RlTWFwKGZhbHNlKTsKIH0K IAogdm9pZCBSZW5kZXJDb3VudGVyOjpkZXN0cm95Q291bnRlck5vZGUoUmVuZGVyT2JqZWN0KiBv d25lciwgY29uc3QgQXRvbWljU3RyaW5nJiBpZGVudGlmaWVyKQpAQCAtNjE1LDcgKzYxNSw3IEBA IHN0YXRpYyB2b2lkIHVwZGF0ZUNvdW50ZXJzKFJlbmRlck9iamVjdCoKICAgICBpZiAoIWRpcmVj dGl2ZU1hcCkKICAgICAgICAgcmV0dXJuOwogICAgIENvdW50ZXJEaXJlY3RpdmVNYXA6OmNvbnN0 X2l0ZXJhdG9yIGVuZCA9IGRpcmVjdGl2ZU1hcC0+ZW5kKCk7Ci0gICAgaWYgKCFyZW5kZXJlci0+ bV9oYXNDb3VudGVyTm9kZU1hcCkgeworICAgIGlmICghcmVuZGVyZXItPmhhc0NvdW50ZXJOb2Rl TWFwKCkpIHsKICAgICAgICAgZm9yIChDb3VudGVyRGlyZWN0aXZlTWFwOjpjb25zdF9pdGVyYXRv ciBpdCA9IGRpcmVjdGl2ZU1hcC0+YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQogICAgICAgICAg ICAgbWFrZUNvdW50ZXJOb2RlKHJlbmRlcmVyLCBBdG9taWNTdHJpbmcoaXQtPmZpcnN0LmdldCgp KSwgZmFsc2UpOwogICAgICAgICByZXR1cm47CkBAIC02ODYsNyArNjg2LDcgQEAgdm9pZCBSZW5k ZXJDb3VudGVyOjpyZW5kZXJlclN0eWxlQ2hhbmdlZAogICAgICAgICAgICAgICAgICAgICBSZW5k ZXJDb3VudGVyOjpkZXN0cm95Q291bnRlck5vZGUocmVuZGVyZXIsIGl0LT5maXJzdC5nZXQoKSk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpZiAocmVuZGVy ZXItPm1faGFzQ291bnRlck5vZGVNYXApCisgICAgICAgICAgICBpZiAocmVuZGVyZXItPmhhc0Nv dW50ZXJOb2RlTWFwKCkpCiAgICAgICAgICAgICAgICAgUmVuZGVyQ291bnRlcjo6ZGVzdHJveUNv dW50ZXJOb2RlcyhyZW5kZXJlcik7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKG5ld1N0eWxl ICYmIChuZXdDb3VudGVyRGlyZWN0aXZlcyA9IG5ld1N0eWxlLT5jb3VudGVyRGlyZWN0aXZlcygp KSkgewpAQCAtNzE5LDcgKzcxOSw3IEBAIHZvaWQgc2hvd0NvdW50ZXJSZW5kZXJlclRyZWUoY29u c3QgV2ViQ28KICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiICAgICIpOwogICAgICAgICBm cHJpbnRmKHN0ZGVyciwgIiVwIE46JXAgUDolcCBQUzolcCBOUzolcCBDOiVwXG4iLAogICAgICAg ICAgICAgY3VycmVudCwgY3VycmVudC0+bm9kZSgpLCBjdXJyZW50LT5wYXJlbnQoKSwgY3VycmVu dC0+cHJldmlvdXNTaWJsaW5nKCksCi0gICAgICAgICAgICBjdXJyZW50LT5uZXh0U2libGluZygp LCBjdXJyZW50LT5tX2hhc0NvdW50ZXJOb2RlTWFwPworICAgICAgICAgICAgY3VycmVudC0+bmV4 dFNpYmxpbmcoKSwgY3VycmVudC0+aGFzQ291bnRlck5vZGVNYXAoKSA/CiAgICAgICAgICAgICBj b3VudGVyTmFtZSA/IFdlYkNvcmU6OmNvdW50ZXJNYXBzKCkuZ2V0KGN1cnJlbnQpLT5nZXQoaWRl bnRpZmllci5pbXBsKCkpLmdldCgpIDogKFdlYkNvcmU6OkNvdW50ZXJOb2RlKikxIDogKFdlYkNv cmU6OkNvdW50ZXJOb2RlKikwKTsKICAgICB9CiAgICAgZmZsdXNoKHN0ZGVycik7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCShyZXZpc2lv biAxMDI5MDYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMCw3ICszMTAsNyBAQCBwcml2YXRlOgogCiB2b2lkIFJl bmRlckZsb3dUaHJlYWQ6OmxheW91dCgpCiB7Ci0gICAgYm9vbCByZWdpb25zQ2hhbmdlZCA9IG1f cmVnaW9uc0ludmFsaWRhdGVkICYmIG1fZXZlckhhZExheW91dDsKKyAgICBib29sIHJlZ2lvbnND aGFuZ2VkID0gbV9yZWdpb25zSW52YWxpZGF0ZWQgJiYgZXZlckhhZExheW91dCgpOwogICAgIGlm IChtX3JlZ2lvbnNJbnZhbGlkYXRlZCkgewogICAgICAgICBtX3JlZ2lvbnNJbnZhbGlkYXRlZCA9 IGZhbHNlOwogICAgICAgICBtX2hhc1ZhbGlkUmVnaW9ucyA9IGZhbHNlOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gMTAyOTA2KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0z NjgsNiArMzY4LDkgQEAgcHVibGljOgogICAgICAgICAgcmV0dXJuIGNvbnRhaW5lcjsKICAgICB9 CiAKKyAgICBib29sIGhhc0NvdW50ZXJOb2RlTWFwKCkgY29uc3QgeyByZXR1cm4gbV9oYXNDb3Vu dGVyTm9kZU1hcDsgfQorICAgIHZvaWQgc2V0SGFzQ291bnRlck5vZGVNYXAoYm9vbCBoYXNDb3Vu dGVyTm9kZU1hcCkgeyBtX2hhc0NvdW50ZXJOb2RlTWFwID0gaGFzQ291bnRlck5vZGVNYXA7IH0K KwogICAgIGJvb2wgY2hpbGRyZW5JbmxpbmUoKSBjb25zdCB7IHJldHVybiBtX2NoaWxkcmVuSW5s aW5lOyB9CiAgICAgdm9pZCBzZXRDaGlsZHJlbklubGluZShib29sIGIpIHsgbV9jaGlsZHJlbklu bGluZSA9IGI7IH0KICAgICBib29sIGhhc0NvbHVtbnMoKSBjb25zdCB7IHJldHVybiBtX2hhc0Nv bHVtbnM7IH0KQEAgLTg0Myw2ICs4NDYsOCBAQCBwdWJsaWM6CiAgICAgfQogCiBwcm90ZWN0ZWQ6 CisgICAgYm9vbCBldmVySGFkTGF5b3V0KCkgY29uc3QgeyByZXR1cm4gbV9ldmVySGFkTGF5b3V0 OyB9CisKICAgICAvLyBPdmVycmlkZXMgc2hvdWxkIGNhbGwgdGhlIHN1cGVyY2xhc3MgYXQgdGhl IGVuZAogICAgIHZpcnR1YWwgdm9pZCBzdHlsZVdpbGxDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlLCBj b25zdCBSZW5kZXJTdHlsZSogbmV3U3R5bGUpOwogICAgIC8vIE92ZXJyaWRlcyBzaG91bGQgY2Fs bCB0aGUgc3VwZXJjbGFzcyBhdCB0aGUgc3RhcnQKQEAgLTkxMSwxMiArOTE2LDEwIEBAIHByaXZh dGU6CiAgICAgYm9vbCBtX2hhc092ZXJmbG93Q2xpcCAgICAgICAgICAgOiAxOyAvLyBTZXQgaW4g dGhlIGNhc2Ugb2Ygb3ZlcmZsb3c6YXV0by9zY3JvbGwvaGlkZGVuCiAgICAgYm9vbCBtX2hhc1Ry YW5zZm9ybSAgICAgICAgICAgICAgOiAxOwogICAgIGJvb2wgbV9oYXNSZWZsZWN0aW9uICAgICAg ICAgICAgIDogMTsKLSAgICAKLXB1YmxpYzoKKwogICAgIGJvb2wgbV9oYXNDb3VudGVyTm9kZU1h cCAgICAgICAgIDogMTsKICAgICBib29sIG1fZXZlckhhZExheW91dCAgICAgICAgICAgICA6IDE7 CiAKLXByaXZhdGU6CiAgICAgLy8gVGhlc2UgYml0ZmllbGRzIGFyZSBtb3ZlZCBoZXJlIGZyb20g c3ViY2xhc3NlcyB0byBwYWNrIHRoZW0gdG9nZXRoZXIKICAgICAvLyBmcm9tIFJlbmRlckJsb2Nr CiAgICAgYm9vbCBtX2NoaWxkcmVuSW5saW5lIDogMTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvUmVuZGVyU1ZHRm9yZWlnbk9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdGb3JlaWduT2JqZWN0LmNwcAkocmV2 aXNpb24gMTAyOTA2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdG b3JlaWduT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ4LDcgKzE0OCw3IEBAIHZvaWQg UmVuZGVyU1ZHRm9yZWlnbk9iamVjdDo6bGF5b3V0KCkKICAgICAvLyBGSVhNRTogSW52ZXN0aWdh dGUgaW4gbG9jYXRpb24gcm91bmRpbmcgaXNzdWVzIC0gb25seSBhZmZlY3RzIFJlbmRlclNWR0Zv cmVpZ25PYmplY3QgJiBSZW5kZXJTVkdUZXh0CiAgICAgc2V0TG9jYXRpb24ocm91bmRlZEludFBv aW50KHZpZXdwb3J0TG9jYXRpb24pKTsKIAotICAgIGJvb2wgbGF5b3V0Q2hhbmdlZCA9IG1fZXZl ckhhZExheW91dCAmJiBzZWxmTmVlZHNMYXlvdXQoKTsKKyAgICBib29sIGxheW91dENoYW5nZWQg PSBldmVySGFkTGF5b3V0KCkgJiYgc2VsZk5lZWRzTGF5b3V0KCk7CiAgICAgUmVuZGVyQmxvY2s6 OmxheW91dCgpOwogICAgIEFTU0VSVCghbmVlZHNMYXlvdXQoKSk7CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW1hZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW1hZ2UuY3BwCShyZXZpc2lvbiAx MDI5MDYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0ltYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtODIsNyArODIsNyBAQCB2b2lkIFJlbmRlclNWR0ltYWdlOjps YXlvdXQoKQogICAgIH0KIAogICAgIC8vIEludmFsaWRhdGUgYWxsIHJlc291cmNlcyBvZiB0aGlz IGNsaWVudCBpZiBvdXIgbGF5b3V0IGNoYW5nZWQuCi0gICAgaWYgKG1fZXZlckhhZExheW91dCAm JiBzZWxmTmVlZHNMYXlvdXQoKSkKKyAgICBpZiAoZXZlckhhZExheW91dCgpICYmIHNlbGZOZWVk c0xheW91dCgpKQogICAgICAgICBTVkdSZXNvdXJjZXNDYWNoZTo6Y2xpZW50TGF5b3V0Q2hhbmdl ZCh0aGlzKTsKIAogICAgIC8vIElmIG91ciBib3VuZHMgY2hhbmdlZCwgbm90aWZ5IHRoZSBwYXJl bnRzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJj ZUNvbnRhaW5lci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAJKHJldmlzaW9uIDEwMjkwNikKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01Myw3ICs1Myw3IEBAIFJlbmRlclNWR1Jlc291cmNlQ29udGFp bmVyOjp+UmVuZGVyU1ZHUmUKIHZvaWQgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXI6OmxheW91 dCgpCiB7CiAgICAgLy8gSW52YWxpZGF0ZSBhbGwgcmVzb3VyY2VzIGlmIG91ciBsYXlvdXQgY2hh bmdlZC4KLSAgICBpZiAobV9ldmVySGFkTGF5b3V0ICYmIHNlbGZOZWVkc0xheW91dCgpKQorICAg IGlmIChldmVySGFkTGF5b3V0KCkgJiYgc2VsZk5lZWRzTGF5b3V0KCkpCiAgICAgICAgIHJlbW92 ZUFsbENsaWVudHNGcm9tQ2FjaGUoKTsKIAogICAgIFJlbmRlclNWR0hpZGRlbkNvbnRhaW5lcjo6 bGF5b3V0KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jl c291cmNlTWFya2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3ZnL1JlbmRlclNWR1Jlc291cmNlTWFya2VyLmNwcAkocmV2aXNpb24gMTAyOTA2KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hcmtlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ4LDcgKzQ4LDcgQEAgUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXI6On5S ZW5kZXJTVkdSZXNvdQogdm9pZCBSZW5kZXJTVkdSZXNvdXJjZU1hcmtlcjo6bGF5b3V0KCkKIHsK ICAgICAvLyBJbnZhbGlkYXRlIGFsbCByZXNvdXJjZXMgaWYgb3VyIGxheW91dCBjaGFuZ2VkLgot ICAgIGlmIChtX2V2ZXJIYWRMYXlvdXQgJiYgc2VsZk5lZWRzTGF5b3V0KCkpCisgICAgaWYgKGV2 ZXJIYWRMYXlvdXQoKSAmJiBzZWxmTmVlZHNMYXlvdXQoKSkKICAgICAgICAgcmVtb3ZlQWxsQ2xp ZW50c0Zyb21DYWNoZSgpOwogCiAgICAgLy8gUmVuZGVyU1ZHSGlkZGVuQ29udGFpbmVyIG92ZXJ3 cml0ZXMgbGF5b3V0KCkuIFdlIG5lZWQgdGhlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAJKHJldmlzaW9uIDEwMjkwNikKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI1MSw3ICsyNTEsNyBAQCB2b2lkIFJlbmRlclNWR1Jvb3Q6OmxheW91dCgpCiAKICAgICBp ZiAodmlldygpICYmIHZpZXcoKS0+ZnJhbWVWaWV3KCkgJiYgdmlldygpLT5mcmFtZVZpZXcoKS0+ ZW1iZWRkZWRDb250ZW50Qm94KCkpIHsKICAgICAgICAgaWYgKCFtX25lZWRzU2l6ZU5lZ290aWF0 aW9uV2l0aEhvc3REb2N1bWVudCkKLSAgICAgICAgICAgIG1fbmVlZHNTaXplTmVnb3RpYXRpb25X aXRoSG9zdERvY3VtZW50ID0gIW1fZXZlckhhZExheW91dCB8fCBvbGRTaXplICE9IHNpemUoKTsK KyAgICAgICAgICAgIG1fbmVlZHNTaXplTmVnb3RpYXRpb25XaXRoSG9zdERvY3VtZW50ID0gIWV2 ZXJIYWRMYXlvdXQoKSB8fCBvbGRTaXplICE9IHNpemUoKTsKICAgICB9IGVsc2UKICAgICAgICAg QVNTRVJUKCFtX25lZWRzU2l6ZU5lZ290aWF0aW9uV2l0aEhvc3REb2N1bWVudCk7CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHU2hhcGUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHU2hhcGUuY3BwCShy ZXZpc2lvbiAxMDI5MDYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1NoYXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc3LDcgKzE3Nyw3IEBAIHZvaWQgUmVuZGVy U1ZHU2hhcGU6OmxheW91dCgpCiAgICAgfQogCiAgICAgLy8gSW52YWxpZGF0ZSBhbGwgcmVzb3Vy Y2VzIG9mIHRoaXMgY2xpZW50IGlmIG91ciBsYXlvdXQgY2hhbmdlZC4KLSAgICBpZiAobV9ldmVy SGFkTGF5b3V0ICYmIHNlbGZOZWVkc0xheW91dCgpKSB7CisgICAgaWYgKGV2ZXJIYWRMYXlvdXQo KSAmJiBzZWxmTmVlZHNMYXlvdXQoKSkgewogICAgICAgICBTVkdSZXNvdXJjZXNDYWNoZTo6Y2xp ZW50TGF5b3V0Q2hhbmdlZCh0aGlzKTsKICAgICAgICAgbV9tYXJrZXJMYXlvdXRJbmZvLmNsZWFy KCk7CiAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdU ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRl clNWR1RleHQuY3BwCShyZXZpc2lvbiAxMDI5MDYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1RleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzMsNyArMTczLDcg QEAgdm9pZCBSZW5kZXJTVkdUZXh0OjpsYXlvdXQoKQogICAgICAgICB1cGRhdGVDYWNoZWRCb3Vu ZGFyaWVzSW5QYXJlbnRzID0gb2xkQm91bmRhcmllcyAhPSBvYmplY3RCb3VuZGluZ0JveCgpOwog CiAgICAgLy8gSW52YWxpZGF0ZSBhbGwgcmVzb3VyY2VzIG9mIHRoaXMgY2xpZW50IGlmIG91ciBs YXlvdXQgY2hhbmdlZC4KLSAgICBpZiAobV9ldmVySGFkTGF5b3V0ICYmIHNlbGZOZWVkc0xheW91 dCgpKQorICAgIGlmIChldmVySGFkTGF5b3V0KCkgJiYgc2VsZk5lZWRzTGF5b3V0KCkpCiAgICAg ICAgIFNWR1Jlc291cmNlc0NhY2hlOjpjbGllbnRMYXlvdXRDaGFuZ2VkKHRoaXMpOwogCiAgICAg Ly8gSWYgb3VyIGJvdW5kcyBjaGFuZ2VkLCBub3RpZnkgdGhlIHBhcmVudHMuCg==