73266 2011-11-28 16:34:43 -0800 [Chromium] Avoid ASSERT_NOT_REACHED() from creating FBO with content texture of size 0 2011-11-30 03:00:26 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sievers sievers cc-bugs enne jamesr vangelis webkit.review.bot oldest_to_newest 510323 0 sievers 2011-11-28 16:34:43 -0800 [Chromium] Avoid ASSERT_NOT_REACHED() from creating FBO with content texture of size 0 510325 1 116849 sievers 2011-11-28 16:37:58 -0800 Created attachment 116849 Patch 510328 2 sievers 2011-11-28 16:39:29 -0800 Hrm on second though, we might want to have that check also before this early return, right? // If neither this layer nor any of its children were added, early out. if (sortingStartIndex == descendants.size()) return; Do we need to duplicate the logic instead where we call renderSurface->clearLayerList()? (In reply to comment #1) > Created an attachment (id=116849) [details] > Patch 510337 3 116849 enne 2011-11-28 16:50:18 -0800 Comment on attachment 116849 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116849&action=review > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:383 > // If neither this layer nor any of its children were added, early out. > if (sortingStartIndex == descendants.size()) > return; This little patch of code should move too, because descendants.size() could be zero, causing a problem for descendants.at(0) in the sort at the end. 510341 4 116849 vangelis 2011-11-28 16:59:24 -0800 Comment on attachment 116849 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116849&action=review Don't you also need to clear the layer's RS at the drawOpacity == 0 early-out? > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:382 > if (sortingStartIndex == descendants.size()) You'll also want to clear the RS here. Maybe it would be best to split the cleanup into a separate function that calls: if (layer->renderSurface() && layer != rootLayer) renderSurfaceList.remove(layer->renderSurface()); layer->clearRenderSurface(); > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:446 > + renderSurfaceLayerList.removeLast(); You can nest this inside the previous if (layer->renderSurface() && layer != rootLayer) {} clause . 510378 5 116863 sievers 2011-11-28 17:56:05 -0800 Created attachment 116863 Patch 510379 6 sievers 2011-11-28 17:56:24 -0800 (In reply to comment #3) > (From update of attachment 116849 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=116849&action=review > > > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:383 > > // If neither this layer nor any of its children were added, early out. > > if (sortingStartIndex == descendants.size()) > > return; > > This little patch of code should move too, because descendants.size() could be zero, causing a problem for descendants.at(0) in the sort at the end. Done. 510380 7 sievers 2011-11-28 17:57:26 -0800 (In reply to comment #4) > (From update of attachment 116849 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=116849&action=review > > Don't you also need to clear the layer's RS at the drawOpacity == 0 early-out? > > > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:382 > > if (sortingStartIndex == descendants.size()) > > You'll also want to clear the RS here. Maybe it would be best to split the cleanup into a separate function that calls: > I'll deal with resetting the render surfaces for the early returns separately in https://bugs.webkit.org/show_bug.cgi?id=73270. I uploaded a different test there that exemplifies the problem. > if (layer->renderSurface() && layer != rootLayer) > renderSurfaceList.remove(layer->renderSurface()); > layer->clearRenderSurface(); > > > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:446 > > + renderSurfaceLayerList.removeLast(); > > You can nest this inside the previous > if (layer->renderSurface() && layer != rootLayer) {} clause . Done. 510381 8 116863 jamesr 2011-11-28 17:57:55 -0800 Comment on attachment 116863 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116863&action=review Vangelis or Enne, could you give this another look? > Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp:480 > + renderSurface1->setOpacity(0.9f); drop the trailing 'f' - see http://www.webkit.org/coding/coding-style.html "Floating point literals" > Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp:483 > + setLayerPropertiesForTesting(renderSurface1.get(), identityMatrix, identityMatrix, FloatPoint(0.0f, 0.0f), FloatPoint(0.0f, 0.0f), IntSize(10, 10), false); the 0.0f isn't needed here. FloatPoint() or FloatPoint::zero() would be even better 510382 9 116863 enne 2011-11-28 18:02:51 -0800 Comment on attachment 116863 Patch Looks good to me. 510390 10 116863 vangelis 2011-11-28 18:34:45 -0800 Comment on attachment 116863 Patch Looks good 510394 11 116863 jamesr 2011-11-28 18:47:18 -0800 Comment on attachment 116863 Patch R=me in that case 510893 12 116996 sievers 2011-11-29 10:27:36 -0800 Created attachment 116996 Patch 511205 13 sievers 2011-11-29 16:36:08 -0800 James, could you cq+ for me in case your comments are addressed? thanks! (In reply to comment #12) > Created an attachment (id=116996) [details] > Patch 511578 14 116996 webkit.review.bot 2011-11-30 03:00:21 -0800 Comment on attachment 116996 Patch Clearing flags on attachment: 116996 Committed r101472: <http://trac.webkit.org/changeset/101472> 511579 15 webkit.review.bot 2011-11-30 03:00:26 -0800 All reviewed patches have been landed. Closing bug. 116849 2011-11-28 16:37:58 -0800 2011-11-28 17:56:02 -0800 Patch bug-73266-20111128163757.patch text/plain 6585 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFhM2EwNTE2OThlYTE2 NDA3ZTIxNWYwM2VjOWQxOWFkMjNhMmM2YS4uMmUxNmI0OTVmMmU0MTRiZmIwMjRlZjE1MDVhNDZl NTYxNTE5Y2IwYSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDExLTExLTI4ICBEYW5p ZWwgU2lldmVycyAgPHNpZXZlcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0g QXZvaWQgQVNTRVJUX05PVF9SRUFDSEVEKCkgZnJvbSBjcmVhdGluZyBGQk8gd2l0aCBjb250ZW50 IHRleHR1cmUgb2Ygc2l6ZSAwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03MzI2NgorCisgICAgICAgIFJlbW92ZSByZW5kZXIgc3VyZmFjZSBsYXllcnMg d2l0aCBubyBjaGlsZHJlbiBhZnRlciBjbGlwcGluZyB0bworICAgICAgICB0aGUgcGFyZW50IGxh eWVyLgorCisgICAgICAgIE1vdmUgdGhlIGNoZWNrIGZvciBlbXB0eSByZW5kZXIgc3VyZmFjZXMg YWZ0ZXIgdGhlIHBpZWNlIG9mIGNvZGUKKyAgICAgICAgdXNlZCB0byBhcHBseSB0aGUgcGFyZW50 J3MgY2xpcCwgYXMgd2UgbWlnaHQgZW5kIHVwIGNhbGxpbmcKKyAgICAgICAgcmVuZGVyU3VyZmFj ZS0+Y2xlYXJMYXllckxpc3QoKS4KKworICAgICAgICBSZW5kZXIgc3VyZmFjZXMgd2l0aCBubyBj aGlsZHJlbiBvciB2aXNpYmxlIGNvbnRlbnQgYXJlIHVuZXhwZWN0ZWQKKyAgICAgICAgZXNwZWNp YWxseSBhdCBkcmF3IHRpbWUgd2hlcmUgd2UgbWlnaHQgdHJ5IHRvIGNyZWF0ZSBhIGNvbnRlbnQK KyAgICAgICAgdGV4dHVyZSBhbmQgRkJPIHdpdGggYSBzaXplIG9mIHplcm8sIHdoaWNoIHdpbGwg ZmFpbC4gVGhpcyBmaXhlcworICAgICAgICBhbiBBU1NFUlRfTk9UX1JFQUNIRUQoKSBmb3IgY2hl Y2tGcmFtZWJ1ZmZlclN0YXR1cygpICE9IENPTVBMRVRFCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdW5pdCB0ZXN0LgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUlu dGVybmFsKToKKwogMjAxMS0xMS0yOCAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5j b20+CiAKICAgICAgICAgSW1hZ2VEZWNvZGVyIHNldFNpemUoKSBzaG91bGQgY2hlY2sgZm9yIGJh Y2tpbmcgc3RvcmUgYWxsb2NhdGlvbiBmYWlsdXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmlu ZGV4IGY1M2VlYWJjN2FjMGUwYmRhOWQxYWVhNjViNDMxNTI0ZTZjZTA3MWQuLmU0NmY5ZWVmMDA3 MzViNTBkMzBmNWE3MWYwZDcxNTFiZDg1YTlkMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTEtMjggIERhbmllbCBTaWV2ZXJzICA8c2lldmVyc0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBBdm9pZCBBU1NFUlRfTk9UX1JFQUNI RUQoKSBmcm9tIGNyZWF0aW5nIEZCTyB3aXRoIGNvbnRlbnQgdGV4dHVyZSBvZiBzaXplIDAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMjY2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9DQ0xh eWVyVHJlZUhvc3RDb21tb25UZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRFU1QpOgorCiAy MDExLTExLTI4ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IEZsb2F0UXVhZDo6aXNSZWN0aWxpbmVhcigpIHJldHVybnMgZmFsc2UgZm9yIDE4MGRlZ3JlZSBy b3RhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwCmluZGV4 IDYyNjM2OGY4MWU3Yzk5OTVhMjEzZjViYWM3OTY2YjlkODI1NmNkOTQuLmM0OTYwYWYxYjFkZjkz YWIwZDk3ZmRmY2FjYTk5ZjZhYWU3ZjIxNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRy ZWVIb3N0Q29tbW9uLmNwcApAQCAtMzc4LDE4ICszNzgsNiBAQCBzdGF0aWMgdm9pZCBjYWxjdWxh dGVEcmF3VHJhbnNmb3Jtc0FuZFZpc2liaWxpdHlJbnRlcm5hbChMYXllclR5cGUqIGxheWVyLCBM YXllcgogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKGxheWVyLT5yZW5kZXJTdXJmYWNlKCkg JiYgIWxheWVyLT5yZW5kZXJTdXJmYWNlKCktPmxheWVyTGlzdCgpLnNpemUoKSkgewotICAgICAg ICAvLyBJZiBhIHJlbmRlciBzdXJmYWNlIGhhcyBubyBsYXllciBsaXN0LCB0aGVuIGl0IGFuZCBu b25lIG9mIGl0cwotICAgICAgICAvLyBjaGlsZHJlbiBuZWVkZWQgdG8gZ2V0IGRyYXduLiBUaGVy ZWZvcmUsIGl0IHNob3VsZCBiZSB0aGUgbGFzdCBsYXllcgotICAgICAgICAvLyBpbiB0aGUgcmVu ZGVyIHN1cmZhY2UgbGlzdCBhbmQgd2UgY2FuIHRyaXZpYWxseSByZW1vdmUgaXQuCi0gICAgICAg IGlmIChsYXllciAhPSByb290TGF5ZXIpIHsKLSAgICAgICAgICAgIEFTU0VSVChyZW5kZXJTdXJm YWNlTGF5ZXJMaXN0Lmxhc3QoKSA9PSBsYXllcik7Ci0gICAgICAgICAgICByZW5kZXJTdXJmYWNl TGF5ZXJMaXN0LnJlbW92ZUxhc3QoKTsKLSAgICAgICAgICAgIGxheWVyLT5jbGVhclJlbmRlclN1 cmZhY2UoKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgLy8gSWYg bmVpdGhlciB0aGlzIGxheWVyIG5vciBhbnkgb2YgaXRzIGNoaWxkcmVuIHdlcmUgYWRkZWQsIGVh cmx5IG91dC4KICAgICBpZiAoc29ydGluZ1N0YXJ0SW5kZXggPT0gZGVzY2VuZGFudHMuc2l6ZSgp KQogICAgICAgICByZXR1cm47CkBAIC00NDksNiArNDM3LDE4IEBAIHN0YXRpYyB2b2lkIGNhbGN1 bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUludGVybmFsKExheWVyVHlwZSogbGF5ZXIs IExheWVyCiAgICAgICAgIH0KICAgICB9CiAKKyAgICBpZiAobGF5ZXItPnJlbmRlclN1cmZhY2Uo KSAmJiAhbGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+bGF5ZXJMaXN0KCkuc2l6ZSgpKSB7CisgICAg ICAgIC8vIElmIGEgcmVuZGVyIHN1cmZhY2UgaGFzIG5vIGxheWVyIGxpc3QsIHRoZW4gaXQgYW5k IG5vbmUgb2YgaXRzCisgICAgICAgIC8vIGNoaWxkcmVuIG5lZWRlZCB0byBnZXQgZHJhd24uIFRo ZXJlZm9yZSwgaXQgc2hvdWxkIGJlIHRoZSBsYXN0IGxheWVyCisgICAgICAgIC8vIGluIHRoZSBy ZW5kZXIgc3VyZmFjZSBsaXN0IGFuZCB3ZSBjYW4gdHJpdmlhbGx5IHJlbW92ZSBpdC4KKyAgICAg ICAgaWYgKGxheWVyICE9IHJvb3RMYXllcikgeworICAgICAgICAgICAgQVNTRVJUKHJlbmRlclN1 cmZhY2VMYXllckxpc3QubGFzdCgpID09IGxheWVyKTsKKyAgICAgICAgICAgIHJlbmRlclN1cmZh Y2VMYXllckxpc3QucmVtb3ZlTGFzdCgpOworICAgICAgICAgICAgbGF5ZXItPmNsZWFyUmVuZGVy U3VyZmFjZSgpOworICAgICAgICB9CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICAvLyBJ ZiBwcmVzZXJ2ZXMtM2QgdGhlbiBzb3J0IGFsbCB0aGUgZGVzY2VuZGFudHMgaW4gM0Qgc28gdGhh dCB0aGV5IGNhbiBiZQogICAgIC8vIGRyYXduIGZyb20gYmFjayB0byBmcm9udC4gSWYgdGhlIHBy ZXNlcnZlcy0zZCBwcm9wZXJ0eSBpcyBhbHNvIHNldCBvbiB0aGUgcGFyZW50IHRoZW4KICAgICAv LyBza2lwIHRoZSBzb3J0aW5nIGFzIHRoZSBwYXJlbnQgd2lsbCBzb3J0IGFsbCB0aGUgZGVzY2Vu ZGFudHMgYW55d2F5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9D Q0xheWVyVHJlZUhvc3RDb21tb25UZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdC5jcHAKaW5kZXggYzlhMmZjNjUxMzI1NjZiNDI2 M2EwMDY4OGY1N2MzZjUyN2IxNjFiMi4uMTIzMzM4YThmZWY3NzY4MTgxM2FkMDM4NGQ0MjhhZjU2 ZjdhNTAxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVy VHJlZUhvc3RDb21tb25UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L0NDTGF5ZXJUcmVlSG9zdENvbW1vblRlc3QuY3BwCkBAIC00NzIsNiArNDcyLDM1IEBAIFRFU1Qo Q0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdCwgdmVyaWZ5VHJhbnNmb3Jtc0ZvclJlbmRlclN1cmZh Y2VIaWVyYXJjaHkpCiAgICAgRVhQRUNUX0ZMT0FUX0VRKDUuMCwgZ3JhbmRDaGlsZE9mUlMyLT5z Y3JlZW5TcGFjZVRyYW5zZm9ybSgpLm00MigpKTsKIH0KIAorVEVTVChDQ0xheWVyVHJlZUhvc3RD b21tb25UZXN0LCB2ZXJpZnlSZW5kZXJTdXJmYWNlTGlzdEZvckNsaXBMYXllcikKK3sKKyAgICBS ZWZQdHI8TGF5ZXJDaHJvbWl1bT4gcGFyZW50ID0gTGF5ZXJDaHJvbWl1bTo6Y3JlYXRlKDApOwor ICAgIFJlZlB0cjxMYXllckNocm9taXVtPiByZW5kZXJTdXJmYWNlMSA9IExheWVyQ2hyb21pdW06 OmNyZWF0ZSgwKTsKKyAgICBSZWZQdHI8TGF5ZXJDaHJvbWl1bVdpdGhGb3JjZWREcmF3c0NvbnRl bnQ+IGNoaWxkID0gYWRvcHRSZWYobmV3IExheWVyQ2hyb21pdW1XaXRoRm9yY2VkRHJhd3NDb250 ZW50KDApKTsKKyAgICByZW5kZXJTdXJmYWNlMS0+c2V0T3BhY2l0eSgwLjlmKTsKKworICAgIGNv bnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4IGlkZW50aXR5TWF0cml4OworICAgIHNldExheWVyUHJv cGVydGllc0ZvclRlc3RpbmcocmVuZGVyU3VyZmFjZTEuZ2V0KCksIGlkZW50aXR5TWF0cml4LCBp ZGVudGl0eU1hdHJpeCwgRmxvYXRQb2ludCgwLjBmLCAwLjBmKSwgRmxvYXRQb2ludCgwLjBmLCAw LjBmKSwgSW50U2l6ZSgxMCwgMTApLCBmYWxzZSk7CisgICAgc2V0TGF5ZXJQcm9wZXJ0aWVzRm9y VGVzdGluZyhjaGlsZC5nZXQoKSwgaWRlbnRpdHlNYXRyaXgsIGlkZW50aXR5TWF0cml4LCBGbG9h dFBvaW50KDAuMGYsIDAuMGYpLCBGbG9hdFBvaW50KDMwLjBmLCAzMC4wZiksIEludFNpemUoMTAs IDEwKSwgZmFsc2UpOworCisgICAgcGFyZW50LT5jcmVhdGVSZW5kZXJTdXJmYWNlKCk7CisgICAg cGFyZW50LT5zZXRDbGlwUmVjdChJbnRSZWN0KDAsIDAsIDEwLCAxMCkpOworICAgIHBhcmVudC0+ YWRkQ2hpbGQocmVuZGVyU3VyZmFjZTEpOworICAgIHJlbmRlclN1cmZhY2UxLT5jcmVhdGVSZW5k ZXJTdXJmYWNlKCk7CisgICAgcmVuZGVyU3VyZmFjZTEtPmFkZENoaWxkKGNoaWxkKTsKKworICAg IFZlY3RvcjxSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gPiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0Owor ICAgIFZlY3RvcjxSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gPiBkdW1teUxheWVyTGlzdDsKKyAgICBp bnQgZHVtbXlNYXhUZXh0dXJlU2l6ZSA9IDUxMjsKKyAgICBDQ0xheWVyVHJlZUhvc3RDb21tb246 OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eShwYXJlbnQuZ2V0KCksIHBhcmVu dC5nZXQoKSwgaWRlbnRpdHlNYXRyaXgsIGlkZW50aXR5TWF0cml4LCByZW5kZXJTdXJmYWNlTGF5 ZXJMaXN0LCBkdW1teUxheWVyTGlzdCwgZHVtbXlNYXhUZXh0dXJlU2l6ZSk7CisKKyAgICAvLyBU aGUgY2hpbGQgbGF5ZXIncyBjb250ZW50IGlzIGVudGlyZWx5IG91dHNpZGUgdGhlIHBhcmVudCdz IGNsaXAgcmVjdCwgc28gdGhlIGludGVybWVkaWF0ZQorICAgIC8vIHJlbmRlciBzdXJmYWNlIHNo b3VsZCBoYXZlIGJlZW4gcmVtb3ZlZC4gUmVuZGVyIHN1cmZhY2VzIHdpdGhvdXQgY2hpbGRyZW4g b3IgdmlzaWJsZQorICAgIC8vIGNvbnRlbnQgYXJlIHVuZXhwZWN0ZWQgYXQgZHJhdyB0aW1lIChl LmcuIHdlIG1pZ2h0IHRyeSB0byBjcmVhdGUgYSBjb250ZW50IHRleHR1cmUgb2Ygc2l6ZSAwKS4K KyAgICBBU1NFUlRfRkFMU0UocmVuZGVyU3VyZmFjZTEtPnJlbmRlclN1cmZhY2UoKSk7CisgICAg RVhQRUNUX0VRKHJlbmRlclN1cmZhY2VMYXllckxpc3Quc2l6ZSgpLCAwVSk7Cit9CisKIC8vIEZJ WE1FOgogLy8gY29udGludWUgd29ya2luZyBvbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Njg5NDIKIC8vICAtIGFkZCBhIHRlc3QgdG8gdmVyaWZ5IGNsaXBwaW5nIHRo YXQgY2hhbmdlcyB0aGUgImNlbnRlciBwb2ludCIK 116863 2011-11-28 17:56:05 -0800 2011-11-29 10:27:32 -0800 Patch bug-73266-20111128175604.patch text/plain 7097 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFhM2EwNTE2OThlYTE2 NDA3ZTIxNWYwM2VjOWQxOWFkMjNhMmM2YS4uMmUxNmI0OTVmMmU0MTRiZmIwMjRlZjE1MDVhNDZl NTYxNTE5Y2IwYSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDExLTExLTI4ICBEYW5p ZWwgU2lldmVycyAgPHNpZXZlcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0g QXZvaWQgQVNTRVJUX05PVF9SRUFDSEVEKCkgZnJvbSBjcmVhdGluZyBGQk8gd2l0aCBjb250ZW50 IHRleHR1cmUgb2Ygc2l6ZSAwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03MzI2NgorCisgICAgICAgIFJlbW92ZSByZW5kZXIgc3VyZmFjZSBsYXllcnMg d2l0aCBubyBjaGlsZHJlbiBhZnRlciBjbGlwcGluZyB0bworICAgICAgICB0aGUgcGFyZW50IGxh eWVyLgorCisgICAgICAgIE1vdmUgdGhlIGNoZWNrIGZvciBlbXB0eSByZW5kZXIgc3VyZmFjZXMg YWZ0ZXIgdGhlIHBpZWNlIG9mIGNvZGUKKyAgICAgICAgdXNlZCB0byBhcHBseSB0aGUgcGFyZW50 J3MgY2xpcCwgYXMgd2UgbWlnaHQgZW5kIHVwIGNhbGxpbmcKKyAgICAgICAgcmVuZGVyU3VyZmFj ZS0+Y2xlYXJMYXllckxpc3QoKS4KKworICAgICAgICBSZW5kZXIgc3VyZmFjZXMgd2l0aCBubyBj aGlsZHJlbiBvciB2aXNpYmxlIGNvbnRlbnQgYXJlIHVuZXhwZWN0ZWQKKyAgICAgICAgZXNwZWNp YWxseSBhdCBkcmF3IHRpbWUgd2hlcmUgd2UgbWlnaHQgdHJ5IHRvIGNyZWF0ZSBhIGNvbnRlbnQK KyAgICAgICAgdGV4dHVyZSBhbmQgRkJPIHdpdGggYSBzaXplIG9mIHplcm8sIHdoaWNoIHdpbGwg ZmFpbC4gVGhpcyBmaXhlcworICAgICAgICBhbiBBU1NFUlRfTk9UX1JFQUNIRUQoKSBmb3IgY2hl Y2tGcmFtZWJ1ZmZlclN0YXR1cygpICE9IENPTVBMRVRFCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdW5pdCB0ZXN0LgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUlu dGVybmFsKToKKwogMjAxMS0xMS0yOCAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5j b20+CiAKICAgICAgICAgSW1hZ2VEZWNvZGVyIHNldFNpemUoKSBzaG91bGQgY2hlY2sgZm9yIGJh Y2tpbmcgc3RvcmUgYWxsb2NhdGlvbiBmYWlsdXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmlu ZGV4IGY1M2VlYWJjN2FjMGUwYmRhOWQxYWVhNjViNDMxNTI0ZTZjZTA3MWQuLmU0NmY5ZWVmMDA3 MzViNTBkMzBmNWE3MWYwZDcxNTFiZDg1YTlkMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTEtMjggIERhbmllbCBTaWV2ZXJzICA8c2lldmVyc0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBBdm9pZCBBU1NFUlRfTk9UX1JFQUNI RUQoKSBmcm9tIGNyZWF0aW5nIEZCTyB3aXRoIGNvbnRlbnQgdGV4dHVyZSBvZiBzaXplIDAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMjY2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9DQ0xh eWVyVHJlZUhvc3RDb21tb25UZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRFU1QpOgorCiAy MDExLTExLTI4ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IEZsb2F0UXVhZDo6aXNSZWN0aWxpbmVhcigpIHJldHVybnMgZmFsc2UgZm9yIDE4MGRlZ3JlZSBy b3RhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwCmluZGV4 IDYyNjM2OGY4MWU3Yzk5OTVhMjEzZjViYWM3OTY2YjlkODI1NmNkOTQuLjIxZmQ3ZGEyZWYzNzI3 OThlYzExMTQyZDAzN2E5MTMyZDA5NjdlZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRy ZWVIb3N0Q29tbW9uLmNwcApAQCAtMzc4LDIyICszNzgsNiBAQCBzdGF0aWMgdm9pZCBjYWxjdWxh dGVEcmF3VHJhbnNmb3Jtc0FuZFZpc2liaWxpdHlJbnRlcm5hbChMYXllclR5cGUqIGxheWVyLCBM YXllcgogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKGxheWVyLT5yZW5kZXJTdXJmYWNlKCkg JiYgIWxheWVyLT5yZW5kZXJTdXJmYWNlKCktPmxheWVyTGlzdCgpLnNpemUoKSkgewotICAgICAg ICAvLyBJZiBhIHJlbmRlciBzdXJmYWNlIGhhcyBubyBsYXllciBsaXN0LCB0aGVuIGl0IGFuZCBu b25lIG9mIGl0cwotICAgICAgICAvLyBjaGlsZHJlbiBuZWVkZWQgdG8gZ2V0IGRyYXduLiBUaGVy ZWZvcmUsIGl0IHNob3VsZCBiZSB0aGUgbGFzdCBsYXllcgotICAgICAgICAvLyBpbiB0aGUgcmVu ZGVyIHN1cmZhY2UgbGlzdCBhbmQgd2UgY2FuIHRyaXZpYWxseSByZW1vdmUgaXQuCi0gICAgICAg IGlmIChsYXllciAhPSByb290TGF5ZXIpIHsKLSAgICAgICAgICAgIEFTU0VSVChyZW5kZXJTdXJm YWNlTGF5ZXJMaXN0Lmxhc3QoKSA9PSBsYXllcik7Ci0gICAgICAgICAgICByZW5kZXJTdXJmYWNl TGF5ZXJMaXN0LnJlbW92ZUxhc3QoKTsKLSAgICAgICAgICAgIGxheWVyLT5jbGVhclJlbmRlclN1 cmZhY2UoKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgLy8gSWYg bmVpdGhlciB0aGlzIGxheWVyIG5vciBhbnkgb2YgaXRzIGNoaWxkcmVuIHdlcmUgYWRkZWQsIGVh cmx5IG91dC4KLSAgICBpZiAoc29ydGluZ1N0YXJ0SW5kZXggPT0gZGVzY2VuZGFudHMuc2l6ZSgp KQotICAgICAgICByZXR1cm47Ci0KICAgICBpZiAobGF5ZXItPm1hc2tzVG9Cb3VuZHMoKSB8fCB1 c2VTdXJmYWNlRm9yTWFza2luZykgewogICAgICAgICBJbnRSZWN0IGRyYXdhYmxlQ29udGVudFJl Y3QgPSBsYXllci0+ZHJhd2FibGVDb250ZW50UmVjdCgpOwogICAgICAgICBkcmF3YWJsZUNvbnRl bnRSZWN0LmludGVyc2VjdCh0cmFuc2Zvcm1lZExheWVyUmVjdCk7CkBAIC00NDcsOCArNDMxLDIy IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUludGVy bmFsKExheWVyVHlwZSogbGF5ZXIsIExheWVyCiAgICAgICAgICAgICByZXBsaWNhRHJhd1RyYW5z Zm9ybS50cmFuc2xhdGUzZChzdXJmYWNlQ2VudGVyLngoKSAtIGFuY2hvclBvaW50LngoKSAqIGJv dW5kcy53aWR0aCgpLCBzdXJmYWNlQ2VudGVyLnkoKSAtIGFuY2hvclBvaW50LnkoKSAqIGJvdW5k cy5oZWlnaHQoKSwgMCk7CiAgICAgICAgICAgICByZW5kZXJTdXJmYWNlLT5zZXRSZXBsaWNhRHJh d1RyYW5zZm9ybShyZXBsaWNhRHJhd1RyYW5zZm9ybSk7CiAgICAgICAgIH0KKworICAgICAgICAv LyBJZiBhIHJlbmRlciBzdXJmYWNlIGhhcyBubyBsYXllciBsaXN0LCB0aGVuIGl0IGFuZCBub25l IG9mIGl0cworICAgICAgICAvLyBjaGlsZHJlbiBuZWVkZWQgdG8gZ2V0IGRyYXduLiBUaGVyZWZv cmUsIGl0IHNob3VsZCBiZSB0aGUgbGFzdCBsYXllcgorICAgICAgICAvLyBpbiB0aGUgcmVuZGVy IHN1cmZhY2UgbGlzdCBhbmQgd2UgY2FuIHRyaXZpYWxseSByZW1vdmUgaXQuCisgICAgICAgIGlm ICghbGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+bGF5ZXJMaXN0KCkuc2l6ZSgpKSB7CisgICAgICAg ICAgICBBU1NFUlQocmVuZGVyU3VyZmFjZUxheWVyTGlzdC5sYXN0KCkgPT0gbGF5ZXIpOworICAg ICAgICAgICAgcmVuZGVyU3VyZmFjZUxheWVyTGlzdC5yZW1vdmVMYXN0KCk7CisgICAgICAgICAg ICBsYXllci0+Y2xlYXJSZW5kZXJTdXJmYWNlKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KICAgICB9CiAKKyAgICAvLyBJZiBuZWl0aGVyIHRoaXMgbGF5ZXIgbm9yIGFueSBvZiBp dHMgY2hpbGRyZW4gd2VyZSBhZGRlZCwgZWFybHkgb3V0LgorICAgIGlmIChzb3J0aW5nU3RhcnRJ bmRleCA9PSBkZXNjZW5kYW50cy5zaXplKCkpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIElm IHByZXNlcnZlcy0zZCB0aGVuIHNvcnQgYWxsIHRoZSBkZXNjZW5kYW50cyBpbiAzRCBzbyB0aGF0 IHRoZXkgY2FuIGJlCiAgICAgLy8gZHJhd24gZnJvbSBiYWNrIHRvIGZyb250LiBJZiB0aGUgcHJl c2VydmVzLTNkIHByb3BlcnR5IGlzIGFsc28gc2V0IG9uIHRoZSBwYXJlbnQgdGhlbgogICAgIC8v IHNraXAgdGhlIHNvcnRpbmcgYXMgdGhlIHBhcmVudCB3aWxsIHNvcnQgYWxsIHRoZSBkZXNjZW5k YW50cyBhbnl3YXkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0ND TGF5ZXJUcmVlSG9zdENvbW1vblRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9DQ0xheWVyVHJlZUhvc3RDb21tb25UZXN0LmNwcAppbmRleCBjOWEyZmM2NTEzMjU2NmI0MjYz YTAwNjg4ZjU3YzNmNTI3YjE2MWIyLi4xMjMzMzhhOGZlZjc3NjgxODEzYWQwMzg0ZDQyOGFmNTZm N2E1MDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJU cmVlSG9zdENvbW1vblRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv Q0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdC5jcHAKQEAgLTQ3Miw2ICs0NzIsMzUgQEAgVEVTVChD Q0xheWVyVHJlZUhvc3RDb21tb25UZXN0LCB2ZXJpZnlUcmFuc2Zvcm1zRm9yUmVuZGVyU3VyZmFj ZUhpZXJhcmNoeSkKICAgICBFWFBFQ1RfRkxPQVRfRVEoNS4wLCBncmFuZENoaWxkT2ZSUzItPnNj cmVlblNwYWNlVHJhbnNmb3JtKCkubTQyKCkpOwogfQogCitURVNUKENDTGF5ZXJUcmVlSG9zdENv bW1vblRlc3QsIHZlcmlmeVJlbmRlclN1cmZhY2VMaXN0Rm9yQ2xpcExheWVyKQoreworICAgIFJl ZlB0cjxMYXllckNocm9taXVtPiBwYXJlbnQgPSBMYXllckNocm9taXVtOjpjcmVhdGUoMCk7Cisg ICAgUmVmUHRyPExheWVyQ2hyb21pdW0+IHJlbmRlclN1cmZhY2UxID0gTGF5ZXJDaHJvbWl1bTo6 Y3JlYXRlKDApOworICAgIFJlZlB0cjxMYXllckNocm9taXVtV2l0aEZvcmNlZERyYXdzQ29udGVu dD4gY2hpbGQgPSBhZG9wdFJlZihuZXcgTGF5ZXJDaHJvbWl1bVdpdGhGb3JjZWREcmF3c0NvbnRl bnQoMCkpOworICAgIHJlbmRlclN1cmZhY2UxLT5zZXRPcGFjaXR5KDAuOWYpOworCisgICAgY29u c3QgVHJhbnNmb3JtYXRpb25NYXRyaXggaWRlbnRpdHlNYXRyaXg7CisgICAgc2V0TGF5ZXJQcm9w ZXJ0aWVzRm9yVGVzdGluZyhyZW5kZXJTdXJmYWNlMS5nZXQoKSwgaWRlbnRpdHlNYXRyaXgsIGlk ZW50aXR5TWF0cml4LCBGbG9hdFBvaW50KDAuMGYsIDAuMGYpLCBGbG9hdFBvaW50KDAuMGYsIDAu MGYpLCBJbnRTaXplKDEwLCAxMCksIGZhbHNlKTsKKyAgICBzZXRMYXllclByb3BlcnRpZXNGb3JU ZXN0aW5nKGNoaWxkLmdldCgpLCBpZGVudGl0eU1hdHJpeCwgaWRlbnRpdHlNYXRyaXgsIEZsb2F0 UG9pbnQoMC4wZiwgMC4wZiksIEZsb2F0UG9pbnQoMzAuMGYsIDMwLjBmKSwgSW50U2l6ZSgxMCwg MTApLCBmYWxzZSk7CisKKyAgICBwYXJlbnQtPmNyZWF0ZVJlbmRlclN1cmZhY2UoKTsKKyAgICBw YXJlbnQtPnNldENsaXBSZWN0KEludFJlY3QoMCwgMCwgMTAsIDEwKSk7CisgICAgcGFyZW50LT5h ZGRDaGlsZChyZW5kZXJTdXJmYWNlMSk7CisgICAgcmVuZGVyU3VyZmFjZTEtPmNyZWF0ZVJlbmRl clN1cmZhY2UoKTsKKyAgICByZW5kZXJTdXJmYWNlMS0+YWRkQ2hpbGQoY2hpbGQpOworCisgICAg VmVjdG9yPFJlZlB0cjxMYXllckNocm9taXVtPiA+IHJlbmRlclN1cmZhY2VMYXllckxpc3Q7Cisg ICAgVmVjdG9yPFJlZlB0cjxMYXllckNocm9taXVtPiA+IGR1bW15TGF5ZXJMaXN0OworICAgIGlu dCBkdW1teU1heFRleHR1cmVTaXplID0gNTEyOworICAgIENDTGF5ZXJUcmVlSG9zdENvbW1vbjo6 Y2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNBbmRWaXNpYmlsaXR5KHBhcmVudC5nZXQoKSwgcGFyZW50 LmdldCgpLCBpZGVudGl0eU1hdHJpeCwgaWRlbnRpdHlNYXRyaXgsIHJlbmRlclN1cmZhY2VMYXll ckxpc3QsIGR1bW15TGF5ZXJMaXN0LCBkdW1teU1heFRleHR1cmVTaXplKTsKKworICAgIC8vIFRo ZSBjaGlsZCBsYXllcidzIGNvbnRlbnQgaXMgZW50aXJlbHkgb3V0c2lkZSB0aGUgcGFyZW50J3Mg Y2xpcCByZWN0LCBzbyB0aGUgaW50ZXJtZWRpYXRlCisgICAgLy8gcmVuZGVyIHN1cmZhY2Ugc2hv dWxkIGhhdmUgYmVlbiByZW1vdmVkLiBSZW5kZXIgc3VyZmFjZXMgd2l0aG91dCBjaGlsZHJlbiBv ciB2aXNpYmxlCisgICAgLy8gY29udGVudCBhcmUgdW5leHBlY3RlZCBhdCBkcmF3IHRpbWUgKGUu Zy4gd2UgbWlnaHQgdHJ5IHRvIGNyZWF0ZSBhIGNvbnRlbnQgdGV4dHVyZSBvZiBzaXplIDApLgor ICAgIEFTU0VSVF9GQUxTRShyZW5kZXJTdXJmYWNlMS0+cmVuZGVyU3VyZmFjZSgpKTsKKyAgICBF WFBFQ1RfRVEocmVuZGVyU3VyZmFjZUxheWVyTGlzdC5zaXplKCksIDBVKTsKK30KKwogLy8gRklY TUU6CiAvLyBjb250aW51ZSB3b3JraW5nIG9uIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02ODk0MgogLy8gIC0gYWRkIGEgdGVzdCB0byB2ZXJpZnkgY2xpcHBpbmcgdGhh dCBjaGFuZ2VzIHRoZSAiY2VudGVyIHBvaW50Igo= 116996 2011-11-29 10:27:36 -0800 2011-11-30 03:00:21 -0800 Patch bug-73266-20111129102735.patch text/plain 7078 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFhM2EwNTE2OThlYTE2 NDA3ZTIxNWYwM2VjOWQxOWFkMjNhMmM2YS4uMTFhMjI5ZmNlNWE3ZTI2ZWZjYjU0OWFhZWJhN2Rm OTFiYjU1OTdkZSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDExLTExLTI4ICBEYW5p ZWwgU2lldmVycyAgPHNpZXZlcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0g QXZvaWQgQVNTRVJUX05PVF9SRUFDSEVEKCkgZnJvbSBjcmVhdGluZyBGQk8gd2l0aCBjb250ZW50 IHRleHR1cmUgb2Ygc2l6ZSAwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03MzI2NgorCisgICAgICAgIFJlbW92ZSByZW5kZXIgc3VyZmFjZSBsYXllcnMg d2l0aCBubyBjaGlsZHJlbiBhZnRlciBjbGlwcGluZyB0bworICAgICAgICB0aGUgcGFyZW50IGxh eWVyLgorCisgICAgICAgIE1vdmUgdGhlIGNoZWNrIGZvciBlbXB0eSByZW5kZXIgc3VyZmFjZXMg YWZ0ZXIgdGhlIHBpZWNlIG9mIGNvZGUKKyAgICAgICAgdXNlZCB0byBhcHBseSB0aGUgcGFyZW50 J3MgY2xpcCwgYXMgd2UgbWlnaHQgZW5kIHVwIGNhbGxpbmcKKyAgICAgICAgcmVuZGVyU3VyZmFj ZS0+Y2xlYXJMYXllckxpc3QoKS4KKworICAgICAgICBSZW5kZXIgc3VyZmFjZXMgd2l0aCBubyBj aGlsZHJlbiBvciB2aXNpYmxlIGNvbnRlbnQgYXJlIHVuZXhwZWN0ZWQKKyAgICAgICAgZXNwZWNp YWxseSBhdCBkcmF3IHRpbWUgd2hlcmUgd2UgbWlnaHQgdHJ5IHRvIGNyZWF0ZSBhIGNvbnRlbnQK KyAgICAgICAgdGV4dHVyZSBhbmQgRkJPIHdpdGggYSBzaXplIG9mIHplcm8sIHdoaWNoIHdpbGwg ZmFpbC4gVGhpcyBmaXhlcworICAgICAgICBhbiBBU1NFUlRfTk9UX1JFQUNIRUQoKSBmb3IgY2hl Y2tGcmFtZWJ1ZmZlclN0YXR1cygpICE9IENPTVBMRVRFCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg SmFtZXMgUm9iaW5zb24uCisKKyAgICAgICAgQWRkZWQgdW5pdCB0ZXN0LgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUlu dGVybmFsKToKKwogMjAxMS0xMS0yOCAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5j b20+CiAKICAgICAgICAgSW1hZ2VEZWNvZGVyIHNldFNpemUoKSBzaG91bGQgY2hlY2sgZm9yIGJh Y2tpbmcgc3RvcmUgYWxsb2NhdGlvbiBmYWlsdXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmlu ZGV4IGY1M2VlYWJjN2FjMGUwYmRhOWQxYWVhNjViNDMxNTI0ZTZjZTA3MWQuLmE0MDYyMDBiMGRm Njc5ZTMxOWEwNmU1OGUwYmI3ZDFhYWI0MzZkNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTEtMjggIERhbmllbCBTaWV2ZXJzICA8c2lldmVyc0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBBdm9pZCBBU1NFUlRfTk9UX1JFQUNI RUQoKSBmcm9tIGNyZWF0aW5nIEZCTyB3aXRoIGNvbnRlbnQgdGV4dHVyZSBvZiBzaXplIDAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMjY2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9iaW5zb24uCisKKyAgICAgICAgKiB0ZXN0cy9DQ0xh eWVyVHJlZUhvc3RDb21tb25UZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRFU1QpOgorCiAy MDExLTExLTI4ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IEZsb2F0UXVhZDo6aXNSZWN0aWxpbmVhcigpIHJldHVybnMgZmFsc2UgZm9yIDE4MGRlZ3JlZSBy b3RhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwCmluZGV4 IDYyNjM2OGY4MWU3Yzk5OTVhMjEzZjViYWM3OTY2YjlkODI1NmNkOTQuLjIxZmQ3ZGEyZWYzNzI3 OThlYzExMTQyZDAzN2E5MTMyZDA5NjdlZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRy ZWVIb3N0Q29tbW9uLmNwcApAQCAtMzc4LDIyICszNzgsNiBAQCBzdGF0aWMgdm9pZCBjYWxjdWxh dGVEcmF3VHJhbnNmb3Jtc0FuZFZpc2liaWxpdHlJbnRlcm5hbChMYXllclR5cGUqIGxheWVyLCBM YXllcgogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKGxheWVyLT5yZW5kZXJTdXJmYWNlKCkg JiYgIWxheWVyLT5yZW5kZXJTdXJmYWNlKCktPmxheWVyTGlzdCgpLnNpemUoKSkgewotICAgICAg ICAvLyBJZiBhIHJlbmRlciBzdXJmYWNlIGhhcyBubyBsYXllciBsaXN0LCB0aGVuIGl0IGFuZCBu b25lIG9mIGl0cwotICAgICAgICAvLyBjaGlsZHJlbiBuZWVkZWQgdG8gZ2V0IGRyYXduLiBUaGVy ZWZvcmUsIGl0IHNob3VsZCBiZSB0aGUgbGFzdCBsYXllcgotICAgICAgICAvLyBpbiB0aGUgcmVu ZGVyIHN1cmZhY2UgbGlzdCBhbmQgd2UgY2FuIHRyaXZpYWxseSByZW1vdmUgaXQuCi0gICAgICAg IGlmIChsYXllciAhPSByb290TGF5ZXIpIHsKLSAgICAgICAgICAgIEFTU0VSVChyZW5kZXJTdXJm YWNlTGF5ZXJMaXN0Lmxhc3QoKSA9PSBsYXllcik7Ci0gICAgICAgICAgICByZW5kZXJTdXJmYWNl TGF5ZXJMaXN0LnJlbW92ZUxhc3QoKTsKLSAgICAgICAgICAgIGxheWVyLT5jbGVhclJlbmRlclN1 cmZhY2UoKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgLy8gSWYg bmVpdGhlciB0aGlzIGxheWVyIG5vciBhbnkgb2YgaXRzIGNoaWxkcmVuIHdlcmUgYWRkZWQsIGVh cmx5IG91dC4KLSAgICBpZiAoc29ydGluZ1N0YXJ0SW5kZXggPT0gZGVzY2VuZGFudHMuc2l6ZSgp KQotICAgICAgICByZXR1cm47Ci0KICAgICBpZiAobGF5ZXItPm1hc2tzVG9Cb3VuZHMoKSB8fCB1 c2VTdXJmYWNlRm9yTWFza2luZykgewogICAgICAgICBJbnRSZWN0IGRyYXdhYmxlQ29udGVudFJl Y3QgPSBsYXllci0+ZHJhd2FibGVDb250ZW50UmVjdCgpOwogICAgICAgICBkcmF3YWJsZUNvbnRl bnRSZWN0LmludGVyc2VjdCh0cmFuc2Zvcm1lZExheWVyUmVjdCk7CkBAIC00NDcsOCArNDMxLDIy IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUludGVy bmFsKExheWVyVHlwZSogbGF5ZXIsIExheWVyCiAgICAgICAgICAgICByZXBsaWNhRHJhd1RyYW5z Zm9ybS50cmFuc2xhdGUzZChzdXJmYWNlQ2VudGVyLngoKSAtIGFuY2hvclBvaW50LngoKSAqIGJv dW5kcy53aWR0aCgpLCBzdXJmYWNlQ2VudGVyLnkoKSAtIGFuY2hvclBvaW50LnkoKSAqIGJvdW5k cy5oZWlnaHQoKSwgMCk7CiAgICAgICAgICAgICByZW5kZXJTdXJmYWNlLT5zZXRSZXBsaWNhRHJh d1RyYW5zZm9ybShyZXBsaWNhRHJhd1RyYW5zZm9ybSk7CiAgICAgICAgIH0KKworICAgICAgICAv LyBJZiBhIHJlbmRlciBzdXJmYWNlIGhhcyBubyBsYXllciBsaXN0LCB0aGVuIGl0IGFuZCBub25l IG9mIGl0cworICAgICAgICAvLyBjaGlsZHJlbiBuZWVkZWQgdG8gZ2V0IGRyYXduLiBUaGVyZWZv cmUsIGl0IHNob3VsZCBiZSB0aGUgbGFzdCBsYXllcgorICAgICAgICAvLyBpbiB0aGUgcmVuZGVy IHN1cmZhY2UgbGlzdCBhbmQgd2UgY2FuIHRyaXZpYWxseSByZW1vdmUgaXQuCisgICAgICAgIGlm ICghbGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+bGF5ZXJMaXN0KCkuc2l6ZSgpKSB7CisgICAgICAg ICAgICBBU1NFUlQocmVuZGVyU3VyZmFjZUxheWVyTGlzdC5sYXN0KCkgPT0gbGF5ZXIpOworICAg ICAgICAgICAgcmVuZGVyU3VyZmFjZUxheWVyTGlzdC5yZW1vdmVMYXN0KCk7CisgICAgICAgICAg ICBsYXllci0+Y2xlYXJSZW5kZXJTdXJmYWNlKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KICAgICB9CiAKKyAgICAvLyBJZiBuZWl0aGVyIHRoaXMgbGF5ZXIgbm9yIGFueSBvZiBp dHMgY2hpbGRyZW4gd2VyZSBhZGRlZCwgZWFybHkgb3V0LgorICAgIGlmIChzb3J0aW5nU3RhcnRJ bmRleCA9PSBkZXNjZW5kYW50cy5zaXplKCkpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIElm IHByZXNlcnZlcy0zZCB0aGVuIHNvcnQgYWxsIHRoZSBkZXNjZW5kYW50cyBpbiAzRCBzbyB0aGF0 IHRoZXkgY2FuIGJlCiAgICAgLy8gZHJhd24gZnJvbSBiYWNrIHRvIGZyb250LiBJZiB0aGUgcHJl c2VydmVzLTNkIHByb3BlcnR5IGlzIGFsc28gc2V0IG9uIHRoZSBwYXJlbnQgdGhlbgogICAgIC8v IHNraXAgdGhlIHNvcnRpbmcgYXMgdGhlIHBhcmVudCB3aWxsIHNvcnQgYWxsIHRoZSBkZXNjZW5k YW50cyBhbnl3YXkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0ND TGF5ZXJUcmVlSG9zdENvbW1vblRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9DQ0xheWVyVHJlZUhvc3RDb21tb25UZXN0LmNwcAppbmRleCBjOWEyZmM2NTEzMjU2NmI0MjYz YTAwNjg4ZjU3YzNmNTI3YjE2MWIyLi41MmMyOTYzNmViNmViNDdmOTM5MmMzOTU5ODYyMGM3MmQ3 NzJjY2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJU cmVlSG9zdENvbW1vblRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv Q0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdC5jcHAKQEAgLTQ3Miw2ICs0NzIsMzUgQEAgVEVTVChD Q0xheWVyVHJlZUhvc3RDb21tb25UZXN0LCB2ZXJpZnlUcmFuc2Zvcm1zRm9yUmVuZGVyU3VyZmFj ZUhpZXJhcmNoeSkKICAgICBFWFBFQ1RfRkxPQVRfRVEoNS4wLCBncmFuZENoaWxkT2ZSUzItPnNj cmVlblNwYWNlVHJhbnNmb3JtKCkubTQyKCkpOwogfQogCitURVNUKENDTGF5ZXJUcmVlSG9zdENv bW1vblRlc3QsIHZlcmlmeVJlbmRlclN1cmZhY2VMaXN0Rm9yQ2xpcExheWVyKQoreworICAgIFJl ZlB0cjxMYXllckNocm9taXVtPiBwYXJlbnQgPSBMYXllckNocm9taXVtOjpjcmVhdGUoMCk7Cisg ICAgUmVmUHRyPExheWVyQ2hyb21pdW0+IHJlbmRlclN1cmZhY2UxID0gTGF5ZXJDaHJvbWl1bTo6 Y3JlYXRlKDApOworICAgIFJlZlB0cjxMYXllckNocm9taXVtV2l0aEZvcmNlZERyYXdzQ29udGVu dD4gY2hpbGQgPSBhZG9wdFJlZihuZXcgTGF5ZXJDaHJvbWl1bVdpdGhGb3JjZWREcmF3c0NvbnRl bnQoMCkpOworICAgIHJlbmRlclN1cmZhY2UxLT5zZXRPcGFjaXR5KDAuOSk7CisKKyAgICBjb25z dCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBpZGVudGl0eU1hdHJpeDsKKyAgICBzZXRMYXllclByb3Bl cnRpZXNGb3JUZXN0aW5nKHJlbmRlclN1cmZhY2UxLmdldCgpLCBpZGVudGl0eU1hdHJpeCwgaWRl bnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQ6Onplcm8oKSwgRmxvYXRQb2ludDo6emVybygpLCBJbnRT aXplKDEwLCAxMCksIGZhbHNlKTsKKyAgICBzZXRMYXllclByb3BlcnRpZXNGb3JUZXN0aW5nKGNo aWxkLmdldCgpLCBpZGVudGl0eU1hdHJpeCwgaWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQ6Onpl cm8oKSwgRmxvYXRQb2ludCgzMCwgMzApLCBJbnRTaXplKDEwLCAxMCksIGZhbHNlKTsKKworICAg IHBhcmVudC0+Y3JlYXRlUmVuZGVyU3VyZmFjZSgpOworICAgIHBhcmVudC0+c2V0Q2xpcFJlY3Qo SW50UmVjdCgwLCAwLCAxMCwgMTApKTsKKyAgICBwYXJlbnQtPmFkZENoaWxkKHJlbmRlclN1cmZh Y2UxKTsKKyAgICByZW5kZXJTdXJmYWNlMS0+Y3JlYXRlUmVuZGVyU3VyZmFjZSgpOworICAgIHJl bmRlclN1cmZhY2UxLT5hZGRDaGlsZChjaGlsZCk7CisKKyAgICBWZWN0b3I8UmVmUHRyPExheWVy Q2hyb21pdW0+ID4gcmVuZGVyU3VyZmFjZUxheWVyTGlzdDsKKyAgICBWZWN0b3I8UmVmUHRyPExh eWVyQ2hyb21pdW0+ID4gZHVtbXlMYXllckxpc3Q7CisgICAgaW50IGR1bW15TWF4VGV4dHVyZVNp emUgPSA1MTI7CisgICAgQ0NMYXllclRyZWVIb3N0Q29tbW9uOjpjYWxjdWxhdGVEcmF3VHJhbnNm b3Jtc0FuZFZpc2liaWxpdHkocGFyZW50LmdldCgpLCBwYXJlbnQuZ2V0KCksIGlkZW50aXR5TWF0 cml4LCBpZGVudGl0eU1hdHJpeCwgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwgZHVtbXlMYXllckxp c3QsIGR1bW15TWF4VGV4dHVyZVNpemUpOworCisgICAgLy8gVGhlIGNoaWxkIGxheWVyJ3MgY29u dGVudCBpcyBlbnRpcmVseSBvdXRzaWRlIHRoZSBwYXJlbnQncyBjbGlwIHJlY3QsIHNvIHRoZSBp bnRlcm1lZGlhdGUKKyAgICAvLyByZW5kZXIgc3VyZmFjZSBzaG91bGQgaGF2ZSBiZWVuIHJlbW92 ZWQuIFJlbmRlciBzdXJmYWNlcyB3aXRob3V0IGNoaWxkcmVuIG9yIHZpc2libGUKKyAgICAvLyBj b250ZW50IGFyZSB1bmV4cGVjdGVkIGF0IGRyYXcgdGltZSAoZS5nLiB3ZSBtaWdodCB0cnkgdG8g Y3JlYXRlIGEgY29udGVudCB0ZXh0dXJlIG9mIHNpemUgMCkuCisgICAgQVNTRVJUX0ZBTFNFKHJl bmRlclN1cmZhY2UxLT5yZW5kZXJTdXJmYWNlKCkpOworICAgIEVYUEVDVF9FUShyZW5kZXJTdXJm YWNlTGF5ZXJMaXN0LnNpemUoKSwgMFUpOworfQorCiAvLyBGSVhNRToKIC8vIGNvbnRpbnVlIHdv cmtpbmcgb24gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4OTQyCiAv LyAgLSBhZGQgYSB0ZXN0IHRvIHZlcmlmeSBjbGlwcGluZyB0aGF0IGNoYW5nZXMgdGhlICJjZW50 ZXIgcG9pbnQiCg==