85010 2012-04-26 14:51:05 -0700 Improve compositing logging output 2012-04-26 18:39:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dino enne jamesr simon.fraser oldest_to_newest 611009 0 simon.fraser 2012-04-26 14:51:05 -0700 Improve compositing logging output 611013 1 simon.fraser 2012-04-26 14:53:27 -0700 Sample output: Update 25 of main frame. Overlap testing is off 0x118243338 1150x14002 0.000MP (root) RenderView 0x121c51b88 769x902 0.000MP (clips compositing descendants) RenderBlock (relative positioned) DIV 'map' 0x1280b9248 1280x1536 1.966MP (transform) RenderBlock (positioned) DIV 0x12a2e52a8 0x0 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 0x12a2e5718 0x0 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 0x12a2e5b88 0x0 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 0x12a2e5ff8 0x0 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 0x12a2e6468 0x0 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 0x12a2e68d8 0x0 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 0x12a2e6d48 0x0 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 0x12a2e71b8 0x0 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186982f8 83x152 0.013MP (overlap/stacking) RenderBlock (positioned) DIV 'views-control' 0x1186a3d58 19x19 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 'map_overview' 0x12859e378 390x19 0.007MP (overlap/stacking) RenderBlock (positioned) DIV 'copyright' 0x11d3ae718 43x29 0.000MP (overlap/stacking) RenderBlock (positioned) DIV 'map_magnifyingglass' 0x12859eae8 110x29 0.003MP (overlap/stacking) RenderBlock (positioned) DIV 'scalecontrol' 0x1282aacc8 90x339 0.031MP (overlap/stacking) RenderBlock (positioned) DIV 'lmc3d' 0x1186a7108 1150x1 0.001MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186a7b38 1150x2 0.002MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186a8568 1150x3 0.003MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186a8f98 1150x4 0.005MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186a99c8 1150x5 0.006MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186aa908 1x900 0.001MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186ab3a8 2x900 0.002MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186abe48 3x900 0.003MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186ac8e8 4x900 0.004MP (overlap/stacking) RenderBlock (positioned) DIV 0x1186ad388 5x900 0.004MP (overlap/stacking) RenderBlock (positioned) DIV 0x118677688 381x59 0.022MP (overlap/stacking) RenderBlock (relative positioned) DIV 'topbar' 0x1186ade78 381x845 0.322MP (overlap/stacking) RenderBlock (positioned) DIV 'panel' 0x121dcb508 1150x102 0.117MP (overlap/stacking) RenderBlock (relative positioned) DIV 0x1186594b8 1150x0 0.000MP (overlap/stacking) RenderBlock (relative positioned) DIV 'infoarea' Total layers primary secondary obligatory backing (MP) secondary backing(MP) total backing (MP) update time (ms) 31 3 28 1.97 0.55 2.51 7.71 611017 2 139078 simon.fraser 2012-04-26 14:58:10 -0700 Created attachment 139078 Patch 611028 3 139078 dino 2012-04-26 15:23:50 -0700 Comment on attachment 139078 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139078&action=review > Source/WebCore/rendering/RenderLayerCompositor.cpp:459 > + LOG(Compositing, "%*p %dx%d %.3fMP (%s) %s\n", 12 + depth * 2, layer, backing->compositedBounds().width(), backing->compositedBounds().height(), maybe depth * 4 to be webkit stylish? > Source/WebCore/rendering/RenderLayerCompositor.cpp:1456 > + return "transform-style: preserve-3d"; I think just "preserve-3d" is enough. 611165 4 simon.fraser 2012-04-26 18:39:28 -0700 http://trac.webkit.org/changeset/115396 139078 2012-04-26 14:58:10 -0700 2012-04-26 15:23:50 -0700 Patch bug-85010-20120426145808.patch text/plain 12511 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmIyOTIzZmY1YmNiNzQw NmIwZDY4Mzk4NTk3OWIzYzhiNjRhMjQyZi4uZmMwY2Q0NDQ1MjNlN2QwNjViMjA5YTY3MDM1NzYy ZDYxYjk0N2E5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA0LTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEltcHJvdmUgY29t cG9zaXRpbmcgbG9nZ2luZyBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg1MDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW4gdGhlIGNvbXBvc2l0aW5nIGxvZyBjaGFubmVsIG91dHB1dCwgaW5k ZW50IHRoZSBsYXllcnMKKyAgICAgICAgYmFzZWQgb24gei1vcmRlciB0cmVlIGRlcHRoLiBUYWJ1 bGF0ZSB0aGUgc3VtbWFyeSwgYW5kCisgICAgICAgIHNob3cgb2JsaWdhdGUgYW5kIHNlY29uZGFy eSBiYWNraW5nIHN0b3JlIGFyZWEgc2VwYXJhdGVseS4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlQ2xp cFJlY3RzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6UmVuZGVyTGF5ZXJDb21w b3NpdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRl Q29tcG9zaXRpbmdMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpsb2dMYXllckluZm8pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpyZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllclRyZWVHZW9tZXRyeSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYXNvbkZvckNvbXBvc2l0aW5nKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisgICAgICAgIChSZW5k ZXJMYXllckNvbXBvc2l0b3IpOgorCiAyMDEyLTA0LTI1ICBBbGV4aXMgTWVuYXJkICA8YWxleGlz Lm1lbmFyZEBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZCwgZml4IFdpbmRv d3MgYnVpbGQgYWZ0ZXIgcjExNTIxNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggMzY1MWU5ZWNlNDk3MjZiNjdjMWIxZDU1 YTNkZmMzYTliMGRmYWFmYS4uYzg5MTE0ODY4NzY2YzIyY2VhZTU5ZTc2MTEyNTRmYTFmZGVjMWU2 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAKQEAgLTE3Nyw3ICsxNzcsOCBAQCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OlJlbmRl ckxheWVyQ29tcG9zaXRvcihSZW5kZXJWaWV3KiByZW5kZXJWaWV3KQogICAgICwgbV9yb290TGF5 ZXJVcGRhdGVDb3VudCgwKQogICAgICwgbV9vYmxpZ2F0ZUNvbXBvc2l0ZWRMYXllckNvdW50KDAp CiAgICAgLCBtX3NlY29uZGFyeUNvbXBvc2l0ZWRMYXllckNvdW50KDApCi0gICAgLCBtX2JhY2tp bmdBcmVhTWVnYVBpeGVscygwKQorICAgICwgbV9vYmxpZ2F0b3J5QmFja2luZ0FyZWFNZWdhUGl4 ZWxzKDApCisgICAgLCBtX3NlY29uZGFyeUJhY2tpbmdBcmVhTWVnYVBpeGVscygwKQogI2VuZGlm CiB7CiB9CkBAIC0zOTQsNyArMzk1LDggQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVw ZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZSB1cGRhdGUKICAgICBp ZiAoY29tcG9zaXRpbmdMb2dFbmFibGVkKCkgJiYgaXNGdWxsVXBkYXRlICYmIChuZWVkSGllcmFy Y2h5VXBkYXRlIHx8IG5lZWRHZW9tZXRyeVVwZGF0ZSkpIHsKICAgICAgICAgbV9vYmxpZ2F0ZUNv bXBvc2l0ZWRMYXllckNvdW50ID0gMDsKICAgICAgICAgbV9zZWNvbmRhcnlDb21wb3NpdGVkTGF5 ZXJDb3VudCA9IDA7Ci0gICAgICAgIG1fYmFja2luZ0FyZWFNZWdhUGl4ZWxzID0gMDsKKyAgICAg ICAgbV9vYmxpZ2F0b3J5QmFja2luZ0FyZWFNZWdhUGl4ZWxzID0gMDsKKyAgICAgICAgbV9zZWNv bmRhcnlCYWNraW5nQXJlYU1lZ2FQaXhlbHMgPSAwOwogCiAgICAgICAgIEZyYW1lKiBmcmFtZSA9 IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCktPmZyYW1lKCk7CiAgICAgICAgIGJvb2wgaXNNYWlu RnJhbWUgPSAhbV9yZW5kZXJWaWV3LT5kb2N1bWVudCgpLT5vd25lckVsZW1lbnQoKTsKQEAgLTQw Niw3ICs0MDgsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRp bmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVwZGF0ZQogICAgIGlmIChuZWVkSGllcmFy Y2h5VXBkYXRlKSB7CiAgICAgICAgIC8vIFVwZGF0ZSB0aGUgaGllcmFyY2h5IG9mIHRoZSBjb21w b3NpdGluZyBsYXllcnMuCiAgICAgICAgIFZlY3RvcjxHcmFwaGljc0xheWVyKj4gY2hpbGRMaXN0 OwotICAgICAgICByZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRyZWUodXBkYXRlUm9vdCwgY2hpbGRM aXN0KTsKKyAgICAgICAgcmVidWlsZENvbXBvc2l0aW5nTGF5ZXJUcmVlKHVwZGF0ZVJvb3QsIGNo aWxkTGlzdCwgMCk7CiAKICAgICAgICAgLy8gSG9zdCB0aGUgZG9jdW1lbnQgbGF5ZXIgaW4gdGhl IFJlbmRlclZpZXcncyByb290IGxheWVyLgogICAgICAgICBpZiAoaXNGdWxsVXBkYXRlKSB7CkBA IC00MjAsMTUgKzQyMiwxNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29t cG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVwZGF0ZQogICAgIH0gZWxzZSBp ZiAobmVlZEdlb21ldHJ5VXBkYXRlKSB7CiAgICAgICAgIC8vIFdlIGp1c3QgbmVlZCB0byBkbyBh IGdlb21ldHJ5IHVwZGF0ZS4gVGhpcyBpcyBvbmx5IHVzZWQgZm9yIHBvc2l0aW9uOmZpeGVkIHNj cm9sbGluZzsKICAgICAgICAgLy8gbW9zdCBvZiB0aGUgdGltZSwgZ2VvbWV0cnkgaXMgdXBkYXRl ZCB2aWEgUmVuZGVyTGF5ZXI6OnN0eWxlQ2hhbmdlZCgpLgotICAgICAgICB1cGRhdGVMYXllclRy ZWVHZW9tZXRyeSh1cGRhdGVSb290KTsKKyAgICAgICAgdXBkYXRlTGF5ZXJUcmVlR2VvbWV0cnko dXBkYXRlUm9vdCwgMCk7CiAgICAgfQogICAgIAogI2lmICFMT0dfRElTQUJMRUQKICAgICBpZiAo Y29tcG9zaXRpbmdMb2dFbmFibGVkKCkgJiYgaXNGdWxsVXBkYXRlICYmIChuZWVkSGllcmFyY2h5 VXBkYXRlIHx8IG5lZWRHZW9tZXRyeVVwZGF0ZSkpIHsKICAgICAgICAgZG91YmxlIGVuZFRpbWUg PSBjdXJyZW50VGltZSgpOwotICAgICAgICBMT0coQ29tcG9zaXRpbmcsICIlZCBsYXllcnMgKCVk IHByaW1hcnksICVkIHNlY29uZGFyeSksIHRvdGFsIGJhY2tpbmcgYXJlYSAlLjJmTVAsIHVwZGF0 ZSB0b29rICUuMmZtcywgXG4iLAorICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJUb3RhbCBsYXll cnMgICBwcmltYXJ5ICAgc2Vjb25kYXJ5ICAgb2JsaWdhdG9yeSBiYWNraW5nIChNUCkgICBzZWNv bmRhcnkgYmFja2luZyhNUCkgICB0b3RhbCBiYWNraW5nIChNUCkgIHVwZGF0ZSB0aW1lIChtcylc biIpOworCisgICAgICAgIExPRyhDb21wb3NpdGluZywgIiU4ZCAlMTFkICU5ZCAlMjAuMmYgJTIy LjJmICUyMi4yZiAlMTguMmZcbiIsCiAgICAgICAgICAgICBtX29ibGlnYXRlQ29tcG9zaXRlZExh eWVyQ291bnQgKyBtX3NlY29uZGFyeUNvbXBvc2l0ZWRMYXllckNvdW50LCBtX29ibGlnYXRlQ29t cG9zaXRlZExheWVyQ291bnQsCi0gICAgICAgICAgICBtX3NlY29uZGFyeUNvbXBvc2l0ZWRMYXll ckNvdW50LCBtX2JhY2tpbmdBcmVhTWVnYVBpeGVscywgMTAwMC4wICogKGVuZFRpbWUgLSBzdGFy dFRpbWUpKTsKKyAgICAgICAgICAgIG1fc2Vjb25kYXJ5Q29tcG9zaXRlZExheWVyQ291bnQsIG1f b2JsaWdhdG9yeUJhY2tpbmdBcmVhTWVnYVBpeGVscywgbV9zZWNvbmRhcnlCYWNraW5nQXJlYU1l Z2FQaXhlbHMsIG1fb2JsaWdhdG9yeUJhY2tpbmdBcmVhTWVnYVBpeGVscyArIG1fc2Vjb25kYXJ5 QmFja2luZ0FyZWFNZWdhUGl4ZWxzLCAxMDAwLjAgKiAoZW5kVGltZSAtIHN0YXJ0VGltZSkpOwog ICAgIH0KICNlbmRpZgogICAgIEFTU0VSVCh1cGRhdGVSb290IHx8ICFtX2NvbXBvc2l0aW5nTGF5 ZXJzTmVlZFJlYnVpbGQpOwpAQCAtNDM4LDIxICs0NDIsMjEgQEAgdm9pZCBSZW5kZXJMYXllckNv bXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZSB1 cGRhdGUKIH0KIAogI2lmICFMT0dfRElTQUJMRUQKLXZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9y Ojpsb2dMYXllckluZm8oY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyKQordm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmxvZ0xheWVySW5mbyhjb25zdCBSZW5kZXJMYXllciogbGF5ZXIsIGludCBk ZXB0aCkKIHsKICAgICBpZiAoIWNvbXBvc2l0aW5nTG9nRW5hYmxlZCgpKQogICAgICAgICByZXR1 cm47CiAgICAgICAgIAotICAgIGlmIChyZXF1aXJlc0NvbXBvc2l0aW5nTGF5ZXIobGF5ZXIpIHx8 IGxheWVyLT5pc1Jvb3RMYXllcigpKQorICAgIFJlbmRlckxheWVyQmFja2luZyogYmFja2luZyA9 IGxheWVyLT5iYWNraW5nKCk7CisgICAgaWYgKHJlcXVpcmVzQ29tcG9zaXRpbmdMYXllcihsYXll cikgfHwgbGF5ZXItPmlzUm9vdExheWVyKCkpIHsKICAgICAgICAgKyttX29ibGlnYXRlQ29tcG9z aXRlZExheWVyQ291bnQ7Ci0gICAgZWxzZQorICAgICAgICBtX29ibGlnYXRvcnlCYWNraW5nQXJl YU1lZ2FQaXhlbHMgKz0gYmFja2luZy0+YmFja2luZ1N0b3JlQXJlYSgpIC8gUElYRUxTX1BFUl9N RUdBUElYRUw7CisgICAgfSBlbHNlIHsKICAgICAgICAgKyttX3NlY29uZGFyeUNvbXBvc2l0ZWRM YXllckNvdW50OworICAgICAgICBtX3NlY29uZGFyeUJhY2tpbmdBcmVhTWVnYVBpeGVscyArPSBi YWNraW5nLT5iYWNraW5nU3RvcmVBcmVhKCkgLyBQSVhFTFNfUEVSX01FR0FQSVhFTDsKKyAgICB9 CiAKLSAgICBSZW5kZXJMYXllckJhY2tpbmcqIGJhY2tpbmcgPSBsYXllci0+YmFja2luZygpOwot ICAgIAotICAgIG1fYmFja2luZ0FyZWFNZWdhUGl4ZWxzICs9IGJhY2tpbmctPmJhY2tpbmdTdG9y ZUFyZWEoKSAvIFBJWEVMU19QRVJfTUVHQVBJWEVMOwotCi0gICAgTE9HKENvbXBvc2l0aW5nLCAi ICBMYXllciAlcCAlZHglZCAlLjNmTVAgKCVzKSAlc1xuIiwgbGF5ZXIsIGJhY2tpbmctPmNvbXBv c2l0ZWRCb3VuZHMoKS53aWR0aCgpLCBiYWNraW5nLT5jb21wb3NpdGVkQm91bmRzKCkuaGVpZ2h0 KCksCisgICAgTE9HKENvbXBvc2l0aW5nLCAiJSpwICVkeCVkICUuM2ZNUCAoJXMpICVzXG4iLCAx MiArIGRlcHRoICogMiwgbGF5ZXIsIGJhY2tpbmctPmNvbXBvc2l0ZWRCb3VuZHMoKS53aWR0aCgp LCBiYWNraW5nLT5jb21wb3NpdGVkQm91bmRzKCkuaGVpZ2h0KCksCiAgICAgICAgIGJhY2tpbmct PmJhY2tpbmdTdG9yZUFyZWEoKSAvIFBJWEVMU19QRVJfTUVHQVBJWEVMLAogICAgICAgICByZWFz b25Gb3JDb21wb3NpdGluZyhsYXllciksIGxheWVyLT5iYWNraW5nKCktPm5hbWVGb3JMYXllcigp LnV0ZjgoKS5kYXRhKCkpOwogfQpAQCAtODkwLDcgKzg5NCw3IEBAIGJvb2wgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpjYW5BY2NlbGVyYXRlVmlkZW9SZW5kZXJpbmcoUmVuZGVyVmlkZW8qIG8pIGNv bnN0CiB9CiAjZW5kaWYKIAotdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRDb21w b3NpdGluZ0xheWVyVHJlZShSZW5kZXJMYXllciogbGF5ZXIsIFZlY3RvcjxHcmFwaGljc0xheWVy Kj4mIGNoaWxkTGF5ZXJzT2ZFbmNsb3NpbmdMYXllcikKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpyZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRyZWUoUmVuZGVyTGF5ZXIqIGxheWVyLCBWZWN0 b3I8R3JhcGhpY3NMYXllcio+JiBjaGlsZExheWVyc09mRW5jbG9zaW5nTGF5ZXIsIGludCBkZXB0 aCkKIHsKICAgICAvLyBNYWtlIHRoZSBsYXllciBjb21wb3NpdGluZyBpZiBuZWNlc3NhcnksIGFu ZCBzZXQgdXAgY2xpcHBpbmcgYW5kIGNvbnRlbnQgbGF5ZXJzLgogICAgIC8vIE5vdGUgdGhhdCB3 ZSBjYW4gb25seSBkbyB3b3JrIGhlcmUgdGhhdCBpcyBpbmRlcGVuZGVudCBvZiB3aGV0aGVyIHRo ZSBkZXNjZW5kYW50IGxheWVycwpAQCAtOTE0LDcgKzkxOCw5IEBAIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpyZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRyZWUoUmVuZGVyTGF5ZXIqIGxheWVy LCBWZWN0CiAgICAgICAgICAgICB1cGRhdGVSb290TGF5ZXJQb3NpdGlvbigpOwogCiAjaWYgIUxP R19ESVNBQkxFRAotICAgICAgICBsb2dMYXllckluZm8obGF5ZXIpOworICAgICAgICBsb2dMYXll ckluZm8obGF5ZXIsIGRlcHRoKTsKKyNlbHNlCisgICAgICAgIFVOVVNFRF9QQVJBTShkZXB0aCk7 CiAjZW5kaWYKICAgICB9CiAKQEAgLTkzNCw3ICs5NDAsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6cmVidWlsZENvbXBvc2l0aW5nTGF5ZXJUcmVlKFJlbmRlckxheWVyKiBsYXllciwg VmVjdAogICAgICAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gbmVnWk9yZGVyTGlzdC0+c2l6ZSgp OwogICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAg ICAgICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gbmVnWk9yZGVyTGlzdC0+YXQo aSk7Ci0gICAgICAgICAgICAgICAgcmVidWlsZENvbXBvc2l0aW5nTGF5ZXJUcmVlKGN1ckxheWVy LCBjaGlsZExpc3QpOworICAgICAgICAgICAgICAgIHJlYnVpbGRDb21wb3NpdGluZ0xheWVyVHJl ZShjdXJMYXllciwgY2hpbGRMaXN0LCBkZXB0aCArIDEpOwogICAgICAgICAgICAgfQogICAgICAg ICB9CiAKQEAgLTk0OCw3ICs5NTQsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVi dWlsZENvbXBvc2l0aW5nTGF5ZXJUcmVlKFJlbmRlckxheWVyKiBsYXllciwgVmVjdAogICAgICAg ICBzaXplX3QgbGlzdFNpemUgPSBub3JtYWxGbG93TGlzdC0+c2l6ZSgpOwogICAgICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXplOyArK2kpIHsKICAgICAgICAgICAgIFJlbmRlckxh eWVyKiBjdXJMYXllciA9IG5vcm1hbEZsb3dMaXN0LT5hdChpKTsKLSAgICAgICAgICAgIHJlYnVp bGRDb21wb3NpdGluZ0xheWVyVHJlZShjdXJMYXllciwgY2hpbGRMaXN0KTsKKyAgICAgICAgICAg IHJlYnVpbGRDb21wb3NpdGluZ0xheWVyVHJlZShjdXJMYXllciwgY2hpbGRMaXN0LCBkZXB0aCAr IDEpOwogICAgICAgICB9CiAgICAgfQogICAgIApAQCAtOTU3LDcgKzk2Myw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjpyZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRyZWUoUmVuZGVyTGF5 ZXIqIGxheWVyLCBWZWN0CiAgICAgICAgICAgICBzaXplX3QgbGlzdFNpemUgPSBwb3NaT3JkZXJM aXN0LT5zaXplKCk7CiAgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXpl OyArK2kpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBwb3NaT3Jk ZXJMaXN0LT5hdChpKTsKLSAgICAgICAgICAgICAgICByZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRy ZWUoY3VyTGF5ZXIsIGNoaWxkTGlzdCk7CisgICAgICAgICAgICAgICAgcmVidWlsZENvbXBvc2l0 aW5nTGF5ZXJUcmVlKGN1ckxheWVyLCBjaGlsZExpc3QsIGRlcHRoICsgMSk7CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KICAgICB9CkBAIC0xMDgyLDcgKzEwODgsNyBAQCBib29sIFJlbmRlckxh eWVyQ29tcG9zaXRvcjo6cGFyZW50RnJhbWVDb250ZW50TGF5ZXJzKFJlbmRlclBhcnQqIHJlbmRl cmVyKQogfQogCiAvLyBUaGlzIGp1c3QgdXBkYXRlcyBsYXllciBnZW9tZXRyeSB3aXRob3V0IGNo YW5naW5nIHRoZSBoaWVyYXJjaHkuCi12b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRl TGF5ZXJUcmVlR2VvbWV0cnkoUmVuZGVyTGF5ZXIqIGxheWVyKQordm9pZCBSZW5kZXJMYXllckNv bXBvc2l0b3I6OnVwZGF0ZUxheWVyVHJlZUdlb21ldHJ5KFJlbmRlckxheWVyKiBsYXllciwgaW50 IGRlcHRoKQogewogICAgIGlmIChSZW5kZXJMYXllckJhY2tpbmcqIGxheWVyQmFja2luZyA9IGxh eWVyLT5iYWNraW5nKCkpIHsKICAgICAgICAgLy8gVGhlIGNvbXBvc2l0aW5nIHN0YXRlIG9mIGFs bCBvdXIgY2hpbGRyZW4gaGFzIGJlZW4gdXBkYXRlZCBhbHJlYWR5LCBzbyBub3cKQEAgLTExMDEs NyArMTEwNyw5IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllclRyZWVH ZW9tZXRyeShSZW5kZXJMYXllciogbGF5ZXIpCiAgICAgICAgICAgICB1cGRhdGVSb290TGF5ZXJQ b3NpdGlvbigpOwogCiAjaWYgIUxPR19ESVNBQkxFRAotICAgICAgICBsb2dMYXllckluZm8obGF5 ZXIpOworICAgICAgICBsb2dMYXllckluZm8obGF5ZXIsIGRlcHRoKTsKKyNlbHNlCisgICAgICAg IFVOVVNFRF9QQVJBTShkZXB0aCk7CiAjZW5kaWYKICAgICB9CiAKQEAgLTExMTUsNyArMTEyMyw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllclRyZWVHZW9tZXRyeShS ZW5kZXJMYXllciogbGF5ZXIpCiAgICAgICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogbmVn Wk9yZGVyTGlzdCA9IGxheWVyLT5uZWdaT3JkZXJMaXN0KCkpIHsKICAgICAgICAgICAgIHNpemVf dCBsaXN0U2l6ZSA9IG5lZ1pPcmRlckxpc3QtPnNpemUoKTsKICAgICAgICAgICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgbGlzdFNpemU7ICsraSkKLSAgICAgICAgICAgICAgICB1cGRhdGVMYXll clRyZWVHZW9tZXRyeShuZWdaT3JkZXJMaXN0LT5hdChpKSk7CisgICAgICAgICAgICAgICAgdXBk YXRlTGF5ZXJUcmVlR2VvbWV0cnkobmVnWk9yZGVyTGlzdC0+YXQoaSksIGRlcHRoICsgMSk7CiAg ICAgICAgIH0KICAgICB9CiAKQEAgLTExMjMsMTQgKzExMzEsMTQgQEAgdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyVHJlZUdlb21ldHJ5KFJlbmRlckxheWVyKiBsYXllcikK ICAgICBpZiAoVmVjdG9yPFJlbmRlckxheWVyKj4qIG5vcm1hbEZsb3dMaXN0ID0gbGF5ZXItPm5v cm1hbEZsb3dMaXN0KCkpIHsKICAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gbm9ybWFsRmxvd0xp c3QtPnNpemUoKTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytp KQotICAgICAgICAgICAgdXBkYXRlTGF5ZXJUcmVlR2VvbWV0cnkobm9ybWFsRmxvd0xpc3QtPmF0 KGkpKTsKKyAgICAgICAgICAgIHVwZGF0ZUxheWVyVHJlZUdlb21ldHJ5KG5vcm1hbEZsb3dMaXN0 LT5hdChpKSwgZGVwdGggKyAxKTsKICAgICB9CiAgICAgCiAgICAgaWYgKGxheWVyLT5pc1N0YWNr aW5nQ29udGV4dCgpKSB7CiAgICAgICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogcG9zWk9y ZGVyTGlzdCA9IGxheWVyLT5wb3NaT3JkZXJMaXN0KCkpIHsKICAgICAgICAgICAgIHNpemVfdCBs aXN0U2l6ZSA9IHBvc1pPcmRlckxpc3QtPnNpemUoKTsKICAgICAgICAgICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgbGlzdFNpemU7ICsraSkKLSAgICAgICAgICAgICAgICB1cGRhdGVMYXllclRy ZWVHZW9tZXRyeShwb3NaT3JkZXJMaXN0LT5hdChpKSk7CisgICAgICAgICAgICAgICAgdXBkYXRl TGF5ZXJUcmVlR2VvbWV0cnkocG9zWk9yZGVyTGlzdC0+YXQoaSksIGRlcHRoICsgMSk7CiAgICAg ICAgIH0KICAgICB9CiB9CkBAIC0xNDQxLDcgKzE0NDksMTMgQEAgY29uc3QgY2hhciogUmVuZGVy TGF5ZXJDb21wb3NpdG9yOjpyZWFzb25Gb3JDb21wb3NpdGluZyhjb25zdCBSZW5kZXJMYXllciog bGF5ZXIKICAgICAgICAgbGF5ZXIgPSB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHJlbmRlcmVyKS0+ bGF5ZXIoKTsKICAgICB9CiAKLSAgICBpZiAocmVxdWlyZXNDb21wb3NpdGluZ0ZvclRyYW5zZm9y bShyZW5kZXJlcikpCisgICAgaWYgKHJlbmRlcmVyLT5oYXNUcmFuc2Zvcm0oKSAmJiByZW5kZXJl ci0+c3R5bGUoKS0+aGFzUGVyc3BlY3RpdmUoKSkKKyAgICAgICAgcmV0dXJuICJwZXJzcGVjdGl2 ZSI7CisKKyAgICBpZiAocmVuZGVyZXItPmhhc1RyYW5zZm9ybSgpICYmIChyZW5kZXJlci0+c3R5 bGUoKS0+dHJhbnNmb3JtU3R5bGUzRCgpID09IFRyYW5zZm9ybVN0eWxlM0RQcmVzZXJ2ZTNEKSkK KyAgICAgICAgcmV0dXJuICJ0cmFuc2Zvcm0tc3R5bGU6IHByZXNlcnZlLTNkIjsKKworICAgIGlm IChyZW5kZXJlci0+aGFzVHJhbnNmb3JtKCkpCiAgICAgICAgIHJldHVybiAidHJhbnNmb3JtIjsK IAogICAgIGlmIChyZXF1aXJlc0NvbXBvc2l0aW5nRm9yVmlkZW8ocmVuZGVyZXIpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IDBi M2VkNzJmOGMzMmY2NmJmMWNkYjM2MzAwOWU4ZWNiZTQ2ZmFkNGEuLjI5NmNmZTBjYzg1Yjg0MDA1 YjlmM2NjMzVlOWM5N2E5MTY2N2Y0YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAgLTI0OSwxMCArMjQ5LDEwIEBAIHByaXZhdGU6 CiAgICAgdm9pZCBjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqLCBP dmVybGFwTWFwKiwgc3RydWN0IENvbXBvc2l0aW5nU3RhdGUmLCBib29sJiBsYXllcnNDaGFuZ2Vk KTsKICAgICAKICAgICAvLyBSZWN1cnNlcyBkb3duIHRoZSB0cmVlLCBwYXJlbnRpbmcgZGVzY2Vu ZGFudCBjb21wb3NpdGluZyBsYXllcnMgYW5kIGNvbGxlY3RpbmcgYW4gYXJyYXkgb2YgY2hpbGQg bGF5ZXJzIGZvciB0aGUgY3VycmVudCBjb21wb3NpdGluZyBsYXllci4KLSAgICB2b2lkIHJlYnVp bGRDb21wb3NpdGluZ0xheWVyVHJlZShSZW5kZXJMYXllciosIFZlY3RvcjxHcmFwaGljc0xheWVy Kj4mIGNoaWxkR3JhcGhpY3NMYXllcnNPZkVuY2xvc2luZ0xheWVyKTsKKyAgICB2b2lkIHJlYnVp bGRDb21wb3NpdGluZ0xheWVyVHJlZShSZW5kZXJMYXllciosIFZlY3RvcjxHcmFwaGljc0xheWVy Kj4mIGNoaWxkR3JhcGhpY3NMYXllcnNPZkVuY2xvc2luZ0xheWVyLCBpbnQgZGVwdGgpOwogCiAg ICAgLy8gUmVjdXJzZXMgZG93biB0aGUgdHJlZSwgdXBkYXRpbmcgbGF5ZXIgZ2VvbWV0cnkgb25s eS4KLSAgICB2b2lkIHVwZGF0ZUxheWVyVHJlZUdlb21ldHJ5KFJlbmRlckxheWVyKik7CisgICAg dm9pZCB1cGRhdGVMYXllclRyZWVHZW9tZXRyeShSZW5kZXJMYXllciosIGludCBkZXB0aCk7CiAg ICAgCiAgICAgLy8gSG9vayBjb21wb3NpdGluZyBsYXllcnMgdG9nZXRoZXIKICAgICB2b2lkIHNl dENvbXBvc2l0aW5nUGFyZW50KFJlbmRlckxheWVyKiBjaGlsZExheWVyLCBSZW5kZXJMYXllciog cGFyZW50TGF5ZXIpOwpAQCAtMzAyLDcgKzMwMiw3IEBAIHByaXZhdGU6CiAKICNpZiAhTE9HX0RJ U0FCTEVECiAgICAgY29uc3QgY2hhciogcmVhc29uRm9yQ29tcG9zaXRpbmcoY29uc3QgUmVuZGVy TGF5ZXIqKTsKLSAgICB2b2lkIGxvZ0xheWVySW5mbyhjb25zdCBSZW5kZXJMYXllciopOworICAg IHZvaWQgbG9nTGF5ZXJJbmZvKGNvbnN0IFJlbmRlckxheWVyKiwgaW50IGRlcHRoKTsKICNlbmRp ZgogCiBwcml2YXRlOgpAQCAtMzUwLDcgKzM1MCw4IEBAIHByaXZhdGU6CiAgICAgaW50IG1fcm9v dExheWVyVXBkYXRlQ291bnQ7CiAgICAgaW50IG1fb2JsaWdhdGVDb21wb3NpdGVkTGF5ZXJDb3Vu dDsgLy8gY291bnQgb2YgbGF5ZXIgdGhhdCBoYXZlIHRvIGJlIGNvbXBvc2l0ZWQuCiAgICAgaW50 IG1fc2Vjb25kYXJ5Q29tcG9zaXRlZExheWVyQ291bnQ7IC8vIGNvdW50IG9mIGxheWVycyB0aGF0 IGhhdmUgdG8gYmUgY29tcG9zaXRlZCBiZWNhdXNlIG9mIHN0YWNraW5nIG9yIG92ZXJsYXAuCi0g ICAgZG91YmxlIG1fYmFja2luZ0FyZWFNZWdhUGl4ZWxzOworICAgIGRvdWJsZSBtX29ibGlnYXRv cnlCYWNraW5nQXJlYU1lZ2FQaXhlbHM7CisgICAgZG91YmxlIG1fc2Vjb25kYXJ5QmFja2luZ0Fy ZWFNZWdhUGl4ZWxzOwogI2VuZGlmCiB9OwogCg==