64400 2011-07-12 15:00:42 -0700 Clean up some RenderLayerCompositor code relating to scroll and root layers 2011-07-12 15:22:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser cmarrin jamesr simon.fraser oldest_to_newest 435996 0 simon.fraser 2011-07-12 15:00:42 -0700 Clean up some RenderLayerCompositor code relating to scroll and root layers 436003 1 100570 simon.fraser 2011-07-12 15:05:41 -0700 Created attachment 100570 Patch 436005 2 100570 jamesr 2011-07-12 15:06:43 -0700 Comment on attachment 100570 Patch R=me 436016 3 simon.fraser 2011-07-12 15:22:16 -0700 http://trac.webkit.org/changeset/90860 100570 2011-07-12 15:05:41 -0700 2011-07-12 15:06:43 -0700 Patch bug-64400-20110712150540.patch text/plain 14189 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjN2Q3ZTc0NTcwMDFhMTlm MjdiNWUyZWQwN2NkZWQ5ZjI0NjAwYTA2Li40MGMwM2JhOGM3MGUzNDg0YzRhZDNlNjIwYmNiZDBm MzAyYTAxZGFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTEtMDctMTIgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgc29t ZSBSZW5kZXJMYXllckNvbXBvc2l0b3IgY29kZSByZWxhdGluZyB0byBzY3JvbGwgYW5kIHJvb3Qg bGF5ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NDQwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZXJlIHdhcyBubyBuZWVkIGZvciBGcmFtZVZpZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhp c0ZyYW1lKCkKKyAgICAgICAgdG8gY2FsbCBzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXll ck9ubHkoKSBvbiB0aGUgdmFyaW91cworICAgICAgICBzY3JvbGxiYXItcmVsYXRlZCBsYXllcnMs IGJlY2F1c2UgdGhlIHN1YnNlcXVlbnQgY2FsbCB0byAKKyAgICAgICAgY29tcG9zaXRvcigpLT5m bHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKSBzdGFydHMgdG8gZmx1c2ggYXQKKyAgICAgICAgbV9v dmVyZmxvd0NvbnRyb2xzSG9zdExheWVyIGlmIG9uZSBleGlzdHMsIGFuZCBpdHMgYW4gYW5jZXN0 b3IKKyAgICAgICAgb2YgdGhlIHNjcm9sbGJhciBsYXllcnMuCisgICAgICAgIAorICAgICAgICBB bHNvIGNsZWFuIHVwIHRlcm1pbm9sb2d5IGluIFJlbmRlckxheWVyQ29tcG9zaXRvci4KKyAgICAg ICAgICAgIG1fcm9vdFBsYXRmb3JtTGF5ZXIgLT4gbV9yb290Q29udGVudExheWVyCisgICAgICAg ICAgICByb290UGxhdGZvcm1MYXllcigpIC0+IHJvb3RHcmFwaGljc0xheWVyKCkKKyAgICAgICAg CisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZSwgc28gbm8gbmV3IHRlc3RzLgorICAgICAgICAK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6ZW5hYmxlQ29tcG9zaXRpbmdNb2RlKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXll cnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpsYXllclRyZWVB c1RleHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpwYXJlbnRG cmFtZUNvbnRlbnRMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpyb290R3JhcGhpY3NMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNv bXBvc2l0b3I6OmRpZE1vdmVPbnNjcmVlbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckNvbXBvc2l0b3I6OndpbGxNb3ZlT2Zmc2NyZWVuKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlUm9vdExheWVyUG9zaXRpb24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjplbnN1cmVSb290TGF5ZXIpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkZXN0cm95Um9vdExheWVyKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6YXR0YWNoUm9vdExheWVyKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGV0YWNoUm9vdExheWVyKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlUm9vdExheWVy QXR0YWNobWVudCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5o OgorCiAyMDExLTA3LTEyICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENhbmNlbGxpbmcgYW4gZW1wdHkgZWRpdCBmYWls cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBhZmE2MWQ3ZWI3ZWEyZjY5Y2RjMTFh ZThkNTIzODc4MDE3MGZmYzg1Li5hMDU4MWQzNDQ4ZDM1MDFjZWJlYmI2ZTJmMTZjYzJmMmYzNDEz ZTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC02OTEsMTMgKzY5MSw2IEBAIGJv b2wgRnJhbWVWaWV3OjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNGcmFtZSgpCiAgICAgaWYg KG5lZWRzTGF5b3V0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChHcmFwaGlj c0xheWVyKiBncmFwaGljc0xheWVyID0gdmlldy0+Y29tcG9zaXRvcigpLT5sYXllckZvckhvcml6 b250YWxTY3JvbGxiYXIoKSkKLSAgICAgICAgZ3JhcGhpY3NMYXllci0+c3luY0NvbXBvc2l0aW5n U3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCk7Ci0gICAgaWYgKEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNz TGF5ZXIgPSB2aWV3LT5jb21wb3NpdG9yKCktPmxheWVyRm9yVmVydGljYWxTY3JvbGxiYXIoKSkK LSAgICAgICAgZ3JhcGhpY3NMYXllci0+c3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJP bmx5KCk7Ci0gICAgaWYgKEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIgPSB2aWV3LT5jb21w b3NpdG9yKCktPmxheWVyRm9yU2Nyb2xsQ29ybmVyKCkpCi0gICAgICAgIGdyYXBoaWNzTGF5ZXIt PnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpOwotCiAgICAgdmlldy0+Y29t cG9zaXRvcigpLT5mbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKTsKIAogI2lmIEVOQUJMRShGVUxM U0NSRUVOX0FQSSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKaW5kZXggYzIzZGFlN2Y4YWMwMTU0NDMyYTU5YTk2MmMwMWQ5Y2NiOTM2 ZDhjNy4uYTc4YjcwN2Y5ZGYzZDU3ZDBjNTM4NTQ0NDA4ZmY5OGFmNWMzZDIxNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAg LTEzMSwxMCArMTMxLDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjplbmFibGVDb21w b3NpdGluZ01vZGUoYm9vbCBlbmFibGUgLyogPSB0cnVlICovKQogICAgICAgICBtX2NvbXBvc2l0 aW5nID0gZW5hYmxlOwogICAgICAgICAKICAgICAgICAgaWYgKG1fY29tcG9zaXRpbmcpIHsKLSAg ICAgICAgICAgIGVuc3VyZVJvb3RQbGF0Zm9ybUxheWVyKCk7CisgICAgICAgICAgICBlbnN1cmVS b290TGF5ZXIoKTsKICAgICAgICAgICAgIG5vdGlmeUlGcmFtZXNPZkNvbXBvc2l0aW5nQ2hhbmdl KCk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgZGVzdHJveVJvb3RQbGF0Zm9ybUxheWVy KCk7CisgICAgICAgICAgICBkZXN0cm95Um9vdExheWVyKCk7CiAgICAgfQogfQogCkBAIC0yMDAs NyArMjAwLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZsdXNoUGVuZGluZ0xheWVy Q2hhbmdlcygpCiAgICAgLy8gZnJhbWUsIHNvIHdoZW4gY29tcG9zaXRpbmcgbGF5ZXJzIGFyZSBj b25uZWN0ZWQgYmV0d2VlbiBmcmFtZXMsIHdlJ2xsCiAgICAgLy8gZW5kIHVwIHN5bmNpbmcgc3Vi ZnJhbWUncyBsYXllcnMgbXVsdGlwbGUgdGltZXMuCiAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNDg5Ci0gICAgaWYgKEdyYXBoaWNzTGF5ZXIqIHJvb3RM YXllciA9IHJvb3RQbGF0Zm9ybUxheWVyKCkpCisgICAgaWYgKEdyYXBoaWNzTGF5ZXIqIHJvb3RM YXllciA9IHJvb3RHcmFwaGljc0xheWVyKCkpCiAgICAgICAgIHJvb3RMYXllci0+c3luY0NvbXBv c2l0aW5nU3RhdGUoKTsKIAogICAgIEFTU0VSVChtX2ZsdXNoaW5nTGF5ZXJzKTsKQEAgLTI5OSw5 ICsyOTksOSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdM YXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVwZGF0ZQogICAgICAgICAvLyBIb3N0IHRoZSBk b2N1bWVudCBsYXllciBpbiB0aGUgUmVuZGVyVmlldydzIHJvb3QgbGF5ZXIuCiAgICAgICAgIGlm ICh1cGRhdGVSb290ID09IHJvb3RSZW5kZXJMYXllcigpKSB7CiAgICAgICAgICAgICBpZiAoY2hp bGRMaXN0LmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICBkZXN0cm95Um9vdFBsYXRmb3JtTGF5 ZXIoKTsKKyAgICAgICAgICAgICAgICBkZXN0cm95Um9vdExheWVyKCk7CiAgICAgICAgICAgICBl bHNlCi0gICAgICAgICAgICAgICAgbV9yb290UGxhdGZvcm1MYXllci0+c2V0Q2hpbGRyZW4oY2hp bGRMaXN0KTsKKyAgICAgICAgICAgICAgICBtX3Jvb3RDb250ZW50TGF5ZXItPnNldENoaWxkcmVu KGNoaWxkTGlzdCk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKG5lZWRHZW9tZXRyeVVwZGF0 ZSkgewogICAgICAgICAvLyBXZSBqdXN0IG5lZWQgdG8gZG8gYSBnZW9tZXRyeSB1cGRhdGUuIFRo aXMgaXMgb25seSB1c2VkIGZvciBwb3NpdGlvbjpmaXhlZCBzY3JvbGxpbmc7CkBAIC05NjEsMTIg Kzk2MSwxMiBAQCBTdHJpbmcgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpsYXllclRyZWVBc1RleHQo Ym9vbCBzaG93RGVidWdJbmZvKQogICAgIGlmIChjb21wb3NpdGluZ0xheWVyVXBkYXRlUGVuZGlu ZygpKQogICAgICAgICB1cGRhdGVDb21wb3NpdGluZ0xheWVycygpOwogCi0gICAgaWYgKCFtX3Jv b3RQbGF0Zm9ybUxheWVyKQorICAgIGlmICghbV9yb290Q29udGVudExheWVyKQogICAgICAgICBy ZXR1cm4gU3RyaW5nKCk7CiAKICAgICAvLyBXZSBza2lwIGR1bXBpbmcgdGhlIHNjcm9sbCBhbmQg Y2xpcCBsYXllcnMgdG8ga2VlcCBsYXllclRyZWVBc1RleHQgb3V0cHV0CiAgICAgLy8gc2ltaWxh ciBiZXR3ZWVuIHBsYXRmb3Jtcy4KLSAgICByZXR1cm4gbV9yb290UGxhdGZvcm1MYXllci0+bGF5 ZXJUcmVlQXNUZXh0KHNob3dEZWJ1Z0luZm8gPyBMYXllclRyZWVBc1RleHREZWJ1ZyA6IExheWVy VHJlZUFzVGV4dEJlaGF2aW9yTm9ybWFsKTsKKyAgICByZXR1cm4gbV9yb290Q29udGVudExheWVy LT5sYXllclRyZWVBc1RleHQoc2hvd0RlYnVnSW5mbyA/IExheWVyVHJlZUFzVGV4dERlYnVnIDog TGF5ZXJUcmVlQXNUZXh0QmVoYXZpb3JOb3JtYWwpOwogfQogCiBSZW5kZXJMYXllckNvbXBvc2l0 b3IqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVDb250ZW50c0NvbXBvc2l0b3IoUmVuZGVy UGFydCogcmVuZGVyZXIpCkBAIC05OTQsNyArOTk0LDcgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBv c2l0b3I6OnBhcmVudEZyYW1lQ29udGVudExheWVycyhSZW5kZXJQYXJ0KiByZW5kZXJlcikKIAog ICAgIFJlbmRlckxheWVyQmFja2luZyogYmFja2luZyA9IGxheWVyLT5iYWNraW5nKCk7CiAgICAg R3JhcGhpY3NMYXllciogaG9zdGluZ0xheWVyID0gYmFja2luZy0+cGFyZW50Rm9yU3VibGF5ZXJz KCk7Ci0gICAgR3JhcGhpY3NMYXllciogcm9vdExheWVyID0gaW5uZXJDb21wb3NpdG9yLT5yb290 UGxhdGZvcm1MYXllcigpOworICAgIEdyYXBoaWNzTGF5ZXIqIHJvb3RMYXllciA9IGlubmVyQ29t cG9zaXRvci0+cm9vdEdyYXBoaWNzTGF5ZXIoKTsKICAgICBpZiAoaG9zdGluZ0xheWVyLT5jaGls ZHJlbigpLnNpemUoKSAhPSAxIHx8IGhvc3RpbmdMYXllci0+Y2hpbGRyZW4oKVswXSAhPSByb290 TGF5ZXIpIHsKICAgICAgICAgaG9zdGluZ0xheWVyLT5yZW1vdmVBbGxDaGlsZHJlbigpOwogICAg ICAgICBob3N0aW5nTGF5ZXItPmFkZENoaWxkKHJvb3RMYXllcik7CkBAIC0xMTQ0LDExICsxMTQ0 LDExIEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RSZW5kZXJMYXll cigpIGNvbnN0CiAgICAgcmV0dXJuIG1fcmVuZGVyVmlldy0+bGF5ZXIoKTsKIH0KIAotR3JhcGhp Y3NMYXllciogUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyb290UGxhdGZvcm1MYXllcigpIGNvbnN0 CitHcmFwaGljc0xheWVyKiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RHcmFwaGljc0xheWVy KCkgY29uc3QKIHsKICAgICBpZiAobV9vdmVyZmxvd0NvbnRyb2xzSG9zdExheWVyKQogICAgICAg ICByZXR1cm4gbV9vdmVyZmxvd0NvbnRyb2xzSG9zdExheWVyLmdldCgpOwotICAgIHJldHVybiBt X3Jvb3RQbGF0Zm9ybUxheWVyLmdldCgpOworICAgIHJldHVybiBtX3Jvb3RDb250ZW50TGF5ZXIu Z2V0KCk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkaWRNb3ZlT25zY3JlZW4o KQpAQCAtMTE1Nyw3ICsxMTU3LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRpZE1v dmVPbnNjcmVlbigpCiAgICAgICAgIHJldHVybjsKIAogICAgIFJvb3RMYXllckF0dGFjaG1lbnQg YXR0YWNobWVudCA9IHNob3VsZFByb3BhZ2F0ZUNvbXBvc2l0aW5nVG9FbmNsb3NpbmdGcmFtZSgp ID8gUm9vdExheWVyQXR0YWNoZWRWaWFFbmNsb3NpbmdGcmFtZSA6IFJvb3RMYXllckF0dGFjaGVk VmlhQ2hyb21lQ2xpZW50OwotICAgIGF0dGFjaFJvb3RQbGF0Zm9ybUxheWVyKGF0dGFjaG1lbnQp OworICAgIGF0dGFjaFJvb3RMYXllcihhdHRhY2htZW50KTsKIH0KIAogdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OndpbGxNb3ZlT2Zmc2NyZWVuKCkKQEAgLTExNjUsNyArMTE2NSw3IEBAIHZv aWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp3aWxsTW92ZU9mZnNjcmVlbigpCiAgICAgaWYgKCFp bkNvbXBvc2l0aW5nTW9kZSgpIHx8IG1fcm9vdExheWVyQXR0YWNobWVudCA9PSBSb290TGF5ZXJV bmF0dGFjaGVkKQogICAgICAgICByZXR1cm47CiAKLSAgICBkZXRhY2hSb290UGxhdGZvcm1MYXll cigpOworICAgIGRldGFjaFJvb3RMYXllcigpOwogfQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6Y2xlYXJCYWNraW5nRm9yTGF5ZXJJbmNsdWRpbmdEZXNjZW5kYW50cyhSZW5kZXJMYXll ciogbGF5ZXIpCkBAIC0xMTg3LDEwICsxMTg3LDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpjbGVhckJhY2tpbmdGb3JBbGxMYXllcnMoKQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6dXBkYXRlUm9vdExheWVyUG9zaXRpb24oKQogewotICAgIGlmIChtX3Jvb3RQbGF0Zm9y bUxheWVyKSB7CisgICAgaWYgKG1fcm9vdENvbnRlbnRMYXllcikgewogICAgICAgICBjb25zdCBJ bnRSZWN0JiBkb2N1bWVudFJlY3QgPSBtX3JlbmRlclZpZXctPmRvY3VtZW50UmVjdCgpOwotICAg ICAgICBtX3Jvb3RQbGF0Zm9ybUxheWVyLT5zZXRTaXplKGRvY3VtZW50UmVjdC5zaXplKCkpOwot ICAgICAgICBtX3Jvb3RQbGF0Zm9ybUxheWVyLT5zZXRQb3NpdGlvbihkb2N1bWVudFJlY3QubG9j YXRpb24oKSk7CisgICAgICAgIG1fcm9vdENvbnRlbnRMYXllci0+c2V0U2l6ZShkb2N1bWVudFJl Y3Quc2l6ZSgpKTsKKyAgICAgICAgbV9yb290Q29udGVudExheWVyLT5zZXRQb3NpdGlvbihkb2N1 bWVudFJlY3QubG9jYXRpb24oKSk7CiAgICAgfQogICAgIGlmIChtX2NsaXBMYXllcikgewogICAg ICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7CkBA IC0xNjA2LDIyICsxNjA2LDIyIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVP dmVyZmxvd0NvbnRyb2xzTGF5ZXJzKCkKICAgICAgICAgbV9yZW5kZXJWaWV3LT5mcmFtZVZpZXco KS0+cG9zaXRpb25TY3JvbGxiYXJMYXllcnMoKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllckNvbXBv c2l0b3I6OmVuc3VyZVJvb3RQbGF0Zm9ybUxheWVyKCkKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjplbnN1cmVSb290TGF5ZXIoKQogewogICAgIFJvb3RMYXllckF0dGFjaG1lbnQgZXhwZWN0 ZWRBdHRhY2htZW50ID0gc2hvdWxkUHJvcGFnYXRlQ29tcG9zaXRpbmdUb0VuY2xvc2luZ0ZyYW1l KCkgPyBSb290TGF5ZXJBdHRhY2hlZFZpYUVuY2xvc2luZ0ZyYW1lIDogUm9vdExheWVyQXR0YWNo ZWRWaWFDaHJvbWVDbGllbnQ7CiAgICAgaWYgKGV4cGVjdGVkQXR0YWNobWVudCA9PSBtX3Jvb3RM YXllckF0dGFjaG1lbnQpCiAgICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1fcm9vdFBsYXRm b3JtTGF5ZXIpIHsKLSAgICAgICAgbV9yb290UGxhdGZvcm1MYXllciA9IEdyYXBoaWNzTGF5ZXI6 OmNyZWF0ZSgwKTsKKyAgICBpZiAoIW1fcm9vdENvbnRlbnRMYXllcikgeworICAgICAgICBtX3Jv b3RDb250ZW50TGF5ZXIgPSBHcmFwaGljc0xheWVyOjpjcmVhdGUoMCk7CiAjaWZuZGVmIE5ERUJV RwotICAgICAgICBtX3Jvb3RQbGF0Zm9ybUxheWVyLT5zZXROYW1lKCJSb290IHBsYXRmb3JtIik7 CisgICAgICAgIG1fcm9vdENvbnRlbnRMYXllci0+c2V0TmFtZSgiUm9vdCBwbGF0Zm9ybSIpOwog I2VuZGlmCi0gICAgICAgIG1fcm9vdFBsYXRmb3JtTGF5ZXItPnNldFNpemUoRmxvYXRTaXplKG1f cmVuZGVyVmlldy0+bWF4WExheW91dE92ZXJmbG93KCksIG1fcmVuZGVyVmlldy0+bWF4WUxheW91 dE92ZXJmbG93KCkpKTsKLSAgICAgICAgbV9yb290UGxhdGZvcm1MYXllci0+c2V0UG9zaXRpb24o RmxvYXRQb2ludCgpKTsKKyAgICAgICAgbV9yb290Q29udGVudExheWVyLT5zZXRTaXplKEZsb2F0 U2l6ZShtX3JlbmRlclZpZXctPm1heFhMYXlvdXRPdmVyZmxvdygpLCBtX3JlbmRlclZpZXctPm1h eFlMYXlvdXRPdmVyZmxvdygpKSk7CisgICAgICAgIG1fcm9vdENvbnRlbnRMYXllci0+c2V0UG9z aXRpb24oRmxvYXRQb2ludCgpKTsKIAogICAgICAgICAvLyBOZWVkIHRvIGNsaXAgdG8gcHJldmVu dCB0cmFuc2Zvcm1lZCBjb250ZW50IHNob3dpbmcgb3V0c2lkZSB0aGlzIGZyYW1lCi0gICAgICAg IG1fcm9vdFBsYXRmb3JtTGF5ZXItPnNldE1hc2tzVG9Cb3VuZHModHJ1ZSk7CisgICAgICAgIG1f cm9vdENvbnRlbnRMYXllci0+c2V0TWFza3NUb0JvdW5kcyh0cnVlKTsKICAgICB9CiAKICAgICBp ZiAocmVxdWlyZXNTY3JvbGxMYXllcihleHBlY3RlZEF0dGFjaG1lbnQpKSB7CkBAIC0xNjUwLDcg KzE2NTAsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZW5zdXJlUm9vdFBsYXRmb3Jt TGF5ZXIoKQogICAgICAgICAgICAgLy8gSG9vayB0aGVtIHVwCiAgICAgICAgICAgICBtX292ZXJm bG93Q29udHJvbHNIb3N0TGF5ZXItPmFkZENoaWxkKG1fY2xpcExheWVyLmdldCgpKTsKICAgICAg ICAgICAgIG1fY2xpcExheWVyLT5hZGRDaGlsZChtX3Njcm9sbExheWVyLmdldCgpKTsKLSAgICAg ICAgICAgIG1fc2Nyb2xsTGF5ZXItPmFkZENoaWxkKG1fcm9vdFBsYXRmb3JtTGF5ZXIuZ2V0KCkp OworICAgICAgICAgICAgbV9zY3JvbGxMYXllci0+YWRkQ2hpbGQobV9yb290Q29udGVudExheWVy LmdldCgpKTsKIAogICAgICAgICAgICAgZnJhbWVWaWV3RGlkQ2hhbmdlU2l6ZSgpOwogICAgICAg ICAgICAgZnJhbWVWaWV3RGlkU2Nyb2xsKG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCktPnNjcm9s bFBvc2l0aW9uKCkpOwpAQCAtMTY2NSwxNyArMTY2NSwxNyBAQCB2b2lkIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6ZW5zdXJlUm9vdFBsYXRmb3JtTGF5ZXIoKQogCiAgICAgLy8gQ2hlY2sgdG8gc2Vl IGlmIHdlIGhhdmUgdG8gY2hhbmdlIHRoZSBhdHRhY2htZW50CiAgICAgaWYgKG1fcm9vdExheWVy QXR0YWNobWVudCAhPSBSb290TGF5ZXJVbmF0dGFjaGVkKQotICAgICAgICBkZXRhY2hSb290UGxh dGZvcm1MYXllcigpOworICAgICAgICBkZXRhY2hSb290TGF5ZXIoKTsKIAotICAgIGF0dGFjaFJv b3RQbGF0Zm9ybUxheWVyKGV4cGVjdGVkQXR0YWNobWVudCk7CisgICAgYXR0YWNoUm9vdExheWVy KGV4cGVjdGVkQXR0YWNobWVudCk7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpk ZXN0cm95Um9vdFBsYXRmb3JtTGF5ZXIoKQordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRl c3Ryb3lSb290TGF5ZXIoKQogewotICAgIGlmICghbV9yb290UGxhdGZvcm1MYXllcikKKyAgICBp ZiAoIW1fcm9vdENvbnRlbnRMYXllcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgZGV0YWNoUm9v dFBsYXRmb3JtTGF5ZXIoKTsKKyAgICBkZXRhY2hSb290TGF5ZXIoKTsKIAogICAgIGlmIChtX2xh eWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhcikgewogICAgICAgICBtX2xheWVyRm9ySG9yaXpvbnRh bFNjcm9sbGJhci0+cmVtb3ZlRnJvbVBhcmVudCgpOwpAQCAtMTcwMiwxMiArMTcwMiwxMiBAQCB2 b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGVzdHJveVJvb3RQbGF0Zm9ybUxheWVyKCkKICAg ICAgICAgbV9zY3JvbGxMYXllciA9IG51bGxwdHI7CiAgICAgfQogICAgIEFTU0VSVCghbV9zY3Jv bGxMYXllcik7Ci0gICAgbV9yb290UGxhdGZvcm1MYXllciA9IG51bGxwdHI7CisgICAgbV9yb290 Q29udGVudExheWVyID0gbnVsbHB0cjsKIH0KIAotdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OmF0dGFjaFJvb3RQbGF0Zm9ybUxheWVyKFJvb3RMYXllckF0dGFjaG1lbnQgYXR0YWNobWVudCkK K3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphdHRhY2hSb290TGF5ZXIoUm9vdExheWVyQXR0 YWNobWVudCBhdHRhY2htZW50KQogewotICAgIGlmICghbV9yb290UGxhdGZvcm1MYXllcikKKyAg ICBpZiAoIW1fcm9vdENvbnRlbnRMYXllcikKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3dpdGNo IChhdHRhY2htZW50KSB7CkBAIC0xNzIwLDcgKzE3MjAsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6YXR0YWNoUm9vdFBsYXRmb3JtTGF5ZXIoUm9vdExheWVyQXR0YWNobWVudCBhdHRh Y2htZQogICAgICAgICAgICAgaWYgKCFwYWdlKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICAgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hdHRhY2hSb290R3JhcGhpY3NM YXllcihmcmFtZSwgcm9vdFBsYXRmb3JtTGF5ZXIoKSk7CisgICAgICAgICAgICBwYWdlLT5jaHJv bWUoKS0+Y2xpZW50KCktPmF0dGFjaFJvb3RHcmFwaGljc0xheWVyKGZyYW1lLCByb290R3JhcGhp Y3NMYXllcigpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2Ug Um9vdExheWVyQXR0YWNoZWRWaWFFbmNsb3NpbmdGcmFtZTogewpAQCAtMTczNSw5ICsxNzM1LDkg QEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmF0dGFjaFJvb3RQbGF0Zm9ybUxheWVyKFJv b3RMYXllckF0dGFjaG1lbnQgYXR0YWNobWUKICAgICByb290TGF5ZXJBdHRhY2htZW50Q2hhbmdl ZCgpOwogfQogCi12b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGV0YWNoUm9vdFBsYXRmb3Jt TGF5ZXIoKQordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRldGFjaFJvb3RMYXllcigpCiB7 Ci0gICAgaWYgKCFtX3Jvb3RQbGF0Zm9ybUxheWVyIHx8IG1fcm9vdExheWVyQXR0YWNobWVudCA9 PSBSb290TGF5ZXJVbmF0dGFjaGVkKQorICAgIGlmICghbV9yb290Q29udGVudExheWVyIHx8IG1f cm9vdExheWVyQXR0YWNobWVudCA9PSBSb290TGF5ZXJVbmF0dGFjaGVkKQogICAgICAgICByZXR1 cm47CiAKICAgICBzd2l0Y2ggKG1fcm9vdExheWVyQXR0YWNobWVudCkgewpAQCAtMTc0Nyw3ICsx NzQ3LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRldGFjaFJvb3RQbGF0Zm9ybUxh eWVyKCkKICAgICAgICAgaWYgKG1fb3ZlcmZsb3dDb250cm9sc0hvc3RMYXllcikKICAgICAgICAg ICAgIG1fb3ZlcmZsb3dDb250cm9sc0hvc3RMYXllci0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAg ICAgICBlbHNlCi0gICAgICAgICAgICBtX3Jvb3RQbGF0Zm9ybUxheWVyLT5yZW1vdmVGcm9tUGFy ZW50KCk7CisgICAgICAgICAgICBtX3Jvb3RDb250ZW50TGF5ZXItPnJlbW92ZUZyb21QYXJlbnQo KTsKIAogICAgICAgICBpZiAoSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lckVsZW1lbnQgPSBt X3JlbmRlclZpZXctPmRvY3VtZW50KCktPm93bmVyRWxlbWVudCgpKQogICAgICAgICAgICAgb3du ZXJFbGVtZW50LT5zY2hlZHVsZVNldE5lZWRzU3R5bGVSZWNhbGMoU3ludGhldGljU3R5bGVDaGFu Z2UpOwpAQCAtMTc3Miw3ICsxNzcyLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRl dGFjaFJvb3RQbGF0Zm9ybUxheWVyKCkKIAogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVw ZGF0ZVJvb3RMYXllckF0dGFjaG1lbnQoKQogewotICAgIGVuc3VyZVJvb3RQbGF0Zm9ybUxheWVy KCk7CisgICAgZW5zdXJlUm9vdExheWVyKCk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpyb290TGF5ZXJBdHRhY2htZW50Q2hhbmdlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggMGM5NDZmNDY2MjEyZDJjNTcy YTEyMDIzY2MxYTFhYmUwN2JlMWIzMC4uMTg1N2E1OTY5NjAxYmIwODI3YjAwNzEzMWU3MWM3ZWIx ZjkwZGNlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuaApAQCAtMTMzLDcgKzEzMyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlcGFpbnRD b21wb3NpdGVkTGF5ZXJzQWJzb2x1dGVSZWN0KGNvbnN0IEludFJlY3QmKTsKIAogICAgIFJlbmRl ckxheWVyKiByb290UmVuZGVyTGF5ZXIoKSBjb25zdDsKLSAgICBHcmFwaGljc0xheWVyKiByb290 UGxhdGZvcm1MYXllcigpIGNvbnN0OworICAgIEdyYXBoaWNzTGF5ZXIqIHJvb3RHcmFwaGljc0xh eWVyKCkgY29uc3Q7CiAKICAgICBlbnVtIFJvb3RMYXllckF0dGFjaG1lbnQgewogICAgICAgICBS b290TGF5ZXJVbmF0dGFjaGVkLApAQCAtMjM5LDExICsyMzksMTEgQEAgcHJpdmF0ZToKICAgICBi b29sIGxheWVySGFzM0RDb250ZW50KGNvbnN0IFJlbmRlckxheWVyKikgY29uc3Q7CiAgICAgYm9v bCBoYXNOb25JZGVudGl0eTNEVHJhbnNmb3JtKFJlbmRlck9iamVjdCopIGNvbnN0OwogCi0gICAg dm9pZCBlbnN1cmVSb290UGxhdGZvcm1MYXllcigpOwotICAgIHZvaWQgZGVzdHJveVJvb3RQbGF0 Zm9ybUxheWVyKCk7CisgICAgdm9pZCBlbnN1cmVSb290TGF5ZXIoKTsKKyAgICB2b2lkIGRlc3Ry b3lSb290TGF5ZXIoKTsKIAotICAgIHZvaWQgYXR0YWNoUm9vdFBsYXRmb3JtTGF5ZXIoUm9vdExh eWVyQXR0YWNobWVudCk7Ci0gICAgdm9pZCBkZXRhY2hSb290UGxhdGZvcm1MYXllcigpOworICAg IHZvaWQgYXR0YWNoUm9vdExheWVyKFJvb3RMYXllckF0dGFjaG1lbnQpOworICAgIHZvaWQgZGV0 YWNoUm9vdExheWVyKCk7CiAgICAgCiAgICAgdm9pZCByb290TGF5ZXJBdHRhY2htZW50Q2hhbmdl ZCgpOwogCkBAIC0yNjgsNyArMjY4LDcgQEAgcHJpdmF0ZToKIAogcHJpdmF0ZToKICAgICBSZW5k ZXJWaWV3KiBtX3JlbmRlclZpZXc7Ci0gICAgT3duUHRyPEdyYXBoaWNzTGF5ZXI+IG1fcm9vdFBs YXRmb3JtTGF5ZXI7CisgICAgT3duUHRyPEdyYXBoaWNzTGF5ZXI+IG1fcm9vdENvbnRlbnRMYXll cjsKICAgICBUaW1lcjxSZW5kZXJMYXllckNvbXBvc2l0b3I+IG1fdXBkYXRlQ29tcG9zaXRpbmdM YXllcnNUaW1lcjsKIAogICAgIGJvb2wgbV9oYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nOwo=