80639 2012-03-08 14:07:13 -0800 Use an explicit attribute to signal that a context prefers to use a discrete GPU 2012-03-08 15:53:14 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth fishd kbr piman senorblanco webkit.review.bot oldest_to_newest 574180 0 jamesr 2012-03-08 14:07:13 -0800 Use an explicit attribute to signal that a context prefers to use a discrete GPU 574269 1 130912 jamesr 2012-03-08 15:03:54 -0800 Created attachment 130912 Patch 574272 2 webkit.review.bot 2012-03-08 15:06:39 -0800 Please wait for approval from fishd@chromium.org, abarth@webkit.org or jamesr@chromium.org before submitting because this patch contains changes to the Chromium platform API. 574274 3 jamesr 2012-03-08 15:07:15 -0800 Chromium side: https://chromiumcodereview.appspot.com/9648014/ 574280 4 piman 2012-03-08 15:09:58 -0800 LGTM 574293 5 130912 senorblanco 2012-03-08 15:17:42 -0800 Comment on attachment 130912 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130912&action=review > Source/Platform/chromium/public/WebGraphicsContext3D.h:97 > + , preferDiscreteGpu(false) GPU should be in all-caps, since it's an acronym. 574312 6 130919 jamesr 2012-03-08 15:29:58 -0800 Created attachment 130919 Gpu -> GPU 574329 7 130919 senorblanco 2012-03-08 15:46:34 -0800 Comment on attachment 130919 Gpu -> GPU Looks good (assuming API approval). r=me 574339 8 jamesr 2012-03-08 15:53:14 -0800 Committed r110227: <http://trac.webkit.org/changeset/110227> 130912 2012-03-08 15:03:54 -0800 2012-03-08 15:29:51 -0800 Patch bug-80639-20120308150353.patch text/plain 11040 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBmZjUwMDZlZDgwMjhm NDNjMzU4NjIyZWFhN2ZmNmFjNjgxYWFlMTEwLi5lMTc1MTMwYjQyNGZmZWU4M2E2ZTE4NWU1ODRm ZWMzNTg5NjkwZDI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wMy0wOCAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSBhbiBl eHBsaWNpdCBhdHRyaWJ1dGUgdG8gc2lnbmFsIHRoYXQgYSBjb250ZXh0IHByZWZlcnMgdG8gdXNl IGEgZGlzY3JldGUgR1BVCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04MDYzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZHMgcHJlZmVyRGlzY3JldGVHcHUgYXR0cmlidXRlIHRvIFdlYkdyYXBoaWNzQ29u dGV4dDNEOjpBdHRyaWJ1dGVzLiBBbHNvIHJlbW92ZSB0aGUgZm9yVXNlT25Bbm90aGVyVGhyZWFk CisgICAgICAgIGF0dHJpYnV0ZSwgdGhpcyBoYXMgYmVlbiBkZWFkIGNvZGUgZm9yIGEgd2hpbGUg bm93LgorCisgICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmg6 CisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzOjpBdHRy aWJ1dGVzKToKKyAgICAgICAgKEF0dHJpYnV0ZXMpOgorCiAyMDEyLTAyLTI0ICBKYW1lcyBSb2Jp bnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBXZWJLaXQ6 OnNldENvbG9yTmFtZXMgaXMgYSBjbGllbnQgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM1ZjFkYjk5MGYy NTRlMjA3NzlmOWMzNjYyMzBhZWNjMDQzNzcyNi4uNzAzMjU1NGNiY2NjOGUwZTBiMTg3Y2VhZTkw YWMzNzM3N2FlNGYyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTA4ICBK YW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVXNlIGFuIGV4 cGxpY2l0IGF0dHJpYnV0ZSB0byBzaWduYWwgdGhhdCBhIGNvbnRleHQgcHJlZmVycyB0byB1c2Ug YSBkaXNjcmV0ZSBHUFUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgwNjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT24gcGxhdGZvcm1zIHRoYXQgc3VwcG9ydCBib3RoIGludGVncmF0ZWQgYW5kIGRpc2Ny ZXRlIEdQVXMgYW5kIGNhbiBkeW5hbWljYWxseSBzd2l0Y2ggYmV0d2VlbiB0aGUgdHdvLCB3ZQor ICAgICAgICBzb21ldGltZXMgaGF2ZSBhIHNwZWNpZmljIHByZWZlcmVuY2UgZm9yIGEgZ2l2ZW4g Y29udGV4dC4gU3BlY2lmaWNhbGx5LCBjb250ZXh0cyB1c2VkIGZvciBXZWJHTCBhbmQgY2FudmFz IDJkCisgICAgICAgIGFjY2VsZXJhdGlvbiBzaG91bGQgdXNlIHRoZSBkaXNjcmV0ZSBHUFUgaWYg YXZhaWxhYmxlLCBidXQgY29tcG9zaXRvciBjb250ZXh0cyBjYW4gcnVuIGZpbmUgb24gYW4gaW50 ZWdyYXRlZAorICAgICAgICBHUFUuIEluc3RlYWQgb2YgYXR0ZW1wdGluZyB0byBpbmZlciB0aGUg aW50ZW50IGZyb20gZXhhbWluaW5nIG90aGVyIGNvbnRleHQgYXR0cmlidXRlcywgdGhpcyBhZGRz IGFuIGV4cGxpY2l0CisgICAgICAgIGF0dHJpYnV0ZSB0byBjb250cm9sIHRoaXMgYmVoYXZpb3Iu CisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OmNyZWF0ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0Qu aDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzOjpBdHRy aWJ1dGVzKToKKyAgICAgICAgKEF0dHJpYnV0ZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dwdS9TaGFyZWRHcmFwaGljc0NvbnRleHQzRC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT aGFyZWRHcmFwaGljc0NvbnRleHQzRDo6Z2V0KToKKwogMjAxMi0wMy0wOCAgSmFzb24gTGl1ICA8 amFzb24ubGl1QHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBbQmxhY2tCZXJyeV1OZXcg ZmVhdHVyZTogc3VwcG9ydCBhYm91dDpjb29raWUgZm9yIGludGVybmFsIGJ1aWxkLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwppbmRleCAzOGQyY2E3ODI0Y2MwNjAxZjM4M2U4M2JlOWZjZWI4YzRj NTJmNGZhLi4yNzlmOGFkZTFkODQ3ZmUwMjA4MzIwOTM1MWJiNTdhZjY0NWFkYTAzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTA4ICBKYW1lcyBS b2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVXNlIGFuIGV4cGxpY2l0 IGF0dHJpYnV0ZSB0byBzaWduYWwgdGhhdCBhIGNvbnRleHQgcHJlZmVycyB0byB1c2UgYSBkaXNj cmV0ZSBHUFUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgwNjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBzcmMvR3JhcGhpY3NDb250ZXh0M0RDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmdldENvbnRleHRBdHRyaWJ1dGVzKToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGUpOgorICAgICAgICAqIHNyYy9XZWJW aWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpjcmVhdGVDb21wb3Np dG9yR3JhcGhpY3NDb250ZXh0M0QpOgorCiAyMDEyLTAzLTA4ICBDYWlvIE1hcmNlbG8gZGUgT2xp dmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgTWFr ZSBlbGVtZW50cyB3aXRoIGF0dHJpYnV0ZXMgc21hbGxlciBieSBlbGltaW5hdGluZyB0aGUgbV9l bGVtZW50IGJhY2sgcG9pbnRlciBpbiBOYW1lZE5vZGVNYXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9Q bGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaCBiL1NvdXJjZS9Q bGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaAppbmRleCAyZjgw NGQ1M2JhMWMzZTA4ZmU5ODRlODM1ZGEyZDY5MGQ3NzBmMmQ3Li5hMDMzMDdkOGEyMzczMzIwMDI5 YWJlZmM3M2NhNGRhMWRhZWY5NTY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21p dW0vcHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJHcmFwaGljc0NvbnRleHQzRC5oCkBAIC05NCw3ICs5NCw3IEBAIHB1 YmxpYzoKICAgICAgICAgICAgICwgY2FuUmVjb3ZlckZyb21Db250ZXh0TG9zcyh0cnVlKQogICAg ICAgICAgICAgLCBub0V4dGVuc2lvbnMoZmFsc2UpCiAgICAgICAgICAgICAsIHNoYXJlUmVzb3Vy Y2VzKHRydWUpCi0gICAgICAgICAgICAsIGZvclVzZU9uQW5vdGhlclRocmVhZChmYWxzZSkKKyAg ICAgICAgICAgICwgcHJlZmVyRGlzY3JldGVHcHUoZmFsc2UpCiAgICAgICAgIHsKICAgICAgICAg fQogCkBAIC0xMDYsNyArMTA2LDcgQEAgcHVibGljOgogICAgICAgICBib29sIGNhblJlY292ZXJG cm9tQ29udGV4dExvc3M7CiAgICAgICAgIGJvb2wgbm9FeHRlbnNpb25zOwogICAgICAgICBib29s IHNoYXJlUmVzb3VyY2VzOwotICAgICAgICBib29sIGZvclVzZU9uQW5vdGhlclRocmVhZDsKKyAg ICAgICAgYm9vbCBwcmVmZXJEaXNjcmV0ZUdwdTsKICAgICB9OwogCiAgICAgY2xhc3MgV2ViR3Jh cGhpY3NDb250ZXh0TG9zdENhbGxiYWNrIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCmluZGV4IGNiMWZjNzE2NWVlMDc1NThj MzczM2FiNDE5MDdjMDhkMGQ3NjFhODcuLjhmOTkyYWFiOTM3ZGNkZDIwZmU2NWY5OGM3YzY4ODNl YzdkMjYzOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVu ZGVyaW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xS ZW5kZXJpbmdDb250ZXh0LmNwcApAQCAtNDAzLDYgKzQwMyw3IEBAIFBhc3NPd25QdHI8V2ViR0xS ZW5kZXJpbmdDb250ZXh0PiBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNyZWF0ZShIVE1MQ2FudmFz RWxlbWVuCiAjZWxzZQogICAgIGF0dHJpYnV0ZXMuc2hhcmVSZXNvdXJjZXMgPSBmYWxzZTsKICNl bmRpZgorICAgIGF0dHJpYnV0ZXMucHJlZmVyRGlzY3JldGVHcHUgPSB0cnVlOwogCiAKICAgICBS ZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IGNvbnRleHQoR3JhcGhpY3NDb250ZXh0M0Q6OmNyZWF0 ZShhdHRyaWJ1dGVzLCBob3N0V2luZG93KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAppbmRleCA1MzE3MjYzOThhMWY0MjFl NTEwYTBjMDE3ZGE0NGJiMWY0ZjNkZDBkLi40MDhhZjk2ZjJlY2IwYzBiOWI5ZWE2NWVjMTg0MWJj NjI1OGU4YmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dDNELmgKQEAgLTQ0Myw2ICs0NDMsNyBAQCBwdWJsaWM6CiAgICAgICAg ICAgICAsIHByZXNlcnZlRHJhd2luZ0J1ZmZlcihmYWxzZSkKICAgICAgICAgICAgICwgbm9FeHRl bnNpb25zKGZhbHNlKQogICAgICAgICAgICAgLCBzaGFyZVJlc291cmNlcyh0cnVlKQorICAgICAg ICAgICAgLCBwcmVmZXJEaXNjcmV0ZUdwdShmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CiAK QEAgLTQ1NSw2ICs0NTYsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgcHJlc2VydmVEcmF3aW5n QnVmZmVyOwogICAgICAgICBib29sIG5vRXh0ZW5zaW9uczsKICAgICAgICAgYm9vbCBzaGFyZVJl c291cmNlczsKKyAgICAgICAgYm9vbCBwcmVmZXJEaXNjcmV0ZUdwdTsKICAgICB9OwogCiAgICAg ZW51bSBSZW5kZXJTdHlsZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ncHUvU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L1NoYXJlZEdyYXBoaWNzQ29udGV4dDNELmNwcAppbmRleCBh NzczNDVjYWE3NzdhOWJjOWIyZDNhNTI4ODU2NTczNDI4NmJmZTEzLi5mMzU5NjZjZGViOGUwMTg0 ZGY5YWI1ODM1ZTI0NTljNDBiNDhhNmJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ncHUvU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9TaGFyZWRHcmFwaGljc0NvbnRleHQzRC5j cHAKQEAgLTM4LDYgKzM4LDcgQEAgR3JhcGhpY3NDb250ZXh0M0QqIFNoYXJlZEdyYXBoaWNzQ29u dGV4dDNEOjpnZXQoKQogICAgIGF0dHJpYnV0ZXMuYW50aWFsaWFzID0gZmFsc2U7CiAgICAgYXR0 cmlidXRlcy5jYW5SZWNvdmVyRnJvbUNvbnRleHRMb3NzID0gZmFsc2U7IC8vIENhbnZhcyBjb250 ZXh0cyBjYW4gbm90IGhhbmRsZSBsb3N0IGNvbnRleHRzLgogICAgIGF0dHJpYnV0ZXMuc2hhcmVS ZXNvdXJjZXMgPSB0cnVlOworICAgIGF0dHJpYnV0ZXMucHJlZmVyRGlzY3JldGVHcHUgPSB0cnVl OwogICAgIHN0YXRpYyBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCA9IEdyYXBoaWNzQ29udGV4 dDNEOjpjcmVhdGUoYXR0cmlidXRlcywgMCkubGVha1JlZigpOwogICAgIGlmIChjb250ZXh0ICYm ICFjb250ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQoKSkKICAgICAgICAgY29udGV4dCA9IDA7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9HcmFwaGljc0NvbnRleHQzRENo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNE Q2hyb21pdW0uY3BwCmluZGV4IGE1YmRiY2YyYTA2ZjQ2NGFkZjFiMzNkNDRmZGZkYzFkNGRiZDBj OWIuLjgwMGUyMjE0ZDNlNzgwYjlhNGE5NDlmYWE2YmRmNjRlYzlkZWU0NWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNEQ2hyb21pdW0uY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNEQ2hyb21p dW0uY3BwCkBAIC01NzMsNiArNTczLDcgQEAgR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMg R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpnZXRDb250ZXh0QXR0cmlidXRlcygpCiAgICAgYXR0 cmlidXRlcy5hbnRpYWxpYXMgPSB3ZWJBdHRyaWJ1dGVzLmFudGlhbGlhczsKICAgICBhdHRyaWJ1 dGVzLnByZW11bHRpcGxpZWRBbHBoYSA9IHdlYkF0dHJpYnV0ZXMucHJlbXVsdGlwbGllZEFscGhh OwogICAgIGF0dHJpYnV0ZXMucHJlc2VydmVEcmF3aW5nQnVmZmVyID0gbV9wcmVzZXJ2ZURyYXdp bmdCdWZmZXI7CisgICAgYXR0cmlidXRlcy5wcmVmZXJEaXNjcmV0ZUdwdSA9IHdlYkF0dHJpYnV0 ZXMucHJlZmVyRGlzY3JldGVHcHU7CiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CiB9CiAKQEAgLTEw MTcsNiArMTAxOCw3IEBAIFBhc3NSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IEdyYXBoaWNzQ29u dGV4dDNEOjpjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpCiAgICAgd2ViQXR0cmlidXRl cy5jYW5SZWNvdmVyRnJvbUNvbnRleHRMb3NzID0gYXR0cnMuY2FuUmVjb3ZlckZyb21Db250ZXh0 TG9zczsKICAgICB3ZWJBdHRyaWJ1dGVzLm5vRXh0ZW5zaW9ucyA9IGF0dHJzLm5vRXh0ZW5zaW9u czsKICAgICB3ZWJBdHRyaWJ1dGVzLnNoYXJlUmVzb3VyY2VzID0gYXR0cnMuc2hhcmVSZXNvdXJj ZXM7CisgICAgd2ViQXR0cmlidXRlcy5wcmVmZXJEaXNjcmV0ZUdwdSA9IGF0dHJzLnByZWZlckRp c2NyZXRlR3B1OwogCiAgICAgT3duUHRyPFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q+IHdl YkNvbnRleHQgPSBhZG9wdFB0cihXZWJLaXQ6OndlYktpdFBsYXRmb3JtU3VwcG9ydCgpLT5jcmVh dGVPZmZzY3JlZW5HcmFwaGljc0NvbnRleHQzRCh3ZWJBdHRyaWJ1dGVzKSk7CiAgICAgaWYgKCF3 ZWJDb250ZXh0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmlu ZGV4IDBlMzBjOTU5MDU4ZDdlNTY0NDE0YTEzODVmNjQ4ZWYwYmY5ZmU2M2UuLmVjOTQwM2NiY2Q2 OTliZjUxODg3ZjQzODA0NmRkZTRhNzQwNjA2YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE3MSwyNyArMTcxLDYgQEAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAotbmFtZXNwYWNlIHsKLQotV2ViS2l0 OjpXZWJHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyBnZXRDb21wb3NpdG9yQ29udGV4dEF0 dHJpYnV0ZXMoYm9vbCB0aHJlYWRlZCkKLXsKLSAgICAvLyBFeHBsaWNpdGx5IGRpc2FibGUgYW50 aWFsaWFzaW5nIGZvciB0aGUgY29tcG9zaXRvci4gQXMgb2YgdGhlIHRpbWUgb2YKLSAgICAvLyB0 aGlzIHdyaXRpbmcsIHRoZSBvbmx5IHBsYXRmb3JtIHRoYXQgc3VwcG9ydGVkIGFudGlhbGlhc2lu ZyBmb3IgdGhlCi0gICAgLy8gY29tcG9zaXRvciB3YXMgTWFjIE9TIFgsIGJlY2F1c2UgdGhlIG9u LXNjcmVlbiBPcGVuR0wgY29udGV4dCBjcmVhdGlvbgotICAgIC8vIGNvZGUgcGF0aHMgb24gV2lu ZG93cyBhbmQgTGludXggZGlkbid0IHlldCBoYXZlIG11bHRpc2FtcGxpbmcgc3VwcG9ydC4KLSAg ICAvLyBNYWMgT1MgWCBlc3NlbnRpYWxseSBhbHdheXMgYmVoYXZlcyBhcyB0aG91Z2ggaXQncyBy ZW5kZXJpbmcgb2Zmc2NyZWVuLgotICAgIC8vIE11bHRpc2FtcGxpbmcgaGFzIGEgaGVhdnkgY29z dCBlc3BlY2lhbGx5IG9uIGRldmljZXMgd2l0aCByZWxhdGl2ZWx5IGxvdwotICAgIC8vIGZpbGwg cmF0ZSBsaWtlIG1vc3Qgbm90ZWJvb2tzLCBhbmQgdGhlIE1hYyBpbXBsZW1lbnRhdGlvbiB3b3Vs ZCBuZWVkIHRvCi0gICAgLy8gYmUgb3B0aW1pemVkIHRvIHJlc29sdmUgZGlyZWN0bHkgaW50byB0 aGUgSU9TdXJmYWNlIHNoYXJlZCBiZXR3ZWVuIHRoZQotICAgIC8vIEdQVSBhbmQgYnJvd3NlciBw cm9jZXNzZXMuIEZvciB0aGVzZSByZWFzb25zIGFuZCB0byBhdm9pZCBwbGF0Zm9ybQotICAgIC8v IGRpc3Bhcml0aWVzIHdlIGV4cGxpY2l0bHkgZGlzYWJsZSBhbnRpYWxpYXNpbmcuCi0gICAgV2Vi S2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyBhdHRyaWJ1dGVzOwotICAgIGF0 dHJpYnV0ZXMuYW50aWFsaWFzID0gZmFsc2U7Ci0gICAgYXR0cmlidXRlcy5zaGFyZVJlc291cmNl cyA9IHRydWU7Ci0gICAgYXR0cmlidXRlcy5mb3JVc2VPbkFub3RoZXJUaHJlYWQgPSB0aHJlYWRl ZDsKLSAgICByZXR1cm4gYXR0cmlidXRlczsKLX0KLQogLy8gVGhlIGZvbGxvd2luZyBjb25zdGFu dHMgY29udHJvbCBwYXJhbWV0ZXJzIGZvciBhdXRvbWF0ZWQgc2NhbGluZyBvZiB3ZWJwYWdlcwog Ly8gKHN1Y2ggYXMgZHVlIHRvIGEgZG91YmxlIHRhcCBnZXN0dXJlIG9yIGZpbmQgaW4gcGFnZSBl dGMuKS4gVGhlc2UgYXJlCiAvLyBleHBlcmltZW50YWxseSBkZXRlcm1pbmVkLgpAQCAtMjAwLDgg KzE3OSw2IEBAIHN0YXRpYyBjb25zdCBmbG9hdCBtaW5TY2FsZURpZmZlcmVuY2UgPSAwLjAxOwog c3RhdGljIGNvbnN0IGZsb2F0IGRvdWJsZVRhcFpvb21Db250ZW50RGVmYXVsdE1hcmdpbiA9IDU7 CiBzdGF0aWMgY29uc3QgZmxvYXQgZG91YmxlVGFwWm9vbUNvbnRlbnRNaW5pbXVtTWFyZ2luID0g MjsKIAotfSAvLyBhbm9ueW1vdXMgbmFtZXNwYWNlCi0KIG5hbWVzcGFjZSBXZWJLaXQgewogCiAv LyBDaGFuZ2UgdGhlIHRleHQgem9vbSBsZXZlbCBieSBrVGV4dFNpemVNdWx0aXBsaWVyUmF0aW8g ZWFjaCB0aW1lIHRoZSB1c2VyCkBAIC0zMjIxLDcgKzMxOTgsMjAgQEAgdm9pZCBXZWJWaWV3SW1w bDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0aXZlKQogCiBQYXNz T3duUHRyPFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q+IFdlYlZpZXdJbXBsOjpjcmVhdGVD b21wb3NpdG9yR3JhcGhpY3NDb250ZXh0M0QoKQogewotICAgIFdlYktpdDo6V2ViR3JhcGhpY3ND b250ZXh0M0Q6OkF0dHJpYnV0ZXMgYXR0cmlidXRlcyA9IGdldENvbXBvc2l0b3JDb250ZXh0QXR0 cmlidXRlcyhDQ1Byb3h5OjpoYXNJbXBsVGhyZWFkKCkpOworICAgIC8vIEV4cGxpY2l0bHkgZGlz YWJsZSBhbnRpYWxpYXNpbmcgZm9yIHRoZSBjb21wb3NpdG9yLiBBcyBvZiB0aGUgdGltZSBvZgor ICAgIC8vIHRoaXMgd3JpdGluZywgdGhlIG9ubHkgcGxhdGZvcm0gdGhhdCBzdXBwb3J0ZWQgYW50 aWFsaWFzaW5nIGZvciB0aGUKKyAgICAvLyBjb21wb3NpdG9yIHdhcyBNYWMgT1MgWCwgYmVjYXVz ZSB0aGUgb24tc2NyZWVuIE9wZW5HTCBjb250ZXh0IGNyZWF0aW9uCisgICAgLy8gY29kZSBwYXRo cyBvbiBXaW5kb3dzIGFuZCBMaW51eCBkaWRuJ3QgeWV0IGhhdmUgbXVsdGlzYW1wbGluZyBzdXBw b3J0LgorICAgIC8vIE1hYyBPUyBYIGVzc2VudGlhbGx5IGFsd2F5cyBiZWhhdmVzIGFzIHRob3Vn aCBpdCdzIHJlbmRlcmluZyBvZmZzY3JlZW4uCisgICAgLy8gTXVsdGlzYW1wbGluZyBoYXMgYSBo ZWF2eSBjb3N0IGVzcGVjaWFsbHkgb24gZGV2aWNlcyB3aXRoIHJlbGF0aXZlbHkgbG93CisgICAg Ly8gZmlsbCByYXRlIGxpa2UgbW9zdCBub3RlYm9va3MsIGFuZCB0aGUgTWFjIGltcGxlbWVudGF0 aW9uIHdvdWxkIG5lZWQgdG8KKyAgICAvLyBiZSBvcHRpbWl6ZWQgdG8gcmVzb2x2ZSBkaXJlY3Rs eSBpbnRvIHRoZSBJT1N1cmZhY2Ugc2hhcmVkIGJldHdlZW4gdGhlCisgICAgLy8gR1BVIGFuZCBi cm93c2VyIHByb2Nlc3Nlcy4gRm9yIHRoZXNlIHJlYXNvbnMgYW5kIHRvIGF2b2lkIHBsYXRmb3Jt CisgICAgLy8gZGlzcGFyaXRpZXMgd2UgZXhwbGljaXRseSBkaXNhYmxlIGFudGlhbGlhc2luZy4K KyAgICBXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzIGF0dHJpYnV0ZXM7 CisgICAgYXR0cmlidXRlcy5hbnRpYWxpYXMgPSBmYWxzZTsKKyAgICBhdHRyaWJ1dGVzLnNoYXJl UmVzb3VyY2VzID0gdHJ1ZTsKKwogICAgIE93blB0cjxXZWJHcmFwaGljc0NvbnRleHQzRD4gd2Vi Q29udGV4dCA9IGFkb3B0UHRyKGNsaWVudCgpLT5jcmVhdGVHcmFwaGljc0NvbnRleHQzRChhdHRy aWJ1dGVzLCB0cnVlIC8qIHJlbmRlckRpcmVjdGx5VG9Ib3N0V2luZG93ICovKSk7CiAgICAgaWYg KCF3ZWJDb250ZXh0KQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK 130919 2012-03-08 15:29:58 -0800 2012-03-08 15:46:34 -0800 Gpu -> GPU bug-80639-20120308152956.patch text/plain 11040 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBmZjUwMDZlZDgwMjhm NDNjMzU4NjIyZWFhN2ZmNmFjNjgxYWFlMTEwLi5hZDU2ZmZiYTU3ODJiNzE5NzM5YzFlY2Y5OGFl YzRhOTJlY2I1YjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wMy0wOCAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSBhbiBl eHBsaWNpdCBhdHRyaWJ1dGUgdG8gc2lnbmFsIHRoYXQgYSBjb250ZXh0IHByZWZlcnMgdG8gdXNl IGEgZGlzY3JldGUgR1BVCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04MDYzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZHMgcHJlZmVyRGlzY3JldGVHUFUgYXR0cmlidXRlIHRvIFdlYkdyYXBoaWNzQ29u dGV4dDNEOjpBdHRyaWJ1dGVzLiBBbHNvIHJlbW92ZSB0aGUgZm9yVXNlT25Bbm90aGVyVGhyZWFk CisgICAgICAgIGF0dHJpYnV0ZSwgdGhpcyBoYXMgYmVlbiBkZWFkIGNvZGUgZm9yIGEgd2hpbGUg bm93LgorCisgICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmg6 CisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzOjpBdHRy aWJ1dGVzKToKKyAgICAgICAgKEF0dHJpYnV0ZXMpOgorCiAyMDEyLTAyLTI0ICBKYW1lcyBSb2Jp bnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBXZWJLaXQ6 OnNldENvbG9yTmFtZXMgaXMgYSBjbGllbnQgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM1ZjFkYjk5MGYy NTRlMjA3NzlmOWMzNjYyMzBhZWNjMDQzNzcyNi4uNzAzMjU1NGNiY2NjOGUwZTBiMTg3Y2VhZTkw YWMzNzM3N2FlNGYyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTA4ICBK YW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVXNlIGFuIGV4 cGxpY2l0IGF0dHJpYnV0ZSB0byBzaWduYWwgdGhhdCBhIGNvbnRleHQgcHJlZmVycyB0byB1c2Ug YSBkaXNjcmV0ZSBHUFUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgwNjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT24gcGxhdGZvcm1zIHRoYXQgc3VwcG9ydCBib3RoIGludGVncmF0ZWQgYW5kIGRpc2Ny ZXRlIEdQVXMgYW5kIGNhbiBkeW5hbWljYWxseSBzd2l0Y2ggYmV0d2VlbiB0aGUgdHdvLCB3ZQor ICAgICAgICBzb21ldGltZXMgaGF2ZSBhIHNwZWNpZmljIHByZWZlcmVuY2UgZm9yIGEgZ2l2ZW4g Y29udGV4dC4gU3BlY2lmaWNhbGx5LCBjb250ZXh0cyB1c2VkIGZvciBXZWJHTCBhbmQgY2FudmFz IDJkCisgICAgICAgIGFjY2VsZXJhdGlvbiBzaG91bGQgdXNlIHRoZSBkaXNjcmV0ZSBHUFUgaWYg YXZhaWxhYmxlLCBidXQgY29tcG9zaXRvciBjb250ZXh0cyBjYW4gcnVuIGZpbmUgb24gYW4gaW50 ZWdyYXRlZAorICAgICAgICBHUFUuIEluc3RlYWQgb2YgYXR0ZW1wdGluZyB0byBpbmZlciB0aGUg aW50ZW50IGZyb20gZXhhbWluaW5nIG90aGVyIGNvbnRleHQgYXR0cmlidXRlcywgdGhpcyBhZGRz IGFuIGV4cGxpY2l0CisgICAgICAgIGF0dHJpYnV0ZSB0byBjb250cm9sIHRoaXMgYmVoYXZpb3Iu CisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OmNyZWF0ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0Qu aDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzOjpBdHRy aWJ1dGVzKToKKyAgICAgICAgKEF0dHJpYnV0ZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dwdS9TaGFyZWRHcmFwaGljc0NvbnRleHQzRC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT aGFyZWRHcmFwaGljc0NvbnRleHQzRDo6Z2V0KToKKwogMjAxMi0wMy0wOCAgSmFzb24gTGl1ICA8 amFzb24ubGl1QHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBbQmxhY2tCZXJyeV1OZXcg ZmVhdHVyZTogc3VwcG9ydCBhYm91dDpjb29raWUgZm9yIGludGVybmFsIGJ1aWxkLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwppbmRleCAzOGQyY2E3ODI0Y2MwNjAxZjM4M2U4M2JlOWZjZWI4YzRj NTJmNGZhLi4yNzlmOGFkZTFkODQ3ZmUwMjA4MzIwOTM1MWJiNTdhZjY0NWFkYTAzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTA4ICBKYW1lcyBS b2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVXNlIGFuIGV4cGxpY2l0 IGF0dHJpYnV0ZSB0byBzaWduYWwgdGhhdCBhIGNvbnRleHQgcHJlZmVycyB0byB1c2UgYSBkaXNj cmV0ZSBHUFUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgwNjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBzcmMvR3JhcGhpY3NDb250ZXh0M0RDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmdldENvbnRleHRBdHRyaWJ1dGVzKToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGUpOgorICAgICAgICAqIHNyYy9XZWJW aWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpjcmVhdGVDb21wb3Np dG9yR3JhcGhpY3NDb250ZXh0M0QpOgorCiAyMDEyLTAzLTA4ICBDYWlvIE1hcmNlbG8gZGUgT2xp dmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgTWFr ZSBlbGVtZW50cyB3aXRoIGF0dHJpYnV0ZXMgc21hbGxlciBieSBlbGltaW5hdGluZyB0aGUgbV9l bGVtZW50IGJhY2sgcG9pbnRlciBpbiBOYW1lZE5vZGVNYXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9Q bGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaCBiL1NvdXJjZS9Q bGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaAppbmRleCAyZjgw NGQ1M2JhMWMzZTA4ZmU5ODRlODM1ZGEyZDY5MGQ3NzBmMmQ3Li4yNzRjMjc5NGMxODExMjA4YjE1 MzI5MWY5YjZhZDE2ZGNiZDQxNGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21p dW0vcHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJHcmFwaGljc0NvbnRleHQzRC5oCkBAIC05NCw3ICs5NCw3IEBAIHB1 YmxpYzoKICAgICAgICAgICAgICwgY2FuUmVjb3ZlckZyb21Db250ZXh0TG9zcyh0cnVlKQogICAg ICAgICAgICAgLCBub0V4dGVuc2lvbnMoZmFsc2UpCiAgICAgICAgICAgICAsIHNoYXJlUmVzb3Vy Y2VzKHRydWUpCi0gICAgICAgICAgICAsIGZvclVzZU9uQW5vdGhlclRocmVhZChmYWxzZSkKKyAg ICAgICAgICAgICwgcHJlZmVyRGlzY3JldGVHUFUoZmFsc2UpCiAgICAgICAgIHsKICAgICAgICAg fQogCkBAIC0xMDYsNyArMTA2LDcgQEAgcHVibGljOgogICAgICAgICBib29sIGNhblJlY292ZXJG cm9tQ29udGV4dExvc3M7CiAgICAgICAgIGJvb2wgbm9FeHRlbnNpb25zOwogICAgICAgICBib29s IHNoYXJlUmVzb3VyY2VzOwotICAgICAgICBib29sIGZvclVzZU9uQW5vdGhlclRocmVhZDsKKyAg ICAgICAgYm9vbCBwcmVmZXJEaXNjcmV0ZUdQVTsKICAgICB9OwogCiAgICAgY2xhc3MgV2ViR3Jh cGhpY3NDb250ZXh0TG9zdENhbGxiYWNrIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCmluZGV4IGNiMWZjNzE2NWVlMDc1NThj MzczM2FiNDE5MDdjMDhkMGQ3NjFhODcuLjRkZWQ5NzgxZGVhNmEyYTljMzBhMjIyYmUxMmU4YjEw YjNhMDgyNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVu ZGVyaW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xS ZW5kZXJpbmdDb250ZXh0LmNwcApAQCAtNDAzLDYgKzQwMyw3IEBAIFBhc3NPd25QdHI8V2ViR0xS ZW5kZXJpbmdDb250ZXh0PiBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNyZWF0ZShIVE1MQ2FudmFz RWxlbWVuCiAjZWxzZQogICAgIGF0dHJpYnV0ZXMuc2hhcmVSZXNvdXJjZXMgPSBmYWxzZTsKICNl bmRpZgorICAgIGF0dHJpYnV0ZXMucHJlZmVyRGlzY3JldGVHUFUgPSB0cnVlOwogCiAKICAgICBS ZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IGNvbnRleHQoR3JhcGhpY3NDb250ZXh0M0Q6OmNyZWF0 ZShhdHRyaWJ1dGVzLCBob3N0V2luZG93KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAppbmRleCA1MzE3MjYzOThhMWY0MjFl NTEwYTBjMDE3ZGE0NGJiMWY0ZjNkZDBkLi40NTVmZmUyYmNiOTBlYWM5YjkwMTRlNGYxODVkZWU3 Mzk0NzYxYTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dDNELmgKQEAgLTQ0Myw2ICs0NDMsNyBAQCBwdWJsaWM6CiAgICAgICAg ICAgICAsIHByZXNlcnZlRHJhd2luZ0J1ZmZlcihmYWxzZSkKICAgICAgICAgICAgICwgbm9FeHRl bnNpb25zKGZhbHNlKQogICAgICAgICAgICAgLCBzaGFyZVJlc291cmNlcyh0cnVlKQorICAgICAg ICAgICAgLCBwcmVmZXJEaXNjcmV0ZUdQVShmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CiAK QEAgLTQ1NSw2ICs0NTYsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgcHJlc2VydmVEcmF3aW5n QnVmZmVyOwogICAgICAgICBib29sIG5vRXh0ZW5zaW9uczsKICAgICAgICAgYm9vbCBzaGFyZVJl c291cmNlczsKKyAgICAgICAgYm9vbCBwcmVmZXJEaXNjcmV0ZUdQVTsKICAgICB9OwogCiAgICAg ZW51bSBSZW5kZXJTdHlsZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ncHUvU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L1NoYXJlZEdyYXBoaWNzQ29udGV4dDNELmNwcAppbmRleCBh NzczNDVjYWE3NzdhOWJjOWIyZDNhNTI4ODU2NTczNDI4NmJmZTEzLi4yNGFmM2Q4Yzk5N2IzNTM0 ZGQ2Y2NlZjJkOGEzMmEyYWEwY2MzMGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ncHUvU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9TaGFyZWRHcmFwaGljc0NvbnRleHQzRC5j cHAKQEAgLTM4LDYgKzM4LDcgQEAgR3JhcGhpY3NDb250ZXh0M0QqIFNoYXJlZEdyYXBoaWNzQ29u dGV4dDNEOjpnZXQoKQogICAgIGF0dHJpYnV0ZXMuYW50aWFsaWFzID0gZmFsc2U7CiAgICAgYXR0 cmlidXRlcy5jYW5SZWNvdmVyRnJvbUNvbnRleHRMb3NzID0gZmFsc2U7IC8vIENhbnZhcyBjb250 ZXh0cyBjYW4gbm90IGhhbmRsZSBsb3N0IGNvbnRleHRzLgogICAgIGF0dHJpYnV0ZXMuc2hhcmVS ZXNvdXJjZXMgPSB0cnVlOworICAgIGF0dHJpYnV0ZXMucHJlZmVyRGlzY3JldGVHUFUgPSB0cnVl OwogICAgIHN0YXRpYyBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCA9IEdyYXBoaWNzQ29udGV4 dDNEOjpjcmVhdGUoYXR0cmlidXRlcywgMCkubGVha1JlZigpOwogICAgIGlmIChjb250ZXh0ICYm ICFjb250ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQoKSkKICAgICAgICAgY29udGV4dCA9IDA7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9HcmFwaGljc0NvbnRleHQzRENo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNE Q2hyb21pdW0uY3BwCmluZGV4IGE1YmRiY2YyYTA2ZjQ2NGFkZjFiMzNkNDRmZGZkYzFkNGRiZDBj OWIuLjc0YzUzMzgzN2RhM2M4NTAyMzlhNjY5NDc0NGYyZGRmYmY2MjBhNjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNEQ2hyb21pdW0uY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNEQ2hyb21p dW0uY3BwCkBAIC01NzMsNiArNTczLDcgQEAgR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMg R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpnZXRDb250ZXh0QXR0cmlidXRlcygpCiAgICAgYXR0 cmlidXRlcy5hbnRpYWxpYXMgPSB3ZWJBdHRyaWJ1dGVzLmFudGlhbGlhczsKICAgICBhdHRyaWJ1 dGVzLnByZW11bHRpcGxpZWRBbHBoYSA9IHdlYkF0dHJpYnV0ZXMucHJlbXVsdGlwbGllZEFscGhh OwogICAgIGF0dHJpYnV0ZXMucHJlc2VydmVEcmF3aW5nQnVmZmVyID0gbV9wcmVzZXJ2ZURyYXdp bmdCdWZmZXI7CisgICAgYXR0cmlidXRlcy5wcmVmZXJEaXNjcmV0ZUdQVSA9IHdlYkF0dHJpYnV0 ZXMucHJlZmVyRGlzY3JldGVHUFU7CiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CiB9CiAKQEAgLTEw MTcsNiArMTAxOCw3IEBAIFBhc3NSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IEdyYXBoaWNzQ29u dGV4dDNEOjpjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpCiAgICAgd2ViQXR0cmlidXRl cy5jYW5SZWNvdmVyRnJvbUNvbnRleHRMb3NzID0gYXR0cnMuY2FuUmVjb3ZlckZyb21Db250ZXh0 TG9zczsKICAgICB3ZWJBdHRyaWJ1dGVzLm5vRXh0ZW5zaW9ucyA9IGF0dHJzLm5vRXh0ZW5zaW9u czsKICAgICB3ZWJBdHRyaWJ1dGVzLnNoYXJlUmVzb3VyY2VzID0gYXR0cnMuc2hhcmVSZXNvdXJj ZXM7CisgICAgd2ViQXR0cmlidXRlcy5wcmVmZXJEaXNjcmV0ZUdQVSA9IGF0dHJzLnByZWZlckRp c2NyZXRlR1BVOwogCiAgICAgT3duUHRyPFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q+IHdl YkNvbnRleHQgPSBhZG9wdFB0cihXZWJLaXQ6OndlYktpdFBsYXRmb3JtU3VwcG9ydCgpLT5jcmVh dGVPZmZzY3JlZW5HcmFwaGljc0NvbnRleHQzRCh3ZWJBdHRyaWJ1dGVzKSk7CiAgICAgaWYgKCF3 ZWJDb250ZXh0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmlu ZGV4IDBlMzBjOTU5MDU4ZDdlNTY0NDE0YTEzODVmNjQ4ZWYwYmY5ZmU2M2UuLmVjOTQwM2NiY2Q2 OTliZjUxODg3ZjQzODA0NmRkZTRhNzQwNjA2YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE3MSwyNyArMTcxLDYgQEAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAotbmFtZXNwYWNlIHsKLQotV2ViS2l0 OjpXZWJHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyBnZXRDb21wb3NpdG9yQ29udGV4dEF0 dHJpYnV0ZXMoYm9vbCB0aHJlYWRlZCkKLXsKLSAgICAvLyBFeHBsaWNpdGx5IGRpc2FibGUgYW50 aWFsaWFzaW5nIGZvciB0aGUgY29tcG9zaXRvci4gQXMgb2YgdGhlIHRpbWUgb2YKLSAgICAvLyB0 aGlzIHdyaXRpbmcsIHRoZSBvbmx5IHBsYXRmb3JtIHRoYXQgc3VwcG9ydGVkIGFudGlhbGlhc2lu ZyBmb3IgdGhlCi0gICAgLy8gY29tcG9zaXRvciB3YXMgTWFjIE9TIFgsIGJlY2F1c2UgdGhlIG9u LXNjcmVlbiBPcGVuR0wgY29udGV4dCBjcmVhdGlvbgotICAgIC8vIGNvZGUgcGF0aHMgb24gV2lu ZG93cyBhbmQgTGludXggZGlkbid0IHlldCBoYXZlIG11bHRpc2FtcGxpbmcgc3VwcG9ydC4KLSAg ICAvLyBNYWMgT1MgWCBlc3NlbnRpYWxseSBhbHdheXMgYmVoYXZlcyBhcyB0aG91Z2ggaXQncyBy ZW5kZXJpbmcgb2Zmc2NyZWVuLgotICAgIC8vIE11bHRpc2FtcGxpbmcgaGFzIGEgaGVhdnkgY29z dCBlc3BlY2lhbGx5IG9uIGRldmljZXMgd2l0aCByZWxhdGl2ZWx5IGxvdwotICAgIC8vIGZpbGwg cmF0ZSBsaWtlIG1vc3Qgbm90ZWJvb2tzLCBhbmQgdGhlIE1hYyBpbXBsZW1lbnRhdGlvbiB3b3Vs ZCBuZWVkIHRvCi0gICAgLy8gYmUgb3B0aW1pemVkIHRvIHJlc29sdmUgZGlyZWN0bHkgaW50byB0 aGUgSU9TdXJmYWNlIHNoYXJlZCBiZXR3ZWVuIHRoZQotICAgIC8vIEdQVSBhbmQgYnJvd3NlciBw cm9jZXNzZXMuIEZvciB0aGVzZSByZWFzb25zIGFuZCB0byBhdm9pZCBwbGF0Zm9ybQotICAgIC8v IGRpc3Bhcml0aWVzIHdlIGV4cGxpY2l0bHkgZGlzYWJsZSBhbnRpYWxpYXNpbmcuCi0gICAgV2Vi S2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyBhdHRyaWJ1dGVzOwotICAgIGF0 dHJpYnV0ZXMuYW50aWFsaWFzID0gZmFsc2U7Ci0gICAgYXR0cmlidXRlcy5zaGFyZVJlc291cmNl cyA9IHRydWU7Ci0gICAgYXR0cmlidXRlcy5mb3JVc2VPbkFub3RoZXJUaHJlYWQgPSB0aHJlYWRl ZDsKLSAgICByZXR1cm4gYXR0cmlidXRlczsKLX0KLQogLy8gVGhlIGZvbGxvd2luZyBjb25zdGFu dHMgY29udHJvbCBwYXJhbWV0ZXJzIGZvciBhdXRvbWF0ZWQgc2NhbGluZyBvZiB3ZWJwYWdlcwog Ly8gKHN1Y2ggYXMgZHVlIHRvIGEgZG91YmxlIHRhcCBnZXN0dXJlIG9yIGZpbmQgaW4gcGFnZSBl dGMuKS4gVGhlc2UgYXJlCiAvLyBleHBlcmltZW50YWxseSBkZXRlcm1pbmVkLgpAQCAtMjAwLDgg KzE3OSw2IEBAIHN0YXRpYyBjb25zdCBmbG9hdCBtaW5TY2FsZURpZmZlcmVuY2UgPSAwLjAxOwog c3RhdGljIGNvbnN0IGZsb2F0IGRvdWJsZVRhcFpvb21Db250ZW50RGVmYXVsdE1hcmdpbiA9IDU7 CiBzdGF0aWMgY29uc3QgZmxvYXQgZG91YmxlVGFwWm9vbUNvbnRlbnRNaW5pbXVtTWFyZ2luID0g MjsKIAotfSAvLyBhbm9ueW1vdXMgbmFtZXNwYWNlCi0KIG5hbWVzcGFjZSBXZWJLaXQgewogCiAv LyBDaGFuZ2UgdGhlIHRleHQgem9vbSBsZXZlbCBieSBrVGV4dFNpemVNdWx0aXBsaWVyUmF0aW8g ZWFjaCB0aW1lIHRoZSB1c2VyCkBAIC0zMjIxLDcgKzMxOTgsMjAgQEAgdm9pZCBXZWJWaWV3SW1w bDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0aXZlKQogCiBQYXNz T3duUHRyPFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q+IFdlYlZpZXdJbXBsOjpjcmVhdGVD b21wb3NpdG9yR3JhcGhpY3NDb250ZXh0M0QoKQogewotICAgIFdlYktpdDo6V2ViR3JhcGhpY3ND b250ZXh0M0Q6OkF0dHJpYnV0ZXMgYXR0cmlidXRlcyA9IGdldENvbXBvc2l0b3JDb250ZXh0QXR0 cmlidXRlcyhDQ1Byb3h5OjpoYXNJbXBsVGhyZWFkKCkpOworICAgIC8vIEV4cGxpY2l0bHkgZGlz YWJsZSBhbnRpYWxpYXNpbmcgZm9yIHRoZSBjb21wb3NpdG9yLiBBcyBvZiB0aGUgdGltZSBvZgor ICAgIC8vIHRoaXMgd3JpdGluZywgdGhlIG9ubHkgcGxhdGZvcm0gdGhhdCBzdXBwb3J0ZWQgYW50 aWFsaWFzaW5nIGZvciB0aGUKKyAgICAvLyBjb21wb3NpdG9yIHdhcyBNYWMgT1MgWCwgYmVjYXVz ZSB0aGUgb24tc2NyZWVuIE9wZW5HTCBjb250ZXh0IGNyZWF0aW9uCisgICAgLy8gY29kZSBwYXRo cyBvbiBXaW5kb3dzIGFuZCBMaW51eCBkaWRuJ3QgeWV0IGhhdmUgbXVsdGlzYW1wbGluZyBzdXBw b3J0LgorICAgIC8vIE1hYyBPUyBYIGVzc2VudGlhbGx5IGFsd2F5cyBiZWhhdmVzIGFzIHRob3Vn aCBpdCdzIHJlbmRlcmluZyBvZmZzY3JlZW4uCisgICAgLy8gTXVsdGlzYW1wbGluZyBoYXMgYSBo ZWF2eSBjb3N0IGVzcGVjaWFsbHkgb24gZGV2aWNlcyB3aXRoIHJlbGF0aXZlbHkgbG93CisgICAg Ly8gZmlsbCByYXRlIGxpa2UgbW9zdCBub3RlYm9va3MsIGFuZCB0aGUgTWFjIGltcGxlbWVudGF0 aW9uIHdvdWxkIG5lZWQgdG8KKyAgICAvLyBiZSBvcHRpbWl6ZWQgdG8gcmVzb2x2ZSBkaXJlY3Rs eSBpbnRvIHRoZSBJT1N1cmZhY2Ugc2hhcmVkIGJldHdlZW4gdGhlCisgICAgLy8gR1BVIGFuZCBi cm93c2VyIHByb2Nlc3Nlcy4gRm9yIHRoZXNlIHJlYXNvbnMgYW5kIHRvIGF2b2lkIHBsYXRmb3Jt CisgICAgLy8gZGlzcGFyaXRpZXMgd2UgZXhwbGljaXRseSBkaXNhYmxlIGFudGlhbGlhc2luZy4K KyAgICBXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzIGF0dHJpYnV0ZXM7 CisgICAgYXR0cmlidXRlcy5hbnRpYWxpYXMgPSBmYWxzZTsKKyAgICBhdHRyaWJ1dGVzLnNoYXJl UmVzb3VyY2VzID0gdHJ1ZTsKKwogICAgIE93blB0cjxXZWJHcmFwaGljc0NvbnRleHQzRD4gd2Vi Q29udGV4dCA9IGFkb3B0UHRyKGNsaWVudCgpLT5jcmVhdGVHcmFwaGljc0NvbnRleHQzRChhdHRy aWJ1dGVzLCB0cnVlIC8qIHJlbmRlckRpcmVjdGx5VG9Ib3N0V2luZG93ICovKSk7CiAgICAgaWYg KCF3ZWJDb250ZXh0KQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK