81329 2012-03-16 03:51:51 -0700 Fallback to common script when per-script font setting is the empty string 2012-03-18 23:58:41 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 falken falken ap jshin morrita tkent webkit.review.bot oldest_to_newest 580342 0 falken 2012-03-16 03:51:51 -0700 Currently, when a per-script font setting is not set, we fall back to the default, common script font setting. For example, standardFontFamily(USCRIPT_ARABIC) will return standardFontFamily(USCRIPT_COMMON) if setStandardFontFamily("Font", USCRIPT_ARABIC) was never called. However, there is no way to unset a font setting, so once a per-script font setting is set, it can never fallback to the common script font setting. It'd be useful to allow this, so it can be possible for a user to clear their font setting for Arabic script and just use their setting for the default script. One way to do this is by treating the empty string the same as an unset setting. 580345 1 132242 falken 2012-03-16 04:00:21 -0700 Created attachment 132242 Patch 581571 2 132242 tkent 2012-03-18 19:24:27 -0700 Comment on attachment 132242 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132242&action=review > Source/WebCore/page/Settings.cpp:67 > - if (it != fontMap.end()) > + if (it != fontMap.end() && !it->second.isEmpty()) This is ok, but can we remove the map entry when an empty font family name is set? It will reduce memory usage. 581626 3 132544 falken 2012-03-18 22:07:23 -0700 Created attachment 132544 Patch 581627 4 falken 2012-03-18 22:09:20 -0700 (In reply to comment #2) > (From update of attachment 132242 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=132242&action=review > > > Source/WebCore/page/Settings.cpp:67 > > - if (it != fontMap.end()) > > + if (it != fontMap.end() && !it->second.isEmpty()) > > This is ok, but can we remove the map entry when an empty font family name is set? It will reduce memory usage. Thanks, uploaded revised patch. 581629 5 132544 tkent 2012-03-18 22:18:17 -0700 Comment on attachment 132544 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132544&action=review > Source/WebCore/page/Settings.cpp:71 > + if (family.isEmpty()) { > + if (it != fontMap.end()) { > + fontMap.remove(it); > + changed = true; > + } > + } else if (it == fontMap.end() || it->second != family) { > + fontMap.set(static_cast<int>(script), family); > + changed = true; > + } > + > + if (changed) > + page->setNeedsRecalcStyleInAllFrames(); The variable 'changed' is not needed. We prefer early-return. The code should be: if (family.isEmpty()) { if (it == fontMap.end()) return; fontMap.remove(it); } else if (it != fontMap.end() && it->second == family) return; else fontMap.set(...); page->setNeedsRecalcStyleInAllFrames(); 581630 6 132545 falken 2012-03-18 22:25:42 -0700 Created attachment 132545 Patch 581632 7 132545 tkent 2012-03-18 22:39:08 -0700 Comment on attachment 132545 Patch ok 581653 8 132545 webkit.review.bot 2012-03-18 23:58:36 -0700 Comment on attachment 132545 Patch Clearing flags on attachment: 132545 Committed r111157: <http://trac.webkit.org/changeset/111157> 581654 9 webkit.review.bot 2012-03-18 23:58:41 -0700 All reviewed patches have been landed. Closing bug. 132242 2012-03-16 04:00:21 -0700 2012-03-18 22:07:16 -0700 Patch bug-81329-20120316200020.patch text/plain 4045 falken U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwOTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmEzNDg2NDczODk5NjIw MDRkZGY0NjllMTM3Yjg5NDRlZWJiMDMwMS4uNjAwOGIwYWYxMTMzMTlmZTkzMDMyNmZhNWVmNDEw OWU4MWM2MjUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTE2ICBNYXR0 IEZhbGtlbmhhZ2VuICA8ZmFsa2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGYWxsYmFjayB0 byBjb21tb24gc2NyaXB0IHdoZW4gcGVyLXNjcmlwdCBmb250IHNldHRpbmcgaXMgdGhlIGVtcHR5 IHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODEzMjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU ZXN0czogZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvZm9udC1mYWxsYmFjay10by1jb21tb24tc2Ny aXB0LWV4cGVjdGVkLmh0bWwKKyAgICAgICAgICAgICAgIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFs L2ZvbnQtZmFsbGJhY2stdG8tY29tbW9uLXNjcmlwdC5odG1sCisKKyAgICAgICAgKiBwYWdlL1Nl dHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldEdlbmVyaWNGb250RmFtaWx5Rm9yU2Ny aXB0KToKKwogMjAxMi0wMy0xNiAgR3JlZyBCaWxsb2NrICA8Z2JpbGxvY2tAZ29vZ2xlLmNvbT4K IAogICAgICAgICBBZGQgVHJhbnNmZXJMaXN0IElETCBtb2RpZmllciwgd2l0aCBzdXBwb3J0IGlu IFY4IGNvZGUgZ2VuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAppbmRleCAzMjNiYzgzN2QyN2Rj ZGVkZjgxMDc4YmM3MDJkZjI5MDY5MzNkMzZiLi4zNGFhMjE1M2Y5ZDE0YmM2Mjk4YTFjMTAzMDZh ZDFhYzdjNGU2MDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApAQCAtNjQsNyArNjQsNyBA QCBzdGF0aWMgaW5saW5lIHZvaWQgc2V0R2VuZXJpY0ZvbnRGYW1pbHlNYXAoU2NyaXB0Rm9udEZh bWlseU1hcCYgZm9udE1hcCwgY29uc3QgQQogc3RhdGljIGlubGluZSBjb25zdCBBdG9taWNTdHJp bmcmIGdldEdlbmVyaWNGb250RmFtaWx5Rm9yU2NyaXB0KGNvbnN0IFNjcmlwdEZvbnRGYW1pbHlN YXAmIGZvbnRNYXAsIFVTY3JpcHRDb2RlIHNjcmlwdCkKIHsKICAgICBTY3JpcHRGb250RmFtaWx5 TWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IGZvbnRNYXAuZmluZChzdGF0aWNfY2FzdDxpbnQ+KHNj cmlwdCkpOwotICAgIGlmIChpdCAhPSBmb250TWFwLmVuZCgpKQorICAgIGlmIChpdCAhPSBmb250 TWFwLmVuZCgpICYmICFpdC0+c2Vjb25kLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGl0LT5z ZWNvbmQ7CiAgICAgaWYgKHNjcmlwdCAhPSBVU0NSSVBUX0NPTU1PTikKICAgICAgICAgcmV0dXJu IGdldEdlbmVyaWNGb250RmFtaWx5Rm9yU2NyaXB0KGZvbnRNYXAsIFVTQ1JJUFRfQ09NTU9OKTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlODg3OTk3NWFhYTI4MDg3YTY0YmQ3M2UzMDdkNjg5YjEyNWU2YmMyLi44OGQ3MDc5 OGZiZmQxNDExNzQxMTRjZjM3Y2EzNTQ2N2RlNjk4MTVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTItMDMtMTYgIE1hdHQgRmFsa2VuaGFnZW4gIDxmYWxrZW5AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIEZhbGxiYWNrIHRvIGNvbW1vbiBzY3JpcHQgd2hlbiBwZXItc2NyaXB0IGZvbnQgc2V0 dGluZyBpcyB0aGUgZW1wdHkgc3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MTMyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvZm9udC1mYWxsYmFjay10 by1jb21tb24tc2NyaXB0LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvdGV4 dC9pbnRlcm5hdGlvbmFsL2ZvbnQtZmFsbGJhY2stdG8tY29tbW9uLXNjcmlwdC5odG1sOiBBZGRl ZC4KKwogMjAxMi0wMy0xNiAgWGlhb21laSBKaSAgPHhqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgVXNpbmcgSUNVIGJyZWFrIGl0ZXJhdG9yIHRvIHNpbXBsaWZ5IHZpc3VhbCB3b3JkIG1vdmVt ZW50IGltcGxlbWVudGF0aW9uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2lu dGVybmF0aW9uYWwvZm9udC1mYWxsYmFjay10by1jb21tb24tc2NyaXB0LWV4cGVjdGVkLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9mb250LWZhbGxiYWNrLXRvLWNv bW1vbi1zY3JpcHQtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMmUyMWM0YjJhNTA2ZDdmNjI5 ZjgxNDQxYTcyNmNhMjE3OWE0ZDVkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC90ZXh0L2ludGVybmF0aW9uYWwvZm9udC1mYWxsYmFjay10by1jb21tb24tc2NyaXB0LWV4cGVj dGVkLmh0bWwKQEAgLTAsMCArMSw4IEBACis8aHRtbD4KKzxib2R5PgorPGRpdiBzdHlsZT0iZm9u dC1zaXplOiAyMHB4Ij4KKzxkaXYgc3R5bGU9ImZvbnQtZmFtaWx5OiAnQWhlbSciPnRoaXMgaXMg YWhlbSBmb250PC9kaXY+Cis8ZGl2IHN0eWxlPSJmb250LWZhbWlseTogJ0FoZW0nIj50aGlzIGlz IGFoZW0gZm9udDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9mb250LWZhbGxiYWNrLXRvLWNvbW1v bi1zY3JpcHQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2ZvbnQt ZmFsbGJhY2stdG8tY29tbW9uLXNjcmlwdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQxMzdhMzc4MDg5MTI2 ZGY4YzEwYTY5YjA4MDlhNzgwODYwYjcwMGIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9mb250LWZhbGxiYWNrLXRvLWNvbW1vbi1zY3JpcHQu aHRtbApAQCAtMCwwICsxLDIwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 c2NyaXB0PgoraWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNl dHRpbmdzLnNldFN0YW5kYXJkRm9udEZhbWlseSgiIiwgIkhhbnMiKTsKKyAgICB3aW5kb3cuaW50 ZXJuYWxzLnNldHRpbmdzLnNldFN0YW5kYXJkRm9udEZhbWlseSgiQWhlbSIsICJaeXl5Iik7Cisg ICAgd2luZG93LmludGVybmFscy5zZXR0aW5ncy5zZXRTYW5zU2VyaWZGb250RmFtaWx5KCJBaGVt IiwgIlp5eXkiKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8IS0tIFRlc3QgZm9y IGZvbnQgZmFsbGJhY2sgdG8gdGhlIGNvbW1vbiBzY3JpcHQgd2hlbiB0aGUgcGVyLXNjcmlwdCBm b250IHNldHRpbmcgaXMgbWlzc2luZyBvciB0aGUgZW1wdHkgc3RyaW5nLgorQnVnIDgxMzI5IDxo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODEzMjk+IC0tPgorPGRpdiBz dHlsZT0iZm9udC1zaXplOiAyMHB4Ij4KKzxkaXYgbGFuZz0iemgtQ04iPnRoaXMgaXMgYWhlbSBm b250PC9kaXY+Cis8ZGl2IGxhbmc9InpoLUNOIiBzdHlsZT0iZm9udC1mYW1pbHk6IHNhbnMtc2Vy aWY7Ij50aGlzIGlzIGFoZW0gZm9udDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 132544 2012-03-18 22:07:23 -0700 2012-03-18 22:25:36 -0700 Patch bug-81329-20120319140722.patch text/plain 4852 falken U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhkZDhjOThhNDJkYjZi Zjc5M2Q0OTgxNWIzMDMxYjE3OWY5Yjk4Mi4uNWM5MjcwNjQ1ZmI0MTk0MGRiOTc1Mzc5YmVhZTY0 MzY4N2QxZWIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAzLTE4ICBNYXR0 IEZhbGtlbmhhZ2VuICA8ZmFsa2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGYWxsYmFjayB0 byBjb21tb24gc2NyaXB0IHdoZW4gcGVyLXNjcmlwdCBmb250IHNldHRpbmcgaXMgdGhlIGVtcHR5 IHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODEzMjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU ZXN0czogZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvZm9udC1mYWxsYmFjay10by1jb21tb24tc2Ny aXB0Lmh0bWwKKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6c2V0R2VuZXJpY0ZvbnRGYW1pbHlGb3JTY3JpcHQpOiBSZW1vdmUgdGhlIHNldHRpbmcgd2hl biB0aGUgcGVyLXNjcmlwdCBmb250IGZhbWlseSBpcyB0aGUgZW1wdHkgc3RyaW5nLgorCiAyMDEy LTAzLTE4ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtj aHJvbWl1bV0gRG9uJ3Qgb2NjbHVkZSBvbiBtYWluLXRocmVhZCBiZWhpbmQgbGF5ZXJzL3N1cmZh Y2VzIHdpdGggaW1wbC10aHJlYWQgYW5pbWF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApp bmRleCAzMjNiYzgzN2QyN2RjZGVkZjgxMDc4YmM3MDJkZjI5MDY5MzNkMzZiLi4yYzBjMDU0Yzky NmE4YzBhOWQ2NTliNzFkZGMwNjU0MGNjZjllNTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNw cApAQCAtNTIsMTMgKzUyLDIzIEBAIHN0YXRpYyB2b2lkIHNldExvYWRzSW1hZ2VzQXV0b21hdGlj YWxseUluQWxsRnJhbWVzKFBhZ2UqIHBhZ2UpCiAgICAgICAgIGZyYW1lLT5kb2N1bWVudCgpLT5j YWNoZWRSZXNvdXJjZUxvYWRlcigpLT5zZXRBdXRvTG9hZEltYWdlcyhwYWdlLT5zZXR0aW5ncygp LT5sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoKSk7CiB9CiAKKy8vIFNldHMgdGhlIGVudHJ5IGlu IHRoZSBmb250IG1hcCBmb3IgdGhlIGdpdmVuIHNjcmlwdC4gSWYgZmFtaWx5IGlzIHRoZSBlbXB0 eSBzdHJpbmcsIHJlbW92ZXMgdGhlIGVudHJ5IGluc3RlYWQuCiBzdGF0aWMgaW5saW5lIHZvaWQg c2V0R2VuZXJpY0ZvbnRGYW1pbHlNYXAoU2NyaXB0Rm9udEZhbWlseU1hcCYgZm9udE1hcCwgY29u c3QgQXRvbWljU3RyaW5nJiBmYW1pbHksIFVTY3JpcHRDb2RlIHNjcmlwdCwgUGFnZSogcGFnZSkK IHsKKyAgICBib29sIGNoYW5nZWQgPSBmYWxzZTsKICAgICBTY3JpcHRGb250RmFtaWx5TWFwOjpp dGVyYXRvciBpdCA9IGZvbnRNYXAuZmluZChzdGF0aWNfY2FzdDxpbnQ+KHNjcmlwdCkpOwotICAg IGlmIChpdCAhPSBmb250TWFwLmVuZCgpICYmIGl0LT5zZWNvbmQgPT0gZmFtaWx5KQotICAgICAg ICByZXR1cm47Ci0gICAgZm9udE1hcC5zZXQoc3RhdGljX2Nhc3Q8aW50PihzY3JpcHQpLCBmYW1p bHkpOwotICAgIHBhZ2UtPnNldE5lZWRzUmVjYWxjU3R5bGVJbkFsbEZyYW1lcygpOworICAgIGlm IChmYW1pbHkuaXNFbXB0eSgpKSB7CisgICAgICAgIGlmIChpdCAhPSBmb250TWFwLmVuZCgpKSB7 CisgICAgICAgICAgICBmb250TWFwLnJlbW92ZShpdCk7CisgICAgICAgICAgICBjaGFuZ2VkID0g dHJ1ZTsKKyAgICAgICAgfQorICAgIH0gZWxzZSBpZiAoaXQgPT0gZm9udE1hcC5lbmQoKSB8fCBp dC0+c2Vjb25kICE9IGZhbWlseSkgeworICAgICAgICBmb250TWFwLnNldChzdGF0aWNfY2FzdDxp bnQ+KHNjcmlwdCksIGZhbWlseSk7CisgICAgICAgIGNoYW5nZWQgPSB0cnVlOworICAgIH0KKwor ICAgIGlmIChjaGFuZ2VkKQorICAgICAgICBwYWdlLT5zZXROZWVkc1JlY2FsY1N0eWxlSW5BbGxG cmFtZXMoKTsKIH0KIAogc3RhdGljIGlubGluZSBjb25zdCBBdG9taWNTdHJpbmcmIGdldEdlbmVy aWNGb250RmFtaWx5Rm9yU2NyaXB0KGNvbnN0IFNjcmlwdEZvbnRGYW1pbHlNYXAmIGZvbnRNYXAs IFVTY3JpcHRDb2RlIHNjcmlwdCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4OWRmY2E0MmUzYWMxYmYyMGVlNmQwNjY4NGZi OTY0MTBlMmE3NTE1Li5iMGI2MTE5NWJiZjg3OWQyMGY2ZTQ5ZTU5NjMzMzdjN2VkMjkxN2Q4IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDMtMTggIE1hdHQgRmFsa2VuaGFnZW4gIDxmYWxr ZW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZhbGxiYWNrIHRvIGNvbW1vbiBzY3JpcHQgd2hl biBwZXItc2NyaXB0IGZvbnQgc2V0dGluZyBpcyB0aGUgZW1wdHkgc3RyaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTMyOQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC90ZXh0L2ludGVybmF0 aW9uYWwvZm9udC1mYWxsYmFjay10by1jb21tb24tc2NyaXB0LWV4cGVjdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2ZvbnQtZmFsbGJhY2stdG8tY29t bW9uLXNjcmlwdC5odG1sOiBBZGRlZC4KKwogMjAxMi0wMy0xOCAgS2Vpc2hpIEhhdHRvcmkgIDxr ZWlzaGlAd2Via2l0Lm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFJlYmFzZWxpbmUgU0wgcmVz dWx0cyBmb3IgdmlkZW8tb3BhY2l0eS1vdmVybGF5Lmh0bWwgYW5kIGxvYWQtdmlkZW8taW4tcmVm bGVjdGlvbi5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRp b25hbC9mb250LWZhbGxiYWNrLXRvLWNvbW1vbi1zY3JpcHQtZXhwZWN0ZWQuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2ZvbnQtZmFsbGJhY2stdG8tY29tbW9uLXNj cmlwdC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjAyZTIxYzRiMmE1MDZkN2Y2MjlmODE0NDFh NzI2Y2EyMTc5YTRkNWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQv aW50ZXJuYXRpb25hbC9mb250LWZhbGxiYWNrLXRvLWNvbW1vbi1zY3JpcHQtZXhwZWN0ZWQuaHRt bApAQCAtMCwwICsxLDggQEAKKzxodG1sPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJmb250LXNpemU6 IDIwcHgiPgorPGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6ICdBaGVtJyI+dGhpcyBpcyBhaGVtIGZv bnQ8L2Rpdj4KKzxkaXYgc3R5bGU9ImZvbnQtZmFtaWx5OiAnQWhlbSciPnRoaXMgaXMgYWhlbSBm b250PC9kaXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2ZvbnQtZmFsbGJhY2stdG8tY29tbW9uLXNjcmlw dC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvZm9udC1mYWxsYmFj ay10by1jb21tb24tc2NyaXB0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTFhNDA2MTE5MzVjYTM1ODVmN2Iw NmM1MTNlZDU2MWY0M2MwYTY2YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv dGV4dC9pbnRlcm5hdGlvbmFsL2ZvbnQtZmFsbGJhY2stdG8tY29tbW9uLXNjcmlwdC5odG1sCkBA IC0wLDAgKzEsMjIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+ CitpZiAod2luZG93LmludGVybmFscykgeworICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Mu c2V0U3RhbmRhcmRGb250RmFtaWx5KCJUaW1lcyIsICJIYW5zIik7CisgICAgd2luZG93LmludGVy bmFscy5zZXR0aW5ncy5zZXRTdGFuZGFyZEZvbnRGYW1pbHkoIiIsICJIYW5zIik7CisgICAgd2lu ZG93LmludGVybmFscy5zZXR0aW5ncy5zZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkFoZW0iLCAiWnl5 eSIpOworCisgICAgd2luZG93LmludGVybmFscy5zZXR0aW5ncy5zZXRTYW5zU2VyaWZGb250RmFt aWx5KCJBaGVtIiwgIlp5eXkiKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8IS0t IFRlc3QgZm9yIGZvbnQgZmFsbGJhY2sgdG8gdGhlIGNvbW1vbiBzY3JpcHQgd2hlbiB0aGUgcGVy LXNjcmlwdCBmb250IHNldHRpbmcgaXMgbWlzc2luZyBvciB0aGUgZW1wdHkgc3RyaW5nLgorQnVn IDgxMzI5IDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODEzMjk+IC0t PgorPGRpdiBzdHlsZT0iZm9udC1zaXplOiAyMHB4Ij4KKzxkaXYgbGFuZz0iemgtQ04iPnRoaXMg aXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IGxhbmc9InpoLUNOIiBzdHlsZT0iZm9udC1mYW1pbHk6 IHNhbnMtc2VyaWY7Ij50aGlzIGlzIGFoZW0gZm9udDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8 L2h0bWw+Cg== 132545 2012-03-18 22:25:42 -0700 2012-03-18 23:58:36 -0700 Patch bug-81329-20120319142540.patch text/plain 4586 falken U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhkZDhjOThhNDJkYjZi Zjc5M2Q0OTgxNWIzMDMxYjE3OWY5Yjk4Mi4uNWM5MjcwNjQ1ZmI0MTk0MGRiOTc1Mzc5YmVhZTY0 MzY4N2QxZWIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAzLTE4ICBNYXR0 IEZhbGtlbmhhZ2VuICA8ZmFsa2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGYWxsYmFjayB0 byBjb21tb24gc2NyaXB0IHdoZW4gcGVyLXNjcmlwdCBmb250IHNldHRpbmcgaXMgdGhlIGVtcHR5 IHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODEzMjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU ZXN0czogZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvZm9udC1mYWxsYmFjay10by1jb21tb24tc2Ny aXB0Lmh0bWwKKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6c2V0R2VuZXJpY0ZvbnRGYW1pbHlGb3JTY3JpcHQpOiBSZW1vdmUgdGhlIHNldHRpbmcgd2hl biB0aGUgcGVyLXNjcmlwdCBmb250IGZhbWlseSBpcyB0aGUgZW1wdHkgc3RyaW5nLgorCiAyMDEy LTAzLTE4ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtj aHJvbWl1bV0gRG9uJ3Qgb2NjbHVkZSBvbiBtYWluLXRocmVhZCBiZWhpbmQgbGF5ZXJzL3N1cmZh Y2VzIHdpdGggaW1wbC10aHJlYWQgYW5pbWF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApp bmRleCAzMjNiYzgzN2QyN2RjZGVkZjgxMDc4YmM3MDJkZjI5MDY5MzNkMzZiLi42M2E0OWRkZThj ZDQ3MjQxNDc0MTNkM2RlZmM5MDEwNDA0YzQ0YmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNw cApAQCAtNTIsMTIgKzUyLDE4IEBAIHN0YXRpYyB2b2lkIHNldExvYWRzSW1hZ2VzQXV0b21hdGlj YWxseUluQWxsRnJhbWVzKFBhZ2UqIHBhZ2UpCiAgICAgICAgIGZyYW1lLT5kb2N1bWVudCgpLT5j YWNoZWRSZXNvdXJjZUxvYWRlcigpLT5zZXRBdXRvTG9hZEltYWdlcyhwYWdlLT5zZXR0aW5ncygp LT5sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoKSk7CiB9CiAKKy8vIFNldHMgdGhlIGVudHJ5IGlu IHRoZSBmb250IG1hcCBmb3IgdGhlIGdpdmVuIHNjcmlwdC4gSWYgZmFtaWx5IGlzIHRoZSBlbXB0 eSBzdHJpbmcsIHJlbW92ZXMgdGhlIGVudHJ5IGluc3RlYWQuCiBzdGF0aWMgaW5saW5lIHZvaWQg c2V0R2VuZXJpY0ZvbnRGYW1pbHlNYXAoU2NyaXB0Rm9udEZhbWlseU1hcCYgZm9udE1hcCwgY29u c3QgQXRvbWljU3RyaW5nJiBmYW1pbHksIFVTY3JpcHRDb2RlIHNjcmlwdCwgUGFnZSogcGFnZSkK IHsKICAgICBTY3JpcHRGb250RmFtaWx5TWFwOjppdGVyYXRvciBpdCA9IGZvbnRNYXAuZmluZChz dGF0aWNfY2FzdDxpbnQ+KHNjcmlwdCkpOwotICAgIGlmIChpdCAhPSBmb250TWFwLmVuZCgpICYm IGl0LT5zZWNvbmQgPT0gZmFtaWx5KQorICAgIGlmIChmYW1pbHkuaXNFbXB0eSgpKSB7CisgICAg ICAgIGlmIChpdCA9PSBmb250TWFwLmVuZCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICBmb250TWFwLnJlbW92ZShpdCk7CisgICAgfSBlbHNlIGlmIChpdCAhPSBmb250TWFwLmVuZCgp ICYmIGl0LT5zZWNvbmQgPT0gZmFtaWx5KQogICAgICAgICByZXR1cm47Ci0gICAgZm9udE1hcC5z ZXQoc3RhdGljX2Nhc3Q8aW50PihzY3JpcHQpLCBmYW1pbHkpOworICAgIGVsc2UKKyAgICAgICAg Zm9udE1hcC5zZXQoc3RhdGljX2Nhc3Q8aW50PihzY3JpcHQpLCBmYW1pbHkpOwogICAgIHBhZ2Ut PnNldE5lZWRzUmVjYWxjU3R5bGVJbkFsbEZyYW1lcygpOwogfQogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODlkZmNhNDJl M2FjMWJmMjBlZTZkMDY2ODRmYjk2NDEwZTJhNzUxNS4uYjBiNjExOTViYmY4NzlkMjBmNmU0OWU1 OTYzMzM3YzdlZDI5MTdkOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTAzLTE4ICBNYXR0 IEZhbGtlbmhhZ2VuICA8ZmFsa2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGYWxsYmFjayB0 byBjb21tb24gc2NyaXB0IHdoZW4gcGVyLXNjcmlwdCBmb250IHNldHRpbmcgaXMgdGhlIGVtcHR5 IHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODEzMjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2ZvbnQtZmFsbGJhY2stdG8tY29tbW9uLXNjcmlwdC1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC9m b250LWZhbGxiYWNrLXRvLWNvbW1vbi1zY3JpcHQuaHRtbDogQWRkZWQuCisKIDIwMTItMDMtMTgg IEtlaXNoaSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW2Nocm9taXVt XSBSZWJhc2VsaW5lIFNMIHJlc3VsdHMgZm9yIHZpZGVvLW9wYWNpdHktb3ZlcmxheS5odG1sIGFu ZCBsb2FkLXZpZGVvLWluLXJlZmxlY3Rpb24uaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvZm9udC1mYWxsYmFjay10by1jb21tb24tc2NyaXB0LWV4 cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9mb250LWZh bGxiYWNrLXRvLWNvbW1vbi1zY3JpcHQtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMmUyMWM0 YjJhNTA2ZDdmNjI5ZjgxNDQxYTcyNmNhMjE3OWE0ZDVkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvZm9udC1mYWxsYmFjay10by1jb21tb24t c2NyaXB0LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw4IEBACis8aHRtbD4KKzxib2R5PgorPGRp diBzdHlsZT0iZm9udC1zaXplOiAyMHB4Ij4KKzxkaXYgc3R5bGU9ImZvbnQtZmFtaWx5OiAnQWhl bSciPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IHN0eWxlPSJmb250LWZhbWlseTogJ0Fo ZW0nIj50aGlzIGlzIGFoZW0gZm9udDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9mb250LWZhbGxi YWNrLXRvLWNvbW1vbi1zY3JpcHQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5h dGlvbmFsL2ZvbnQtZmFsbGJhY2stdG8tY29tbW9uLXNjcmlwdC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUx YTQwNjExOTM1Y2EzNTg1ZjdiMDZjNTEzZWQ1NjFmNDNjMGE2NmIKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9mb250LWZhbGxiYWNrLXRvLWNv bW1vbi1zY3JpcHQuaHRtbApAQCAtMCwwICsxLDIyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorPGhlYWQ+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICB3aW5kb3cu aW50ZXJuYWxzLnNldHRpbmdzLnNldFN0YW5kYXJkRm9udEZhbWlseSgiVGltZXMiLCAiSGFucyIp OworICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RhbmRhcmRGb250RmFtaWx5KCIi LCAiSGFucyIpOworICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RhbmRhcmRGb250 RmFtaWx5KCJBaGVtIiwgIlp5eXkiKTsKKworICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Mu c2V0U2Fuc1NlcmlmRm9udEZhbWlseSgiQWhlbSIsICJaeXl5Iik7Cit9Cis8L3NjcmlwdD4KKzwv aGVhZD4KKzxib2R5PgorPCEtLSBUZXN0IGZvciBmb250IGZhbGxiYWNrIHRvIHRoZSBjb21tb24g c2NyaXB0IHdoZW4gdGhlIHBlci1zY3JpcHQgZm9udCBzZXR0aW5nIGlzIG1pc3Npbmcgb3IgdGhl IGVtcHR5IHN0cmluZy4KK0J1ZyA4MTMyOSA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTgxMzI5PiAtLT4KKzxkaXYgc3R5bGU9ImZvbnQtc2l6ZTogMjBweCI+Cis8ZGl2 IGxhbmc9InpoLUNOIj50aGlzIGlzIGFoZW0gZm9udDwvZGl2PgorPGRpdiBsYW5nPSJ6aC1DTiIg c3R5bGU9ImZvbnQtZmFtaWx5OiBzYW5zLXNlcmlmOyI+dGhpcyBpcyBhaGVtIGZvbnQ8L2Rpdj4K KzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=