68213 2011-09-15 19:36:48 -0700 remove redundant and error-prone semantics with m_dirtyRect and m_contentsDirty in LayerChromium. 2011-10-11 16:50:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 shawnsingh shawnsingh enne jamesr nduca piman webkit.review.bot oldest_to_newest 468251 0 shawnsingh 2011-09-15 19:36:48 -0700 m_contentsDirty is used by some layers, m_dirtyRect.isEmpty() is used by other layers. Thankfully, LayerChromium initializes both properly, but the individual layer types may be expected to reset these values themselves, and they only set one or the other, not both. One solution is to remove m_contentsDirty. All layers should check if the m_dirtyRect is empty. 468271 1 107595 shawnsingh 2011-09-15 20:34:52 -0700 Created attachment 107595 Patch 468343 2 107595 jamesr 2011-09-15 23:55:46 -0700 Comment on attachment 107595 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107595&action=review > Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp:72 > + if (!m_dirtyRect.isEmpty()) { Since you're here, this if check is clearly unnecessary. Can you remove it? 468551 3 107669 shawnsingh 2011-09-16 09:59:46 -0700 Created attachment 107669 Patch 468620 4 107669 jamesr 2011-09-16 11:03:39 -0700 Comment on attachment 107669 Patch Cool 469015 5 107669 webkit.review.bot 2011-09-16 21:38:50 -0700 Comment on attachment 107669 Patch Clearing flags on attachment: 107669 Committed r95365: <http://trac.webkit.org/changeset/95365> 469016 6 webkit.review.bot 2011-09-16 21:38:55 -0700 All reviewed patches have been landed. Closing bug. 107595 2011-09-15 20:34:52 -0700 2011-09-16 09:59:42 -0700 Patch bug-68213-20110915203450.patch text/plain 8185 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogOTUxODcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZmM1YWQ2MWIxODg0OThi MzIwZWU3YTkzMjgxZWFiMTRiZmYzYjFkLi5jOGY0MGYyYTU2NDVhNzJmMjU3YmE2OWQyMDdiYmU4 YTI4ZjA0N2QxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDktMTUgIFNoYXdu IFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVtb3ZlIG1fY29u dGVudHNEaXJ0eSBmcm9tIExheWVyQ2hyb21pdW0gYmVjYXVzZSBpdAorICAgICAgICBpcyByZWR1 bmRhbnQgd2l0aCBtX2RpcnR5UmVjdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY4MjEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ29kZSBjbGVhbnVwIHRvd2FyZHMgdW5pdCB0ZXN0aW5nLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckNocm9taXVtLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9z aXRvclJlc291cmNlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29u dGVudExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyQ2hy b21pdW06OnBhaW50Q29udGVudHNJZkRpcnR5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1h Z2VMYXllckNocm9taXVtOjpwYWludENvbnRlbnRzSWZEaXJ0eSk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXllckNocm9taXVtOjpMYXllckNocm9taXVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVy Q2hyb21pdW06OnNldE5lZWRzRGlzcGxheSk6CisgICAgICAgIChXZWJDb3JlOjpMYXllckNocm9t aXVtOjpyZXNldE5lZWRzRGlzcGxheSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaWRlb0xheWVy Q2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpXZWJHTExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMpOgorCiAy MDExLTA5LTE1ICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbQ2hyb21pdW1dIE1ha2Ugc3VyZSB0aGF0IHRoZSBBUk0gTkVPTiBmaWxlcyBidWlsZCB3aXRo IC1tYXJtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckNocm9taXVtLmNwcAppbmRleCAyZjcwZjY4 YTEwMDBhYzZjMzgzNTM2Yjg5YjJkNGE3MmUwYWZjNDZiLi5iYjJmZWY4MWUyYzE1ZTY3OGQwY2Fh ZDg2NDhkNjNiNmYyOTg1YmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5j cHAKQEAgLTY2LDEwICs2NiwxMCBAQCBib29sIENhbnZhczJETGF5ZXJDaHJvbWl1bTo6ZHJhd3ND b250ZW50KCkgY29uc3QKIAogdm9pZCBDYW52YXMyRExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBv c2l0b3JSZXNvdXJjZXMoR3JhcGhpY3NDb250ZXh0M0QqKQogewotICAgIGlmICghbV9jb250ZW50 c0RpcnR5IHx8ICFkcmF3c0NvbnRlbnQoKSkKKyAgICBpZiAobV9kaXJ0eVJlY3QuaXNFbXB0eSgp IHx8ICFkcmF3c0NvbnRlbnQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fY29udGVu dHNEaXJ0eSkgeworICAgIGlmICghbV9kaXJ0eVJlY3QuaXNFbXB0eSgpKSB7CiAgICAgICAgIGlm IChtX2NvbnRleHQpIHsKICNpZiBVU0UoU0tJQSkKICAgICAgICAgICAgIEdyQ29udGV4dCogZ3JD b250ZXh0ID0gbV9jb250ZXh0LT5nckNvbnRleHQoKTsKQEAgLTgwLDcgKzgwLDcgQEAgdm9pZCBD YW52YXMyRExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoR3JhcGhpY3ND b250ZXh0M0QqKQogI2VuZGlmCiAgICAgICAgICAgICBtX2NvbnRleHQtPmZsdXNoKCk7CiAgICAg ICAgIH0KLSAgICAgICAgbV9jb250ZW50c0RpcnR5ID0gZmFsc2U7CisgICAgICAgIHJlc2V0TmVl ZHNEaXNwbGF5KCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5j cHAKaW5kZXggMDVlMzE2NjVmNDU1OWYzNjQ2NzVlYTE2MjVmMjg1YTI2M2I3NTc3ZC4uZTgwM2M3 MTg5ZDZiNGI4ODUxNmFlNWM5NDJiZDczNWZiODRlYzBmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRM YXllckNocm9taXVtLmNwcApAQCAtMTEwLDcgKzExMCw3IEBAIHZvaWQgQ29udGVudExheWVyQ2hy b21pdW06OnBhaW50Q29udGVudHNJZkRpcnR5KCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgcHJl cGFyZVRvVXBkYXRlKGxheWVyUmVjdCk7Ci0gICAgbV9kaXJ0eVJlY3QgPSBGbG9hdFJlY3QoKTsK KyAgICByZXNldE5lZWRzRGlzcGxheSgpOwogfQogCiBib29sIENvbnRlbnRMYXllckNocm9taXVt OjpkcmF3c0NvbnRlbnQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5jcHAKaW5k ZXggNjQzZDE2NzhmOTE2NzhhNWY1NGIyMjdmNjY4NTM0NDZkMTcxODA4ZS4uNDhiMzFkNDI1MmMx YTdiZWRjOGZiZWQwNmI3Y2IwMDE0YTQzNTc3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21p dW0uY3BwCkBAIC0xNTIsNyArMTUyLDcgQEAgdm9pZCBJbWFnZUxheWVyQ2hyb21pdW06OnBhaW50 Q29udGVudHNJZkRpcnR5KCkKICAgICAgICAgSW50UmVjdCBwYWludFJlY3QoSW50UG9pbnQoKSwg Y29udGVudEJvdW5kcygpKTsKICAgICAgICAgaWYgKCFtX2RpcnR5UmVjdC5pc0VtcHR5KCkpIHsK ICAgICAgICAgICAgIGludmFsaWRhdGVSZWN0KHBhaW50UmVjdCk7Ci0gICAgICAgICAgICBtX2Rp cnR5UmVjdCA9IEludFJlY3QoKTsKKyAgICAgICAgICAgIHJlc2V0TmVlZHNEaXNwbGF5KCk7CiAg ICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggM2U5ZGUwZGJjYWZh ZTE1NjNlNTA2ODM5YzE0YWM0ZDg0YTM5NGZmYS4uNGQ2ZDg3MTM5MTE4YWUwOTg0Y2YyNWM0NTA1 Y2U2NTg3N2JmYzhlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTU4LDcgKzU4LDYgQEAg UGFzc1JlZlB0cjxMYXllckNocm9taXVtPiBMYXllckNocm9taXVtOjpjcmVhdGUoQ0NMYXllckRl bGVnYXRlKiBkZWxlZ2F0ZSkKIAogTGF5ZXJDaHJvbWl1bTo6TGF5ZXJDaHJvbWl1bShDQ0xheWVy RGVsZWdhdGUqIGRlbGVnYXRlKQogICAgIDogbV9kZWxlZ2F0ZShkZWxlZ2F0ZSkKLSAgICAsIG1f Y29udGVudHNEaXJ0eShmYWxzZSkKICAgICAsIG1fbGF5ZXJJZChzX25leHRMYXllcklkKyspCiAg ICAgLCBtX3BhcmVudCgwKQogICAgICwgbV9hbmNob3JQb2ludCgwLjUsIDAuNSkKQEAgLTI3NCw4 ICsyNzMsNiBAQCB2b2lkIExheWVyQ2hyb21pdW06OnNldE5lZWRzRGlzcGxheShjb25zdCBGbG9h dFJlY3QmIGRpcnR5UmVjdCkKICAgICAvLyBTaW1wbHkgbWFyayB0aGUgY29udGVudHMgYXMgZGly dHkuIEZvciBub24tcm9vdCBsYXllcnMsIHRoZSBjYWxsIHRvCiAgICAgLy8gc2V0TmVlZHNDb21t aXQgd2lsbCBzY2hlZHVsZSBhIGZyZXNoIGNvbXBvc2l0aW5nIHBhc3MuCiAgICAgLy8gRm9yIHRo ZSByb290IGxheWVyLCBzZXROZWVkc0NvbW1pdCBoYXMgbm8gZWZmZWN0LgotICAgIG1fY29udGVu dHNEaXJ0eSA9IHRydWU7Ci0KICAgICBtX2RpcnR5UmVjdC51bml0ZShkaXJ0eVJlY3QpOwogICAg IHNldE5lZWRzQ29tbWl0KCk7CiB9CkBAIC0yODQsMTQgKzI4MSwxMiBAQCB2b2lkIExheWVyQ2hy b21pdW06OnNldE5lZWRzRGlzcGxheSgpCiB7CiAgICAgbV9kaXJ0eVJlY3Quc2V0TG9jYXRpb24o RmxvYXRQb2ludCgpKTsKICAgICBtX2RpcnR5UmVjdC5zZXRTaXplKGJvdW5kcygpKTsKLSAgICBt X2NvbnRlbnRzRGlydHkgPSB0cnVlOwogICAgIHNldE5lZWRzQ29tbWl0KCk7CiB9CiAKIHZvaWQg TGF5ZXJDaHJvbWl1bTo6cmVzZXROZWVkc0Rpc3BsYXkoKQogewogICAgIG1fZGlydHlSZWN0ID0g RmxvYXRSZWN0KCk7Ci0gICAgbV9jb250ZW50c0RpcnR5ID0gZmFsc2U7CiB9CiAKIHZvaWQgTGF5 ZXJDaHJvbWl1bTo6dG9HTE1hdHJpeChmbG9hdCogZmxhdHRlbmVkLCBjb25zdCBUcmFuc2Zvcm1h dGlvbk1hdHJpeCYgbSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaAppbmRleCA5MGRmNjhkNWRjOWViYWM5Mjgy ZjcwMzk5NWViZjA1MDhlY2JlNzlhLi4zNDBjMTdjMjlhMWE5MWE5MDlmM2MwOWMzMjQwZTA2ZjVl ZjVlYTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9MYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCkBAIC0yMjgsNyArMjI4LDYgQEAgcHJvdGVjdGVk OgogICAgIHN0YXRpYyB2b2lkIHRvR0xNYXRyaXgoZmxvYXQqLCBjb25zdCBUcmFuc2Zvcm1hdGlv bk1hdHJpeCYpOwogCiAgICAgRmxvYXRSZWN0IG1fZGlydHlSZWN0OwotICAgIGJvb2wgbV9jb250 ZW50c0RpcnR5OwogCiAgICAgUmVmUHRyPExheWVyQ2hyb21pdW0+IG1fbWFza0xheWVyOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9WaWRl b0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vVmlkZW9MYXllckNocm9taXVtLmNwcAppbmRleCAxYTk0OTg4MTc3ZTA5MDIxN2UzY2Vi YmY2ZGZlN2IxY2M3NTc5MTY0Li4wOTRkYTQyOTdmYjQyMjA5MmQxNzFkNjk5Mzc2MTU2MTA3YmVl MjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9WaWRlb0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTc5LDcgKzc5LDcgQEAg dm9pZCBWaWRlb0xheWVyQ2hyb21pdW06OmNsZWFudXBSZXNvdXJjZXMoKQogCiB2b2lkIFZpZGVv TGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhHcmFwaGljc0NvbnRleHQz RCogY29udGV4dCkKIHsKLSAgICBpZiAoIW1fY29udGVudHNEaXJ0eSB8fCAhbV9kZWxlZ2F0ZSkK KyAgICBpZiAobV9kaXJ0eVJlY3QuaXNFbXB0eSgpIHx8ICFtX2RlbGVnYXRlKQogICAgICAgICBy ZXR1cm47CiAKICAgICBBU1NFUlQoZHJhd3NDb250ZW50KCkpOwpAQCAtMTE5LDggKzExOSw3IEBA IHZvaWQgVmlkZW9MYXllckNocm9taXVtOjp1cGRhdGVDb21wb3NpdG9yUmVzb3VyY2VzKEdyYXBo aWNzQ29udGV4dDNEKiBjb250ZXh0KQogICAgICAgICB1cGRhdGVUZXh0dXJlKGNvbnRleHQsIHRl eHR1cmUsIGZyYW1lLT5kYXRhKHBsYW5lKSk7CiAgICAgfQogCi0gICAgbV9kaXJ0eVJlY3Quc2V0 U2l6ZShGbG9hdFNpemUoKSk7Ci0gICAgbV9jb250ZW50c0RpcnR5ID0gZmFsc2U7CisgICAgcmVz ZXROZWVkc0Rpc3BsYXkoKTsKIAogICAgIG1fcHJvdmlkZXItPnB1dEN1cnJlbnRGcmFtZShmcmFt ZSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcAppbmRleCA0NmMxOTU4YTdjNTdj ZDIzNzQyYmI4NmE0YWFlMmZhMzAzNDk0ZTE5Li5hNmE5OWU5MTJiNjI5OWUyYmM1Yzg4Y2UwYWQ4 Y2RjYzNmYTZlNDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTcwLDcg KzcwLDcgQEAgdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJj ZXMoR3JhcGhpY3NDb250ZXh0M0QqIHJlbmRlcmVyQ28KICAgICBpZiAoIWRyYXdzQ29udGVudCgp KQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1fY29udGVudHNEaXJ0eSkKKyAgICBpZiAo bV9kaXJ0eVJlY3QuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobV90ZXh0 dXJlQ2hhbmdlZCkgewpAQCAtODQsMTMgKzg0LDEzIEBAIHZvaWQgV2ViR0xMYXllckNocm9taXVt Ojp1cGRhdGVDb21wb3NpdG9yUmVzb3VyY2VzKEdyYXBoaWNzQ29udGV4dDNEKiByZW5kZXJlckNv CiAgICAgICAgIG1fdGV4dHVyZUNoYW5nZWQgPSBmYWxzZTsKICAgICB9CiAgICAgLy8gVXBkYXRl IHRoZSBjb250ZW50cyBvZiB0aGUgdGV4dHVyZSB1c2VkIGJ5IHRoZSBjb21wb3NpdG9yLgotICAg IGlmIChtX2NvbnRlbnRzRGlydHkgJiYgbV90ZXh0dXJlVXBkYXRlZCkgeworICAgIGlmICghbV9k aXJ0eVJlY3QuaXNFbXB0eSgpICYmIG1fdGV4dHVyZVVwZGF0ZWQpIHsKICAgICAgICAgLy8gcHJl cGFyZVRleHR1cmUgY29waWVzIHRoZSBjb250ZW50cyBvZiB0aGUgb2ZmLXNjcmVlbiByZW5kZXIg dGFyZ2V0IGludG8gdGhlIHRleHR1cmUKICAgICAgICAgLy8gdXNlZCBieSB0aGUgY29tcG9zaXRv ci4KICAgICAgICAgLy8KICAgICAgICAgbV9jb250ZXh0LT5wcmVwYXJlVGV4dHVyZSgpOwogICAg ICAgICBtX2NvbnRleHQtPm1hcmtMYXllckNvbXBvc2l0ZWQoKTsKLSAgICAgICAgbV9jb250ZW50 c0RpcnR5ID0gZmFsc2U7CisgICAgICAgIHJlc2V0TmVlZHNEaXNwbGF5KCk7CiAgICAgICAgIG1f dGV4dHVyZVVwZGF0ZWQgPSBmYWxzZTsKICAgICB9CiB9Cg== 107669 2011-09-16 09:59:46 -0700 2011-09-16 21:38:50 -0700 Patch bug-68213-20110916095945.patch text/plain 8409 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogOTUxODcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZmM1YWQ2MWIxODg0OThi MzIwZWU3YTkzMjgxZWFiMTRiZmYzYjFkLi5jOGY0MGYyYTU2NDVhNzJmMjU3YmE2OWQyMDdiYmU4 YTI4ZjA0N2QxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDktMTUgIFNoYXdu IFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVtb3ZlIG1fY29u dGVudHNEaXJ0eSBmcm9tIExheWVyQ2hyb21pdW0gYmVjYXVzZSBpdAorICAgICAgICBpcyByZWR1 bmRhbnQgd2l0aCBtX2RpcnR5UmVjdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY4MjEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ29kZSBjbGVhbnVwIHRvd2FyZHMgdW5pdCB0ZXN0aW5nLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckNocm9taXVtLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9z aXRvclJlc291cmNlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29u dGVudExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyQ2hy b21pdW06OnBhaW50Q29udGVudHNJZkRpcnR5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1h Z2VMYXllckNocm9taXVtOjpwYWludENvbnRlbnRzSWZEaXJ0eSk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXllckNocm9taXVtOjpMYXllckNocm9taXVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVy Q2hyb21pdW06OnNldE5lZWRzRGlzcGxheSk6CisgICAgICAgIChXZWJDb3JlOjpMYXllckNocm9t aXVtOjpyZXNldE5lZWRzRGlzcGxheSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaWRlb0xheWVy Q2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpXZWJHTExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMpOgorCiAy MDExLTA5LTE1ICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbQ2hyb21pdW1dIE1ha2Ugc3VyZSB0aGF0IHRoZSBBUk0gTkVPTiBmaWxlcyBidWlsZCB3aXRo IC1tYXJtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckNocm9taXVtLmNwcAppbmRleCAyZjcwZjY4 YTEwMDBhYzZjMzgzNTM2Yjg5YjJkNGE3MmUwYWZjNDZiLi43OWQwNGYzMjhkYTllYjE1ZTA0NGZi NDBiZjdjZWRhY2Y5MGQ1ZjZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5j cHAKQEAgLTY2LDIyICs2NiwyMCBAQCBib29sIENhbnZhczJETGF5ZXJDaHJvbWl1bTo6ZHJhd3ND b250ZW50KCkgY29uc3QKIAogdm9pZCBDYW52YXMyRExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBv c2l0b3JSZXNvdXJjZXMoR3JhcGhpY3NDb250ZXh0M0QqKQogewotICAgIGlmICghbV9jb250ZW50 c0RpcnR5IHx8ICFkcmF3c0NvbnRlbnQoKSkKKyAgICBpZiAobV9kaXJ0eVJlY3QuaXNFbXB0eSgp IHx8ICFkcmF3c0NvbnRlbnQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fY29udGVu dHNEaXJ0eSkgewotICAgICAgICBpZiAobV9jb250ZXh0KSB7CisgICAgaWYgKG1fY29udGV4dCkg ewogI2lmIFVTRShTS0lBKQotICAgICAgICAgICAgR3JDb250ZXh0KiBnckNvbnRleHQgPSBtX2Nv bnRleHQtPmdyQ29udGV4dCgpOwotICAgICAgICAgICAgaWYgKGdyQ29udGV4dCkgewotICAgICAg ICAgICAgICAgIG1fY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCk7Ci0gICAgICAgICAgICAg ICAgZ3JDb250ZXh0LT5mbHVzaCgpOwotICAgICAgICAgICAgfQotI2VuZGlmCi0gICAgICAgICAg ICBtX2NvbnRleHQtPmZsdXNoKCk7CisgICAgICAgIEdyQ29udGV4dCogZ3JDb250ZXh0ID0gbV9j b250ZXh0LT5nckNvbnRleHQoKTsKKyAgICAgICAgaWYgKGdyQ29udGV4dCkgeworICAgICAgICAg ICAgbV9jb250ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKKyAgICAgICAgICAgIGdyQ29udGV4 dC0+Zmx1c2goKTsKICAgICAgICAgfQotICAgICAgICBtX2NvbnRlbnRzRGlydHkgPSBmYWxzZTsK KyNlbmRpZgorICAgICAgICBtX2NvbnRleHQtPmZsdXNoKCk7CiAgICAgfQorICAgIHJlc2V0TmVl ZHNEaXNwbGF5KCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcApp bmRleCAwNWUzMTY2NWY0NTU5ZjM2NDY3NWVhMTYyNWYyODVhMjYzYjc1NzdkLi5lODAzYzcxODlk NmI0Yjg4NTE2YWU1Yzk0MmJkNzM1ZmI4NGVjMGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVy Q2hyb21pdW0uY3BwCkBAIC0xMTAsNyArMTEwLDcgQEAgdm9pZCBDb250ZW50TGF5ZXJDaHJvbWl1 bTo6cGFpbnRDb250ZW50c0lmRGlydHkoKQogICAgICAgICByZXR1cm47CiAKICAgICBwcmVwYXJl VG9VcGRhdGUobGF5ZXJSZWN0KTsKLSAgICBtX2RpcnR5UmVjdCA9IEZsb2F0UmVjdCgpOworICAg IHJlc2V0TmVlZHNEaXNwbGF5KCk7CiB9CiAKIGJvb2wgQ29udGVudExheWVyQ2hyb21pdW06OmRy YXdzQ29udGVudCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcAppbmRleCA2 NDNkMTY3OGY5MTY3OGE1ZjU0YjIyN2Y2Njg1MzQ0NmQxNzE4MDhlLi40OGIzMWQ0MjUyYzFhN2Jl ZGM4ZmJlZDA2YjdjYjAwMTRhNDM1Nzc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5j cHAKQEAgLTE1Miw3ICsxNTIsNyBAQCB2b2lkIEltYWdlTGF5ZXJDaHJvbWl1bTo6cGFpbnRDb250 ZW50c0lmRGlydHkoKQogICAgICAgICBJbnRSZWN0IHBhaW50UmVjdChJbnRQb2ludCgpLCBjb250 ZW50Qm91bmRzKCkpOwogICAgICAgICBpZiAoIW1fZGlydHlSZWN0LmlzRW1wdHkoKSkgewogICAg ICAgICAgICAgaW52YWxpZGF0ZVJlY3QocGFpbnRSZWN0KTsKLSAgICAgICAgICAgIG1fZGlydHlS ZWN0ID0gSW50UmVjdCgpOworICAgICAgICAgICAgcmVzZXROZWVkc0Rpc3BsYXkoKTsKICAgICAg ICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcAppbmRleCAzZTlkZTBkYmNhZmFlMTU2 M2U1MDY4MzljMTRhYzRkODRhMzk0ZmZhLi40ZDZkODcxMzkxMThhZTA5ODRjZjI1YzQ1MDVjZTY1 ODc3YmZjOGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcApAQCAtNTgsNyArNTgsNiBAQCBQYXNz UmVmUHRyPExheWVyQ2hyb21pdW0+IExheWVyQ2hyb21pdW06OmNyZWF0ZShDQ0xheWVyRGVsZWdh dGUqIGRlbGVnYXRlKQogCiBMYXllckNocm9taXVtOjpMYXllckNocm9taXVtKENDTGF5ZXJEZWxl Z2F0ZSogZGVsZWdhdGUpCiAgICAgOiBtX2RlbGVnYXRlKGRlbGVnYXRlKQotICAgICwgbV9jb250 ZW50c0RpcnR5KGZhbHNlKQogICAgICwgbV9sYXllcklkKHNfbmV4dExheWVySWQrKykKICAgICAs IG1fcGFyZW50KDApCiAgICAgLCBtX2FuY2hvclBvaW50KDAuNSwgMC41KQpAQCAtMjc0LDggKzI3 Myw2IEBAIHZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0TmVlZHNEaXNwbGF5KGNvbnN0IEZsb2F0UmVj dCYgZGlydHlSZWN0KQogICAgIC8vIFNpbXBseSBtYXJrIHRoZSBjb250ZW50cyBhcyBkaXJ0eS4g Rm9yIG5vbi1yb290IGxheWVycywgdGhlIGNhbGwgdG8KICAgICAvLyBzZXROZWVkc0NvbW1pdCB3 aWxsIHNjaGVkdWxlIGEgZnJlc2ggY29tcG9zaXRpbmcgcGFzcy4KICAgICAvLyBGb3IgdGhlIHJv b3QgbGF5ZXIsIHNldE5lZWRzQ29tbWl0IGhhcyBubyBlZmZlY3QuCi0gICAgbV9jb250ZW50c0Rp cnR5ID0gdHJ1ZTsKLQogICAgIG1fZGlydHlSZWN0LnVuaXRlKGRpcnR5UmVjdCk7CiAgICAgc2V0 TmVlZHNDb21taXQoKTsKIH0KQEAgLTI4NCwxNCArMjgxLDEyIEBAIHZvaWQgTGF5ZXJDaHJvbWl1 bTo6c2V0TmVlZHNEaXNwbGF5KCkKIHsKICAgICBtX2RpcnR5UmVjdC5zZXRMb2NhdGlvbihGbG9h dFBvaW50KCkpOwogICAgIG1fZGlydHlSZWN0LnNldFNpemUoYm91bmRzKCkpOwotICAgIG1fY29u dGVudHNEaXJ0eSA9IHRydWU7CiAgICAgc2V0TmVlZHNDb21taXQoKTsKIH0KIAogdm9pZCBMYXll ckNocm9taXVtOjpyZXNldE5lZWRzRGlzcGxheSgpCiB7CiAgICAgbV9kaXJ0eVJlY3QgPSBGbG9h dFJlY3QoKTsKLSAgICBtX2NvbnRlbnRzRGlydHkgPSBmYWxzZTsKIH0KIAogdm9pZCBMYXllckNo cm9taXVtOjp0b0dMTWF0cml4KGZsb2F0KiBmbGF0dGVuZWQsIGNvbnN0IFRyYW5zZm9ybWF0aW9u TWF0cml4JiBtKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCmluZGV4IDkwZGY2OGQ1ZGM5ZWJhYzkyODJmNzAz OTk1ZWJmMDUwOGVjYmU3OWEuLjM0MGMxN2MyOWExYTkxYTkwOWYzYzA5YzMyNDBlMDZmNWVmNWVh NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0xheWVyQ2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllckNocm9taXVtLmgKQEAgLTIyOCw3ICsyMjgsNiBAQCBwcm90ZWN0ZWQ6CiAg ICAgc3RhdGljIHZvaWQgdG9HTE1hdHJpeChmbG9hdCosIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0 cml4Jik7CiAKICAgICBGbG9hdFJlY3QgbV9kaXJ0eVJlY3Q7Ci0gICAgYm9vbCBtX2NvbnRlbnRz RGlydHk7CiAKICAgICBSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gbV9tYXNrTGF5ZXI7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5 ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9WaWRlb0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IDFhOTQ5ODgxNzdlMDkwMjE3ZTNjZWJiZjZk ZmU3YjFjYzc1NzkxNjQuLjA5NGRhNDI5N2ZiNDIyMDkyZDE3MWQ2OTkzNzYxNTYxMDdiZWUyMDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Zp ZGVvTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmNwcApAQCAtNzksNyArNzksNyBAQCB2b2lk IFZpZGVvTGF5ZXJDaHJvbWl1bTo6Y2xlYW51cFJlc291cmNlcygpCiAKIHZvaWQgVmlkZW9MYXll ckNocm9taXVtOjp1cGRhdGVDb21wb3NpdG9yUmVzb3VyY2VzKEdyYXBoaWNzQ29udGV4dDNEKiBj b250ZXh0KQogewotICAgIGlmICghbV9jb250ZW50c0RpcnR5IHx8ICFtX2RlbGVnYXRlKQorICAg IGlmIChtX2RpcnR5UmVjdC5pc0VtcHR5KCkgfHwgIW1fZGVsZWdhdGUpCiAgICAgICAgIHJldHVy bjsKIAogICAgIEFTU0VSVChkcmF3c0NvbnRlbnQoKSk7CkBAIC0xMTksOCArMTE5LDcgQEAgdm9p ZCBWaWRlb0xheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoR3JhcGhpY3ND b250ZXh0M0QqIGNvbnRleHQpCiAgICAgICAgIHVwZGF0ZVRleHR1cmUoY29udGV4dCwgdGV4dHVy ZSwgZnJhbWUtPmRhdGEocGxhbmUpKTsKICAgICB9CiAKLSAgICBtX2RpcnR5UmVjdC5zZXRTaXpl KEZsb2F0U2l6ZSgpKTsKLSAgICBtX2NvbnRlbnRzRGlydHkgPSBmYWxzZTsKKyAgICByZXNldE5l ZWRzRGlzcGxheSgpOwogCiAgICAgbV9wcm92aWRlci0+cHV0Q3VycmVudEZyYW1lKGZyYW1lKTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCmluZGV4IDQ2YzE5NThhN2M1N2NkMjM3 NDJiYjg2YTRhYWUyZmEzMDM0OTRlMTkuLmE2YTk5ZTkxMmI2Mjk5ZTJiYzVjODhjZTBhZDhjZGNj M2ZhNmU0OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcApAQCAtNzAsNyArNzAs NyBAQCB2b2lkIFdlYkdMTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhH cmFwaGljc0NvbnRleHQzRCogcmVuZGVyZXJDbwogICAgIGlmICghZHJhd3NDb250ZW50KCkpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGlmICghbV9jb250ZW50c0RpcnR5KQorICAgIGlmIChtX2Rp cnR5UmVjdC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX3RleHR1cmVD aGFuZ2VkKSB7CkBAIC04NCwxMyArODQsMTMgQEAgdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnVw ZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoR3JhcGhpY3NDb250ZXh0M0QqIHJlbmRlcmVyQ28KICAg ICAgICAgbV90ZXh0dXJlQ2hhbmdlZCA9IGZhbHNlOwogICAgIH0KICAgICAvLyBVcGRhdGUgdGhl IGNvbnRlbnRzIG9mIHRoZSB0ZXh0dXJlIHVzZWQgYnkgdGhlIGNvbXBvc2l0b3IuCi0gICAgaWYg KG1fY29udGVudHNEaXJ0eSAmJiBtX3RleHR1cmVVcGRhdGVkKSB7CisgICAgaWYgKCFtX2RpcnR5 UmVjdC5pc0VtcHR5KCkgJiYgbV90ZXh0dXJlVXBkYXRlZCkgewogICAgICAgICAvLyBwcmVwYXJl VGV4dHVyZSBjb3BpZXMgdGhlIGNvbnRlbnRzIG9mIHRoZSBvZmYtc2NyZWVuIHJlbmRlciB0YXJn ZXQgaW50byB0aGUgdGV4dHVyZQogICAgICAgICAvLyB1c2VkIGJ5IHRoZSBjb21wb3NpdG9yLgog ICAgICAgICAvLwogICAgICAgICBtX2NvbnRleHQtPnByZXBhcmVUZXh0dXJlKCk7CiAgICAgICAg IG1fY29udGV4dC0+bWFya0xheWVyQ29tcG9zaXRlZCgpOwotICAgICAgICBtX2NvbnRlbnRzRGly dHkgPSBmYWxzZTsKKyAgICAgICAgcmVzZXROZWVkc0Rpc3BsYXkoKTsKICAgICAgICAgbV90ZXh0 dXJlVXBkYXRlZCA9IGZhbHNlOwogICAgIH0KIH0K