40544 2010-06-13 04:32:20 -0700 [Chromium] Add stubs for OOP font loading to Chromium WebKit API on OSX. 2010-06-17 17:24:21 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 playmobil webkit-unassigned commit-queue fishd ojan oldest_to_newest 237541 0 playmobil 2010-06-13 04:32:20 -0700 Add stubs for OOP font loading to Chromium WebKit API on OSX 237542 1 58590 playmobil 2010-06-13 04:39:49 -0700 Created attachment 58590 patch 1 With this patch, there will be versions of WebSandboxSupport for Mac/Windows & Linux. 237953 2 58590 fishd 2010-06-14 11:46:34 -0700 Comment on attachment 58590 patch 1 WebCore/platform/chromium/ChromiumBridge.h:143 + #endif nit: please add a new line after the #endif WebKit/chromium/src/ChromiumBridge.cpp:410 + return ss ? ss->loadFont(srcFont, out) : true; why return true when there is no sandbox support? shouldn't you also do |*out = 0;| before returning? WebCore/platform/chromium/ChromiumBridge.h:50 + nit: no need for this new line here. it is nice to keep the OS(DARWIN) block as one contiguous block since it is fairly small. 238249 3 58755 playmobil 2010-06-14 23:14:56 -0700 Created attachment 58755 patch 2 As noted in the comment, loadFont() should only be called when font loading is blocked by the Sandbox. This is a distinct error from any other font loading error and thus if the function is called with the Sandbox not present, that would indicate a programming error. 239670 4 58755 commit-queue 2010-06-17 17:24:16 -0700 Comment on attachment 58755 patch 2 Clearing flags on attachment: 58755 Committed r61361: <http://trac.webkit.org/changeset/61361> 239671 5 commit-queue 2010-06-17 17:24:21 -0700 All reviewed patches have been landed. Closing bug. 58590 2010-06-13 04:39:49 -0700 2010-06-14 23:14:56 -0700 patch 1 sandbox.patch text/plain 7141 playmobil Y29tbWl0IDM0MDRhMjQ5MDMyOTA2ZDU3YWJjMjhkNjRhYmRiNDA2ZTY5OGQyYjkKQXV0aG9yOiBK ZXJlbXkgTW9za292aWNoIDxqZXJlbXlAY2hyb21pdW0ub3JnPgpEYXRlOiAgIFN1biBKdW4gMTMg MTI6MjY6MzIgMjAxMCArMDMwMAoKICAgIEFkZCBhIE1hYyB2ZXJzaW9uIG9mIFdlYlNhbmRib3hT dXBwb3J0LgoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggZTRhNGI5Mi4uMTNiMDk2NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNi0xMyAgSmVy ZW15IE1vc2tvdmljaCAgPGplcmVteUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtIEFQSV0gSW1wbGVtZW50IFdl YlNhbmRib3hTdXBwb3J0IG9uIE9TIFggYW5kIGFkZCBzdHVicyB0byBhbGxvdworICAgICAgICBP T1AgbG9hZGluZyBvZiBmb250cy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDA1NDQKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0Nocm9t aXVtQnJpZGdlLmg6IEFkZCBwcm90b3R5cGUgZm9yIGxvYWRGb250KCkKKwogMjAxMC0wNi0xMiAg QnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vQ2hyb21pdW1CcmlkZ2UuaCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1C cmlkZ2UuaAppbmRleCBmMWRjOTViLi45ZmFmYjcxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9DaHJvbWl1bUJyaWRnZS5oCkBAIC00NCw2ICs0NCwxNyBAQCB0eXBlZGVmIHN0cnVjdCBO UE9iamVjdCBOUE9iamVjdDsKIHR5cGVkZWYgc3RydWN0IF9OUFAgTlBQX3Q7CiB0eXBlZGVmIE5Q UF90KiBOUFA7CiAKKyNpZiBPUyhEQVJXSU4pCit0eXBlZGVmIHN0cnVjdCBDR0ZvbnQqIENHRm9u dFJlZjsKK3R5cGVkZWYgdWludHB0cl90IEFUU0ZvbnRDb250YWluZXJSZWY7CisKKyNpZmRlZiBf X09CSkNfXworQGNsYXNzIE5TRm9udDsKKyNlbHNlCitjbGFzcyBOU0ZvbnQ7CisjZW5kaWYKKyNl bmRpZiAvLyBPUyhEQVJXSU4pCisKICNpZiBPUyhXSU5ET1dTKQogdHlwZWRlZiBzdHJ1Y3QgSEZP TlRfXyogSEZPTlQ7CiAjZW5kaWYKQEAgLTEyNyw3ICsxMzgsOSBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIHN0YXRpYyB2b2lkIGdldFJlbmRlclN0eWxlRm9yU3RyaWtlKGNvbnN0IGNo YXIqIGZhbWlseSwgaW50IHNpemVBbmRTdHlsZSwgRm9udFJlbmRlclN0eWxlKiByZXN1bHQpOwog ICAgICAgICBzdGF0aWMgU3RyaW5nIGdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNvbnN0IFVD aGFyKiwgc2l6ZV90IG51bUNoYXJhY3RlcnMpOwogI2VuZGlmCi0KKyNpZiBPUyhEQVJXSU4pCisg ICAgICAgIHN0YXRpYyBib29sIGxvYWRGb250KE5TRm9udCogc3JjRm9udCwgQVRTRm9udENvbnRh aW5lclJlZiogb3V0KTsKKyNlbmRpZgogICAgICAgICAvLyBGb3JtcyAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgICBz dGF0aWMgdm9pZCBub3RpZnlGb3JtU3RhdGVDaGFuZ2VkKGNvbnN0IERvY3VtZW50Kik7CiAKZGlm ZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IGNjMjdkMWIuLmIwNzcwYTggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEwLTA2LTEzICBKZXJlbXkgTW9za292aWNoICA8amVyZW15QGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hyb21p dW0gQVBJXSBJbXBsZW1lbnQgV2ViU2FuZGJveFN1cHBvcnQgb24gT1MgWCBhbmQgYWRkIHN0dWJz IHRvIGFsbG93CisgICAgICAgIE9PUCBsb2FkaW5nIG9mIGZvbnRzLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDU0NAorCisgICAgICAgICogV2Vi S2l0Lmd5cDogQWRkIG1hYyBXZWJTYW5kYm94U3VwcG9ydC5oCisgICAgICAgICogcHVibGljL21h Yy9XZWJTYW5kYm94U3VwcG9ydC5oOiBBZGRlZC4KKyAgICAgICAgKiBzcmMvQ2hyb21pdW1Ccmlk Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21pdW1CcmlkZ2U6OmxvYWRGb250KToKKwog MjAxMC0wNi0xMSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQu Z3lwIGIvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5kZXggODNhZTYzMS4uNjE2NDZiYSAx MDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKKysrIGIvV2ViS2l0L2Nocm9t aXVtL1dlYktpdC5neXAKQEAgLTc3LDYgKzc3LDcgQEAKICAgICAgICAgICAgICAgICAncHVibGlj L2xpbnV4L1dlYlJlbmRlclRoZW1lLmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMveDExL1dl YlNjcmVlbkluZm9GYWN0b3J5LmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvbWFjL1dlYklu cHV0RXZlbnRGYWN0b3J5LmgnLAorICAgICAgICAgICAgICAgICdwdWJsaWMvbWFjL1dlYlNhbmRi b3hTdXBwb3J0LmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvbWFjL1dlYlNjcmVlbkluZm9G YWN0b3J5LmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViQWNjZXNzaWJpbGl0eUNhY2hl LmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5oJywK ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbWFjL1dlYlNhbmRib3hTdXBwb3J0 LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL21hYy9XZWJTYW5kYm94U3VwcG9ydC5oCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU3ZDQ4YWEKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJLaXQvY2hyb21pdW0vcHVibGljL21hYy9XZWJTYW5kYm94U3VwcG9ydC5oCkBAIC0wLDAg KzEsNjMgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoK KyAqCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4g dGhlIGFib3ZlIGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgor ICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBH b29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1 c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMg c29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5E IENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdB UlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNV TEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklH SFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElO RElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5U SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNU UklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K KyAqLworCisjaWZuZGVmIFdlYlNhbmRib3hTdXBwb3J0X2gKKyNkZWZpbmUgV2ViU2FuZGJveFN1 cHBvcnRfaAorCit0eXBlZGVmIHVpbnRwdHJfdCBBVFNGb250Q29udGFpbmVyUmVmOworCisjaWZk ZWYgX19PQkpDX18KK0BjbGFzcyBOU0ZvbnQ7CisjZWxzZQorY2xhc3MgTlNGb250OworI2VuZGlm CisKK25hbWVzcGFjZSBXZWJLaXQgeworCisvLyBQdXQgbWV0aG9kcyBoZXJlIHRoYXQgYXJlIHJl cXVpcmVkIGR1ZSB0byBzYW5kYm94IHJlc3RyaWN0aW9ucy4KK2NsYXNzIFdlYlNhbmRib3hTdXBw b3J0IHsKK3B1YmxpYzoKKyAgICAvLyBHaXZlbiBhbiBpbnB1dCBmb250IC0gfHNyY0ZvbnR8IFt3 aGljaCBjYW4ndCBiZSBsb2FkZWQgZHVlIHRvIHNhbmRib3gKKyAgICAvLyByZXN0cmljdGlvbnNd LiAgUmV0dXJuIGEgZm9udCBjb250YWluZXIgYmVsb25naW5nIHRvIGFuIGVxdWl2YWxlbnQKKyAg ICAvLyBmb250IGZpbGUgdGhhdCBjYW4gYmUgdXNlZCB0byBhY2Nlc3MgdGhlIGZvbnQuCisgICAg Ly8KKyAgICAvLyBOb3RlIHRoYXQgYSBmb250IGNvbnRhaW5lciBtYXkgY29udGFpbiBtdWx0aXBs ZSBmb250cywgdGhlIGNhbGxlciBpcworICAgIC8vIHJlc3BvbnNpYmxlIGZvciByZXRyZWl2aW5n IHRoZSBhcHByb3ByaWF0ZSBmb250IGZyb20gdGhlIGNvbnRhaW5lci4KKyAgICAvLworICAgIC8v IElmIHRoaXMgZnVuY3Rpb24gc3VjY2VlZHMsIHRoZSBjYWxsZXIgYXNzdW1lcyBvd25lcnNoaXAg b2YgdGhlIHxvdXR8CisgICAgLy8gcGFyYW1ldGVyIGFuZCBtdXN0IGNhbGwgQVRTRm9udERlYWN0 aXZhdGUoKSB0byB1bmxvYWQgaXQgd2hlbiBkb25lLgorICAgIC8vCisgICAgLy8gUmV0dXJuczog dHJ1ZSBvbiBzdWNjZXNzLCBmYWxzZSBvbiBlcnJvci4KKyAgICB2aXJ0dWFsIGJvb2wgbG9hZEZv bnQoTlNGb250KiBzcmNGb250LCBBVFNGb250Q29udGFpbmVyUmVmKiBvdXQpID0gMDsKK307CisK K30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5kaWYKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJv bWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1 bUJyaWRnZS5jcHAKaW5kZXggM2I4ZTVmYS4uNGNhN2RlMiAxMDA2NDQKLS0tIGEvV2ViS2l0L2No cm9taXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9D aHJvbWl1bUJyaWRnZS5jcHAKQEAgLTQ5LDYgKzQ5LDcgQEAKICNpbmNsdWRlICJXZWJNaW1lUmVn aXN0cnkuaCIKICNpbmNsdWRlICJXZWJQbHVnaW5Db250YWluZXJJbXBsLmgiCiAjaW5jbHVkZSAi V2ViUGx1Z2luTGlzdEJ1aWxkZXJJbXBsLmgiCisjaW5jbHVkZSAiV2ViU2FuZGJveFN1cHBvcnQu aCIKICNpbmNsdWRlICJXZWJTY3JlZW5JbmZvLmgiCiAjaW5jbHVkZSAiV2ViU3RyaW5nLmgiCiAj aW5jbHVkZSAiV2ViVVJMLmgiCkBAIC01OSwxMiArNjAsMTAgQEAKIAogI2lmIE9TKFdJTkRPV1Mp CiAjaW5jbHVkZSAiV2ViUmVjdC5oIgotI2luY2x1ZGUgIldlYlNhbmRib3hTdXBwb3J0LmgiCiAj aW5jbHVkZSAiV2ViVGhlbWVFbmdpbmUuaCIKICNlbmRpZgogCiAjaWYgT1MoTElOVVgpCi0jaW5j bHVkZSAiV2ViU2FuZGJveFN1cHBvcnQuaCIKICNpbmNsdWRlICJXZWJGb250SW5mby5oIgogI2lu Y2x1ZGUgIldlYkZvbnRSZW5kZXJTdHlsZS5oIgogI2VuZGlmCkBAIC00MDQsNiArNDAzLDE0IEBA IHZvaWQgQ2hyb21pdW1CcmlkZ2U6OmdldFJlbmRlclN0eWxlRm9yU3RyaWtlKGNvbnN0IGNoYXIq IGZvbnQsIGludCBzaXplQW5kU3R5bGUsCiB9CiAjZW5kaWYKIAorI2lmIE9TKERBUldJTikKK2Jv b2wgQ2hyb21pdW1CcmlkZ2U6OmxvYWRGb250KE5TRm9udCogc3JjRm9udCwgQVRTRm9udENvbnRh aW5lclJlZiogb3V0KQoreworICAgIFdlYlNhbmRib3hTdXBwb3J0KiBzcyA9IHdlYktpdENsaWVu dCgpLT5zYW5kYm94U3VwcG9ydCgpOworICAgIHJldHVybiBzcyA/IHNzLT5sb2FkRm9udChzcmNG b250LCBvdXQpIDogdHJ1ZTsKK30KKyNlbmRpZgorCiAvLyBHZW9sb2NhdGlvbiAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAK IEdlb2xvY2F0aW9uU2VydmljZUJyaWRnZSogQ2hyb21pdW1CcmlkZ2U6OmNyZWF0ZUdlb2xvY2F0 aW9uU2VydmljZUJyaWRnZShHZW9sb2NhdGlvblNlcnZpY2VDaHJvbWl1bSogZ2VvbG9jYXRpb25T ZXJ2aWNlQ2hyb21pdW0pCg== 58755 2010-06-14 23:14:56 -0700 2010-06-17 17:24:16 -0700 patch 2 sandbox.patch text/plain 7409 playmobil Y29tbWl0IDE2Mjk3MjYzZDc0MDRkNjM4ZWQyZTM0NWQ1NDM4NDU5MWM4ZWJiNWYKQXV0aG9yOiBK ZXJlbXkgTW9za292aWNoIDxqZXJlbXlAY2hyb21pdW0ub3JnPgpEYXRlOiAgIFN1biBKdW4gMTMg MTI6MjY6MzIgMjAxMCArMDMwMAoKICAgIEFkZCBhIE1hYyB2ZXJzaW9uIG9mIFdlYlNhbmRib3hT dXBwb3J0LgoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggZTRhNGI5Mi4uMTNiMDk2NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNi0xMyAgSmVy ZW15IE1vc2tvdmljaCAgPGplcmVteUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtIEFQSV0gSW1wbGVtZW50IFdl YlNhbmRib3hTdXBwb3J0IG9uIE9TIFggYW5kIGFkZCBzdHVicyB0byBhbGxvdworICAgICAgICBP T1AgbG9hZGluZyBvZiBmb250cy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDA1NDQKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0Nocm9t aXVtQnJpZGdlLmg6IEFkZCBwcm90b3R5cGUgZm9yIGxvYWRGb250KCkKKwogMjAxMC0wNi0xMiAg QnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vQ2hyb21pdW1CcmlkZ2UuaCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1C cmlkZ2UuaAppbmRleCBmMWRjOTViLi4zZTk0MDZkIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9DaHJvbWl1bUJyaWRnZS5oCkBAIC00NCw2ICs0NCwxNiBAQCB0eXBlZGVmIHN0cnVjdCBO UE9iamVjdCBOUE9iamVjdDsKIHR5cGVkZWYgc3RydWN0IF9OUFAgTlBQX3Q7CiB0eXBlZGVmIE5Q UF90KiBOUFA7CiAKKyNpZiBPUyhEQVJXSU4pCit0eXBlZGVmIHN0cnVjdCBDR0ZvbnQqIENHRm9u dFJlZjsKK3R5cGVkZWYgdWludHB0cl90IEFUU0ZvbnRDb250YWluZXJSZWY7CisjaWZkZWYgX19P QkpDX18KK0BjbGFzcyBOU0ZvbnQ7CisjZWxzZQorY2xhc3MgTlNGb250OworI2VuZGlmCisjZW5k aWYgLy8gT1MoREFSV0lOKQorCiAjaWYgT1MoV0lORE9XUykKIHR5cGVkZWYgc3RydWN0IEhGT05U X18qIEhGT05UOwogI2VuZGlmCkBAIC0xMjcsNiArMTM3LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICBzdGF0aWMgdm9pZCBnZXRSZW5kZXJTdHlsZUZvclN0cmlrZShjb25zdCBjaGFy KiBmYW1pbHksIGludCBzaXplQW5kU3R5bGUsIEZvbnRSZW5kZXJTdHlsZSogcmVzdWx0KTsKICAg ICAgICAgc3RhdGljIFN0cmluZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hh ciosIHNpemVfdCBudW1DaGFyYWN0ZXJzKTsKICNlbmRpZgorI2lmIE9TKERBUldJTikKKyAgICAg ICAgc3RhdGljIGJvb2wgbG9hZEZvbnQoTlNGb250KiBzcmNGb250LCBBVFNGb250Q29udGFpbmVy UmVmKiBvdXQpOworI2VuZGlmCiAKICAgICAgICAgLy8gRm9ybXMgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgICAgc3Rh dGljIHZvaWQgbm90aWZ5Rm9ybVN0YXRlQ2hhbmdlZChjb25zdCBEb2N1bWVudCopOwpkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKaW5kZXggY2MyN2QxYi4uYjA3NzBhOCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDYtMTMgIEplcmVteSBNb3Nrb3ZpY2ggIDxqZXJlbXlAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bSBB UEldIEltcGxlbWVudCBXZWJTYW5kYm94U3VwcG9ydCBvbiBPUyBYIGFuZCBhZGQgc3R1YnMgdG8g YWxsb3cKKyAgICAgICAgT09QIGxvYWRpbmcgb2YgZm9udHMuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNTQ0CisKKyAgICAgICAgKiBXZWJLaXQu Z3lwOiBBZGQgbWFjIFdlYlNhbmRib3hTdXBwb3J0LmgKKyAgICAgICAgKiBwdWJsaWMvbWFjL1dl YlNhbmRib3hTdXBwb3J0Lmg6IEFkZGVkLgorICAgICAgICAqIHNyYy9DaHJvbWl1bUJyaWRnZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1bUJyaWRnZTo6bG9hZEZvbnQpOgorCiAyMDEw LTA2LTExICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAg Yi9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAppbmRleCA4M2FlNjMxLi42MTY0NmJhIDEwMDY0 NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9XZWJLaXQvY2hyb21pdW0v V2ViS2l0Lmd5cApAQCAtNzcsNiArNzcsNyBAQAogICAgICAgICAgICAgICAgICdwdWJsaWMvbGlu dXgvV2ViUmVuZGVyVGhlbWUuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy94MTEvV2ViU2Ny ZWVuSW5mb0ZhY3RvcnkuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9tYWMvV2ViSW5wdXRF dmVudEZhY3RvcnkuaCcsCisgICAgICAgICAgICAgICAgJ3B1YmxpYy9tYWMvV2ViU2FuZGJveFN1 cHBvcnQuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9tYWMvV2ViU2NyZWVuSW5mb0ZhY3Rv cnkuaCcsCiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJBY2Nlc3NpYmlsaXR5Q2FjaGUuaCcs CiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0LmgnLApkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9tYWMvV2ViU2FuZGJveFN1cHBvcnQuaCBi L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbWFjL1dlYlNhbmRib3hTdXBwb3J0LmgKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTdkNDhhYQotLS0gL2Rldi9udWxsCisrKyBiL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvbWFjL1dlYlNhbmRib3hTdXBwb3J0LmgKQEAgLTAsMCArMSw2 MyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICoK KyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBp biB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlCisgKiBkaXN0cmlidXRpb24uCisgKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2ds ZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisgKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQg dG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorICogdGhpcyBzb2Z0 d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqCisgKiBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09O VFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJQ1VMQVIg UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAor ICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJF Q1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwg REFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyAqIERBVEEsIE9S IFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9O IEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNU IExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICov CisKKyNpZm5kZWYgV2ViU2FuZGJveFN1cHBvcnRfaAorI2RlZmluZSBXZWJTYW5kYm94U3VwcG9y dF9oCisKK3R5cGVkZWYgdWludHB0cl90IEFUU0ZvbnRDb250YWluZXJSZWY7CisKKyNpZmRlZiBf X09CSkNfXworQGNsYXNzIE5TRm9udDsKKyNlbHNlCitjbGFzcyBOU0ZvbnQ7CisjZW5kaWYKKwor bmFtZXNwYWNlIFdlYktpdCB7CisKKy8vIFB1dCBtZXRob2RzIGhlcmUgdGhhdCBhcmUgcmVxdWly ZWQgZHVlIHRvIHNhbmRib3ggcmVzdHJpY3Rpb25zLgorY2xhc3MgV2ViU2FuZGJveFN1cHBvcnQg eworcHVibGljOgorICAgIC8vIEdpdmVuIGFuIGlucHV0IGZvbnQgLSB8c3JjRm9udHwgW3doaWNo IGNhbid0IGJlIGxvYWRlZCBkdWUgdG8gc2FuZGJveAorICAgIC8vIHJlc3RyaWN0aW9uc10uICBS ZXR1cm4gYSBmb250IGNvbnRhaW5lciBiZWxvbmdpbmcgdG8gYW4gZXF1aXZhbGVudAorICAgIC8v IGZvbnQgZmlsZSB0aGF0IGNhbiBiZSB1c2VkIHRvIGFjY2VzcyB0aGUgZm9udC4KKyAgICAvLwor ICAgIC8vIE5vdGUgdGhhdCBhIGZvbnQgY29udGFpbmVyIG1heSBjb250YWluIG11bHRpcGxlIGZv bnRzLCB0aGUgY2FsbGVyIGlzCisgICAgLy8gcmVzcG9uc2libGUgZm9yIHJldHJlaXZpbmcgdGhl IGFwcHJvcHJpYXRlIGZvbnQgZnJvbSB0aGUgY29udGFpbmVyLgorICAgIC8vCisgICAgLy8gSWYg dGhpcyBmdW5jdGlvbiBzdWNjZWVkcywgdGhlIGNhbGxlciBhc3N1bWVzIG93bmVyc2hpcCBvZiB0 aGUgfG91dHwKKyAgICAvLyBwYXJhbWV0ZXIgYW5kIG11c3QgY2FsbCBBVFNGb250RGVhY3RpdmF0 ZSgpIHRvIHVubG9hZCBpdCB3aGVuIGRvbmUuCisgICAgLy8KKyAgICAvLyBSZXR1cm5zOiB0cnVl IG9uIHN1Y2Nlc3MsIGZhbHNlIG9uIGVycm9yLgorICAgIHZpcnR1YWwgYm9vbCBsb2FkRm9udChO U0ZvbnQqIHNyY0ZvbnQsIEFUU0ZvbnRDb250YWluZXJSZWYqIG91dCkgPSAwOworfTsKKworfSAv LyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVt L3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9taXVtQnJp ZGdlLmNwcAppbmRleCAzYjhlNWZhLi40OTYzZjc4IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21p dW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9t aXVtQnJpZGdlLmNwcApAQCAtNDksNiArNDksNyBAQAogI2luY2x1ZGUgIldlYk1pbWVSZWdpc3Ry eS5oIgogI2luY2x1ZGUgIldlYlBsdWdpbkNvbnRhaW5lckltcGwuaCIKICNpbmNsdWRlICJXZWJQ bHVnaW5MaXN0QnVpbGRlckltcGwuaCIKKyNpbmNsdWRlICJXZWJTYW5kYm94U3VwcG9ydC5oIgog I2luY2x1ZGUgIldlYlNjcmVlbkluZm8uaCIKICNpbmNsdWRlICJXZWJTdHJpbmcuaCIKICNpbmNs dWRlICJXZWJVUkwuaCIKQEAgLTU5LDEyICs2MCwxMCBAQAogCiAjaWYgT1MoV0lORE9XUykKICNp bmNsdWRlICJXZWJSZWN0LmgiCi0jaW5jbHVkZSAiV2ViU2FuZGJveFN1cHBvcnQuaCIKICNpbmNs dWRlICJXZWJUaGVtZUVuZ2luZS5oIgogI2VuZGlmCiAKICNpZiBPUyhMSU5VWCkKLSNpbmNsdWRl ICJXZWJTYW5kYm94U3VwcG9ydC5oIgogI2luY2x1ZGUgIldlYkZvbnRJbmZvLmgiCiAjaW5jbHVk ZSAiV2ViRm9udFJlbmRlclN0eWxlLmgiCiAjZW5kaWYKQEAgLTQwNCw2ICs0MDMsMjIgQEAgdm9p ZCBDaHJvbWl1bUJyaWRnZTo6Z2V0UmVuZGVyU3R5bGVGb3JTdHJpa2UoY29uc3QgY2hhciogZm9u dCwgaW50IHNpemVBbmRTdHlsZSwKIH0KICNlbmRpZgogCisjaWYgT1MoREFSV0lOKQorYm9vbCBD aHJvbWl1bUJyaWRnZTo6bG9hZEZvbnQoTlNGb250KiBzcmNGb250LCBBVFNGb250Q29udGFpbmVy UmVmKiBvdXQpCit7CisgICAgV2ViU2FuZGJveFN1cHBvcnQqIHNzID0gd2ViS2l0Q2xpZW50KCkt PnNhbmRib3hTdXBwb3J0KCk7CisgICAgaWYgKHNzKQorICAgICAgICByZXR1cm4gc3MtPmxvYWRG b250KHNyY0ZvbnQsIG91dCk7CisKKyAgICAvLyBUaGlzIGZ1bmN0aW9uIHNob3VsZCBvbmx5IGJl IGNhbGxlZCBpbiByZXNwb25zZSB0byBhbiBlcnJvciBsb2FkaW5nIGEKKyAgICAvLyBmb250IGR1 ZSB0byBiZWluZyBibG9ja2VkIGJ5IHRoZSBzYW5kYm94LgorICAgIC8vIFRoaXMgYnkgZGVmaW5p dGlvbiBzaG91bGRuJ3QgaGFwcGVuIGlmIHRoZXJlIGlzIG5vIHNhbmRib3ggc3VwcG9ydC4KKyAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAqb3V0ID0gMDsKKyAgICByZXR1cm4gZmFsc2U7 Cit9CisjZW5kaWYKKwogLy8gR2VvbG9jYXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBHZW9sb2NhdGlvblNlcnZp Y2VCcmlkZ2UqIENocm9taXVtQnJpZGdlOjpjcmVhdGVHZW9sb2NhdGlvblNlcnZpY2VCcmlkZ2Uo R2VvbG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0qIGdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtKQo=