68295 2011-09-16 17:43:06 -0700 Remove preserves3D() from CCLayerDelegate 2011-09-23 16:24:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 piman webkit-unassigned jamesr nduca webkit.review.bot oldest_to_newest 468932 0 piman 2011-09-16 17:43:06 -0700 Remove preserves3D() from CCLayerDelegate 468934 1 107755 piman 2011-09-16 17:44:51 -0700 Created attachment 107755 Patch 468951 2 107757 piman 2011-09-16 18:01:09 -0700 Created attachment 107757 Patch 472030 3 108436 piman 2011-09-22 19:51:33 -0700 Created attachment 108436 Patch 472031 4 piman 2011-09-22 19:53:00 -0700 Rebased patch (and friendly ping) 472525 5 108436 jamesr 2011-09-23 14:55:52 -0700 Comment on attachment 108436 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108436&action=review > Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:367 > + platformLayer->setPreserves3D(m_preserves3D); I don't think we need to do this - the canvas contents layer can't have preserves3D set since it's a CSS property and would only apply to the container layer, and even if it could we should be able to rely on the normal property propagation code > Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:400 > + layer->setPreserves3D(m_preserves3D); same here - i don't think media layers can have this bit > Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:600 > + if (m_contentsLayer) > + m_contentsLayer->setPreserves3D(m_preserves3D); it looks like we used to propagate the preserves3D bit to the contents layer. this change preserves that behavior but I think it's actually wrong. Can you see if any tests break if you only propagate the preserves3D bit to the m_layer? > Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:652 > + m_contentsLayer->setPreserves3D(m_preserves3D); do we need this? 472527 6 108436 jamesr 2011-09-23 14:57:11 -0700 Comment on attachment 108436 Patch R=me since this is preserving the existing behavior, so it's fine to land as-is. I think we can simplify, however. 472573 7 108551 piman 2011-09-23 15:52:44 -0700 Created attachment 108551 Patch 472574 8 piman 2011-09-23 15:54:08 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=108436&action=review >> Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:367 >> + platformLayer->setPreserves3D(m_preserves3D); > > I don't think we need to do this - the canvas contents layer can't have preserves3D set since it's a CSS property and would only apply to the container layer, and even if it could we should be able to rely on the normal property propagation code Done. >> Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:400 >> + layer->setPreserves3D(m_preserves3D); > > same here - i don't think media layers can have this bit Done. >> Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:600 >> + m_contentsLayer->setPreserves3D(m_preserves3D); > > it looks like we used to propagate the preserves3D bit to the contents layer. this change preserves that behavior but I think it's actually wrong. Can you see if any tests break if you only propagate the preserves3D bit to the m_layer? Done. Layout tests still pass. >> Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:652 >> + m_contentsLayer->setPreserves3D(m_preserves3D); > > do we need this? Removed. 472576 9 108551 jamesr 2011-09-23 15:57:04 -0700 Comment on attachment 108551 Patch R=me 472599 10 108551 webkit.review.bot 2011-09-23 16:24:10 -0700 Comment on attachment 108551 Patch Clearing flags on attachment: 108551 Committed r95886: <http://trac.webkit.org/changeset/95886> 472600 11 webkit.review.bot 2011-09-23 16:24:15 -0700 All reviewed patches have been landed. Closing bug. 107755 2011-09-16 17:44:51 -0700 2011-09-16 18:01:06 -0700 Patch bug-68295-20110916174450.patch text/plain 6587 piman U3VidmVyc2lvbiBSZXZpc2lvbjogOTUzMjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1OTAwMmE0YjgwZmMzNzUz MGYxZjZmYmYwOTAzODRiNTcxYTRiNDg4Li5jNTg2NDE1NDdhZGZiYmY0NDQ5NjQwYWI0MjNiZDkx OWQwNWI3NDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDktMTYgIEFudG9p bmUgTGFib3VyICA8cGltYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBwcmVzZXJ2 ZXMzRCgpIGZyb20gQ0NMYXllckRlbGVnYXRlLCByZXBsYWNpbmcgaXQgYnkgc2V0dGluZyB0aGUK KwkJCQl2YWx1ZSBleHBsaWNpdGx5IGFmdGVyIGNyZWF0aW5nIGEgbGF5ZXIsIG9yIHNldHRpbmcg aXRzIGRlbGVnYXRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjgyOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDb3ZlcmVkIGJ5IGNvbXBvc2l0aW5nLyBsYXllb3V0IHRlc3RzLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGVudHNUb0NhbnZh cyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRz VG9NZWRpYSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hyb21pdW06OnVwZGF0 ZUxheWVyUHJlc2VydmVzM0QpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9t aXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJD aHJvbWl1bTo6TGF5ZXJDaHJvbWl1bSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDaHJvbWl1bTo6 c2V0UHJlc2VydmVzM0QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDaHJvbWl1bTo6cHJlc2Vy dmVzM0QpOgorCiAyMDExLTA5LTE2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVXBkYXRlIEpTQyByZXN1bHRzIHRvIGFjY291bnQgZm9yIGludHJpbnNpY3MgY2hh bmdlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggZjQ2NzFmOWYz ZjE0MTdiZWRhYWIzZGRmMjA5ZTFmNjA4MTJjNThlMS4uY2MzODZkZDAyOTY2ZWQzZDlkZTI4MzNh NTRhZjY1Y2Y5ZmQ0NWNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3Bw CkBAIC0zODQsNiArMzg0LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRl bnRzVG9DYW52YXMoUGxhdGZvcm1MYXllciogcGxhdGZvcm1MYXllcikKICAgICBib29sIGNoaWxk cmVuQ2hhbmdlZCA9IGZhbHNlOwogICAgIGlmIChwbGF0Zm9ybUxheWVyKSB7CiAgICAgICAgIHBs YXRmb3JtTGF5ZXItPnNldERlbGVnYXRlKHRoaXMpOworICAgICAgICBwbGF0Zm9ybUxheWVyLT5z ZXRQcmVzZXJ2ZXMzRChtX3ByZXNlcnZlczNEKTsKICAgICAgICAgaWYgKG1fY29udGVudHNMYXll ci5nZXQoKSAhPSBwbGF0Zm9ybUxheWVyKSB7CiAgICAgICAgICAgICBzZXR1cENvbnRlbnRzTGF5 ZXIocGxhdGZvcm1MYXllcik7CiAgICAgICAgICAgICBtX2NvbnRlbnRzTGF5ZXIgPSBwbGF0Zm9y bUxheWVyOwpAQCAtNDE2LDYgKzQxNyw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpz ZXRDb250ZW50c1RvTWVkaWEoUGxhdGZvcm1MYXllciogbGF5ZXIpCiAgICAgICAgICAgICBjaGls ZHJlbkNoYW5nZWQgPSB0cnVlOwogICAgICAgICB9CiAgICAgICAgIGxheWVyLT5zZXREZWxlZ2F0 ZSh0aGlzKTsKKyAgICAgICAgbGF5ZXItPnNldFByZXNlcnZlczNEKG1fcHJlc2VydmVzM0QpOwog ICAgICAgICBsYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7CiAgICAgICAgIHVwZGF0ZUNvbnRlbnRz UmVjdCgpOwogICAgIH0gZWxzZSB7CkBAIC01NzEsNiArNTczLDcgQEAgdm9pZCBHcmFwaGljc0xh eWVyQ2hyb21pdW06OnVwZGF0ZUxheWVyUHJlc2VydmVzM0QoKQogICAgIGlmIChtX3ByZXNlcnZl czNEICYmICFtX3RyYW5zZm9ybUxheWVyKSB7CiAgICAgICAgIC8vIENyZWF0ZSB0aGUgdHJhbnNm b3JtIGxheWVyLgogICAgICAgICBtX3RyYW5zZm9ybUxheWVyID0gTGF5ZXJDaHJvbWl1bTo6Y3Jl YXRlKHRoaXMpOworICAgICAgICBtX3RyYW5zZm9ybUxheWVyLT5zZXRQcmVzZXJ2ZXMzRCh0cnVl KTsKIAogICAgICAgICAvLyBDb3B5IHRoZSBwb3NpdGlvbiBmcm9tIHRoaXMgbGF5ZXIuCiAgICAg ICAgIHVwZGF0ZUxheWVyUG9zaXRpb24oKTsKQEAgLTYxMiw2ICs2MTUsOSBAQCB2b2lkIEdyYXBo aWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlTGF5ZXJQcmVzZXJ2ZXMzRCgpCiAgICAgICAgIHVwZGF0 ZUNoaWxkTGlzdCgpOwogICAgIH0KIAorICAgIG1fbGF5ZXItPnNldFByZXNlcnZlczNEKG1fcHJl c2VydmVzM0QpOworICAgIGlmIChtX2NvbnRlbnRzTGF5ZXIpCisgICAgICAgIG1fY29udGVudHNM YXllci0+c2V0UHJlc2VydmVzM0QobV9wcmVzZXJ2ZXMzRCk7CiAgICAgdXBkYXRlT3BhY2l0eU9u TGF5ZXIoKTsKICAgICB1cGRhdGVOYW1lcygpOwogfQpAQCAtNjYzLDYgKzY2OSw3IEBAIHZvaWQg R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIoTGF5ZXJDaHJvbWl1bSog Y29udGVudHNMYXllcikKICAgICBpZiAoY29udGVudHNMYXllcikgewogICAgICAgICBtX2NvbnRl bnRzTGF5ZXIgPSBjb250ZW50c0xheWVyOwogCisgICAgICAgIG1fY29udGVudHNMYXllci0+c2V0 UHJlc2VydmVzM0QobV9wcmVzZXJ2ZXMzRCk7CiAgICAgICAgIG1fY29udGVudHNMYXllci0+c2V0 QW5jaG9yUG9pbnQoRmxvYXRQb2ludCgwLCAwKSk7CiAKICAgICAgICAgLy8gSW5zZXJ0IHRoZSBj b250ZW50IGxheWVyIGZpcnN0LiBWaWRlbyBlbGVtZW50cyByZXF1aXJlIHRoaXMsIGJlY2F1c2Ug dGhleSBoYXZlCkBAIC02OTEsMTEgKzY5OCw2IEBAIGJvb2wgR3JhcGhpY3NMYXllckNocm9taXVt OjpkcmF3c0NvbnRlbnQoKSBjb25zdAogICAgIHJldHVybiBHcmFwaGljc0xheWVyOjpkcmF3c0Nv bnRlbnQoKTsKIH0KIAotYm9vbCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnByZXNlcnZlczNEKCkg Y29uc3QKLXsKLSAgICByZXR1cm4gR3JhcGhpY3NMYXllcjo6cHJlc2VydmVzM0QoKTsKLX0KLQog dm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnBhaW50Q29udGVudHMoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBjbGlwKQogewogICAgIHBhaW50R3JhcGhpY3NMYXll ckNvbnRlbnRzKGNvbnRleHQsIGNsaXApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0u aAppbmRleCA4YjIxM2E4NDAzODU3MTM0MTBlNzczNDEwZjRkYjczZWYwYzMwZjFkLi43MTkwZTUw NTlmYzU2MTY0OTY5NjkwNDk0M2E1ZTc1YzUzN2M1MzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xh eWVyQ2hyb21pdW0uaApAQCAtOTcsNyArOTcsNiBAQCBwdWJsaWM6CiAKICAgICAvLyBUaGUgZm9s bG93aW5nIGZ1bmN0aW9ucyBpbXBsZW1lbnQgdGhlIENDTGF5ZXJEZWxlZ2F0ZSBpbnRlcmZhY2Uu CiAgICAgdmlydHVhbCBib29sIGRyYXdzQ29udGVudCgpIGNvbnN0OwotICAgIHZpcnR1YWwgYm9v bCBwcmVzZXJ2ZXMzRCgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBwYWludENvbnRlbnRzKEdy YXBoaWNzQ29udGV4dCYsIGNvbnN0IEludFJlY3QmIGNsaXApOwogICAgIHZpcnR1YWwgdm9pZCBu b3RpZnlTeW5jUmVxdWlyZWQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcAppbmRleCAzZTlkZTBk YmNhZmFlMTU2M2U1MDY4MzljMTRhYzRkODRhMzk0ZmZhLi40ZjEyMzY4Y2ZiYjkyOGFlNDY5ZDhm MWJhM2U3YWM2MTA2MWEzNjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcApAQCAtNzYsNiArNzYs NyBAQCBMYXllckNocm9taXVtOjpMYXllckNocm9taXVtKENDTGF5ZXJEZWxlZ2F0ZSogZGVsZWdh dGUpCiAgICAgLCBtX2RvdWJsZVNpZGVkKHRydWUpCiAgICAgLCBtX3VzZXNMYXllclNjaXNzb3Io ZmFsc2UpCiAgICAgLCBtX2lzUm9vdExheWVyKGZhbHNlKQorICAgICwgbV9wcmVzZXJ2ZXMzRChm YWxzZSkKICAgICAsIG1fcmVwbGljYUxheWVyKDApCiAgICAgLCBtX2RyYXdPcGFjaXR5KDApCiAg ICAgLCBtX3RhcmdldFJlbmRlclN1cmZhY2UoMCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaAppbmRleCA5MGRm NjhkNWRjOWViYWM5MjgyZjcwMzk5NWViZjA1MDhlY2JlNzlhLi41ZTYzZWY5OTYxMjUxN2NkNTUz YmRkYjlkN2QwZDhlZGJjOTY1NzVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCkBAIC01OSw3ICs1OSw2 IEBAIGNsYXNzIENDTGF5ZXJEZWxlZ2F0ZSB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+Q0NMYXll ckRlbGVnYXRlKCkgeyB9CiAgICAgdmlydHVhbCBib29sIGRyYXdzQ29udGVudCgpIGNvbnN0ID0g MDsKLSAgICB2aXJ0dWFsIGJvb2wgcHJlc2VydmVzM0QoKSBjb25zdCA9IDA7CiAgICAgdmlydHVh bCB2b2lkIHBhaW50Q29udGVudHMoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgSW50UmVjdCYgY2xp cCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlTeW5jUmVxdWlyZWQoKSA9IDA7CiB9OwpA QCAtMTUyLDcgKzE1MSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEdlb21ldHJ5RmxpcHBlZChi b29sIGZsaXBwZWQpIHsgbV9nZW9tZXRyeUZsaXBwZWQgPSBmbGlwcGVkOyBzZXROZWVkc0NvbW1p dCgpOyB9CiAgICAgYm9vbCBnZW9tZXRyeUZsaXBwZWQoKSBjb25zdCB7IHJldHVybiBtX2dlb21l dHJ5RmxpcHBlZDsgfQogCi0gICAgYm9vbCBwcmVzZXJ2ZXMzRCgpIHsgcmV0dXJuIG1fZGVsZWdh dGUgJiYgbV9kZWxlZ2F0ZS0+cHJlc2VydmVzM0QoKTsgfQorICAgIHZvaWQgc2V0UHJlc2VydmVz M0QoYm9vbCBwcmVzZXJ2ZTNEKSB7IG1fcHJlc2VydmVzM0QgPSBwcmVzZXJ2ZTNEOyB9CisgICAg Ym9vbCBwcmVzZXJ2ZXMzRCgpIHsgcmV0dXJuIG1fcHJlc2VydmVzM0Q7IH0KIAogICAgIHZvaWQg c2V0VXNlc0xheWVyU2Npc3Nvcihib29sIHVzZXNMYXllclNjaXNzb3IpIHsgbV91c2VzTGF5ZXJT Y2lzc29yID0gdXNlc0xheWVyU2Npc3NvcjsgfQogICAgIGJvb2wgdXNlc0xheWVyU2Npc3Nvcigp IGNvbnN0IHsgcmV0dXJuIG1fdXNlc0xheWVyU2Npc3NvcjsgfQpAQCAtMjgxLDYgKzI4MSw3IEBA IHByaXZhdGU6CiAgICAgYm9vbCBtX2RvdWJsZVNpZGVkOwogICAgIGJvb2wgbV91c2VzTGF5ZXJT Y2lzc29yOwogICAgIGJvb2wgbV9pc1Jvb3RMYXllcjsKKyAgICBib29sIG1fcHJlc2VydmVzM0Q7 CiAKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX3RyYW5zZm9ybTsKICAgICBUcmFuc2Zvcm1h dGlvbk1hdHJpeCBtX3N1YmxheWVyVHJhbnNmb3JtOwo= 107757 2011-09-16 18:01:09 -0700 2011-09-22 19:51:20 -0700 Patch bug-68295-20110916180108.patch text/plain 6591 piman U3VidmVyc2lvbiBSZXZpc2lvbjogOTUzMjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1OTAwMmE0YjgwZmMzNzUz MGYxZjZmYmYwOTAzODRiNTcxYTRiNDg4Li5jNjgwZjVlMzI5NWM0NzAzNDIxODQ3M2FmZmViMjM2 YTlkN2UxMWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDktMTYgIEFudG9p bmUgTGFib3VyICA8cGltYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBwcmVzZXJ2 ZXMzRCgpIGZyb20gQ0NMYXllckRlbGVnYXRlLCByZXBsYWNpbmcgaXQgYnkgc2V0dGluZyB0aGUK KyAgICAgICAgdmFsdWUgZXhwbGljaXRseSBhZnRlciBjcmVhdGluZyBhIGxheWVyLCBvciBzZXR0 aW5nIGl0cyBkZWxlZ2F0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY4Mjk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ292ZXJlZCBieSBjb21wb3NpdGluZy8gbGF5ZW91dCB0ZXN0cy4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzVG9D YW52YXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250 ZW50c1RvTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjp1 cGRhdGVMYXllclByZXNlcnZlczNEKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJD aHJvbWl1bTo6c2V0dXBDb250ZW50c0xheWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eWVyQ2hyb21pdW06OkxheWVyQ2hyb21pdW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21p dW06OnNldFByZXNlcnZlczNEKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnBy ZXNlcnZlczNEKToKKwogMjAxMS0wOS0xNiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3Jn PgogCiAgICAgICAgIFVwZGF0ZSBKU0MgcmVzdWx0cyB0byBhY2NvdW50IGZvciBpbnRyaW5zaWNz IGNoYW5nZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IGY0Njcx ZjlmM2YxNDE3YmVkYWFiM2RkZjIwOWUxZjYwODEyYzU4ZTEuLmNjMzg2ZGQwMjk2NmVkM2Q5ZGUy ODMzYTU0YWY2NWNmOWZkNDVjYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVt LmNwcApAQCAtMzg0LDYgKzM4NCw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRD b250ZW50c1RvQ2FudmFzKFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIpCiAgICAgYm9vbCBj aGlsZHJlbkNoYW5nZWQgPSBmYWxzZTsKICAgICBpZiAocGxhdGZvcm1MYXllcikgewogICAgICAg ICBwbGF0Zm9ybUxheWVyLT5zZXREZWxlZ2F0ZSh0aGlzKTsKKyAgICAgICAgcGxhdGZvcm1MYXll ci0+c2V0UHJlc2VydmVzM0QobV9wcmVzZXJ2ZXMzRCk7CiAgICAgICAgIGlmIChtX2NvbnRlbnRz TGF5ZXIuZ2V0KCkgIT0gcGxhdGZvcm1MYXllcikgewogICAgICAgICAgICAgc2V0dXBDb250ZW50 c0xheWVyKHBsYXRmb3JtTGF5ZXIpOwogICAgICAgICAgICAgbV9jb250ZW50c0xheWVyID0gcGxh dGZvcm1MYXllcjsKQEAgLTQxNiw2ICs0MTcsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1 bTo6c2V0Q29udGVudHNUb01lZGlhKFBsYXRmb3JtTGF5ZXIqIGxheWVyKQogICAgICAgICAgICAg Y2hpbGRyZW5DaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICBsYXllci0+c2V0RGVs ZWdhdGUodGhpcyk7CisgICAgICAgIGxheWVyLT5zZXRQcmVzZXJ2ZXMzRChtX3ByZXNlcnZlczNE KTsKICAgICAgICAgbGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOwogICAgICAgICB1cGRhdGVDb250 ZW50c1JlY3QoKTsKICAgICB9IGVsc2UgewpAQCAtNTcxLDYgKzU3Myw3IEBAIHZvaWQgR3JhcGhp Y3NMYXllckNocm9taXVtOjp1cGRhdGVMYXllclByZXNlcnZlczNEKCkKICAgICBpZiAobV9wcmVz ZXJ2ZXMzRCAmJiAhbV90cmFuc2Zvcm1MYXllcikgewogICAgICAgICAvLyBDcmVhdGUgdGhlIHRy YW5zZm9ybSBsYXllci4KICAgICAgICAgbV90cmFuc2Zvcm1MYXllciA9IExheWVyQ2hyb21pdW06 OmNyZWF0ZSh0aGlzKTsKKyAgICAgICAgbV90cmFuc2Zvcm1MYXllci0+c2V0UHJlc2VydmVzM0Qo dHJ1ZSk7CiAKICAgICAgICAgLy8gQ29weSB0aGUgcG9zaXRpb24gZnJvbSB0aGlzIGxheWVyLgog ICAgICAgICB1cGRhdGVMYXllclBvc2l0aW9uKCk7CkBAIC02MTIsNiArNjE1LDkgQEAgdm9pZCBH cmFwaGljc0xheWVyQ2hyb21pdW06OnVwZGF0ZUxheWVyUHJlc2VydmVzM0QoKQogICAgICAgICB1 cGRhdGVDaGlsZExpc3QoKTsKICAgICB9CiAKKyAgICBtX2xheWVyLT5zZXRQcmVzZXJ2ZXMzRCht X3ByZXNlcnZlczNEKTsKKyAgICBpZiAobV9jb250ZW50c0xheWVyKQorICAgICAgICBtX2NvbnRl bnRzTGF5ZXItPnNldFByZXNlcnZlczNEKG1fcHJlc2VydmVzM0QpOwogICAgIHVwZGF0ZU9wYWNp dHlPbkxheWVyKCk7CiAgICAgdXBkYXRlTmFtZXMoKTsKIH0KQEAgLTY2Myw2ICs2NjksNyBAQCB2 b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0dXBDb250ZW50c0xheWVyKExheWVyQ2hyb21p dW0qIGNvbnRlbnRzTGF5ZXIpCiAgICAgaWYgKGNvbnRlbnRzTGF5ZXIpIHsKICAgICAgICAgbV9j b250ZW50c0xheWVyID0gY29udGVudHNMYXllcjsKIAorICAgICAgICBtX2NvbnRlbnRzTGF5ZXIt PnNldFByZXNlcnZlczNEKG1fcHJlc2VydmVzM0QpOwogICAgICAgICBtX2NvbnRlbnRzTGF5ZXIt PnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQoMCwgMCkpOwogCiAgICAgICAgIC8vIEluc2VydCB0 aGUgY29udGVudCBsYXllciBmaXJzdC4gVmlkZW8gZWxlbWVudHMgcmVxdWlyZSB0aGlzLCBiZWNh dXNlIHRoZXkgaGF2ZQpAQCAtNjkxLDExICs2OTgsNiBAQCBib29sIEdyYXBoaWNzTGF5ZXJDaHJv bWl1bTo6ZHJhd3NDb250ZW50KCkgY29uc3QKICAgICByZXR1cm4gR3JhcGhpY3NMYXllcjo6ZHJh d3NDb250ZW50KCk7CiB9CiAKLWJvb2wgR3JhcGhpY3NMYXllckNocm9taXVtOjpwcmVzZXJ2ZXMz RCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIEdyYXBoaWNzTGF5ZXI6OnByZXNlcnZlczNEKCk7Ci19 Ci0KIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpwYWludENvbnRlbnRzKEdyYXBoaWNzQ29u dGV4dCYgY29udGV4dCwgY29uc3QgSW50UmVjdCYgY2xpcCkKIHsKICAgICBwYWludEdyYXBoaWNz TGF5ZXJDb250ZW50cyhjb250ZXh0LCBjbGlwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9t aXVtLmgKaW5kZXggOGIyMTNhODQwMzg1NzEzNDEwZTc3MzQxMGY0ZGI3M2VmMGMzMGYxZC4uNzE5 MGU1MDU5ZmM1NjE2NDk2OTY5MDQ5NDNhNWU3NWM1MzdjNTM3ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVt LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhp Y3NMYXllckNocm9taXVtLmgKQEAgLTk3LDcgKzk3LDYgQEAgcHVibGljOgogCiAgICAgLy8gVGhl IGZvbGxvd2luZyBmdW5jdGlvbnMgaW1wbGVtZW50IHRoZSBDQ0xheWVyRGVsZWdhdGUgaW50ZXJm YWNlLgogICAgIHZpcnR1YWwgYm9vbCBkcmF3c0NvbnRlbnQoKSBjb25zdDsKLSAgICB2aXJ0dWFs IGJvb2wgcHJlc2VydmVzM0QoKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250ZW50 cyhHcmFwaGljc0NvbnRleHQmLCBjb25zdCBJbnRSZWN0JiBjbGlwKTsKICAgICB2aXJ0dWFsIHZv aWQgbm90aWZ5U3luY1JlcXVpcmVkKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggM2U5 ZGUwZGJjYWZhZTE1NjNlNTA2ODM5YzE0YWM0ZDg0YTM5NGZmYS4uNGYxMjM2OGNmYmI5MjhhZTQ2 OWQ4ZjFiYTNlN2FjNjEwNjFhMzY2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTc2LDYg Kzc2LDcgQEAgTGF5ZXJDaHJvbWl1bTo6TGF5ZXJDaHJvbWl1bShDQ0xheWVyRGVsZWdhdGUqIGRl bGVnYXRlKQogICAgICwgbV9kb3VibGVTaWRlZCh0cnVlKQogICAgICwgbV91c2VzTGF5ZXJTY2lz c29yKGZhbHNlKQogICAgICwgbV9pc1Jvb3RMYXllcihmYWxzZSkKKyAgICAsIG1fcHJlc2VydmVz M0QoZmFsc2UpCiAgICAgLCBtX3JlcGxpY2FMYXllcigwKQogICAgICwgbV9kcmF3T3BhY2l0eSgw KQogICAgICwgbV90YXJnZXRSZW5kZXJTdXJmYWNlKDApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKaW5kZXgg OTBkZjY4ZDVkYzllYmFjOTI4MmY3MDM5OTVlYmYwNTA4ZWNiZTc5YS4uNWU2M2VmOTk2MTI1MTdj ZDU1M2JkZGI5ZDdkMGQ4ZWRiYzk2NTc1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaApAQCAtNTksNyAr NTksNiBAQCBjbGFzcyBDQ0xheWVyRGVsZWdhdGUgewogcHVibGljOgogICAgIHZpcnR1YWwgfkND TGF5ZXJEZWxlZ2F0ZSgpIHsgfQogICAgIHZpcnR1YWwgYm9vbCBkcmF3c0NvbnRlbnQoKSBjb25z dCA9IDA7Ci0gICAgdmlydHVhbCBib29sIHByZXNlcnZlczNEKCkgY29uc3QgPSAwOwogICAgIHZp cnR1YWwgdm9pZCBwYWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IEludFJlY3Qm IGNsaXApID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5U3luY1JlcXVpcmVkKCkgPSAwOwog fTsKQEAgLTE1Miw3ICsxNTEsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRHZW9tZXRyeUZsaXBw ZWQoYm9vbCBmbGlwcGVkKSB7IG1fZ2VvbWV0cnlGbGlwcGVkID0gZmxpcHBlZDsgc2V0TmVlZHND b21taXQoKTsgfQogICAgIGJvb2wgZ2VvbWV0cnlGbGlwcGVkKCkgY29uc3QgeyByZXR1cm4gbV9n ZW9tZXRyeUZsaXBwZWQ7IH0KIAotICAgIGJvb2wgcHJlc2VydmVzM0QoKSB7IHJldHVybiBtX2Rl bGVnYXRlICYmIG1fZGVsZWdhdGUtPnByZXNlcnZlczNEKCk7IH0KKyAgICB2b2lkIHNldFByZXNl cnZlczNEKGJvb2wgcHJlc2VydmUzRCkgeyBtX3ByZXNlcnZlczNEID0gcHJlc2VydmUzRDsgfQor ICAgIGJvb2wgcHJlc2VydmVzM0QoKSB7IHJldHVybiBtX3ByZXNlcnZlczNEOyB9CiAKICAgICB2 b2lkIHNldFVzZXNMYXllclNjaXNzb3IoYm9vbCB1c2VzTGF5ZXJTY2lzc29yKSB7IG1fdXNlc0xh eWVyU2Npc3NvciA9IHVzZXNMYXllclNjaXNzb3I7IH0KICAgICBib29sIHVzZXNMYXllclNjaXNz b3IoKSBjb25zdCB7IHJldHVybiBtX3VzZXNMYXllclNjaXNzb3I7IH0KQEAgLTI4MSw2ICsyODEs NyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9kb3VibGVTaWRlZDsKICAgICBib29sIG1fdXNlc0xh eWVyU2Npc3NvcjsKICAgICBib29sIG1faXNSb290TGF5ZXI7CisgICAgYm9vbCBtX3ByZXNlcnZl czNEOwogCiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggbV90cmFuc2Zvcm07CiAgICAgVHJhbnNm b3JtYXRpb25NYXRyaXggbV9zdWJsYXllclRyYW5zZm9ybTsK 108436 2011-09-22 19:51:33 -0700 2011-09-23 15:52:40 -0700 Patch bug-68295-20110922195132.patch text/plain 6611 piman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU3NzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4N2I5YzQzZWJlZDZmNDg0 MDlmZmVhNjdhZGY3YTQ4NjA1MDQxOWQyLi5jMWE4NDk2ZTBjNjVkYjM0NjgzZWQwNTI4NTZlYzg2 MjZhYTc0YzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDktMTYgIEFudG9p bmUgTGFib3VyICA8cGltYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBwcmVzZXJ2 ZXMzRCgpIGZyb20gQ0NMYXllckRlbGVnYXRlLCByZXBsYWNpbmcgaXQgYnkgc2V0dGluZyB0aGUK KyAgICAgICAgdmFsdWUgZXhwbGljaXRseSBhZnRlciBjcmVhdGluZyBhIGxheWVyLCBvciBzZXR0 aW5nIGl0cyBkZWxlZ2F0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY4Mjk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ292ZXJlZCBieSBjb21wb3NpdGluZy8gbGF5ZW91dCB0ZXN0cy4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzVG9D YW52YXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250 ZW50c1RvTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjp1 cGRhdGVMYXllclByZXNlcnZlczNEKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJD aHJvbWl1bTo6c2V0dXBDb250ZW50c0xheWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eWVyQ2hyb21pdW06OkxheWVyQ2hyb21pdW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21p dW06OnNldFByZXNlcnZlczNEKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnBy ZXNlcnZlczNEKToKKwogMjAxMS0wOS0yMiAgQW50b2luZSBMYWJvdXIgIDxwaW1hbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHVudXNlZCBtZW1iZXJzIGZyb20gTGF5ZXJDaHJvbWl1 bS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IDRhNTIyZjc3MDZk YTRiMGJmOTkxOTg5ZmFkNGQzMzQwZWUzYTRhY2QuLjIyN2I1NDY4MTI5NzM2YWJlODcxYmIxMTE5 MmVhYjA5OWZkOWRlNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcApA QCAtMzY0LDYgKzM2NCw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250ZW50 c1RvQ2FudmFzKFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIpCiAgICAgYm9vbCBjaGlsZHJl bkNoYW5nZWQgPSBmYWxzZTsKICAgICBpZiAocGxhdGZvcm1MYXllcikgewogICAgICAgICBwbGF0 Zm9ybUxheWVyLT5zZXREZWxlZ2F0ZSh0aGlzKTsKKyAgICAgICAgcGxhdGZvcm1MYXllci0+c2V0 UHJlc2VydmVzM0QobV9wcmVzZXJ2ZXMzRCk7CiAgICAgICAgIGlmIChtX2NvbnRlbnRzTGF5ZXIu Z2V0KCkgIT0gcGxhdGZvcm1MYXllcikgewogICAgICAgICAgICAgc2V0dXBDb250ZW50c0xheWVy KHBsYXRmb3JtTGF5ZXIpOwogICAgICAgICAgICAgbV9jb250ZW50c0xheWVyID0gcGxhdGZvcm1M YXllcjsKQEAgLTM5Niw2ICszOTcsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0 Q29udGVudHNUb01lZGlhKFBsYXRmb3JtTGF5ZXIqIGxheWVyKQogICAgICAgICAgICAgY2hpbGRy ZW5DaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICBsYXllci0+c2V0RGVsZWdhdGUo dGhpcyk7CisgICAgICAgIGxheWVyLT5zZXRQcmVzZXJ2ZXMzRChtX3ByZXNlcnZlczNEKTsKICAg ICAgICAgbGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOwogICAgICAgICB1cGRhdGVDb250ZW50c1Jl Y3QoKTsKICAgICB9IGVsc2UgewpAQCAtNTUxLDYgKzU1Myw3IEBAIHZvaWQgR3JhcGhpY3NMYXll ckNocm9taXVtOjp1cGRhdGVMYXllclByZXNlcnZlczNEKCkKICAgICBpZiAobV9wcmVzZXJ2ZXMz RCAmJiAhbV90cmFuc2Zvcm1MYXllcikgewogICAgICAgICAvLyBDcmVhdGUgdGhlIHRyYW5zZm9y bSBsYXllci4KICAgICAgICAgbV90cmFuc2Zvcm1MYXllciA9IExheWVyQ2hyb21pdW06OmNyZWF0 ZSh0aGlzKTsKKyAgICAgICAgbV90cmFuc2Zvcm1MYXllci0+c2V0UHJlc2VydmVzM0QodHJ1ZSk7 CiAKICAgICAgICAgLy8gQ29weSB0aGUgcG9zaXRpb24gZnJvbSB0aGlzIGxheWVyLgogICAgICAg ICB1cGRhdGVMYXllclBvc2l0aW9uKCk7CkBAIC01OTIsNiArNTk1LDkgQEAgdm9pZCBHcmFwaGlj c0xheWVyQ2hyb21pdW06OnVwZGF0ZUxheWVyUHJlc2VydmVzM0QoKQogICAgICAgICB1cGRhdGVD aGlsZExpc3QoKTsKICAgICB9CiAKKyAgICBtX2xheWVyLT5zZXRQcmVzZXJ2ZXMzRChtX3ByZXNl cnZlczNEKTsKKyAgICBpZiAobV9jb250ZW50c0xheWVyKQorICAgICAgICBtX2NvbnRlbnRzTGF5 ZXItPnNldFByZXNlcnZlczNEKG1fcHJlc2VydmVzM0QpOwogICAgIHVwZGF0ZU9wYWNpdHlPbkxh eWVyKCk7CiAgICAgdXBkYXRlTmFtZXMoKTsKIH0KQEAgLTY0Myw2ICs2NDksNyBAQCB2b2lkIEdy YXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0dXBDb250ZW50c0xheWVyKExheWVyQ2hyb21pdW0qIGNv bnRlbnRzTGF5ZXIpCiAgICAgaWYgKGNvbnRlbnRzTGF5ZXIpIHsKICAgICAgICAgbV9jb250ZW50 c0xheWVyID0gY29udGVudHNMYXllcjsKIAorICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnNldFBy ZXNlcnZlczNEKG1fcHJlc2VydmVzM0QpOwogICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnNldEFu Y2hvclBvaW50KEZsb2F0UG9pbnQoMCwgMCkpOwogCiAgICAgICAgIC8vIEluc2VydCB0aGUgY29u dGVudCBsYXllciBmaXJzdC4gVmlkZW8gZWxlbWVudHMgcmVxdWlyZSB0aGlzLCBiZWNhdXNlIHRo ZXkgaGF2ZQpAQCAtNjcxLDExICs2NzgsNiBAQCBib29sIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6 ZHJhd3NDb250ZW50KCkgY29uc3QKICAgICByZXR1cm4gR3JhcGhpY3NMYXllcjo6ZHJhd3NDb250 ZW50KCk7CiB9CiAKLWJvb2wgR3JhcGhpY3NMYXllckNocm9taXVtOjpwcmVzZXJ2ZXMzRCgpIGNv bnN0Ci17Ci0gICAgcmV0dXJuIEdyYXBoaWNzTGF5ZXI6OnByZXNlcnZlczNEKCk7Ci19Ci0KIHZv aWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpwYWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCYg Y29udGV4dCwgY29uc3QgSW50UmVjdCYgY2xpcCkKIHsKICAgICBwYWludEdyYXBoaWNzTGF5ZXJD b250ZW50cyhjb250ZXh0LCBjbGlwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmgK aW5kZXggOGIyMTNhODQwMzg1NzEzNDEwZTc3MzQxMGY0ZGI3M2VmMGMzMGYxZC4uNzE5MGU1MDU5 ZmM1NjE2NDk2OTY5MDQ5NDNhNWU3NWM1MzdjNTM3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXll ckNocm9taXVtLmgKQEAgLTk3LDcgKzk3LDYgQEAgcHVibGljOgogCiAgICAgLy8gVGhlIGZvbGxv d2luZyBmdW5jdGlvbnMgaW1wbGVtZW50IHRoZSBDQ0xheWVyRGVsZWdhdGUgaW50ZXJmYWNlLgog ICAgIHZpcnR1YWwgYm9vbCBkcmF3c0NvbnRlbnQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIGJvb2wg cHJlc2VydmVzM0QoKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250ZW50cyhHcmFw aGljc0NvbnRleHQmLCBjb25zdCBJbnRSZWN0JiBjbGlwKTsKICAgICB2aXJ0dWFsIHZvaWQgbm90 aWZ5U3luY1JlcXVpcmVkKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggMDQ5YmI5ZTg2 ZmIxMWQ1NDIyYzM1Yjc3OGIxM2IxZTVhMDc2NjE4MS4uMGRkNDIxZGY2MTViZDAxZDE5NTk1MDQ3 ZjI5YWY0ODA4ZWFhODRmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTcwLDYgKzcwLDcg QEAgTGF5ZXJDaHJvbWl1bTo6TGF5ZXJDaHJvbWl1bShDQ0xheWVyRGVsZWdhdGUqIGRlbGVnYXRl KQogICAgICwgbV9kb3VibGVTaWRlZCh0cnVlKQogICAgICwgbV91c2VzTGF5ZXJTY2lzc29yKGZh bHNlKQogICAgICwgbV9pc05vbkNvbXBvc2l0ZWRDb250ZW50KGZhbHNlKQorICAgICwgbV9wcmVz ZXJ2ZXMzRChmYWxzZSkKICAgICAsIG1fcmVwbGljYUxheWVyKDApCiAgICAgLCBtX2RyYXdPcGFj aXR5KDApCiAgICAgLCBtX3RhcmdldFJlbmRlclN1cmZhY2UoMCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaApp bmRleCAyNTIyNjJjYTM1YzcxNmEyNGE0YzQ4MTBlNmYxNDEyYTUyNGYyYjA1Li4zMzFlNmMxNTQ1 NGFiNTZiNzM3NjQzNzgxYmQyZTM5NzRmMzlkOTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCkBAIC01 OSw3ICs1OSw2IEBAIGNsYXNzIENDTGF5ZXJEZWxlZ2F0ZSB7CiBwdWJsaWM6CiAgICAgdmlydHVh bCB+Q0NMYXllckRlbGVnYXRlKCkgeyB9CiAgICAgdmlydHVhbCBib29sIGRyYXdzQ29udGVudCgp IGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIGJvb2wgcHJlc2VydmVzM0QoKSBjb25zdCA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIHBhaW50Q29udGVudHMoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgSW50 UmVjdCYgY2xpcCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlTeW5jUmVxdWlyZWQoKSA9 IDA7CiB9OwpAQCAtMTM0LDcgKzEzMyw4IEBAIHB1YmxpYzoKICAgICBib29sIGRvdWJsZVNpZGVk KCkgY29uc3QgeyByZXR1cm4gbV9kb3VibGVTaWRlZDsgfQogICAgIHZvaWQgc2V0RG91YmxlU2lk ZWQoYm9vbCBkb3VibGVTaWRlZCkgeyBtX2RvdWJsZVNpZGVkID0gZG91YmxlU2lkZWQ7IHNldE5l ZWRzQ29tbWl0KCk7IH0KIAotICAgIGJvb2wgcHJlc2VydmVzM0QoKSBjb25zdCB7IHJldHVybiBt X2RlbGVnYXRlICYmIG1fZGVsZWdhdGUtPnByZXNlcnZlczNEKCk7IH0KKyAgICB2b2lkIHNldFBy ZXNlcnZlczNEKGJvb2wgcHJlc2VydmUzRCkgeyBtX3ByZXNlcnZlczNEID0gcHJlc2VydmUzRDsg fQorICAgIGJvb2wgcHJlc2VydmVzM0QoKSBjb25zdCB7IHJldHVybiBtX3ByZXNlcnZlczNEOyB9 CiAKICAgICB2b2lkIHNldFVzZXNMYXllclNjaXNzb3IoYm9vbCB1c2VzTGF5ZXJTY2lzc29yKSB7 IG1fdXNlc0xheWVyU2Npc3NvciA9IHVzZXNMYXllclNjaXNzb3I7IH0KICAgICBib29sIHVzZXNM YXllclNjaXNzb3IoKSBjb25zdCB7IHJldHVybiBtX3VzZXNMYXllclNjaXNzb3I7IH0KQEAgLTI0 OSw2ICsyNDksNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9kb3VibGVTaWRlZDsKICAgICBib29s IG1fdXNlc0xheWVyU2Npc3NvcjsKICAgICBib29sIG1faXNOb25Db21wb3NpdGVkQ29udGVudDsK KyAgICBib29sIG1fcHJlc2VydmVzM0Q7CiAKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX3Ry YW5zZm9ybTsKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX3N1YmxheWVyVHJhbnNmb3JtOwo= 108551 2011-09-23 15:52:44 -0700 2011-09-23 16:24:09 -0700 Patch bug-68295-20110923155243.patch text/plain 5446 piman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU3NzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4N2I5YzQzZWJlZDZmNDg0 MDlmZmVhNjdhZGY3YTQ4NjA1MDQxOWQyLi5jMWE4NDk2ZTBjNjVkYjM0NjgzZWQwNTI4NTZlYzg2 MjZhYTc0YzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDktMTYgIEFudG9p bmUgTGFib3VyICA8cGltYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBwcmVzZXJ2 ZXMzRCgpIGZyb20gQ0NMYXllckRlbGVnYXRlLCByZXBsYWNpbmcgaXQgYnkgc2V0dGluZyB0aGUK KyAgICAgICAgdmFsdWUgZXhwbGljaXRseSBhZnRlciBjcmVhdGluZyBhIGxheWVyLCBvciBzZXR0 aW5nIGl0cyBkZWxlZ2F0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY4Mjk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ292ZXJlZCBieSBjb21wb3NpdGluZy8gbGF5ZW91dCB0ZXN0cy4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzVG9D YW52YXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250 ZW50c1RvTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjp1 cGRhdGVMYXllclByZXNlcnZlczNEKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJD aHJvbWl1bTo6c2V0dXBDb250ZW50c0xheWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eWVyQ2hyb21pdW06OkxheWVyQ2hyb21pdW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21p dW06OnNldFByZXNlcnZlczNEKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnBy ZXNlcnZlczNEKToKKwogMjAxMS0wOS0yMiAgQW50b2luZSBMYWJvdXIgIDxwaW1hbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHVudXNlZCBtZW1iZXJzIGZyb20gTGF5ZXJDaHJvbWl1 bS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IDRhNTIyZjc3MDZk YTRiMGJmOTkxOTg5ZmFkNGQzMzQwZWUzYTRhY2QuLjk2YTljYTYxNDBiMjUzZGEwOWRiMDJhMmJk MDIwNjM0NzhkNGFmZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcApA QCAtNTUxLDYgKzU1MSw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjp1cGRhdGVMYXll clByZXNlcnZlczNEKCkKICAgICBpZiAobV9wcmVzZXJ2ZXMzRCAmJiAhbV90cmFuc2Zvcm1MYXll cikgewogICAgICAgICAvLyBDcmVhdGUgdGhlIHRyYW5zZm9ybSBsYXllci4KICAgICAgICAgbV90 cmFuc2Zvcm1MYXllciA9IExheWVyQ2hyb21pdW06OmNyZWF0ZSh0aGlzKTsKKyAgICAgICAgbV90 cmFuc2Zvcm1MYXllci0+c2V0UHJlc2VydmVzM0QodHJ1ZSk7CiAKICAgICAgICAgLy8gQ29weSB0 aGUgcG9zaXRpb24gZnJvbSB0aGlzIGxheWVyLgogICAgICAgICB1cGRhdGVMYXllclBvc2l0aW9u KCk7CkBAIC01OTIsNiArNTkzLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnVwZGF0 ZUxheWVyUHJlc2VydmVzM0QoKQogICAgICAgICB1cGRhdGVDaGlsZExpc3QoKTsKICAgICB9CiAK KyAgICBtX2xheWVyLT5zZXRQcmVzZXJ2ZXMzRChtX3ByZXNlcnZlczNEKTsKICAgICB1cGRhdGVP cGFjaXR5T25MYXllcigpOwogICAgIHVwZGF0ZU5hbWVzKCk7CiB9CkBAIC02NzEsMTEgKzY3Myw2 IEBAIGJvb2wgR3JhcGhpY3NMYXllckNocm9taXVtOjpkcmF3c0NvbnRlbnQoKSBjb25zdAogICAg IHJldHVybiBHcmFwaGljc0xheWVyOjpkcmF3c0NvbnRlbnQoKTsKIH0KIAotYm9vbCBHcmFwaGlj c0xheWVyQ2hyb21pdW06OnByZXNlcnZlczNEKCkgY29uc3QKLXsKLSAgICByZXR1cm4gR3JhcGhp Y3NMYXllcjo6cHJlc2VydmVzM0QoKTsKLX0KLQogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06 OnBhaW50Q29udGVudHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBj bGlwKQogewogICAgIHBhaW50R3JhcGhpY3NMYXllckNvbnRlbnRzKGNvbnRleHQsIGNsaXApOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3Jh cGhpY3NMYXllckNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaAppbmRleCA4YjIxM2E4NDAzODU3MTM0MTBl NzczNDEwZjRkYjczZWYwYzMwZjFkLi43MTkwZTUwNTlmYzU2MTY0OTY5NjkwNDk0M2E1ZTc1YzUz N2M1MzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaApAQCAtOTcsNyArOTcs NiBAQCBwdWJsaWM6CiAKICAgICAvLyBUaGUgZm9sbG93aW5nIGZ1bmN0aW9ucyBpbXBsZW1lbnQg dGhlIENDTGF5ZXJEZWxlZ2F0ZSBpbnRlcmZhY2UuCiAgICAgdmlydHVhbCBib29sIGRyYXdzQ29u dGVudCgpIGNvbnN0OwotICAgIHZpcnR1YWwgYm9vbCBwcmVzZXJ2ZXMzRCgpIGNvbnN0OwogICAg IHZpcnR1YWwgdm9pZCBwYWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IEludFJl Y3QmIGNsaXApOwogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlTeW5jUmVxdWlyZWQoKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJD aHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllckNocm9taXVtLmNwcAppbmRleCAwNDliYjllODZmYjExZDU0MjJjMzViNzc4YjEzYjFlNWEw NzY2MTgxLi4wZGQ0MjFkZjYxNWJkMDFkMTk1OTUwNDdmMjlhZjQ4MDhlYWE4NGYwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9t aXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllckNocm9taXVtLmNwcApAQCAtNzAsNiArNzAsNyBAQCBMYXllckNocm9taXVtOjpMYXllckNo cm9taXVtKENDTGF5ZXJEZWxlZ2F0ZSogZGVsZWdhdGUpCiAgICAgLCBtX2RvdWJsZVNpZGVkKHRy dWUpCiAgICAgLCBtX3VzZXNMYXllclNjaXNzb3IoZmFsc2UpCiAgICAgLCBtX2lzTm9uQ29tcG9z aXRlZENvbnRlbnQoZmFsc2UpCisgICAgLCBtX3ByZXNlcnZlczNEKGZhbHNlKQogICAgICwgbV9y ZXBsaWNhTGF5ZXIoMCkKICAgICAsIG1fZHJhd09wYWNpdHkoMCkKICAgICAsIG1fdGFyZ2V0UmVu ZGVyU3VyZmFjZSgwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCmluZGV4IDI1MjI2MmNhMzVjNzE2YTI0YTRj NDgxMGU2ZjE0MTJhNTI0ZjJiMDUuLjMzMWU2YzE1NDU0YWI1NmI3Mzc2NDM3ODFiZDJlMzk3NGYz OWQ5MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyQ2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKQEAgLTU5LDcgKzU5LDYgQEAgY2xhc3MgQ0NMYXll ckRlbGVnYXRlIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5DQ0xheWVyRGVsZWdhdGUoKSB7IH0K ICAgICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250ZW50KCkgY29uc3QgPSAwOwotICAgIHZpcnR1YWwg Ym9vbCBwcmVzZXJ2ZXMzRCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250 ZW50cyhHcmFwaGljc0NvbnRleHQmLCBjb25zdCBJbnRSZWN0JiBjbGlwKSA9IDA7CiAgICAgdmly dHVhbCB2b2lkIG5vdGlmeVN5bmNSZXF1aXJlZCgpID0gMDsKIH07CkBAIC0xMzQsNyArMTMzLDgg QEAgcHVibGljOgogICAgIGJvb2wgZG91YmxlU2lkZWQoKSBjb25zdCB7IHJldHVybiBtX2RvdWJs ZVNpZGVkOyB9CiAgICAgdm9pZCBzZXREb3VibGVTaWRlZChib29sIGRvdWJsZVNpZGVkKSB7IG1f ZG91YmxlU2lkZWQgPSBkb3VibGVTaWRlZDsgc2V0TmVlZHNDb21taXQoKTsgfQogCi0gICAgYm9v bCBwcmVzZXJ2ZXMzRCgpIGNvbnN0IHsgcmV0dXJuIG1fZGVsZWdhdGUgJiYgbV9kZWxlZ2F0ZS0+ cHJlc2VydmVzM0QoKTsgfQorICAgIHZvaWQgc2V0UHJlc2VydmVzM0QoYm9vbCBwcmVzZXJ2ZTNE KSB7IG1fcHJlc2VydmVzM0QgPSBwcmVzZXJ2ZTNEOyB9CisgICAgYm9vbCBwcmVzZXJ2ZXMzRCgp IGNvbnN0IHsgcmV0dXJuIG1fcHJlc2VydmVzM0Q7IH0KIAogICAgIHZvaWQgc2V0VXNlc0xheWVy U2Npc3Nvcihib29sIHVzZXNMYXllclNjaXNzb3IpIHsgbV91c2VzTGF5ZXJTY2lzc29yID0gdXNl c0xheWVyU2Npc3NvcjsgfQogICAgIGJvb2wgdXNlc0xheWVyU2Npc3NvcigpIGNvbnN0IHsgcmV0 dXJuIG1fdXNlc0xheWVyU2Npc3NvcjsgfQpAQCAtMjQ5LDYgKzI0OSw3IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBtX2RvdWJsZVNpZGVkOwogICAgIGJvb2wgbV91c2VzTGF5ZXJTY2lzc29yOwogICAg IGJvb2wgbV9pc05vbkNvbXBvc2l0ZWRDb250ZW50OworICAgIGJvb2wgbV9wcmVzZXJ2ZXMzRDsK IAogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fdHJhbnNmb3JtOwogICAgIFRyYW5zZm9ybWF0 aW9uTWF0cml4IG1fc3VibGF5ZXJUcmFuc2Zvcm07Cg==