103497 2012-11-28 02:38:25 -0800 GraphicsSurface: Implement usage of GraphicsSurface for WebGL in WK1. 2012-11-30 07:01:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zeno zeno achicu dino hausmann noam ossy webkit.review.bot oldest_to_newest 777666 0 zeno 2012-11-28 02:38:25 -0800 GraphicsSurface: Implement usage of GraphicsSurface for WebGL in WK1. 777683 1 176438 zeno 2012-11-28 03:12:40 -0800 Created attachment 176438 Patch 777687 2 176439 zeno 2012-11-28 03:15:08 -0800 Created attachment 176439 patch: Temporary workaround. 777696 3 176438 hausmann 2012-11-28 03:22:23 -0800 Comment on attachment 176438 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176438&action=review > Source/WebCore/ChangeLog:15 > + After blitting the multismaple framebuffer, smaple -> sample :) 777726 4 176438 zeno 2012-11-28 04:09:24 -0800 Comment on attachment 176438 Patch Committed r135995. 777728 5 176439 zeno 2012-11-28 04:09:51 -0800 Comment on attachment 176439 patch: Temporary workaround. Committed r135996. 777731 6 ossy 2012-11-28 04:12:29 -0800 (In reply to comment #5) > (From update of attachment 176439 [details]) > Committed r135996. It broke the ARM build: /mnt/raptor2/slaves/qt5-linux-armv7-release/build/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp: In member function 'virtual void WebCore::GraphicsContext3DPrivate::paintToTextureMapper(WebCore::TextureMapper*, const WebCore::FloatRect&, const WebCore::TransformationMatrix&, float, WebCore::BitmapTexture*)': /mnt/raptor2/slaves/qt5-linux-armv7-release/build/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:216:9: error: 'm_graphicsSurface' was not declared in this scope 777733 7 zeno 2012-11-28 04:15:31 -0800 (In reply to comment #6) looking at it right now. Seems like a trivial #ifdef missing. 777759 8 zeno 2012-11-28 04:51:39 -0800 (In reply to comment #7) Fixed in r135998. 780084 9 zeno 2012-11-30 07:01:13 -0800 *** Bug 101942 has been marked as a duplicate of this bug. *** 176438 2012-11-28 03:12:40 -0800 2012-11-28 04:09:24 -0800 Patch bug-103497-20121128121026.patch text/plain 11532 zeno U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzk2MmE1YmQ4ZTE4Mzhk OWM1OWYxMmYzM2I1YTQwOTQ4YjI1YjgyOS4uYTUzZWYzODQzY2Y4MzMwZWNhOTY2MzhjODM1NDk5 ODk1NmIzZTVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU5IEBACisyMDEyLTExLTI4ICBaZW5v IEFsYmlzc2VyICA8emVub0B3ZWJraXQub3JnPgorCisgICAgICAgIEdyYXBoaWNzU3VyZmFjZTog SW1wbGVtZW50IHVzYWdlIG9mIEdyYXBoaWNzU3VyZmFjZSBmb3IgV2ViR0wgaW4gV0sxLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNDk3CisKKyAg ICAgICAgVXNpbmcgR3JhcGhpY3NTdXJmYWNlIGZvciBXZWJHTCBpbiBXSzEgYWxsb3dzIHVzIHRv IHNoYXJlCisgICAgICAgIHRoZSBjb2RlIHdpdGggdGhlIFdLMiBpbXBsZW1lbnRhdGlvbi4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGUpOgorICAg ICAgICAgICAgUmVtb3ZlIG9ic29sZXRlIGNvZGUuCisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQzRFByaXZhdGU6OnBhaW50VG9UZXh0dXJlTWFwcGVyKToKKyAgICAgICAgICAgIEFm dGVyIGJsaXR0aW5nIHRoZSBtdWx0aXNtYXBsZSBmcmFtZWJ1ZmZlciwKKyAgICAgICAgICAgIHdl IGNhbiBjb3B5IHRoZSBjb250ZW50cyBvbnRvIHRoZSBHcmFwaGljc1N1cmZhY2UuCisgICAgICAg ICAgICBSaWdodCBhZnRlciB0aGF0IHdlIGNhbiB1c2UgdGhlIEdyYXBoaWNzU3VyZmFjZQorICAg ICAgICAgICAgYXMgYSB0ZXh0dXJlIG9yaWdpbiB0byBwYWludCB0byB0aGUgVGV4dHVyZU1hcHBl ci4KKyAgICAgICAgICAgIEZsYWdzIHJlbGF0ZWQgdG8gZmxpcHBpbmcgYW5kIGJsZW5kaW5nIGFy ZSBiZWluZyByZXNvbHZlZAorICAgICAgICAgICAgYnkgR3JhcGhpY3NTdXJmYWNlLCBhbmQgZG8g bm90IG5lZWQgdG8gYmUgaGFuZGxlZCBoZXJlIGFueW1vcmUuCisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmNvcHlUb0dyYXBoaWNzU3VyZmFjZSk6CisgICAgICAg ICAgICBSZW1vdmUgYSByZWR1bmRhbnQgbWFrZUN1cnJlbnRJZk5lZWRlZCBjYWxsLgorICAgICAg ICAgICAgVGhlIG9yaWdpbmFsIGNvbnRleHQgaXMgYmVpbmcgcmVzdG9yZWQgYnkKKyAgICAgICAg ICAgIGJsaXRNdWx0aXNhbXBsZUZyYW1lYnVmZmVyQW5kUmVzdG9yZUNvbnRleHQgYW55d2F5Lgor ICAgICAgICAgICAgSW5zdGVhZCBvZiBleHBsaWNpdGx5IGNhbGxpbmcgc3dhcEJ1ZmZlcnMgaGVy ZSwKKyAgICAgICAgICAgIHdlIGNhbGwgc3dhcEJ1ZmZlcnMgb24gdGhlIEdyYXBoaWNzU3VyZmFj ZSBpbXBsaWNpdGx5CisgICAgICAgICAgICBhZnRlciBpbiBHcmFwaGljc1N1cmZhY2VQcml2YXRl Ojpjb3B5RnJvbVRleHR1cmUoKS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNl cy9tYWMvR3JhcGhpY3NTdXJmYWNlTWFjLmNwcDoKKyAgICAgICAgICAgIEFkZCBtZW1iZXJzIHRv IGhvbGQgdGhlIHJlYWRpbmcgZW5kIHRleHR1cmUgSURzLgorICAgICAgICAgICAgVGhlIHRleHR1 cmUgb24gdGhlIHJlYWRpbmcgc2lkZSBhcmUgaW4gYSBkaWZmZXJlbnQKKyAgICAgICAgICAgIGNv bnRleHQgdGhhbiB0aGUgdGV4dHVyZSBvbiB0aGUgd3JpdGluZyBzaWRlLgorICAgICAgICAgICAg QnkgdXNpbmcgR3JhcGhpY3NTdXJmYWNlIGluIFdLMSB3ZSBoYXZlIHRvIGRpc3Rpbmd1aXNoCisg ICAgICAgICAgICBiZXR3ZWVuIHRoZXNlIHRleHR1cmVzLCBhcyBhIHNpbmdsZSBpbnN0YW5jZSBz ZXJ2ZXMKKyAgICAgICAgICAgIGZvciByZWFkaW5nIGFuZCB3cml0aW5nLgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NTdXJmYWNlUHJpdmF0ZTo6R3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc1N1cmZhY2VQcml2YXRlOjp+R3JhcGhpY3NTdXJmYWNl UHJpdmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc1N1cmZhY2VQcml2YXRlOjpzd2Fw QnVmZmVycyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc1N1cmZhY2VQcml2YXRlOjpjb3B5 RnJvbVRleHR1cmUpOgorICAgICAgICAgICAgQWRkIGFuIGltcGxpY2l0IGNhbGwgdG8gc3dhcEJ1 ZmZlcnMoKS4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzU3VyZmFjZVByaXZhdGU6OmZyb250 QnVmZmVyVGV4dHVyZUlEKToKKyAgICAgICAgKEdyYXBoaWNzU3VyZmFjZVByaXZhdGUpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL3F0L0dyYXBoaWNzU3VyZmFjZUdMWC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc1N1cmZhY2VQcml2YXRlOjpHcmFwaGljc1N1 cmZhY2VQcml2YXRlKToKKyAgICAgICAgICAgIEFkZCBhIGZsYWcgdG8gZGlzdGluZ3Vpc2ggYmV0 d2VlbiBzZW5kaW5nIGFuZCByZWNlaXZpbmcvcmVhZGluZworICAgICAgICAgICAgc2lkZSBvZiB0 aGUgc3VyZmFjZS4gVGhpcyBmbGFnIGlzIGJlaW5nIGluaXRpYWxpemVkIGluIHRoZSBjb25zdHJ1 Y3RvcgorICAgICAgICAgICAgd2hpY2ggaXMgdGhlIG9ubHkgcGxhY2Ugd2hlcmUgd2Uga25vdyBp ZiBhbiBpbnN0YW5jZSB3aWxsIGJlIHVzZWQgZm9yCisgICAgICAgICAgICB3cml0aW5nIG9yIHJl YWRpbmcuCisgICAgICAgICAgICBUaGUgcHVycG9zZSBvZiB0aGlzIGZsYWcgaXMgdG8gYXZvaWQg ZXJyb25lb3VzbHkgc3dhcHBpbmcgdGhlIGJ1ZmZlcnMKKyAgICAgICAgICAgIG9uIHRoZSByZWFk aW5nIHNpZGUuIFdlIGNhbiBubyBsb25nZXIgcmVseSBvbiBtX3hQaXhtYXAgZm9yIHRoaXMgcHVy cG9zZS4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzU3VyZmFjZVByaXZhdGU6OnN3YXBCdWZm ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzU3VyZmFjZVByaXZhdGU6OmNvcHlGcm9t VGV4dHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc1N1cmZhY2VQcml2YXRlOjpnbHhQ aXhtYXApOgorICAgICAgICAgICAgTGF6aWx5IGNyZWF0ZSB0aGUgR0xYIHBpeG1hcCBvbiBkZW1h bmQuCisgICAgICAgIChHcmFwaGljc1N1cmZhY2VQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzU3VyZmFjZTo6cGxhdGZvcm1JbXBvcnQpOgorCiAyMDEyLTExLTI4ICBIdWFuZyBE b25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFtUZXhtYXBdIFJF R1JFU1NJT04ocjEzNTYyMCkgUXRUZXN0QnJvd3NlciBjcmFzaGVzIG9uIEdvb2dsZS1ncmF2aXR5 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0M0RRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0NvbnRleHQzRFF0LmNwcAppbmRleCAzNTMzYWRhOTZhNDc0ZTViZGZmZDM5NTVlZDRj NzNkYjIyYzM4NTkxLi5hZmQ0ZmI5ZDNjZmQyZTJhYmI5MmI1OWZhY2VmNWUyZTBkMzJiZjM1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHQzRFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0NvbnRleHQzRFF0LmNwcApAQCAtMTA4LDE3ICsxMDgsNiBAQCBHcmFwaGljc0NvbnRl eHQzRFByaXZhdGU6OkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZShHcmFwaGljc0NvbnRleHQzRCog Y29udGV4dCwgSAogICAgICwgbV9wbGF0Zm9ybUNvbnRleHQoMCkKICAgICAsIG1fc3VyZmFjZU93 bmVyKDApCiB7Ci0gICAgaWYgKG1faG9zdFdpbmRvdyAmJiBtX2hvc3RXaW5kb3ctPnBsYXRmb3Jt UGFnZUNsaWVudCgpKSB7Ci0gICAgICAgIC8vIFRoaXMgaXMgdGhlIFdlYktpdDEgY29kZSBwYXRo LgotICAgICAgICBRV2ViUGFnZUNsaWVudCogd2ViUGFnZUNsaWVudCA9IG1faG9zdFdpbmRvdy0+ cGxhdGZvcm1QYWdlQ2xpZW50KCk7Ci0gICAgICAgIHdlYlBhZ2VDbGllbnQtPmNyZWF0ZVBsYXRm b3JtR3JhcGhpY3NDb250ZXh0M0QoJm1fcGxhdGZvcm1Db250ZXh0LCAmbV9zdXJmYWNlLCAmbV9z dXJmYWNlT3duZXIpOwotICAgICAgICBpZiAoIW1fc3VyZmFjZSkKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICBtYWtlQ3VycmVudElmTmVlZGVkKCk7Ci0gICAgICAgIHJldHVybjsKLSAg ICB9Ci0KICAgICBpZiAocmVuZGVyU3R5bGUgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OlJlbmRlclRv Q3VycmVudEdMQ29udGV4dCkgewogICAgICAgICBtX3BsYXRmb3JtQ29udGV4dCA9IFFPcGVuR0xD b250ZXh0OjpjdXJyZW50Q29udGV4dCgpOwogICAgICAgICBtX3N1cmZhY2UgPSBtX3BsYXRmb3Jt Q29udGV4dC0+c3VyZmFjZSgpOwpAQCAtMjI0LDEwICsyMTMsMTAgQEAgdm9pZCBHcmFwaGljc0Nv bnRleHQzRFByaXZhdGU6OnBhaW50VG9UZXh0dXJlTWFwcGVyKFRleHR1cmVNYXBwZXIqIHRleHR1 cmVNYXBwZXIKICAgICBibGl0TXVsdGlzYW1wbGVGcmFtZWJ1ZmZlckFuZFJlc3RvcmVDb250ZXh0 KCk7CiAKICAgICBpZiAodGV4dHVyZU1hcHBlci0+YWNjZWxlcmF0aW9uTW9kZSgpID09IFRleHR1 cmVNYXBwZXI6Ok9wZW5HTE1vZGUpIHsKKyAgICAgICAgbV9ncmFwaGljc1N1cmZhY2UtPmNvcHlG cm9tVGV4dHVyZShtX2NvbnRleHQtPm1fdGV4dHVyZSwgSW50UmVjdCgwLCAwLCBtX2NvbnRleHQt Pm1fY3VycmVudFdpZHRoLCBtX2NvbnRleHQtPm1fY3VycmVudEhlaWdodCkpOworCiAgICAgICAg IFRleHR1cmVNYXBwZXJHTCogdGV4bWFwR0wgPSBzdGF0aWNfY2FzdDxUZXh0dXJlTWFwcGVyR0wq Pih0ZXh0dXJlTWFwcGVyKTsKLSAgICAgICAgVGV4dHVyZU1hcHBlckdMOjpGbGFncyBmbGFncyA9 IFRleHR1cmVNYXBwZXJHTDo6U2hvdWxkRmxpcFRleHR1cmUgfCAobV9jb250ZXh0LT5tX2F0dHJz LmFscGhhID8gVGV4dHVyZU1hcHBlckdMOjpTdXBwb3J0c0JsZW5kaW5nIDogMCk7Ci0gICAgICAg IEludFNpemUgdGV4dHVyZVNpemUobV9jb250ZXh0LT5tX2N1cnJlbnRXaWR0aCwgbV9jb250ZXh0 LT5tX2N1cnJlbnRIZWlnaHQpOwotICAgICAgICB0ZXhtYXBHTC0+ZHJhd1RleHR1cmUobV9jb250 ZXh0LT5tX3RleHR1cmUsIGZsYWdzLCB0ZXh0dXJlU2l6ZSwgdGFyZ2V0UmVjdCwgbWF0cml4LCBv cGFjaXR5LCBtYXNrKTsKKyAgICAgICAgbV9ncmFwaGljc1N1cmZhY2UtPnBhaW50VG9UZXh0dXJl TWFwcGVyKHRleG1hcEdMLCB0YXJnZXRSZWN0LCBtYXRyaXgsIG9wYWNpdHksIG1hc2spOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCkBAIC0yODgsMTAgKzI3Nyw4IEBAIHVpbnQzMl90IEdyYXBo aWNzQ29udGV4dDNEUHJpdmF0ZTo6Y29weVRvR3JhcGhpY3NTdXJmYWNlKCkKICAgICAgICAgcmV0 dXJuIDA7CiAKICAgICBibGl0TXVsdGlzYW1wbGVGcmFtZWJ1ZmZlckFuZFJlc3RvcmVDb250ZXh0 KCk7Ci0gICAgbWFrZUN1cnJlbnRJZk5lZWRlZCgpOwogICAgIG1fZ3JhcGhpY3NTdXJmYWNlLT5j b3B5RnJvbVRleHR1cmUobV9jb250ZXh0LT5tX3RleHR1cmUsIEludFJlY3QoMCwgMCwgbV9jb250 ZXh0LT5tX2N1cnJlbnRXaWR0aCwgbV9jb250ZXh0LT5tX2N1cnJlbnRIZWlnaHQpKTsKLSAgICB1 aW50MzJfdCBmcm9udEJ1ZmZlciA9IG1fZ3JhcGhpY3NTdXJmYWNlLT5zd2FwQnVmZmVycygpOwot ICAgIHJldHVybiBmcm9udEJ1ZmZlcjsKKyAgICByZXR1cm4gbV9ncmFwaGljc1N1cmZhY2UtPmZy b250QnVmZmVyKCk7CiB9CiAKIEdyYXBoaWNzU3VyZmFjZVRva2VuIEdyYXBoaWNzQ29udGV4dDNE UHJpdmF0ZTo6Z3JhcGhpY3NTdXJmYWNlVG9rZW4oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvbWFjL0dyYXBoaWNzU3VyZmFjZU1h Yy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9tYWMvR3Jh cGhpY3NTdXJmYWNlTWFjLmNwcAppbmRleCBhMTk3NGFiN2UxOGZlMTBkYjUwMWFhZWVkNzNkZmRi ZjYxNDc5MmNmLi41ZGZjOGM1NWYxZWMwMDI0Mzg2YTI3NWI0NWIyMWNhZWQzMTE3MmM2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9tYWMvR3Jh cGhpY3NTdXJmYWNlTWFjLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9zdXJmYWNlcy9tYWMvR3JhcGhpY3NTdXJmYWNlTWFjLmNwcApAQCAtNzcsNyArNzcsOSBAQCBw dWJsaWM6CiAgICAgICAgICwgbV9zaXplKHNpemUpCiAgICAgICAgICwgbV90b2tlbih0b2tlbikK ICAgICAgICAgLCBtX2Zyb250QnVmZmVyVGV4dHVyZSgwKQorICAgICAgICAsIG1fZnJvbnRCdWZm ZXJSZWFkVGV4dHVyZSgwKQogICAgICAgICAsIG1fYmFja0J1ZmZlclRleHR1cmUoMCkKKyAgICAg ICAgLCBtX2JhY2tCdWZmZXJSZWFkVGV4dHVyZSgwKQogICAgICAgICAsIG1fcmVhZEZibygwKQog ICAgICAgICAsIG1fZHJhd0ZibygwKQogICAgIHsKQEAgLTg5LDcgKzkxLDkgQEAgcHVibGljOgog ICAgICAgICA6IG1fY29udGV4dCgwKQogICAgICAgICAsIG1fc2l6ZShzaXplKQogICAgICAgICAs IG1fZnJvbnRCdWZmZXJUZXh0dXJlKDApCisgICAgICAgICwgbV9mcm9udEJ1ZmZlclJlYWRUZXh0 dXJlKDApCiAgICAgICAgICwgbV9iYWNrQnVmZmVyVGV4dHVyZSgwKQorICAgICAgICAsIG1fYmFj a0J1ZmZlclJlYWRUZXh0dXJlKDApCiAgICAgICAgICwgbV9yZWFkRmJvKDApCiAgICAgICAgICwg bV9kcmF3RmJvKDApCiAgICAgewpAQCAtMTUyLDkgKzE1NiwxNSBAQCBwdWJsaWM6CiAgICAgICAg IGlmIChtX2Zyb250QnVmZmVyVGV4dHVyZSkKICAgICAgICAgICAgIGdsRGVsZXRlVGV4dHVyZXMo MSwgJm1fZnJvbnRCdWZmZXJUZXh0dXJlKTsKIAorICAgICAgICBpZiAobV9mcm9udEJ1ZmZlclJl YWRUZXh0dXJlKQorICAgICAgICAgICAgZ2xEZWxldGVUZXh0dXJlcygxLCAmbV9mcm9udEJ1ZmZl clJlYWRUZXh0dXJlKTsKKwogICAgICAgICBpZiAobV9iYWNrQnVmZmVyVGV4dHVyZSkKICAgICAg ICAgICAgIGdsRGVsZXRlVGV4dHVyZXMoMSwgJm1fYmFja0J1ZmZlclRleHR1cmUpOwogCisgICAg ICAgIGlmIChtX2JhY2tCdWZmZXJSZWFkVGV4dHVyZSkKKyAgICAgICAgICAgIGdsRGVsZXRlVGV4 dHVyZXMoMSwgJm1fYmFja0J1ZmZlclJlYWRUZXh0dXJlKTsKKwogICAgICAgICBpZiAobV9mcm9u dEJ1ZmZlcikKICAgICAgICAgICAgIENGUmVsZWFzZShJT1N1cmZhY2VSZWYobV9mcm9udEJ1ZmZl cikpOwogCkBAIC0xODEsNiArMTkxLDcgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgc3RkOjpz d2FwKG1fZnJvbnRCdWZmZXIsIG1fYmFja0J1ZmZlcik7CiAgICAgICAgIHN0ZDo6c3dhcChtX2Zy b250QnVmZmVyVGV4dHVyZSwgbV9iYWNrQnVmZmVyVGV4dHVyZSk7CisgICAgICAgIHN0ZDo6c3dh cChtX2Zyb250QnVmZmVyUmVhZFRleHR1cmUsIG1fYmFja0J1ZmZlclJlYWRUZXh0dXJlKTsKIAog ICAgICAgICByZXR1cm4gSU9TdXJmYWNlR2V0SUQobV9mcm9udEJ1ZmZlcik7CiAgICAgfQpAQCAt MjM3LDYgKzI0OCw3IEBAIHB1YmxpYzoKICAgICAgICAgLy8gRmx1c2hpbmcgdGhlIGdsIGNvbW1h bmQgYnVmZmVyIGlzIG5lY2Vzc2FyeSB0byBlbnN1cmUgdGhlIHRleHR1cmUgaGFzIGNvcnJlY3Rs eSBiZWVuIGJvdW5kIHRvIHRoZSBJT1N1cmZhY2UuCiAgICAgICAgIGdsRmx1c2goKTsKIAorICAg ICAgICBzd2FwQnVmZmVycygpOwogICAgICAgICBkb25lQ3VycmVudCgpOwogICAgIH0KIApAQCAt MjQ3LDEwICsyNTksMTAgQEAgcHVibGljOgogCiAgICAgdWludDMyX3QgZnJvbnRCdWZmZXJUZXh0 dXJlSUQoKQogICAgIHsKLSAgICAgICAgaWYgKCFtX2Zyb250QnVmZmVyVGV4dHVyZSkKLSAgICAg ICAgICAgIG1fZnJvbnRCdWZmZXJUZXh0dXJlID0gY3JlYXRlVGV4dHVyZShtX2Zyb250QnVmZmVy KTsKKyAgICAgICAgaWYgKCFtX2Zyb250QnVmZmVyUmVhZFRleHR1cmUpCisgICAgICAgICAgICBt X2Zyb250QnVmZmVyUmVhZFRleHR1cmUgPSBjcmVhdGVUZXh0dXJlKG1fZnJvbnRCdWZmZXIpOwog Ci0gICAgICAgIHJldHVybiBtX2Zyb250QnVmZmVyVGV4dHVyZTsKKyAgICAgICAgcmV0dXJuIG1f ZnJvbnRCdWZmZXJSZWFkVGV4dHVyZTsKICAgICB9CiAKICAgICB1aW50MzJfdCBiYWNrQnVmZmVy VGV4dHVyZUlEKCkKQEAgLTI4Myw3ICsyOTUsOSBAQCBwcml2YXRlOgogICAgIFBsYXRmb3JtR3Jh cGhpY3NTdXJmYWNlIG1fZnJvbnRCdWZmZXI7CiAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2Ug bV9iYWNrQnVmZmVyOwogICAgIHVpbnQzMl90IG1fZnJvbnRCdWZmZXJUZXh0dXJlOworICAgIHVp bnQzMl90IG1fZnJvbnRCdWZmZXJSZWFkVGV4dHVyZTsKICAgICB1aW50MzJfdCBtX2JhY2tCdWZm ZXJUZXh0dXJlOworICAgIHVpbnQzMl90IG1fYmFja0J1ZmZlclJlYWRUZXh0dXJlOwogICAgIHVp bnQzMl90IG1fcmVhZEZibzsKICAgICB1aW50MzJfdCBtX2RyYXdGYm87CiAgICAgR3JhcGhpY3NT dXJmYWNlVG9rZW4gbV90b2tlbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3N1cmZhY2VzL3F0L0dyYXBoaWNzU3VyZmFjZUdMWC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9xdC9HcmFwaGljc1N1cmZhY2VHTFguY3Bw CmluZGV4IGUxOTRmODE0MGJhMTdiYjk3ZTE3YTdlZjI1ZTJhMzRiNTVmMDRmODcuLjAxYjcyZmJl MDlkNjJlNTc5YWQwNDFhNmRiNzZhMmE2ZmUzNzM4MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL3F0L0dyYXBoaWNzU3VyZmFjZUdMWC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvcXQvR3JhcGhp Y3NTdXJmYWNlR0xYLmNwcApAQCAtMTM4LDcgKzEzOCw3IEBAIHN0YXRpYyBjb25zdCBpbnQgZ2x4 QXR0cmlidXRlc1tdID0gewogCiBzdHJ1Y3QgR3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSB7CiAgICAg R3JhcGhpY3NTdXJmYWNlUHJpdmF0ZShjb25zdCBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEIHNo YXJlQ29udGV4dCA9IDApCi0gICAgICAgIDogbV9kaXNwbGF5KDApCisgICAgICAgIDogbV9kaXNw bGF5KG1fb2ZmU2NyZWVuV2luZG93LmRpc3BsYXkoKSkKICAgICAgICAgLCBtX3hQaXhtYXAoMCkK ICAgICAgICAgLCBtX2dseFBpeG1hcCgwKQogICAgICAgICAsIG1fc3VyZmFjZSgwKQpAQCAtMTQ5 LDkgKzE0OSw5IEBAIHN0cnVjdCBHcmFwaGljc1N1cmZhY2VQcml2YXRlIHsKICAgICAgICAgLCBt X2ZiQ29uZmlnKDApCiAgICAgICAgICwgbV90ZXh0dXJlSXNZSW52ZXJ0ZWQoZmFsc2UpCiAgICAg ICAgICwgbV9oYXNBbHBoYShmYWxzZSkKKyAgICAgICAgLCBtX2lzUmVjZWl2ZXIoZmFsc2UpCiAg ICAgewogICAgICAgICBHTFhDb250ZXh0IHNoYXJlQ29udGV4dE9iamVjdCA9IDA7Ci0gICAgICAg IG1fZGlzcGxheSA9IG1fb2ZmU2NyZWVuV2luZG93LmRpc3BsYXkoKTsKIAogI2lmIFBMQVRGT1JN KFFUKQogICAgICAgICBpZiAoc2hhcmVDb250ZXh0KSB7CkBAIC0yMTEsNiArMjExLDcgQEAgc3Ry dWN0IEdyYXBoaWNzU3VyZmFjZVByaXZhdGUgewogICAgICAgICAsIG1fZmJDb25maWcoMCkKICAg ICAgICAgLCBtX3RleHR1cmVJc1lJbnZlcnRlZChmYWxzZSkKICAgICAgICAgLCBtX2hhc0FscGhh KGZhbHNlKQorICAgICAgICAsIG1faXNSZWNlaXZlcih0cnVlKQogICAgIHsgfQogCiAgICAgfkdy YXBoaWNzU3VyZmFjZVByaXZhdGUoKQpAQCAtMjk5LDEwICszMDAsOSBAQCBzdHJ1Y3QgR3JhcGhp Y3NTdXJmYWNlUHJpdmF0ZSB7CiAKICAgICB2b2lkIHN3YXBCdWZmZXJzKCkKICAgICB7Ci0gICAg ICAgIC8vIElmIHRoZXJlIGlzIGEgeHBpeG1hcCwgd2UgYXJlIG9uIHRoZSByZWFkaW5nIHNpZGUg YW5kIGRvIG5vdCB3YW50IHRvIHN3YXAgYW55IGJ1ZmZlcnMuCiAgICAgICAgIC8vIFRoZSBidWZm ZXJzIGFyZSBiZWluZyBzd2l0Y2hlZCBvbiB0aGUgd3JpdGluZyBzaWRlLCB0aGUgcmVhZGluZyBz aWRlIGp1c3QgcmVhZHMKICAgICAgICAgLy8gd2hhdGV2ZXIgdGV4dHVyZSB0aGUgWFdpbmRvdyBj b250YWlucy4KLSAgICAgICAgaWYgKG1feFBpeG1hcCkKKyAgICAgICAgaWYgKG1faXNSZWNlaXZl cikKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBHTFhDb250ZXh0IGdsQ29udGV4dCA9 IGdsWEdldEN1cnJlbnRDb250ZXh0KCk7CkBAIC0zNDMsMTIgKzM0MywxOSBAQCBzdHJ1Y3QgR3Jh cGhpY3NTdXJmYWNlUHJpdmF0ZSB7CiAgICAgICAgIHBHbERlbGV0ZUZyYW1lYnVmZmVycygxLCAm b3JpZ2luRkJPKTsKIAogICAgICAgICBnbFBvcEF0dHJpYigpOworCisgICAgICAgIHN3YXBCdWZm ZXJzKCk7CiAgICAgICAgIGRvbmVDdXJyZW50KCk7CiAgICAgfQogCiAgICAgRGlzcGxheSogZGlz cGxheSgpIGNvbnN0IHsgcmV0dXJuIG1fZGlzcGxheTsgfQogCi0gICAgR0xYUGl4bWFwIGdseFBp eG1hcCgpIGNvbnN0IHsgcmV0dXJuIG1fZ2x4UGl4bWFwOyB9CisgICAgR0xYUGl4bWFwIGdseFBp eG1hcCgpIGNvbnN0CisgICAgeworICAgICAgICBpZiAoIW1fZ2x4UGl4bWFwICYmIG1fc3VyZmFj ZSkKKyAgICAgICAgICAgIGNvbnN0X2Nhc3Q8R3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSo+KHRoaXMp LT5jcmVhdGVQaXhtYXAobV9zdXJmYWNlKTsKKyAgICAgICAgcmV0dXJuIG1fZ2x4UGl4bWFwOwor ICAgIH0KIAogICAgIEludFNpemUgc2l6ZSgpIGNvbnN0CiAgICAgewpAQCAtMzc0LDYgKzM4MSw3 IEBAIHByaXZhdGU6CiAgICAgR0xYRkJDb25maWcgbV9mYkNvbmZpZzsKICAgICBib29sIG1fdGV4 dHVyZUlzWUludmVydGVkOwogICAgIGJvb2wgbV9oYXNBbHBoYTsKKyAgICBib29sIG1faXNSZWNl aXZlcjsKIH07CiAKIHN0YXRpYyBib29sIHJlc29sdmVHTE1ldGhvZHMoR3JhcGhpY3NTdXJmYWNl UHJpdmF0ZSopCkBAIC00ODUsOCArNDkzLDYgQEAgUGFzc1JlZlB0cjxHcmFwaGljc1N1cmZhY2U+ IEdyYXBoaWNzU3VyZmFjZTo6cGxhdGZvcm1JbXBvcnQoY29uc3QgSW50U2l6ZSYgc2l6ZSwKICAg ICBpZiAoIXJlc29sdmVHTE1ldGhvZHMoc3VyZmFjZS0+bV9wcml2YXRlKSkKICAgICAgICAgcmV0 dXJuIFBhc3NSZWZQdHI8R3JhcGhpY3NTdXJmYWNlPigpOwogCi0gICAgc3VyZmFjZS0+bV9wcml2 YXRlLT5jcmVhdGVQaXhtYXAoc3VyZmFjZS0+bV9wbGF0Zm9ybVN1cmZhY2UpOwotCiAgICAgcmV0 dXJuIHN1cmZhY2U7CiB9CiAK 176439 2012-11-28 03:15:08 -0800 2012-11-28 04:09:51 -0800 patch: Temporary workaround. 103497_20121128-121135.patch text/plain 2953 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNTNlZjM4Li43NjE2YTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0zLDYgKzMsMjQg QEAKICAgICAgICAgR3JhcGhpY3NTdXJmYWNlOiBJbXBsZW1lbnQgdXNhZ2Ugb2YgR3JhcGhpY3NT dXJmYWNlIGZvciBXZWJHTCBpbiBXSzEuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDM0OTcKIAorICAgICAgICBUaGlzIGlzIGEgdGVtcG9yYXJ5IHdv cmthcm91bmQgZm9yIGFuIGlzc3VlIHdpdGggR3JhcGhpY3NTdXJmYWNlTWFjLgorICAgICAgICBH cmFwaGljc1N1cmZhY2VNYWMgaXMgY3VycmVudGx5IGltcGxlbWVudGVkIHVzaW5nIENHTCBvbmx5 LgorICAgICAgICBDR0wgZG9lcyBub3QgYWxsb3cgdXMgdG8gcHJvcGVybHkgcmVzdG9yZSB0aGUg TlNWaWV3IGEgY29udGV4dCB3YXMgbWFkZSBjdXJyZW50IHdpdGguCisgICAgICAgIFRoZXJlZm9y ZSB3ZSBoYXZlIHRvIGdvIHRocm91Z2ggUU9wZW5HTENvbnRleHQgdG8gZW5zdXJlIHRoZSBjb250 ZXh0CisgICAgICAgIGlzIGJlaW5nIHJlc3RvcmVkIGNvcnJlY3RseS4KKyAgICAgICAgQXMgc29v biBhcyB3ZSBhcmUgdXBkYXRpbmcgR3JhcGhpY3NTdXJmYWNlTWFjIHRvIHVzZSBOU09wZW5HTCwK KyAgICAgICAgd2Ugc2hvdWxkIHJldmVydCB0aGlzIHBhdGNoLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0M0RRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQz RFByaXZhdGU6OnBhaW50VG9UZXh0dXJlTWFwcGVyKToKKworMjAxMi0xMS0yOCAgWmVubyBBbGJp c3NlciAgPHplbm9Ad2Via2l0Lm9yZz4KKworICAgICAgICBHcmFwaGljc1N1cmZhY2U6IEltcGxl bWVudCB1c2FnZSBvZiBHcmFwaGljc1N1cmZhY2UgZm9yIFdlYkdMIGluIFdLMS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzQ5NworCiAgICAgICAg IFVzaW5nIEdyYXBoaWNzU3VyZmFjZSBmb3IgV2ViR0wgaW4gV0sxIGFsbG93cyB1cyB0byBzaGFy ZQogICAgICAgICB0aGUgY29kZSB3aXRoIHRoZSBXSzIgaW1wbGVtZW50YXRpb24uCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4 dDNEUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3ND b250ZXh0M0RRdC5jcHAKaW5kZXggYWZkNGZiOS4uN2QwNWEwZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0M0RRdC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0M0RR dC5jcHAKQEAgLTIxMyw4ICsyMTMsMjEgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6 OnBhaW50VG9UZXh0dXJlTWFwcGVyKFRleHR1cmVNYXBwZXIqIHRleHR1cmVNYXBwZXIKICAgICBi bGl0TXVsdGlzYW1wbGVGcmFtZWJ1ZmZlckFuZFJlc3RvcmVDb250ZXh0KCk7CiAKICAgICBpZiAo dGV4dHVyZU1hcHBlci0+YWNjZWxlcmF0aW9uTW9kZSgpID09IFRleHR1cmVNYXBwZXI6Ok9wZW5H TE1vZGUpIHsKKworICAgICAgICAvLyBDR0wgb25seSBwcm92aWRlcyB1cyB0aGUgY29udGV4dCwg YnV0IG5vdCB0aGUgdmlldyB0aGUgY29udGV4dCBpcyBjdXJyZW50bHkgYm91bmQgdG8uCisgICAg ICAgIC8vIFRvIG1ha2Ugc3VyZSB0aGUgY29udGV4dCBpcyBib3VuZCB0aGUgdGhlIHJpZ2h0IHN1 cmZhY2Ugd2UgaGF2ZSB0byBkbyBhIG1ha2VDdXJyZW50IHRocm91Z2ggUU9wZW5HTCBhZ2Fpbi4K KyAgICAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIGNvZGUgYXMgc29vbiBhcyBHcmFwaGljc1N1 cmZhY2VNYWMgbWFrZXMgdXNlIG9mIE5TT3BlbkdMLgorICAgICAgICBRT3BlbkdMQ29udGV4dCog Y3VycmVudENvbnRleHQgPSBRT3BlbkdMQ29udGV4dDo6Y3VycmVudENvbnRleHQoKTsKKyAgICAg ICAgUVN1cmZhY2UqIGN1cnJlbnRTdXJmYWNlID0gY3VycmVudENvbnRleHQtPnN1cmZhY2UoKTsK KyAgICAgICAgbWFrZUN1cnJlbnRJZk5lZWRlZCgpOworCiAgICAgICAgIG1fZ3JhcGhpY3NTdXJm YWNlLT5jb3B5RnJvbVRleHR1cmUobV9jb250ZXh0LT5tX3RleHR1cmUsIEludFJlY3QoMCwgMCwg bV9jb250ZXh0LT5tX2N1cnJlbnRXaWR0aCwgbV9jb250ZXh0LT5tX2N1cnJlbnRIZWlnaHQpKTsK IAorICAgICAgICAvLyBDR0wgb25seSBwcm92aWRlcyB1cyB0aGUgY29udGV4dCwgYnV0IG5vdCB0 aGUgdmlldyB0aGUgY29udGV4dCBpcyBjdXJyZW50bHkgYm91bmQgdG8uCisgICAgICAgIC8vIFRv IG1ha2Ugc3VyZSB0aGUgY29udGV4dCBpcyBib3VuZCB0aGUgdGhlIHJpZ2h0IHN1cmZhY2Ugd2Ug aGF2ZSB0byBkbyBhIG1ha2VDdXJyZW50IHRocm91Z2ggUU9wZW5HTCBhZ2Fpbi4KKyAgICAgICAg Ly8gRklYTUU6IFJlbW92ZSB0aGlzIGNvZGUgYXMgc29vbiBhcyBHcmFwaGljc1N1cmZhY2VNYWMg bWFrZXMgdXNlIG9mIE5TT3BlbkdMLgorICAgICAgICBjdXJyZW50Q29udGV4dC0+bWFrZUN1cnJl bnQoY3VycmVudFN1cmZhY2UpOworCiAgICAgICAgIFRleHR1cmVNYXBwZXJHTCogdGV4bWFwR0wg PSBzdGF0aWNfY2FzdDxUZXh0dXJlTWFwcGVyR0wqPih0ZXh0dXJlTWFwcGVyKTsKICAgICAgICAg bV9ncmFwaGljc1N1cmZhY2UtPnBhaW50VG9UZXh0dXJlTWFwcGVyKHRleG1hcEdMLCB0YXJnZXRS ZWN0LCBtYXRyaXgsIG9wYWNpdHksIG1hc2spOwogICAgICAgICByZXR1cm47Cg==