47113 2010-10-04 14:12:22 -0700 Move SharedGraphicsContext3D from ChromeClient to Page 2010-10-04 17:10:30 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cmarrin cmarrin jamesr kbr senorblanco simon.fraser oldest_to_newest 289133 0 cmarrin 2010-10-04 14:12:22 -0700 In talking to James Robinson, we've agreed that SharedGraphicsContext3D doesn't need to be in ChromeClient. Page has the same lifetime and there are no platform dependencies in this class. 289144 1 69681 cmarrin 2010-10-04 14:30:45 -0700 Created attachment 69681 Patch 289152 2 69681 simon.fraser 2010-10-04 14:39:03 -0700 Comment on attachment 69681 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69681&action=review > WebCore/page/Page.cpp:783 > + if (!context) > + return 0; > + m_sharedGraphicsContext3D = SharedGraphicsContext3D::create(context.release()); > + } I think the GraphicsContext3D::create() stuff should be hidden inside of static bool SharedGraphicsContext3D::canCreateContext() or something, or maybe SharedGraphicsContext3D::create() should just return 0 if the context can't be created. 289184 3 69695 cmarrin 2010-10-04 15:07:41 -0700 Created attachment 69695 Patch 289310 4 69695 jamesr 2010-10-04 17:03:42 -0700 Comment on attachment 69695 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69695&action=review Looks fine to me. > WebCore/page/Page.cpp:69 > +#if ENABLE(ACCELERATED_2D_CANVAS) > +#include "SharedGraphicsContext3D.h" > +#endif Normally conditionally included headers are put after the main list of headers, not in the middle. 289316 5 cmarrin 2010-10-04 17:10:23 -0700 Landed in http://trac.webkit.org/changeset/69053 69681 2010-10-04 14:30:45 -0700 2010-10-04 15:07:38 -0700 Patch bug-47113-20101004143044.patch text/plain 8163 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTAzNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMTAtMDQgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v dmUgU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QgZnJvbSBDaHJvbWVDbGllbnQgdG8gUGFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcxMTMKKworICAg ICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OkNhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRCk6CisgICAgICAgICogcGFnZS9DaHJvbWVDbGllbnQuaDoKKyAgICAgICAgKiBwYWdlL1Bh Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2hhcmVkR3JhcGhpY3NDb250ZXh0M0Qp OgorICAgICAgICAqIHBhZ2UvUGFnZS5oOgorCiAyMDEwLTEwLTA0ICBIdWFodWkgV3UgIDxtZWRp YWRlcGVuZGVudEBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIu CkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0 MkQuY3BwCShyZXZpc2lvbiA2OTAyMikKKysrIFdlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDcgKzEyOCw3IEBAIENh bnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Q2FudmFzUmVuZGVyaW4KICAgICAgICAgcmV0dXJuOwog ICAgIGlmICghcC0+c2V0dGluZ3MoKS0+YWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoKSkKICAg ICAgICAgcmV0dXJuOwotICAgIG1fY29udGV4dDNEID0gcC0+Y2hyb21lKCktPmNsaWVudCgpLT5n ZXRTaGFyZWRHcmFwaGljc0NvbnRleHQzRCgpOworICAgIG1fY29udGV4dDNEID0gcC0+c2hhcmVk R3JhcGhpY3NDb250ZXh0M0QoKTsKICAgICBpZiAobV9jb250ZXh0M0QpIHsKICAgICAgICAgaWYg KEdyYXBoaWNzQ29udGV4dCogYyA9IGRyYXdpbmdDb250ZXh0KCkpIHsKICAgICAgICAgICAgIG1f ZHJhd2luZ0J1ZmZlciA9IERyYXdpbmdCdWZmZXI6OmNyZWF0ZShtX2NvbnRleHQzRC5nZXQoKSwg SW50U2l6ZShjYW52YXMtPndpZHRoKCksIGNhbnZhcy0+aGVpZ2h0KCkpKTsKSW5kZXg6IFdlYkNv cmUvcGFnZS9DaHJvbWVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvQ2hyb21l Q2xpZW50LmgJKHJldmlzaW9uIDY5MDIyKQorKysgV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5o CSh3b3JraW5nIGNvcHkpCkBAIC0yMzMsOCArMjMzLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICB2aXJ0dWFsIGJvb2wgYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0 IHsgcmV0dXJuIHRydWU7IH0KICNlbmRpZgogCi0gICAgICAgIHZpcnR1YWwgU2hhcmVkR3JhcGhp Y3NDb250ZXh0M0QqIGdldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKCkgeyByZXR1cm4gMDsgfQot CiAgICAgICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0Z1bGxzY3JlZW5Gb3JOb2RlKGNvbnN0IE5v ZGUqKSB7IHJldHVybiBmYWxzZTsgfQogICAgICAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGdWxsc2Ny ZWVuRm9yTm9kZShOb2RlKikgeyB9CiAgICAgICAgIHZpcnR1YWwgdm9pZCBleGl0RnVsbHNjcmVl bkZvck5vZGUoTm9kZSopIHsgfQpJbmRleDogV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gNjkwMjIpCisrKyBXZWJDb3Jl L3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDYgKzQzLDkgQEAKICNpbmNsdWRl ICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkZyYW1lVHJlZS5oIgogI2luY2x1ZGUg IkZyYW1lVmlldy5oIgorI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCisjaW5jbHVk ZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIKKyNlbmRpZgogI2luY2x1ZGUgIkhUTUxFbGVtZW50Lmgi CiAjaW5jbHVkZSAiSGlzdG9yeUl0ZW0uaCIKICNpbmNsdWRlICJJbnNwZWN0b3JDb250cm9sbGVy LmgiCkBAIC02NCw2ICs2Nyw5IEBACiAjaW5jbHVkZSAiU2VsZWN0aW9uQ29udHJvbGxlci5oIgog I2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCisjaWYgRU5B QkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKKyNpbmNsdWRlICJTaGFyZWRHcmFwaGljc0NvbnRl eHQzRC5oIgorI2VuZGlmCiAjaW5jbHVkZSAiU3BlZWNoSW5wdXQuaCIKICNpbmNsdWRlICJTcGVl Y2hJbnB1dENsaWVudC5oIgogI2luY2x1ZGUgIlRleHRSZXNvdXJjZURlY29kZXIuaCIKQEAgLTc2 NSw2ICs3NzEsMjMgQEAgdm9pZCBQYWdlOjpzZXREZWJ1Z2dlcihKU0M6OkRlYnVnZ2VyKiBkZQog ICAgICAgICBmcmFtZS0+c2NyaXB0KCktPmF0dGFjaERlYnVnZ2VyKG1fZGVidWdnZXIpOwogfQog CitTaGFyZWRHcmFwaGljc0NvbnRleHQzRCogUGFnZTo6c2hhcmVkR3JhcGhpY3NDb250ZXh0M0Qo KQoreworI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCisgICAgaWYgKCFtX3NoYXJl ZEdyYXBoaWNzQ29udGV4dDNEKSB7CisgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1 dGVzIGF0dHI7CisgICAgICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQzRD4gY29udGV4dCA9IEdy YXBoaWNzQ29udGV4dDNEOjpjcmVhdGUoYXR0ciwgY2hyb21lKCkpOworICAgICAgICBpZiAoIWNv bnRleHQpCisgICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgbV9zaGFyZWRHcmFwaGljc0Nv bnRleHQzRCA9IFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGUoY29udGV4dC5yZWxlYXNl KCkpOworICAgIH0KKworICAgIHJldHVybiBtX3NoYXJlZEdyYXBoaWNzQ29udGV4dDNELmdldCgp OworI2Vsc2UKKyAgICByZXR1cm4gMDsKKyNlbmRpZgorfQorCiAjaWYgRU5BQkxFKERPTV9TVE9S QUdFKQogU3RvcmFnZU5hbWVzcGFjZSogUGFnZTo6c2Vzc2lvblN0b3JhZ2UoYm9vbCBvcHRpb25h bENyZWF0ZSkKIHsKSW5kZXg6IFdlYkNvcmUvcGFnZS9QYWdlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gNjkwMjIpCisrKyBXZWJDb3JlL3BhZ2UvUGFnZS5o CSh3b3JraW5nIGNvcHkpCkBAIC03Myw2ICs3Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICBjbGFzcyBWaXNpYmxlU2VsZWN0aW9uOwogICAgIGNsYXNzIFNlbGVjdGlvbkNvbnRyb2xsZXI7 CiAgICAgY2xhc3MgU2V0dGluZ3M7CisgICAgY2xhc3MgU2hhcmVkR3JhcGhpY3NDb250ZXh0M0Q7 CiAgICAgY2xhc3MgU3BlZWNoSW5wdXQ7CiAgICAgY2xhc3MgU3BlZWNoSW5wdXRDbGllbnQ7CiAK QEAgLTI2Myw2ICsyNjQsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyB2 b2lkIGFsbFZpc2l0ZWRTdGF0ZUNoYW5nZWQoUGFnZUdyb3VwKik7CiAgICAgICAgIHN0YXRpYyB2 b2lkIHZpc2l0ZWRTdGF0ZUNoYW5nZWQoUGFnZUdyb3VwKiwgTGlua0hhc2ggdmlzaXRlZEhhc2gp OwogCisgICAgICAgIFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKiBzaGFyZWRHcmFwaGljc0NvbnRl eHQzRCgpOworCiAjaWYgRU5BQkxFKERPTV9TVE9SQUdFKQogICAgICAgICBTdG9yYWdlTmFtZXNw YWNlKiBzZXNzaW9uU3RvcmFnZShib29sIG9wdGlvbmFsQ3JlYXRlID0gdHJ1ZSk7CiAgICAgICAg IHZvaWQgc2V0U2Vzc2lvblN0b3JhZ2UoUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPik7CkBA IC0zMDgsNiArMzExLDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBPd25QdHI8 Q2hyb21lPiBtX2Nocm9tZTsKICAgICAgICAgT3duUHRyPFNlbGVjdGlvbkNvbnRyb2xsZXI+IG1f ZHJhZ0NhcmV0Q29udHJvbGxlcjsKKworI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMp CisgICAgICAgIFJlZlB0cjxTaGFyZWRHcmFwaGljc0NvbnRleHQzRD4gbV9zaGFyZWRHcmFwaGlj c0NvbnRleHQzRDsKKyNlbmRpZgorICAgICAgICAKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQog ICAgICAgICBPd25QdHI8RHJhZ0NvbnRyb2xsZXI+IG1fZHJhZ0NvbnRyb2xsZXI7CiAjZW5kaWYK SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjkwMzcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDQgIENocmlz IE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QgZnJvbSBD aHJvbWVDbGllbnQgdG8gUGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDcxMTMKKworICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoK KyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1w bC5oOgorCiAyMDEwLTEwLTAxICBWaWN0b3JpYSBLaXJzdCAgPHZya0Bnb29nbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpJbmRleDogV2ViS2l0L2Nocm9taXVt L3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v c3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA2OTAyMikKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDcgKzU4 LDYgQEAKICNpbmNsdWRlICJTY3JpcHRDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiU2VhcmNoUG9w dXBNZW51Q2hyb21pdW0uaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgotI2luY2x1ZGUg IlNoYXJlZEdyYXBoaWNzQ29udGV4dDNELmgiCiAjaWYgVVNFKFY4KQogI2luY2x1ZGUgIlY4UHJv eHkuaCIKICNlbmRpZgpAQCAtODA1LDExICs4MDQsNiBAQCBib29sIENocm9tZUNsaWVudEltcGw6 OmFsbG93c0FjY2VsZXJhdGVkCiB9CiAjZW5kaWYKIAotV2ViQ29yZTo6U2hhcmVkR3JhcGhpY3ND b250ZXh0M0QqIENocm9tZUNsaWVudEltcGw6OmdldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKCkK LXsKLSAgICByZXR1cm4gbV93ZWJWaWV3LT5nZXRTaGFyZWRHcmFwaGljc0NvbnRleHQzRCgpOwot fQotCiBib29sIENocm9tZUNsaWVudEltcGw6OnN1cHBvcnRzRnVsbHNjcmVlbkZvck5vZGUoY29u c3QgV2ViQ29yZTo6Tm9kZSogbm9kZSkKIHsKICAgICBpZiAobV93ZWJWaWV3LT5jbGllbnQoKSAm JiBub2RlLT5oYXNUYWdOYW1lKFdlYkNvcmU6OkhUTUxOYW1lczo6dmlkZW9UYWcpKQpJbmRleDog V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJldmlzaW9uIDY5MDIyKQorKysgV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMCwxMCAr MTMwLDYgQEAKICNpbmNsdWRlICJSZW5kZXJUaGVtZS5oIgogI2VuZGlmCiAKLSNpZiBFTkFCTEUo QUNDRUxFUkFURURfMkRfQ0FOVkFTKQotI2luY2x1ZGUgIlNoYXJlZEdyYXBoaWNzQ29udGV4dDNE LmgiCi0jZW5kaWYKLQogLy8gR2V0IHJpZCBvZiBXVEYncyBwb3cgZGVmaW5lIHNvIHdlIGNhbiB1 c2Ugc3RkOjpwb3cuCiAjdW5kZWYgcG93CiAjaW5jbHVkZSA8Y21hdGg+IC8vIGZvciBzdGQ6OnBv dwpAQCAtMjQ1MiwyMyArMjQ0OCw2IEBAIHZvaWQgV2ViVmlld0ltcGw6OmRvQ29tcG9zaXRlKCkK ICNlbmRpZgogCiAKLVNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKiBXZWJWaWV3SW1wbDo6Z2V0U2hh cmVkR3JhcGhpY3NDb250ZXh0M0QoKQotewotI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5W QVMpCi0gICAgaWYgKCFtX3NoYXJlZENvbnRleHQzRCkgewotICAgICAgICBHcmFwaGljc0NvbnRl eHQzRDo6QXR0cmlidXRlcyBhdHRyOwotICAgICAgICBPd25QdHI8R3JhcGhpY3NDb250ZXh0M0Q+ IGNvbnRleHQgPSBHcmFwaGljc0NvbnRleHQzRDo6Y3JlYXRlKGF0dHIsIG1fcGFnZS0+Y2hyb21l KCkpOwotICAgICAgICBpZiAoIWNvbnRleHQpCi0gICAgICAgICAgICByZXR1cm4gMDsKLSAgICAg ICAgbV9zaGFyZWRDb250ZXh0M0QgPSBTaGFyZWRHcmFwaGljc0NvbnRleHQzRDo6Y3JlYXRlKGNv bnRleHQucmVsZWFzZSgpKTsKLSAgICB9Ci0KLSAgICByZXR1cm4gbV9zaGFyZWRDb250ZXh0M0Qu Z2V0KCk7Ci0jZWxzZQotICAgIHJldHVybiAwOwotI2VuZGlmCi19Ci0KIFdlYkdyYXBoaWNzQ29u dGV4dDNEKiBXZWJWaWV3SW1wbDo6Z3JhcGhpY3NDb250ZXh0M0QoKQogewogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgJKHJl dmlzaW9uIDY5MDIyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNDAsOCArMzQwLDYgQEAgcHVibGljOgogICAgIC8vIFdlYkdMLiBSZXR1 cm5zIDAgaWYgY29tcG9zaXRpbmcgc3VwcG9ydCBpcyBub3QgY29tcGlsZWQgaW4uCiAgICAgdmly dHVhbCBXZWJHcmFwaGljc0NvbnRleHQzRCogZ3JhcGhpY3NDb250ZXh0M0QoKTsKIAotICAgIHZp cnR1YWwgV2ViQ29yZTo6U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QqIGdldFNoYXJlZEdyYXBoaWNz Q29udGV4dDNEKCk7Ci0KICAgICBXZWJDb3JlOjpQb3B1cENvbnRhaW5lciogc2VsZWN0UG9wdXAo KSBjb25zdCB7IHJldHVybiBtX3NlbGVjdFBvcHVwLmdldCgpOyB9CiAKICAgICAvLyBSZXR1cm5z IHRydWUgaWYgdGhlIGV2ZW50IGxlYWRzIHRvIHNjcm9sbGluZy4KQEAgLTU0NSwxMCArNTQzLDYg QEAgcHJpdmF0ZToKICAgICAvLyB0aGUgY29tcG9zaXRvciBoYXMgYmVlbiB0dXJuZWQgb24sIHdl IG5lZWQgdG8gaW5zdGFudGlhdGUgaXQKICAgICAvLyBlYXJseS4gVGhpcyBtZW1iZXIgaG9sZHMg b24gdG8gdGhlIEdDM0QgaW4gdGhpcyBjYXNlLgogICAgIE93blB0cjxXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQzRD4gbV90ZW1wb3JhcnlPbnNjcmVlbkdyYXBoaWNzQ29udGV4dDNEOwotCi0jaWYg RU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKLSAgICBSZWZQdHI8V2ViQ29yZTo6U2hhcmVk R3JhcGhpY3NDb250ZXh0M0Q+IG1fc2hhcmVkQ29udGV4dDNEOwotI2VuZGlmCiAgICAgT3duUHRy PERldmljZU9yaWVudGF0aW9uQ2xpZW50UHJveHk+IG1fZGV2aWNlT3JpZW50YXRpb25DbGllbnRQ cm94eTsKIH07CiAK 69695 2010-10-04 15:07:41 -0700 2010-10-04 17:03:41 -0700 Patch bug-47113-20101004150740.patch text/plain 9680 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTAzOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMTAtMDQgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v dmUgU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QgZnJvbSBDaHJvbWVDbGllbnQgdG8gUGFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcxMTMKKworICAg ICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OkNhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRCk6CisgICAgICAgICogcGFnZS9DaHJvbWVDbGllbnQuaDoKKyAgICAgICAgKiBwYWdlL1Bh Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2hhcmVkR3JhcGhpY3NDb250ZXh0M0Qp OgorICAgICAgICAqIHBhZ2UvUGFnZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dw dS9TaGFyZWRHcmFwaGljc0NvbnRleHQzRC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFyZWRH cmFwaGljc0NvbnRleHQzRDo6Y3JlYXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n cHUvU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuaDoKKwogMjAxMC0xMC0wNCAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCklu ZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQu Y3BwCShyZXZpc2lvbiA2OTAyMikKKysrIFdlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDcgKzEyOCw3IEBAIENhbnZh c1JlbmRlcmluZ0NvbnRleHQyRDo6Q2FudmFzUmVuZGVyaW4KICAgICAgICAgcmV0dXJuOwogICAg IGlmICghcC0+c2V0dGluZ3MoKS0+YWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoKSkKICAgICAg ICAgcmV0dXJuOwotICAgIG1fY29udGV4dDNEID0gcC0+Y2hyb21lKCktPmNsaWVudCgpLT5nZXRT aGFyZWRHcmFwaGljc0NvbnRleHQzRCgpOworICAgIG1fY29udGV4dDNEID0gcC0+c2hhcmVkR3Jh cGhpY3NDb250ZXh0M0QoKTsKICAgICBpZiAobV9jb250ZXh0M0QpIHsKICAgICAgICAgaWYgKEdy YXBoaWNzQ29udGV4dCogYyA9IGRyYXdpbmdDb250ZXh0KCkpIHsKICAgICAgICAgICAgIG1fZHJh d2luZ0J1ZmZlciA9IERyYXdpbmdCdWZmZXI6OmNyZWF0ZShtX2NvbnRleHQzRC5nZXQoKSwgSW50 U2l6ZShjYW52YXMtPndpZHRoKCksIGNhbnZhcy0+aGVpZ2h0KCkpKTsKSW5kZXg6IFdlYkNvcmUv cGFnZS9DaHJvbWVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvQ2hyb21lQ2xp ZW50LmgJKHJldmlzaW9uIDY5MDIyKQorKysgV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yMzMsOCArMjMzLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICB2aXJ0dWFsIGJvb2wgYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0IHsg cmV0dXJuIHRydWU7IH0KICNlbmRpZgogCi0gICAgICAgIHZpcnR1YWwgU2hhcmVkR3JhcGhpY3ND b250ZXh0M0QqIGdldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKCkgeyByZXR1cm4gMDsgfQotCiAg ICAgICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0Z1bGxzY3JlZW5Gb3JOb2RlKGNvbnN0IE5vZGUq KSB7IHJldHVybiBmYWxzZTsgfQogICAgICAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGdWxsc2NyZWVu Rm9yTm9kZShOb2RlKikgeyB9CiAgICAgICAgIHZpcnR1YWwgdm9pZCBleGl0RnVsbHNjcmVlbkZv ck5vZGUoTm9kZSopIHsgfQpJbmRleDogV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gNjkwMjIpCisrKyBXZWJDb3JlL3Bh Z2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0LDYgKzY0LDkgQEAKICNpbmNsdWRlICJT ZWxlY3Rpb25Db250cm9sbGVyLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJT aGFyZWRCdWZmZXIuaCIKKyNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQorI2luY2x1 ZGUgIlNoYXJlZEdyYXBoaWNzQ29udGV4dDNELmgiCisjZW5kaWYKICNpbmNsdWRlICJTcGVlY2hJ bnB1dC5oIgogI2luY2x1ZGUgIlNwZWVjaElucHV0Q2xpZW50LmgiCiAjaW5jbHVkZSAiVGV4dFJl c291cmNlRGVjb2Rlci5oIgpAQCAtNzY1LDYgKzc2OCwxOCBAQCB2b2lkIFBhZ2U6OnNldERlYnVn Z2VyKEpTQzo6RGVidWdnZXIqIGRlCiAgICAgICAgIGZyYW1lLT5zY3JpcHQoKS0+YXR0YWNoRGVi dWdnZXIobV9kZWJ1Z2dlcik7CiB9CiAKK1NoYXJlZEdyYXBoaWNzQ29udGV4dDNEKiBQYWdlOjpz aGFyZWRHcmFwaGljc0NvbnRleHQzRCgpCit7CisjaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NB TlZBUykKKyAgICBpZiAoIW1fc2hhcmVkR3JhcGhpY3NDb250ZXh0M0QpCisgICAgICAgIG1fc2hh cmVkR3JhcGhpY3NDb250ZXh0M0QgPSBTaGFyZWRHcmFwaGljc0NvbnRleHQzRDo6Y3JlYXRlKGNo cm9tZSgpKTsKKworICAgIHJldHVybiBtX3NoYXJlZEdyYXBoaWNzQ29udGV4dDNELmdldCgpOwor I2Vsc2UKKyAgICByZXR1cm4gMDsKKyNlbmRpZgorfQorCiAjaWYgRU5BQkxFKERPTV9TVE9SQUdF KQogU3RvcmFnZU5hbWVzcGFjZSogUGFnZTo6c2Vzc2lvblN0b3JhZ2UoYm9vbCBvcHRpb25hbENy ZWF0ZSkKIHsKSW5kZXg6IFdlYkNvcmUvcGFnZS9QYWdlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gNjkwMjIpCisrKyBXZWJDb3JlL3BhZ2UvUGFnZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC03Myw2ICs3Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBj bGFzcyBWaXNpYmxlU2VsZWN0aW9uOwogICAgIGNsYXNzIFNlbGVjdGlvbkNvbnRyb2xsZXI7CiAg ICAgY2xhc3MgU2V0dGluZ3M7CisgICAgY2xhc3MgU2hhcmVkR3JhcGhpY3NDb250ZXh0M0Q7CiAg ICAgY2xhc3MgU3BlZWNoSW5wdXQ7CiAgICAgY2xhc3MgU3BlZWNoSW5wdXRDbGllbnQ7CiAKQEAg LTI2Myw2ICsyNjQsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyB2b2lk IGFsbFZpc2l0ZWRTdGF0ZUNoYW5nZWQoUGFnZUdyb3VwKik7CiAgICAgICAgIHN0YXRpYyB2b2lk IHZpc2l0ZWRTdGF0ZUNoYW5nZWQoUGFnZUdyb3VwKiwgTGlua0hhc2ggdmlzaXRlZEhhc2gpOwog CisgICAgICAgIFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKiBzaGFyZWRHcmFwaGljc0NvbnRleHQz RCgpOworCiAjaWYgRU5BQkxFKERPTV9TVE9SQUdFKQogICAgICAgICBTdG9yYWdlTmFtZXNwYWNl KiBzZXNzaW9uU3RvcmFnZShib29sIG9wdGlvbmFsQ3JlYXRlID0gdHJ1ZSk7CiAgICAgICAgIHZv aWQgc2V0U2Vzc2lvblN0b3JhZ2UoUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPik7CkBAIC0z MDgsNiArMzExLDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBPd25QdHI8Q2hy b21lPiBtX2Nocm9tZTsKICAgICAgICAgT3duUHRyPFNlbGVjdGlvbkNvbnRyb2xsZXI+IG1fZHJh Z0NhcmV0Q29udHJvbGxlcjsKKworI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCisg ICAgICAgIFJlZlB0cjxTaGFyZWRHcmFwaGljc0NvbnRleHQzRD4gbV9zaGFyZWRHcmFwaGljc0Nv bnRleHQzRDsKKyNlbmRpZgorICAgICAgICAKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAg ICAgICBPd25QdHI8RHJhZ0NvbnRyb2xsZXI+IG1fZHJhZ0NvbnRyb2xsZXI7CiAjZW5kaWYKSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L1NoYXJlZEdyYXBoaWNzQ29udGV4dDNE LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9TaGFyZWRH cmFwaGljc0NvbnRleHQzRC5jcHAJKHJldmlzaW9uIDY5MDIyKQorKysgV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ncHUvU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC00OSw5ICs0OSwxMyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAvLyBzdGF0aWMKLVBh c3NSZWZQdHI8U2hhcmVkR3JhcGhpY3NDb250ZXh0M0Q+IFNoYXJlZEdyYXBoaWNzQ29udGV4dDNE OjpjcmVhdGUoUGFzc093blB0cjxHcmFwaGljc0NvbnRleHQzRD4gY29udGV4dCkKK1Bhc3NSZWZQ dHI8U2hhcmVkR3JhcGhpY3NDb250ZXh0M0Q+IFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEOjpjcmVh dGUoSG9zdFdpbmRvdyogaG9zdFdpbmRvdykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNo YXJlZEdyYXBoaWNzQ29udGV4dDNEKGNvbnRleHQpKTsKKyAgICBHcmFwaGljc0NvbnRleHQzRDo6 QXR0cmlidXRlcyBhdHRyOworICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQzRD4gY29udGV4dCA9 IEdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGUoYXR0ciwgaG9zdFdpbmRvdyk7CisgICAgaWYgKCFj b250ZXh0KQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNoYXJl ZEdyYXBoaWNzQ29udGV4dDNEKGNvbnRleHQuZ2V0KCkpKTsKIH0KIAogU2hhcmVkR3JhcGhpY3ND b250ZXh0M0Q6OlNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKFBhc3NPd25QdHI8R3JhcGhpY3NDb250 ZXh0M0Q+IGNvbnRleHQpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9TaGFy ZWRHcmFwaGljc0NvbnRleHQzRC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L1NoYXJlZEdyYXBoaWNzQ29udGV4dDNELmgJKHJldmlzaW9uIDY5MDIyKQorKysg V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuaAko d29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsNyBAQCBjbGFzcyBBZmZpbmVUcmFuc2Zvcm07CiBj bGFzcyBDb2xvcjsKIGNsYXNzIEdyYXBoaWNzQ29udGV4dDNEOwogY2xhc3MgRmxvYXRSZWN0Owor Y2xhc3MgSG9zdFdpbmRvdzsKIGNsYXNzIEludFNpemU7CiBjbGFzcyBTb2xpZEZpbGxTaGFkZXI7 CiBjbGFzcyBUZXhTaGFkZXI7CkBAIC01NSw3ICs1Niw3IEBAIHR5cGVkZWYgSGFzaE1hcDxOYXRp dmVJbWFnZVB0ciwgUmVmUHRyPFQKIAogY2xhc3MgU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QgOiBw dWJsaWMgUmVmQ291bnRlZDxTaGFyZWRHcmFwaGljc0NvbnRleHQzRD4gewogcHVibGljOgotICAg IHN0YXRpYyBQYXNzUmVmUHRyPFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEPiBjcmVhdGUoUGFzc093 blB0cjxHcmFwaGljc0NvbnRleHQzRD4pOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNoYXJlZEdy YXBoaWNzQ29udGV4dDNEPiBjcmVhdGUoSG9zdFdpbmRvdyopOwogICAgIH5TaGFyZWRHcmFwaGlj c0NvbnRleHQzRCgpOwogCiAgICAgLy8gRnVuY3Rpb25zIHRoYXQgZGVsZWdhdGUgZGlyZWN0bHkg dG8gR3JhcGhpY3NDb250ZXh0M0QsIHdpdGggY2FjaGluZwpJbmRleDogV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZp c2lvbiA2OTAzOCkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNCBAQAorMjAxMC0xMC0wNCAgQ2hyaXMgTWFycmluICA8Y21hcnJpbkBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TW92ZSBTaGFyZWRHcmFwaGljc0NvbnRleHQzRCBmcm9tIENocm9tZUNsaWVudCB0byBQYWdlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzExMworCisg ICAgICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAqIHNyYy9XZWJWaWV3 SW1wbC5jcHA6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTAtMTAtMDEgIFZp Y3RvcmlhIEtpcnN0ICA8dnJrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmFt ZXMgUm9iaW5zb24uCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5j cHAJKHJldmlzaW9uIDY5MDIyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJ bXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsNyArNTgsNiBAQAogI2luY2x1ZGUgIlNjcmlw dENvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJTZWFyY2hQb3B1cE1lbnVDaHJvbWl1bS5oIgogI2lu Y2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCi0jaW5jbHVkZSAiU2hhcmVkR3JhcGhpY3NDb250ZXh0 M0QuaCIKICNpZiBVU0UoVjgpCiAjaW5jbHVkZSAiVjhQcm94eS5oIgogI2VuZGlmCkBAIC04MDUs MTEgKzgwNCw2IEBAIGJvb2wgQ2hyb21lQ2xpZW50SW1wbDo6YWxsb3dzQWNjZWxlcmF0ZWQKIH0K ICNlbmRpZgogCi1XZWJDb3JlOjpTaGFyZWRHcmFwaGljc0NvbnRleHQzRCogQ2hyb21lQ2xpZW50 SW1wbDo6Z2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QoKQotewotICAgIHJldHVybiBtX3dlYlZp ZXctPmdldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKCk7Ci19Ci0KIGJvb2wgQ2hyb21lQ2xpZW50 SW1wbDo6c3VwcG9ydHNGdWxsc2NyZWVuRm9yTm9kZShjb25zdCBXZWJDb3JlOjpOb2RlKiBub2Rl KQogewogICAgIGlmIChtX3dlYlZpZXctPmNsaWVudCgpICYmIG5vZGUtPmhhc1RhZ05hbWUoV2Vi Q29yZTo6SFRNTE5hbWVzOjp2aWRlb1RhZykpCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmNwcAkocmV2aXNpb24gNjkwMjIpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMwLDEwICsxMzAsNiBAQAogI2luY2x1ZGUgIlJl bmRlclRoZW1lLmgiCiAjZW5kaWYKIAotI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMp Ci0jaW5jbHVkZSAiU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuaCIKLSNlbmRpZgotCiAvLyBHZXQg cmlkIG9mIFdURidzIHBvdyBkZWZpbmUgc28gd2UgY2FuIHVzZSBzdGQ6OnBvdy4KICN1bmRlZiBw b3cKICNpbmNsdWRlIDxjbWF0aD4gLy8gZm9yIHN0ZDo6cG93CkBAIC0yNDUyLDIzICsyNDQ4LDYg QEAgdm9pZCBXZWJWaWV3SW1wbDo6ZG9Db21wb3NpdGUoKQogI2VuZGlmCiAKIAotU2hhcmVkR3Jh cGhpY3NDb250ZXh0M0QqIFdlYlZpZXdJbXBsOjpnZXRTaGFyZWRHcmFwaGljc0NvbnRleHQzRCgp Ci17Ci0jaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKLSAgICBpZiAoIW1fc2hhcmVk Q29udGV4dDNEKSB7Ci0gICAgICAgIEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzIGF0dHI7 Ci0gICAgICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQzRD4gY29udGV4dCA9IEdyYXBoaWNzQ29u dGV4dDNEOjpjcmVhdGUoYXR0ciwgbV9wYWdlLT5jaHJvbWUoKSk7Ci0gICAgICAgIGlmICghY29u dGV4dCkKLSAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICBtX3NoYXJlZENvbnRleHQzRCA9 IFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGUoY29udGV4dC5yZWxlYXNlKCkpOwotICAg IH0KLQotICAgIHJldHVybiBtX3NoYXJlZENvbnRleHQzRC5nZXQoKTsKLSNlbHNlCi0gICAgcmV0 dXJuIDA7Ci0jZW5kaWYKLX0KLQogV2ViR3JhcGhpY3NDb250ZXh0M0QqIFdlYlZpZXdJbXBsOjpn cmFwaGljc0NvbnRleHQzRCgpCiB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQpJ bmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAkocmV2aXNpb24gNjkwMjIpCisrKyBXZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0MCw4ICsz NDAsNiBAQCBwdWJsaWM6CiAgICAgLy8gV2ViR0wuIFJldHVybnMgMCBpZiBjb21wb3NpdGluZyBz dXBwb3J0IGlzIG5vdCBjb21waWxlZCBpbi4KICAgICB2aXJ0dWFsIFdlYkdyYXBoaWNzQ29udGV4 dDNEKiBncmFwaGljc0NvbnRleHQzRCgpOwogCi0gICAgdmlydHVhbCBXZWJDb3JlOjpTaGFyZWRH cmFwaGljc0NvbnRleHQzRCogZ2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QoKTsKLQogICAgIFdl YkNvcmU6OlBvcHVwQ29udGFpbmVyKiBzZWxlY3RQb3B1cCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vs ZWN0UG9wdXAuZ2V0KCk7IH0KIAogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgZXZlbnQgbGVh ZHMgdG8gc2Nyb2xsaW5nLgpAQCAtNTQ1LDEwICs1NDMsNiBAQCBwcml2YXRlOgogICAgIC8vIHRo ZSBjb21wb3NpdG9yIGhhcyBiZWVuIHR1cm5lZCBvbiwgd2UgbmVlZCB0byBpbnN0YW50aWF0ZSBp dAogICAgIC8vIGVhcmx5LiBUaGlzIG1lbWJlciBob2xkcyBvbiB0byB0aGUgR0MzRCBpbiB0aGlz IGNhc2UuCiAgICAgT3duUHRyPFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEPiBtX3RlbXBvcmFy eU9uc2NyZWVuR3JhcGhpY3NDb250ZXh0M0Q7Ci0KLSNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRf Q0FOVkFTKQotICAgIFJlZlB0cjxXZWJDb3JlOjpTaGFyZWRHcmFwaGljc0NvbnRleHQzRD4gbV9z aGFyZWRDb250ZXh0M0Q7Ci0jZW5kaWYKICAgICBPd25QdHI8RGV2aWNlT3JpZW50YXRpb25DbGll bnRQcm94eT4gbV9kZXZpY2VPcmllbnRhdGlvbkNsaWVudFByb3h5OwogfTsKIAo=