82457 2012-03-28 06:07:13 -0700 [BlackBerry] Plumb through GraphicsLayer::contentsOpaque() to the LayerTiler 2012-03-28 09:03:48 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 anilsson webkit-unassigned manyoso rwlbuis tonikitoo webkit.review.bot oldest_to_newest 589898 0 anilsson 2012-03-28 06:07:13 -0700 The LayerTiler already knows not to turn on GL_BLEND for opaque layers. However, it only ever sets the opaque flag for image layers and color layers, never for content layers. This was no big deal, because content layers are never opaque, except for the root layer, which we always drew using the BlackBerry::WebKit::BackingStore anyway. Now, we're going to start using RenderLayerBacking::m_usingTiledCacheLayer = true on the root layer in some situations to make the root layer draw using the LayerRenderer instead of the BackingStore (specifically, in situations where the BackingStore is inactive). So make sure we plumb through the GraphicsLayer::contentsOpaque() flag all the way to LayerTiler and on to Texture. 589899 1 anilsson 2012-03-28 06:09:55 -0700 No new tests, this stuff is currently not testable in the BlackBerry DRT infrastructure. 589907 2 134281 anilsson 2012-03-28 06:18:46 -0700 Created attachment 134281 Patch 589977 3 134281 rwlbuis 2012-03-28 08:16:00 -0700 Comment on attachment 134281 Patch Looks fine. 590004 4 134281 webkit.review.bot 2012-03-28 09:03:44 -0700 Comment on attachment 134281 Patch Clearing flags on attachment: 134281 Committed r112407: <http://trac.webkit.org/changeset/112407> 590005 5 webkit.review.bot 2012-03-28 09:03:48 -0700 All reviewed patches have been landed. Closing bug. 134281 2012-03-28 06:18:46 -0700 2012-03-28 09:03:44 -0700 Patch bug-82457-20120328091845.patch text/plain 13018 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODU0MWI1YjQ2ZGZiZmY4 NDRkNGU3MjgwNWVlODVjZTM3NDZmNzMyYS4uYjBmMWJiNjhjNTk2OTg3ODVhYWQwNmU0YjliZDQ2 ZDhiZmI4NzBhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDEyLTAzLTI4ICBBcnZp ZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gUGx1 bWIgdGhyb3VnaCBHcmFwaGljc0xheWVyOjpjb250ZW50c09wYXF1ZSgpIHRvIExheWVyVGlsZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNDU3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIExheWVy VGlsZXIgYWxyZWFkeSBrbm93cyBub3QgdG8gdHVybiBvbiBHTF9CTEVORCBmb3Igb3BhcXVlIGxh eWVycy4KKyAgICAgICAgSG93ZXZlciwgaXQgb25seSBldmVyIHNldHMgdGhlIG9wYXF1ZSBmbGFn IGZvciBpbWFnZSBsYXllcnMgYW5kIGNvbG9yCisgICAgICAgIGxheWVycywgbmV2ZXIgZm9yIGNv bnRlbnQgbGF5ZXJzLgorCisgICAgICAgIFRoaXMgd2FzIG5vIGJpZyBkZWFsLCBiZWNhdXNlIGNv bnRlbnRzT3BhcXVlKCkgaXMgY3VycmVudGx5IGZhbHNlIGZvcgorICAgICAgICBhbGwgbGF5ZXJz IGV4Y2VwdCB0aGUgcm9vdCBsYXllciwgd2hpY2ggd2UgYWx3YXlzIGRyZXcgdXNpbmcgdGhlCisg ICAgICAgIEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlIGFueXdheS4KKworICAgICAg ICBXaGVuIHdlIHN0YXJ0IHVzaW5nIFJlbmRlckxheWVyQmFja2luZzo6bV91c2luZ1RpbGVkQ2Fj aGVMYXllcj10cnVlIG9uCisgICAgICAgIHRoZSByb290IGxheWVyIGluIHNpdHVhdGlvbnMgd2hl cmUgdGhlIEJhY2tpbmdTdG9yZSBpcyB1bmF2YWlsYWJsZSwgd2UKKyAgICAgICAgY2FuIHNwZWVk IHVwIHJlbmRlcmluZyBvZiB0aGUgcm9vdCBsYXllciBieSBob25vdXJpbmcgdGhlIG9wYXF1ZSBm bGFnLgorCisgICAgICAgIEZpeGVkIGJ5IHBsdW1iaW5nIHRocm91Z2ggdGhlIEdyYXBoaWNzTGF5 ZXI6OmNvbnRlbnRzT3BhcXVlKCkgZmxhZyBhbGwKKyAgICAgICAgdGhlIHdheSB0byBMYXllclRp bGVyIGFuZCBvbiB0byBUZXh0dXJlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9MYXllckRhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyRGF0YTo6TGF5ZXJE YXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyRGF0YTo6aXNPcGFxdWUpOgorICAgICAgICAo TGF5ZXJEYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVy VGlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclRpbGU6OnVwZGF0ZUNvbnRlbnRzKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyVGlsZS5oOgorICAg ICAgICAoTGF5ZXJUaWxlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5 L0xheWVyVGlsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJUaWxlcjo6dXBkYXRlVGV4 dHVyZUNvbnRlbnRzSWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJUaWxlcjo6cGVy Zm9ybVRpbGVKb2IpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5 ZXJUaWxlci5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJUaWxlcjo6VGV4dHVyZUpvYjo6VGV4 dHVyZUpvYik6CisgICAgICAgIChXZWJDb3JlOjpMYXllclRpbGVyOjpUZXh0dXJlSm9iOjp1cGRh dGVDb250ZW50cyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXll cldlYktpdFRocmVhZC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJXZWJLaXRUaHJlYWQ6OnNl dE9wYXF1ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9UZXh0dXJl Lmg6CisgICAgICAgIChUZXh0dXJlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFj a2JlcnJ5L1RleHR1cmVDYWNoZUNvbXBvc2l0aW5nVGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlRleHR1cmVDYWNoZUNvbXBvc2l0aW5nVGhyZWFkOjp1cGRhdGVDb250ZW50cyk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9UZXh0dXJlQ2FjaGVDb21wb3NpdGlu Z1RocmVhZC5oOgorICAgICAgICAoVGV4dHVyZUNhY2hlQ29tcG9zaXRpbmdUaHJlYWQpOgorCiAy MDEyLTAzLTI4ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgog CiAgICAgICAgIFNwZWVkIHVwIHVwZGF0ZXMgb2YgZXhpc3RpbmcgQ1NTIHByb3BlcnRpZXMgZnJv bSBKUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNr YmVycnkvTGF5ZXJEYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFj a2JlcnJ5L0xheWVyRGF0YS5oCmluZGV4IDg1NzU3ODZlYmM5OWY5ZGRjZTlhZTlkODNjNTJjOGQx MzE2ZDFhNGEuLjJhNTViY2ZlNTllYjgzYmU2ZDdkMjE1ZjRkMmE3YmE0NDllNmMxYjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJE YXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9M YXllckRhdGEuaApAQCAtNzgsNyArNzgsNyBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9zdXNwZW5k VGltZSgwKQogICAgICAgICAsIG1fZG91YmxlU2lkZWQodHJ1ZSkKICAgICAgICAgLCBtX21hc2tz VG9Cb3VuZHMoZmFsc2UpCi0gICAgICAgICwgbV9vcGFxdWUodHJ1ZSkKKyAgICAgICAgLCBtX2lz T3BhcXVlKGZhbHNlKQogICAgICAgICAsIG1fcHJlc2VydmVzM0QoZmFsc2UpCiAgICAgICAgICwg bV9uZWVkc0Rpc3BsYXlPbkJvdW5kc0NoYW5nZShmYWxzZSkKICAgICAgICAgLCBtX25lZWRzVGV4 dHVyZShmYWxzZSkKQEAgLTExMyw3ICsxMTMsNyBAQCBwdWJsaWM6CiAKICAgICBmbG9hdCBvcGFj aXR5KCkgY29uc3QgeyByZXR1cm4gbV9vcGFjaXR5OyB9CiAKLSAgICBib29sIG9wYXF1ZSgpIGNv bnN0IHsgcmV0dXJuIG1fb3BhcXVlOyB9CisgICAgYm9vbCBpc09wYXF1ZSgpIGNvbnN0IHsgcmV0 dXJuIG1faXNPcGFxdWU7IH0KIAogICAgIEZsb2F0UG9pbnQgcG9zaXRpb24oKSBjb25zdCB7IHJl dHVybiBtX3Bvc2l0aW9uOyB9CiAKQEAgLTE5Nyw3ICsxOTcsNyBAQCBwcm90ZWN0ZWQ6CiAKICAg ICB1bnNpZ25lZCBtX2RvdWJsZVNpZGVkIDogMTsKICAgICB1bnNpZ25lZCBtX21hc2tzVG9Cb3Vu ZHMgOiAxOwotICAgIHVuc2lnbmVkIG1fb3BhcXVlIDogMTsKKyAgICB1bnNpZ25lZCBtX2lzT3Bh cXVlIDogMTsKICAgICB1bnNpZ25lZCBtX3ByZXNlcnZlczNEIDogMTsKICAgICB1bnNpZ25lZCBt X25lZWRzRGlzcGxheU9uQm91bmRzQ2hhbmdlIDogMTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclRpbGUuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclRpbGUuY3BwCmluZGV4 IGYyMWVhOTQ4ZThjODZiZTFkYmZmYTFkZDgwYzMzNTdlN2I2MDhiZjUuLmRlYzE5ZDQ4YjdhNTQ0 MGM1ODY0ZWFlYjMyMWU5ZGViYzU4Y2QzYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJUaWxlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyVGlsZS5jcHAKQEAgLTQ3LDkg KzQ3LDkgQEAgdm9pZCBMYXllclRpbGU6OnNldENvbnRlbnRzVG9Db2xvcihjb25zdCBDb2xvciYg Y29sb3IpCiAgICAgc2V0VGV4dHVyZSh0ZXh0dXJlQ2FjaGVDb21wb3NpdGluZ1RocmVhZCgpLT50 ZXh0dXJlRm9yQ29sb3IoY29sb3IpKTsKIH0KIAotdm9pZCBMYXllclRpbGU6OnVwZGF0ZUNvbnRl bnRzKGNvbnN0IFNrQml0bWFwJiBjb250ZW50cywgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0LCBj b25zdCBJbnRSZWN0JiB0aWxlUmVjdCkKK3ZvaWQgTGF5ZXJUaWxlOjp1cGRhdGVDb250ZW50cyhj b25zdCBTa0JpdG1hcCYgY29udGVudHMsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCwgY29uc3Qg SW50UmVjdCYgdGlsZVJlY3QsIGJvb2wgaXNPcGFxdWUpCiB7Ci0gICAgc2V0VGV4dHVyZSh0ZXh0 dXJlQ2FjaGVDb21wb3NpdGluZ1RocmVhZCgpLT51cGRhdGVDb250ZW50cyhtX3RleHR1cmUsIGNv bnRlbnRzLCBkaXJ0eVJlY3QsIHRpbGVSZWN0KSk7CisgICAgc2V0VGV4dHVyZSh0ZXh0dXJlQ2Fj aGVDb21wb3NpdGluZ1RocmVhZCgpLT51cGRhdGVDb250ZW50cyhtX3RleHR1cmUsIGNvbnRlbnRz LCBkaXJ0eVJlY3QsIHRpbGVSZWN0LCBpc09wYXF1ZSkpOwogfQogCiB2b2lkIExheWVyVGlsZTo6 ZGlzY2FyZENvbnRlbnRzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJUaWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ibGFja2JlcnJ5L0xheWVyVGlsZS5oCmluZGV4IDBlZGRjZGFhZTczM2QxM2JjZTM2 ODVjMDhmN2FkZmQ0NDZkYzIzOTEuLmFmNDQwM2RmZjEwMDg5YzcxZGFhMzAwNzNjMmUyY2VkMzNl ZjJhZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNr YmVycnkvTGF5ZXJUaWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YmxhY2tiZXJyeS9MYXllclRpbGUuaApAQCAtNjMsNyArNjMsNyBAQCBwdWJsaWM6CiAKICAgICB2 b2lkIHNldENvbnRlbnRzKGNvbnN0IFNrQml0bWFwJiBjb250ZW50cywgY29uc3QgSW50UmVjdCYg dGlsZVJlY3QsIGNvbnN0IFRpbGVJbmRleCYsIGJvb2wgaXNPcGFxdWUpOwogICAgIHZvaWQgc2V0 Q29udGVudHNUb0NvbG9yKGNvbnN0IENvbG9yJik7Ci0gICAgdm9pZCB1cGRhdGVDb250ZW50cyhj b25zdCBTa0JpdG1hcCYgY29udGVudHMsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCwgY29uc3Qg SW50UmVjdCYgdGlsZVJlY3QpOworICAgIHZvaWQgdXBkYXRlQ29udGVudHMoY29uc3QgU2tCaXRt YXAmIGNvbnRlbnRzLCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QsIGNvbnN0IEludFJlY3QmIHRp bGVSZWN0LCBib29sIGlzT3BhcXVlKTsKICAgICB2b2lkIGRpc2NhcmRDb250ZW50cygpOwogCiAg ICAgLy8gVGhlIGN1cnJlbnQgdGV4dHVyZSBpcyBhbiBhY2N1cmF0ZSBwcmV2aWV3IG9mIHRoaXMg bGF5ZXIsIGJ1dCBhIG1vcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJUaWxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyVGlsZXIuY3BwCmluZGV4IDMzODAwZTEyY2UxYjlk YzhkYWE0ODQ2ZTFkZDZiYzAxOTJiOWNiZWQuLjFiNWE3MzE5ZTQyZDlkZjE0YmQyNTk1MTEzMTkx NjJlODcxNWMxNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2JsYWNrYmVycnkvTGF5ZXJUaWxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclRpbGVyLmNwcApAQCAtMjAyLDcgKzIwMiw3IEBAIHZv aWQgTGF5ZXJUaWxlcjo6dXBkYXRlVGV4dHVyZUNvbnRlbnRzSWZOZWVkZWQoZG91YmxlIHNjYWxl KQogICAgICAgICAgICAgICAgICAgICBpZiAoaXNTb2xpZENvbG9yKQogICAgICAgICAgICAgICAg ICAgICAgICAgYWRkVGV4dHVyZUpvYihUZXh0dXJlSm9iOjpzZXRDb250ZW50c1RvQ29sb3IoY29s b3IsICppdCkpOwogICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAg ICAgICBhZGRUZXh0dXJlSm9iKFRleHR1cmVKb2I6OnVwZGF0ZUNvbnRlbnRzKGJpdG1hcCwgdGls ZVJlY3QpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGFkZFRleHR1cmVKb2IoVGV4dHVyZUpv Yjo6dXBkYXRlQ29udGVudHMoYml0bWFwLCB0aWxlUmVjdCwgbV9sYXllci0+aXNPcGFxdWUoKSkp OwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIGZpbmlzaGVkSm9icy5hZGQo Kml0KTsKQEAgLTI5Nyw3ICsyOTcsNyBAQCB2b2lkIExheWVyVGlsZXI6OnVwZGF0ZVRleHR1cmVD b250ZW50c0lmTmVlZGVkKGRvdWJsZSBzY2FsZSkKICAgICAgICAgICAgICAgICBpZiAoaXNTb2xp ZENvbG9yKQogICAgICAgICAgICAgICAgICAgICBhZGRUZXh0dXJlSm9iKFRleHR1cmVKb2I6OnNl dENvbnRlbnRzVG9Db2xvcihjb2xvciwgaW5kZXgpKTsKICAgICAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgICAgIGFkZFRleHR1cmVKb2IoVGV4dHVyZUpvYjo6dXBkYXRlQ29udGVu dHMoYml0bWFwLCB0aWxlUmVjdCkpOworICAgICAgICAgICAgICAgICAgICBhZGRUZXh0dXJlSm9i KFRleHR1cmVKb2I6OnVwZGF0ZUNvbnRlbnRzKGJpdG1hcCwgdGlsZVJlY3QsIG1fbGF5ZXItPmlz T3BhcXVlKCkpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KQEAgLTQ1Miw3ICs0 NTIsNyBAQCB2b2lkIExheWVyVGlsZXI6OnBlcmZvcm1UaWxlSm9iKExheWVyVGlsZSogdGlsZSwg Y29uc3QgVGV4dHVyZUpvYiYgam9iLCBjb25zdCBJbgogICAgICAgICB0aWxlLT5zZXRDb250ZW50 cyhqb2IubV9jb250ZW50cywgdGlsZVJlY3QsIGluZGV4T2ZUaWxlKHRpbGVSZWN0LmxvY2F0aW9u KCkpLCBqb2IubV9pc09wYXF1ZSk7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIFRleHR1cmVK b2I6OlVwZGF0ZUNvbnRlbnRzOgotICAgICAgICB0aWxlLT51cGRhdGVDb250ZW50cyhqb2IubV9j b250ZW50cywgam9iLm1fZGlydHlSZWN0LCB0aWxlUmVjdCk7CisgICAgICAgIHRpbGUtPnVwZGF0 ZUNvbnRlbnRzKGpvYi5tX2NvbnRlbnRzLCBqb2IubV9kaXJ0eVJlY3QsIHRpbGVSZWN0LCBqb2Iu bV9pc09wYXF1ZSk7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIFRleHR1cmVKb2I6OkRpc2Nh cmRDb250ZW50czoKICAgICAgICAgdGlsZS0+ZGlzY2FyZENvbnRlbnRzKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyVGlsZXIu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJUaWxl ci5oCmluZGV4IGVkYTllNjFkMzJlZGQxMzhlZTg0NTZiYzkwYjRiMDQyZGI2ZDdmYzEuLjM3NjY2 Mjk1NTllYjQ1ZDkyYjQzMGUxY2IxM2IxOGYyNDI3MWI1NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJUaWxlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJUaWxlci5oCkBA IC0xMDAsNyArMTAwLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIEFTU0VSVCh0eXBlID09IERp c2NhcmRDb250ZW50cyB8fCB0eXBlID09IERpcnR5Q29udGVudHMpOwogICAgICAgICB9CiAKLSAg ICAgICAgVGV4dHVyZUpvYihUeXBlIHR5cGUsIGNvbnN0IFNrQml0bWFwJiBjb250ZW50cywgY29u c3QgSW50UmVjdCYgZGlydHlSZWN0LCBib29sIGlzT3BhcXVlID0gZmFsc2UpCisgICAgICAgIFRl eHR1cmVKb2IoVHlwZSB0eXBlLCBjb25zdCBTa0JpdG1hcCYgY29udGVudHMsIGNvbnN0IEludFJl Y3QmIGRpcnR5UmVjdCwgYm9vbCBpc09wYXF1ZSkKICAgICAgICAgICAgIDogbV90eXBlKHR5cGUp CiAgICAgICAgICAgICAsIG1fY29udGVudHMoY29udGVudHMpCiAgICAgICAgICAgICAsIG1faXNP cGFxdWUoaXNPcGFxdWUpCkBAIC0xMjEsNyArMTIxLDcgQEAgcHJpdmF0ZToKIAogICAgICAgICBz dGF0aWMgVGV4dHVyZUpvYiBzZXRDb250ZW50cyhjb25zdCBTa0JpdG1hcCYgY29udGVudHMsIGJv b2wgaXNPcGFxdWUpIHsgcmV0dXJuIFRleHR1cmVKb2IoU2V0Q29udGVudHMsIGNvbnRlbnRzLCBJ bnRSZWN0KEludFBvaW50Ojp6ZXJvKCksIEludFNpemUoY29udGVudHMud2lkdGgoKSwgY29udGVu dHMuaGVpZ2h0KCkpKSwgaXNPcGFxdWUpOyB9CiAgICAgICAgIHN0YXRpYyBUZXh0dXJlSm9iIHNl dENvbnRlbnRzVG9Db2xvcihjb25zdCBDb2xvciYgY29sb3IsIGNvbnN0IFRpbGVJbmRleCYgaW5k ZXgpIHsgcmV0dXJuIFRleHR1cmVKb2IoU2V0Q29udGVudHNUb0NvbG9yLCBjb2xvciwgaW5kZXgp OyB9Ci0gICAgICAgIHN0YXRpYyBUZXh0dXJlSm9iIHVwZGF0ZUNvbnRlbnRzKGNvbnN0IFNrQml0 bWFwJiBjb250ZW50cywgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KSB7IHJldHVybiBUZXh0dXJl Sm9iKFVwZGF0ZUNvbnRlbnRzLCBjb250ZW50cywgZGlydHlSZWN0KTsgfQorICAgICAgICBzdGF0 aWMgVGV4dHVyZUpvYiB1cGRhdGVDb250ZW50cyhjb25zdCBTa0JpdG1hcCYgY29udGVudHMsIGNv bnN0IEludFJlY3QmIGRpcnR5UmVjdCwgYm9vbCBpc09wYXF1ZSkgeyByZXR1cm4gVGV4dHVyZUpv YihVcGRhdGVDb250ZW50cywgY29udGVudHMsIGRpcnR5UmVjdCwgaXNPcGFxdWUpOyB9CiAgICAg ICAgIHN0YXRpYyBUZXh0dXJlSm9iIGRpc2NhcmRDb250ZW50cyhjb25zdCBJbnRSZWN0JiBkaXJ0 eVJlY3QpIHsgcmV0dXJuIFRleHR1cmVKb2IoRGlzY2FyZENvbnRlbnRzLCBkaXJ0eVJlY3QpOyB9 CiAgICAgICAgIHN0YXRpYyBUZXh0dXJlSm9iIHJlc2l6ZUNvbnRlbnRzKGNvbnN0IEludFNpemUm IG5ld1NpemUpIHsgcmV0dXJuIFRleHR1cmVKb2IoUmVzaXplQ29udGVudHMsIG5ld1NpemUpOyB9 CiAgICAgICAgIHN0YXRpYyBUZXh0dXJlSm9iIGRpcnR5Q29udGVudHMoY29uc3QgSW50UmVjdCYg ZGlydHlSZWN0KSB7IHJldHVybiBUZXh0dXJlSm9iKERpcnR5Q29udGVudHMsIGRpcnR5UmVjdCk7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVy cnkvTGF5ZXJXZWJLaXRUaHJlYWQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2JsYWNrYmVycnkvTGF5ZXJXZWJLaXRUaHJlYWQuaAppbmRleCBmNGM3NDQxY2RkOTI4ZTc3YmJl YzUzNDBjYmYwYzI3NGExNTRjZWZkLi44NDhjMTg0YTY4ZTlhMGRkODJkOWEyMjNiNjU5MDEwYTYx NWRlM2ExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFj a2JlcnJ5L0xheWVyV2ViS2l0VGhyZWFkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllcldlYktpdFRocmVhZC5oCkBAIC05NSw3ICs5NSw3IEBA IHB1YmxpYzoKIAogICAgIHZvaWQgc2V0T3BhY2l0eShmbG9hdCBvcGFjaXR5KSB7IG1fb3BhY2l0 eSA9IG9wYWNpdHk7IHNldE5lZWRzQ29tbWl0KCk7IH0KIAotICAgIHZvaWQgc2V0T3BhcXVlKGJv b2wgb3BhcXVlKSB7IG1fb3BhcXVlID0gb3BhcXVlOyBzZXROZWVkc0NvbW1pdCgpOyB9CisgICAg dm9pZCBzZXRPcGFxdWUoYm9vbCBpc09wYXF1ZSkgeyBtX2lzT3BhcXVlID0gaXNPcGFxdWU7IHNl dE5lZWRzQ29tbWl0KCk7IH0KIAogICAgIHZvaWQgc2V0UG9zaXRpb24oY29uc3QgRmxvYXRQb2lu dCYgcG9zaXRpb24pIHsgbV9wb3NpdGlvbiA9IHBvc2l0aW9uOyBzZXROZWVkc0NvbW1pdCgpOyB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVy cnkvVGV4dHVyZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJy eS9UZXh0dXJlLmgKaW5kZXggNGU5OTZkMGQzM2JhNGJlOTJkNWRmYjJlNDRmY2Y5MGM0MGFlZWQ4 Yi4uNmRjNGZkYmNjYzA3NTU2MDQwYmEwODgwYTRhN2I1OGI5MTMxMDMzMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9UZXh0dXJlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9UZXh0dXJlLmgK QEAgLTYxLDcgKzYxLDcgQEAgcHVibGljOgogICAgIHZvaWQgdW5wcm90ZWN0KCkgeyAtLW1fcHJv dGVjdGlvbkNvdW50OyB9CiAgICAgYm9vbCBwcm90ZWN0KGNvbnN0IEludFNpemUmKTsKIAotICAg IHZvaWQgdXBkYXRlQ29udGVudHMoY29uc3QgU2tCaXRtYXAmIGNvbnRlbnRzLCBjb25zdCBJbnRS ZWN0JiBkaXJ0eVJlY3QsIGNvbnN0IEludFJlY3QmIHRpbGUsIGJvb2wgaXNPcGFxdWUgPSBmYWxz ZSk7CisgICAgdm9pZCB1cGRhdGVDb250ZW50cyhjb25zdCBTa0JpdG1hcCYgY29udGVudHMsIGNv bnN0IEludFJlY3QmIGRpcnR5UmVjdCwgY29uc3QgSW50UmVjdCYgdGlsZSwgYm9vbCBpc09wYXF1 ZSk7CiAgICAgdm9pZCBzZXRDb250ZW50c1RvQ29sb3IoY29uc3QgQ29sb3ImKTsKIAogICAgIElu dFNpemUgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9UZXh0dXJlQ2FjaGVDb21wb3Np dGluZ1RocmVhZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2Jl cnJ5L1RleHR1cmVDYWNoZUNvbXBvc2l0aW5nVGhyZWFkLmNwcAppbmRleCBmZTBjM2RhNDk1ZTNj MjhhZDRhNmEwOWY4OWY4MmM5ZjcxOTJjNjI2Li5mOWY2NTQwOGEyY2JkNDA0M2FiZTcyNzE1OTI3 NTgzMTFhOGZlMDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ibGFja2JlcnJ5L1RleHR1cmVDYWNoZUNvbXBvc2l0aW5nVGhyZWFkLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L1RleHR1cmVDYWNoZUNvbXBv c2l0aW5nVGhyZWFkLmNwcApAQCAtMjU0LDcgKzI1NCw3IEBAIFBhc3NSZWZQdHI8VGV4dHVyZT4g VGV4dHVyZUNhY2hlQ29tcG9zaXRpbmdUaHJlYWQ6OnRleHR1cmVGb3JDb2xvcihjb25zdCBDb2xv ciYKICAgICByZXR1cm4gdGV4dHVyZS5yZWxlYXNlKCk7CiB9CiAKLVBhc3NSZWZQdHI8VGV4dHVy ZT4gVGV4dHVyZUNhY2hlQ29tcG9zaXRpbmdUaHJlYWQ6OnVwZGF0ZUNvbnRlbnRzKGNvbnN0IFJl ZlB0cjxUZXh0dXJlPiYgdGV4dHVyZUluLCBjb25zdCBTa0JpdG1hcCYgY29udGVudHMsIGNvbnN0 IEludFJlY3QmIGRpcnR5UmVjdCwgY29uc3QgSW50UmVjdCYgdGlsZVJlY3QpCitQYXNzUmVmUHRy PFRleHR1cmU+IFRleHR1cmVDYWNoZUNvbXBvc2l0aW5nVGhyZWFkOjp1cGRhdGVDb250ZW50cyhj b25zdCBSZWZQdHI8VGV4dHVyZT4mIHRleHR1cmVJbiwgY29uc3QgU2tCaXRtYXAmIGNvbnRlbnRz LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QsIGNvbnN0IEludFJlY3QmIHRpbGVSZWN0LCBib29s IGlzT3BhcXVlKQogewogICAgIFJlZlB0cjxUZXh0dXJlPiB0ZXh0dXJlKHRleHR1cmVJbik7CiAK QEAgLTI2Niw3ICsyNjYsNyBAQCBQYXNzUmVmUHRyPFRleHR1cmU+IFRleHR1cmVDYWNoZUNvbXBv c2l0aW5nVGhyZWFkOjp1cGRhdGVDb250ZW50cyhjb25zdCBSZWZQdHI8VAogICAgIC8vIFByb3Rl Y3QgbmV3bHkgY3JlYXRlZCB0ZXh0dXJlIGZyb20gYmVpbmcgZXZpY3RlZC4KICAgICBUZXh0dXJl UHJvdGVjdG9yIHByb3RlY3Rvcih0ZXh0dXJlLmdldCgpKTsKIAotICAgIHRleHR1cmUtPnVwZGF0 ZUNvbnRlbnRzKGNvbnRlbnRzLCBkaXJ0eVJlY3QsIHRpbGVSZWN0KTsKKyAgICB0ZXh0dXJlLT51 cGRhdGVDb250ZW50cyhjb250ZW50cywgZGlydHlSZWN0LCB0aWxlUmVjdCwgaXNPcGFxdWUpOwog CiAgICAgcmV0dXJuIHRleHR1cmUucmVsZWFzZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9UZXh0dXJlQ2FjaGVDb21wb3NpdGlu Z1RocmVhZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9U ZXh0dXJlQ2FjaGVDb21wb3NpdGluZ1RocmVhZC5oCmluZGV4IDgyOTA1Yjk5MTVlMTM1NTllZDdm OWMwOTcxZmM1NWViNzQxNzRlMjQuLmRmNzc5MmZhMmYyN2UzMjJjZmFjMzYyNGNkYzRkMGI3NjU1 NWNkNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNr YmVycnkvVGV4dHVyZUNhY2hlQ29tcG9zaXRpbmdUaHJlYWQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L1RleHR1cmVDYWNoZUNvbXBvc2l0aW5nVGhy ZWFkLmgKQEAgLTU0LDcgKzU0LDcgQEAgcHVibGljOgogICAgIFBhc3NSZWZQdHI8VGV4dHVyZT4g dGV4dHVyZUZvckNvbG9yKGNvbnN0IENvbG9yJik7CiAKICAgICAvLyBVcGRhdGUgY29udGVudHMg b2YgYW4gZXhpc3RpbmcgdGV4dHVyZSwgb3IgY3JlYXRlIGEgbmV3IG9uZSBpZiB0ZXh0dXJlIGlz IDAuCi0gICAgUGFzc1JlZlB0cjxUZXh0dXJlPiB1cGRhdGVDb250ZW50cyhjb25zdCBSZWZQdHI8 VGV4dHVyZT4mLCBjb25zdCBTa0JpdG1hcCYgY29udGVudHMsIGNvbnN0IEludFJlY3QmIGRpcnR5 UmVjdCwgY29uc3QgSW50UmVjdCYgdGlsZVJlY3QpOworICAgIFBhc3NSZWZQdHI8VGV4dHVyZT4g dXBkYXRlQ29udGVudHMoY29uc3QgUmVmUHRyPFRleHR1cmU+JiwgY29uc3QgU2tCaXRtYXAmIGNv bnRlbnRzLCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QsIGNvbnN0IEludFJlY3QmIHRpbGVSZWN0 LCBib29sIGlzT3BhcXVlKTsKIAogICAgIHNpemVfdCBtZW1vcnlVc2FnZSgpIGNvbnN0IHsgcmV0 dXJuIG1fbWVtb3J5VXNhZ2U7IH0KICAgICBzaXplX3QgbWVtb3J5TGltaXQoKSBjb25zdCB7IHJl dHVybiBtX21lbW9yeUxpbWl0OyB9Cg==