80032 2012-03-01 09:28:14 -0800 [GTK] Simplify the code to adjust font sizes depending on screen DPI 2012-03-01 23:33:48 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned gustavo mrobinson pnormand webkit.review.bot oldest_to_newest 568715 0 cgarcia 2012-03-01 09:28:14 -0800 So that it can be used by both WebKit1 and WebKit2 568717 1 mrobinson 2012-03-01 09:31:06 -0800 I don't believe that WebKit2 needs to use this code. 568720 2 129715 cgarcia 2012-03-01 09:33:56 -0800 Created attachment 129715 Patch 568724 3 webkit.review.bot 2012-03-01 09:39:37 -0800 Attachment 129715 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'LayoutTests/ChangeLog', u'La..." exit_code: 1 WARNING: File exempt from style guide. Skipping: "Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h" Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp:71: Use 0 instead of NULL. [readability/null] [5] Total errors found: 1 in 193 files If any of these errors are false positives, please file a bug against check-webkit-style. 568731 4 cgarcia 2012-03-01 09:50:45 -0800 Ok, I didn't know we didn't wat to use the screen dpi in wk2, the patch still makes the wk1 code a lot simpler and cleaner IMO. 568738 5 129715 mrobinson 2012-03-01 09:57:11 -0800 Comment on attachment 129715 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129715&action=review > Source/WebCore/platform/gtk/GtkUtilities.cpp:65 > + static const double kMillimetresPerInch = 25.4; > + double diagonalSizeInPixels = hypot(gdk_screen_get_width(screen), gdk_screen_get_height(screen)); > + double diagonalSizeInInches = hypot(gdk_screen_get_width_mm(screen), gdk_screen_get_height_mm(screen)) / kMillimetresPerInch; > + return diagonalSizeInPixels / diagonalSizeInInches; I like the way you're falling back here. 568758 6 129723 cgarcia 2012-03-01 10:15:49 -0800 Created attachment 129723 Updated patch Moved the code from web core back to webkit but leaving the cleaner code. 569323 7 cgarcia 2012-03-01 23:33:48 -0800 Committed r109517: <http://trac.webkit.org/changeset/109517> 129715 2012-03-01 09:33:56 -0800 2012-03-01 10:15:49 -0800 Patch wk-screen-dpi.diff text/plain 7712 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMmEyY2ExLi4wZjRiN2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTItMDMtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIE1vdmUgdGhlIGNvZGUgdG8gZ2V0IHRoZSBzY3JlZW4gRFBJIHRv IFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgwMDMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNjcmVl bkRQSSk6IEhlbHBlciBmdW5jdGlvbiB0byBnZXQgdGhlIERQSSBvZiBhIGdpdmVuCisgICAgICAg IEdka1NjcmVlbi4gQWRkZWQgYWxzbyBmYWxsYmFjayBjb2RlIHdoZW4gZ2RrX3NjcmVlbl9yZXNv bHV0aW9uCisgICAgICAgIHJldHVybnMgLTEuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a1V0 aWxpdGllcy5oOgorCiAyMDEyLTAyLTI5ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFic3RyYWN0IG91dCB0aGUgY29t bW9uIHBhdHRlcm4gb2YgY3JlYXRpbmcgYXV0by11cGRhdGVkIGxvY2F0aW9ucy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5n ZUxvZwppbmRleCA2ZjFjNTE1Li5hYzkxOGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjAgQEAKKzIwMTItMDMtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgorCisgICAgICAgIFtHVEtdIE1vdmUgdGhlIGNvZGUgdG8gZ2V0IHRoZSBzY3JlZW4gRFBJ IHRvIFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTgwMDMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJWaWV3R2V0RFBJKTog VXNlIHNjcmVlbkRQSSgpIGZyb20gV2ViQ29yZS4KKyAgICAgICAgKHdlYlZpZXdDb252ZXJ0Rm9u dFNpemVUb1BpeGVscyk6IFRoaXNuIGlzIHRoZSBleGlzdGluZworICAgICAgICBwaXhlbHNGcm9t U2l6ZSgpLCByZW5hbWVkIGFuZCBtb3ZlZCB0byBiZSB1c2VkIGFsc28gaW4KKyAgICAgICAgd2Vi a2l0X3dlYl92aWV3X3NjcmVlbl9jaGFuZ2VkKCkuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdf c2NyZWVuX2NoYW5nZWQpOiBVc2UKKyAgICAgICAgd2ViVmlld0NvbnZlcnRGb250U2l6ZVRvUGl4 ZWxzKCkgaW5zdGVhZCBvZiBkdXBsaWNhdGluZyB0aGUgY29kZS4KKyAgICAgICAgKHdlYmtpdF93 ZWJfdmlld19zZXR0aW5nc19ub3RpZnkpOiBVc2UKKyAgICAgICAgd2ViVmlld0NvbnZlcnRGb250 U2l6ZVRvUGl4ZWxzKCkgaW5zdGVhZCBvZiBwaXhlbHNGcm9tU2l6ZSgpLgorCiAyMDEyLTAyLTI3 ICBWaW5jZW50IFVudHogIDx2dW50ekBnbm9tZS5vcmc+PiBhbmQgR3VzdGF2byBOb3JvbmhhIFNp bHZhICA8Z25zQGdub21lLm9yZz4KIAogICAgICAgICBCdWlsZCBmaXggZm9yIGJ1aWxkaW5nIHdp dGggR1RLKyAyLnguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3Rr VXRpbGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMu Y3BwCmluZGV4IGM5OGI1YmEuLjc3YjMyOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9HdGtVdGlsaXRpZXMuY3BwCkBAIC01Miw0ICs1MiwxNyBAQCBib29sIHdpZGdldElzT25z Y3JlZW5Ub3BsZXZlbFdpbmRvdyhHdGtXaWRnZXQqIHdpZGdldCkKICAgICByZXR1cm4gZ3RrX3dp ZGdldF9pc190b3BsZXZlbCh3aWRnZXQpICYmIEdUS19JU19XSU5ET1cod2lkZ2V0KSAmJiAhR1RL X0lTX09GRlNDUkVFTl9XSU5ET1cod2lkZ2V0KTsKIH0KIAorZG91YmxlIHNjcmVlbkRQSShHZGtT Y3JlZW4qIHNjcmVlbikKK3sKKyAgICAvLyBnZGtfc2NyZWVuX2dldF9yZXNvbHV0aW9uKCkgcmV0 dXJucyAtMSB3aGVuIG5vIERQSSBpcyBzZXQuCisgICAgZG91YmxlIGRwaSA9IGdka19zY3JlZW5f Z2V0X3Jlc29sdXRpb24oc2NyZWVuKTsKKyAgICBpZiAoZHBpICE9IC0xKQorICAgICAgICByZXR1 cm4gZHBpOworCisgICAgc3RhdGljIGNvbnN0IGRvdWJsZSBrTWlsbGltZXRyZXNQZXJJbmNoID0g MjUuNDsKKyAgICBkb3VibGUgZGlhZ29uYWxTaXplSW5QaXhlbHMgPSBoeXBvdChnZGtfc2NyZWVu X2dldF93aWR0aChzY3JlZW4pLCBnZGtfc2NyZWVuX2dldF9oZWlnaHQoc2NyZWVuKSk7CisgICAg ZG91YmxlIGRpYWdvbmFsU2l6ZUluSW5jaGVzID0gaHlwb3QoZ2RrX3NjcmVlbl9nZXRfd2lkdGhf bW0oc2NyZWVuKSwgZ2RrX3NjcmVlbl9nZXRfaGVpZ2h0X21tKHNjcmVlbikpIC8ga01pbGxpbWV0 cmVzUGVySW5jaDsKKyAgICByZXR1cm4gZGlhZ29uYWxTaXplSW5QaXhlbHMgLyBkaWFnb25hbFNp emVJbkluY2hlczsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5oCmluZGV4IGI5YmRkZTYuLjkzNTJmMWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKQEAgLTE5LDEyICsxOSwx NSBAQAogI2lmbmRlZiBHdGtVdGlsaXRpZXNfaCAKICNkZWZpbmUgR3RrVXRpbGl0aWVzX2ggCiAK K3R5cGVkZWYgc3RydWN0IF9HZGtTY3JlZW4gR2RrU2NyZWVuOworCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIGNsYXNzIEludFBvaW50OwogCiBJbnRQb2ludCBjb252ZXJ0V2lkZ2V0UG9pbnRUb1Nj cmVlblBvaW50KEd0a1dpZGdldCosIGNvbnN0IEludFBvaW50Jik7CiBib29sIHdpZGdldElzT25z Y3JlZW5Ub3BsZXZlbFdpbmRvdyhHdGtXaWRnZXQqKTsKK2RvdWJsZSBzY3JlZW5EUEkoR2RrU2Ny ZWVuKik7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDg5YjljMjIuLjVhZGNkM2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTE0MjMsMTIgKzE0MjMsMTIg QEAgc3RhdGljIGdkb3VibGUgd2ViVmlld0dldERQSShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQog CiAgICAgc3RhdGljIGNvbnN0IGRvdWJsZSBkZWZhdWx0RFBJID0gOTY7CiAgICAgR2RrU2NyZWVu KiBzY3JlZW4gPSBndGtfd2lkZ2V0X2hhc19zY3JlZW4oR1RLX1dJREdFVCh3ZWJWaWV3KSkgPyBn dGtfd2lkZ2V0X2dldF9zY3JlZW4oR1RLX1dJREdFVCh3ZWJWaWV3KSkgOiBnZGtfc2NyZWVuX2dl dF9kZWZhdWx0KCk7Ci0gICAgaWYgKCFzY3JlZW4pIAotICAgICAgICByZXR1cm4gZGVmYXVsdERQ STsKKyAgICByZXR1cm4gc2NyZWVuID8gc2NyZWVuRFBJKHNjcmVlbikgOiBkZWZhdWx0RFBJOwor fQogCi0gICAgLy8gZ2RrX3NjcmVlbl9nZXRfcmVzb2x1dGlvbigpIHJldHVybnMgLTEgd2hlbiBu byBEUEkgaXMgc2V0LgotICAgIGdkb3VibGUgRFBJID0gZ2RrX3NjcmVlbl9nZXRfcmVzb2x1dGlv bihzY3JlZW4pOwotICAgIHJldHVybiBEUEkgIT0gLTEgPyBEUEkgOiBkZWZhdWx0RFBJOworc3Rh dGljIGlubGluZSBnaW50IHdlYlZpZXdDb252ZXJ0Rm9udFNpemVUb1BpeGVscyhXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3LCBkb3VibGUgZm9udFNpemUpCit7CisgICAgcmV0dXJuIGZvbnRTaXplIC8g NzIuMCAqIHdlYlZpZXdHZXREUEkod2ViVmlldyk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdF93 ZWJfdmlld19zY3JlZW5fY2hhbmdlZChHdGtXaWRnZXQqIHdpZGdldCwgR2RrU2NyZWVuKiBwcmV2 aW91c1NjcmVlbikKQEAgLTE0NDEsOCArMTQ0MSw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJf dmlld19zY3JlZW5fY2hhbmdlZChHdGtXaWRnZXQqIHdpZGdldCwgR2RrU2NyZWVuKiBwcmV2aW91 CiAKICAgICBXZWJLaXRXZWJTZXR0aW5ncyogd2ViU2V0dGluZ3MgPSBwcml2LT53ZWJTZXR0aW5n cy5nZXQoKTsKICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBjb3JlKHdlYlZpZXcpLT5zZXR0aW5n cygpOwotICAgIGdkb3VibGUgRFBJID0gd2ViVmlld0dldERQSSh3ZWJWaWV3KTsKLQogICAgIGd1 aW50IGRlZmF1bHRGb250U2l6ZSwgZGVmYXVsdE1vbm9zcGFjZUZvbnRTaXplLCBtaW5pbXVtRm9u dFNpemUsIG1pbmltdW1Mb2dpY2FsRm9udFNpemU7CiAKICAgICBnX29iamVjdF9nZXQod2ViU2V0 dGluZ3MsCkBAIC0xNDUyLDEwICsxNDUwLDEwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmll d19zY3JlZW5fY2hhbmdlZChHdGtXaWRnZXQqIHdpZGdldCwgR2RrU2NyZWVuKiBwcmV2aW91CiAg ICAgICAgICAgICAgICAgICJtaW5pbXVtLWxvZ2ljYWwtZm9udC1zaXplIiwgJm1pbmltdW1Mb2dp Y2FsRm9udFNpemUsCiAgICAgICAgICAgICAgICAgIE5VTEwpOwogCi0gICAgc2V0dGluZ3MtPnNl dERlZmF1bHRGb250U2l6ZShkZWZhdWx0Rm9udFNpemUgLyA3Mi4wICogRFBJKTsKLSAgICBzZXR0 aW5ncy0+c2V0RGVmYXVsdEZpeGVkRm9udFNpemUoZGVmYXVsdE1vbm9zcGFjZUZvbnRTaXplIC8g NzIuMCAqIERQSSk7Ci0gICAgc2V0dGluZ3MtPnNldE1pbmltdW1Gb250U2l6ZShtaW5pbXVtRm9u dFNpemUgLyA3Mi4wICogRFBJKTsKLSAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250 U2l6ZShtaW5pbXVtTG9naWNhbEZvbnRTaXplIC8gNzIuMCAqIERQSSk7CisgICAgc2V0dGluZ3Mt PnNldERlZmF1bHRGb250U2l6ZSh3ZWJWaWV3Q29udmVydEZvbnRTaXplVG9QaXhlbHMod2ViVmll dywgZGVmYXVsdEZvbnRTaXplKSk7CisgICAgc2V0dGluZ3MtPnNldERlZmF1bHRGaXhlZEZvbnRT aXplKHdlYlZpZXdDb252ZXJ0Rm9udFNpemVUb1BpeGVscyh3ZWJWaWV3LCBkZWZhdWx0TW9ub3Nw YWNlRm9udFNpemUpKTsKKyAgICBzZXR0aW5ncy0+c2V0TWluaW11bUZvbnRTaXplKHdlYlZpZXdD b252ZXJ0Rm9udFNpemVUb1BpeGVscyh3ZWJWaWV3LCBtaW5pbXVtRm9udFNpemUpKTsKKyAgICBz ZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZSh3ZWJWaWV3Q29udmVydEZvbnRTaXpl VG9QaXhlbHMod2ViVmlldywgbWluaW11bUxvZ2ljYWxGb250U2l6ZSkpOwogfQogCiBzdGF0aWMg dm9pZCB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19lbmQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0RyYWdD b250ZXh0KiBjb250ZXh0KQpAQCAtMzMzNiwxMSArMzMzNCw2IEBAIHN0YXRpYyB2b2lkIHdlYmtp dF93ZWJfdmlld191cGRhdGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICB3 ZWJraXRfd2ViX3ZpZXdfc2NyZWVuX2NoYW5nZWQoR1RLX1dJREdFVCh3ZWJWaWV3KSwgTlVMTCk7 CiB9CiAKLXN0YXRpYyBpbmxpbmUgZ2ludCBwaXhlbHNGcm9tU2l6ZShXZWJLaXRXZWJWaWV3KiB3 ZWJWaWV3LCBnaW50IHNpemUpCi17Ci0gICAgcmV0dXJuIHNpemUgLyA3Mi4wICogd2ViVmlld0dl dERQSSh3ZWJWaWV3KTsKLX0KLQogc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldHRpbmdz X25vdGlmeShXZWJLaXRXZWJTZXR0aW5ncyogd2ViU2V0dGluZ3MsIEdQYXJhbVNwZWMqIHBzcGVj LCBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGNv cmUod2ViVmlldyktPnNldHRpbmdzKCk7CkBAIC0zMzY1LDEzICszMzU4LDEzIEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF93ZWJfdmlld19zZXR0aW5nc19ub3RpZnkoV2ViS2l0V2ViU2V0dGluZ3MqIHdl YlNldHRpbmdzLCBHUGFyCiAgICAgZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoInNl cmlmLWZvbnQtZmFtaWx5IikpCiAgICAgICAgIHNldHRpbmdzLT5zZXRTZXJpZkZvbnRGYW1pbHko Z192YWx1ZV9nZXRfc3RyaW5nKCZ2YWx1ZSkpOwogICAgIGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRl cm5fc3RyaW5nKCJkZWZhdWx0LWZvbnQtc2l6ZSIpKQotICAgICAgICBzZXR0aW5ncy0+c2V0RGVm YXVsdEZvbnRTaXplKHBpeGVsc0Zyb21TaXplKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2ludCgmdmFs dWUpKSk7CisgICAgICAgIHNldHRpbmdzLT5zZXREZWZhdWx0Rm9udFNpemUod2ViVmlld0NvbnZl cnRGb250U2l6ZVRvUGl4ZWxzKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2ludCgmdmFsdWUpKSk7CiAg ICAgZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoImRlZmF1bHQtbW9ub3NwYWNlLWZv bnQtc2l6ZSIpKQotICAgICAgICBzZXR0aW5ncy0+c2V0RGVmYXVsdEZpeGVkRm9udFNpemUocGl4 ZWxzRnJvbVNpemUod2ViVmlldywgZ192YWx1ZV9nZXRfaW50KCZ2YWx1ZSkpKTsKKyAgICAgICAg c2V0dGluZ3MtPnNldERlZmF1bHRGaXhlZEZvbnRTaXplKHdlYlZpZXdDb252ZXJ0Rm9udFNpemVU b1BpeGVscyh3ZWJWaWV3LCBnX3ZhbHVlX2dldF9pbnQoJnZhbHVlKSkpOwogICAgIGVsc2UgaWYg KG5hbWUgPT0gZ19pbnRlcm5fc3RyaW5nKCJtaW5pbXVtLWZvbnQtc2l6ZSIpKQotICAgICAgICBz ZXR0aW5ncy0+c2V0TWluaW11bUZvbnRTaXplKHBpeGVsc0Zyb21TaXplKHdlYlZpZXcsIGdfdmFs dWVfZ2V0X2ludCgmdmFsdWUpKSk7CisgICAgICAgIHNldHRpbmdzLT5zZXRNaW5pbXVtRm9udFNp emUod2ViVmlld0NvbnZlcnRGb250U2l6ZVRvUGl4ZWxzKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2lu dCgmdmFsdWUpKSk7CiAgICAgZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoIm1pbmlt dW0tbG9naWNhbC1mb250LXNpemUiKSkKLSAgICAgICAgc2V0dGluZ3MtPnNldE1pbmltdW1Mb2dp Y2FsRm9udFNpemUocGl4ZWxzRnJvbVNpemUod2ViVmlldywgZ192YWx1ZV9nZXRfaW50KCZ2YWx1 ZSkpKTsKKyAgICAgICAgc2V0dGluZ3MtPnNldE1pbmltdW1Mb2dpY2FsRm9udFNpemUod2ViVmll d0NvbnZlcnRGb250U2l6ZVRvUGl4ZWxzKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2ludCgmdmFsdWUp KSk7CiAgICAgZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoImVuZm9yY2UtOTYtZHBp IikpCiAgICAgICAgIHdlYmtpdF93ZWJfdmlld19zY3JlZW5fY2hhbmdlZChHVEtfV0lER0VUKHdl YlZpZXcpLCBOVUxMKTsKICAgICBlbHNlIGlmIChuYW1lID09IGdfaW50ZXJuX3N0cmluZygiYXV0 by1sb2FkLWltYWdlcyIpKQo= 129723 2012-03-01 10:15:49 -0800 2012-03-01 10:19:12 -0800 Updated patch wk-screen-dpi2.diff text/plain 6323 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCA2ZjFjNTE1Li4wZWMwZmY3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMDMtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFNpbXBsaWZ5IHRoZSBjb2RlIHRvIGFkanVz dCBmb250IHNpemVzIGRlcGVuZGluZyBvbiBzY3JlZW4gRFBJCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDAzMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgor ICAgICAgICAoc2NyZWVuRFBJKTogSGVscGVyIGZ1bmN0aW9uIHRvIGdldCB0aGUgRFBJIG9mIGEg Z2l2ZW4KKyAgICAgICAgR2RrU2NyZWVuLiBBZGRlZCBhbHNvIGZhbGxiYWNrIGNvZGUgd2hlbiBn ZGtfc2NyZWVuX3Jlc29sdXRpb24KKyAgICAgICAgcmV0dXJucyAtMS4KKyAgICAgICAgKHdlYlZp ZXdHZXREUEkpOiBVc2Ugc2NyZWVuRFBJKCkgZnJvbSBXZWJDb3JlLgorICAgICAgICAod2ViVmll d0NvbnZlcnRGb250U2l6ZVRvUGl4ZWxzKTogVGhpcyBpcyB0aGUgZXhpc3RpbmcKKyAgICAgICAg cGl4ZWxzRnJvbVNpemUoKSwgcmVuYW1lZCBhbmQgbW92ZWQgdG8gYmUgdXNlZCBhbHNvIGluCisg ICAgICAgIHdlYmtpdF93ZWJfdmlld19zY3JlZW5fY2hhbmdlZCgpLgorICAgICAgICAod2Via2l0 X3dlYl92aWV3X3NjcmVlbl9jaGFuZ2VkKTogVXNlCisgICAgICAgIHdlYlZpZXdDb252ZXJ0Rm9u dFNpemVUb1BpeGVscygpIGluc3RlYWQgb2YgZHVwbGljYXRpbmcgdGhlIGNvZGUuCisgICAgICAg ICh3ZWJraXRfd2ViX3ZpZXdfc2V0dGluZ3Nfbm90aWZ5KTogVXNlCisgICAgICAgIHdlYlZpZXdD b252ZXJ0Rm9udFNpemVUb1BpeGVscygpIGluc3RlYWQgb2YgcGl4ZWxzRnJvbVNpemUoKS4KKwog MjAxMi0wMi0yNyAgVmluY2VudCBVbnR6ICA8dnVudHpAZ25vbWUub3JnPj4gYW5kIEd1c3Rhdm8g Tm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4IGZvciBi dWlsZGluZyB3aXRoIEdUSysgMi54LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdl YnZpZXcuY3BwCmluZGV4IDg5YjljMjIuLjMxMmMyZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTE0MTYsNiArMTQxNiwxOSBAQCBzdGF0aWMgQXRr T2JqZWN0KiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2FjY2Vzc2libGUoR3RrV2lkZ2V0KiB3aWRnZXQp CiAgICAgcmV0dXJuIGF4Um9vdDsKIH0KIAorc3RhdGljIGRvdWJsZSBzY3JlZW5EUEkoR2RrU2Ny ZWVuKiBzY3JlZW4pCit7CisgICAgLy8gZ2RrX3NjcmVlbl9nZXRfcmVzb2x1dGlvbigpIHJldHVy bnMgLTEgd2hlbiBubyBEUEkgaXMgc2V0LgorICAgIGRvdWJsZSBkcGkgPSBnZGtfc2NyZWVuX2dl dF9yZXNvbHV0aW9uKHNjcmVlbik7CisgICAgaWYgKGRwaSAhPSAtMSkKKyAgICAgICAgcmV0dXJu IGRwaTsKKworICAgIHN0YXRpYyBjb25zdCBkb3VibGUga01pbGxpbWV0cmVzUGVySW5jaCA9IDI1 LjQ7CisgICAgZG91YmxlIGRpYWdvbmFsU2l6ZUluUGl4ZWxzID0gaHlwb3QoZ2RrX3NjcmVlbl9n ZXRfd2lkdGgoc2NyZWVuKSwgZ2RrX3NjcmVlbl9nZXRfaGVpZ2h0KHNjcmVlbikpOworICAgIGRv dWJsZSBkaWFnb25hbFNpemVJbkluY2hlcyA9IGh5cG90KGdka19zY3JlZW5fZ2V0X3dpZHRoX21t KHNjcmVlbiksIGdka19zY3JlZW5fZ2V0X2hlaWdodF9tbShzY3JlZW4pKSAvIGtNaWxsaW1ldHJl c1BlckluY2g7CisgICAgcmV0dXJuIGRpYWdvbmFsU2l6ZUluUGl4ZWxzIC8gZGlhZ29uYWxTaXpl SW5JbmNoZXM7Cit9CisKIHN0YXRpYyBnZG91YmxlIHdlYlZpZXdHZXREUEkoV2ViS2l0V2ViVmll dyogd2ViVmlldykKIHsKICAgICBpZiAod2ViVmlldy0+cHJpdi0+d2ViU2V0dGluZ3MtPnByaXYt PmVuZm9yY2U5NkRQSSkKQEAgLTE0MjMsMTIgKzE0MzYsMTIgQEAgc3RhdGljIGdkb3VibGUgd2Vi Vmlld0dldERQSShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogCiAgICAgc3RhdGljIGNvbnN0IGRv dWJsZSBkZWZhdWx0RFBJID0gOTY7CiAgICAgR2RrU2NyZWVuKiBzY3JlZW4gPSBndGtfd2lkZ2V0 X2hhc19zY3JlZW4oR1RLX1dJREdFVCh3ZWJWaWV3KSkgPyBndGtfd2lkZ2V0X2dldF9zY3JlZW4o R1RLX1dJREdFVCh3ZWJWaWV3KSkgOiBnZGtfc2NyZWVuX2dldF9kZWZhdWx0KCk7Ci0gICAgaWYg KCFzY3JlZW4pIAotICAgICAgICByZXR1cm4gZGVmYXVsdERQSTsKKyAgICByZXR1cm4gc2NyZWVu ID8gc2NyZWVuRFBJKHNjcmVlbikgOiBkZWZhdWx0RFBJOworfQogCi0gICAgLy8gZ2RrX3NjcmVl bl9nZXRfcmVzb2x1dGlvbigpIHJldHVybnMgLTEgd2hlbiBubyBEUEkgaXMgc2V0LgotICAgIGdk b3VibGUgRFBJID0gZ2RrX3NjcmVlbl9nZXRfcmVzb2x1dGlvbihzY3JlZW4pOwotICAgIHJldHVy biBEUEkgIT0gLTEgPyBEUEkgOiBkZWZhdWx0RFBJOworc3RhdGljIGlubGluZSBnaW50IHdlYlZp ZXdDb252ZXJ0Rm9udFNpemVUb1BpeGVscyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBkb3VibGUg Zm9udFNpemUpCit7CisgICAgcmV0dXJuIGZvbnRTaXplIC8gNzIuMCAqIHdlYlZpZXdHZXREUEko d2ViVmlldyk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19zY3JlZW5fY2hhbmdl ZChHdGtXaWRnZXQqIHdpZGdldCwgR2RrU2NyZWVuKiBwcmV2aW91c1NjcmVlbikKQEAgLTE0NDEs OCArMTQ1NCw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19zY3JlZW5fY2hhbmdlZChH dGtXaWRnZXQqIHdpZGdldCwgR2RrU2NyZWVuKiBwcmV2aW91CiAKICAgICBXZWJLaXRXZWJTZXR0 aW5ncyogd2ViU2V0dGluZ3MgPSBwcml2LT53ZWJTZXR0aW5ncy5nZXQoKTsKICAgICBTZXR0aW5n cyogc2V0dGluZ3MgPSBjb3JlKHdlYlZpZXcpLT5zZXR0aW5ncygpOwotICAgIGdkb3VibGUgRFBJ ID0gd2ViVmlld0dldERQSSh3ZWJWaWV3KTsKLQogICAgIGd1aW50IGRlZmF1bHRGb250U2l6ZSwg ZGVmYXVsdE1vbm9zcGFjZUZvbnRTaXplLCBtaW5pbXVtRm9udFNpemUsIG1pbmltdW1Mb2dpY2Fs Rm9udFNpemU7CiAKICAgICBnX29iamVjdF9nZXQod2ViU2V0dGluZ3MsCkBAIC0xNDUyLDEwICsx NDYzLDEwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19zY3JlZW5fY2hhbmdlZChHdGtX aWRnZXQqIHdpZGdldCwgR2RrU2NyZWVuKiBwcmV2aW91CiAgICAgICAgICAgICAgICAgICJtaW5p bXVtLWxvZ2ljYWwtZm9udC1zaXplIiwgJm1pbmltdW1Mb2dpY2FsRm9udFNpemUsCiAgICAgICAg ICAgICAgICAgIE5VTEwpOwogCi0gICAgc2V0dGluZ3MtPnNldERlZmF1bHRGb250U2l6ZShkZWZh dWx0Rm9udFNpemUgLyA3Mi4wICogRFBJKTsKLSAgICBzZXR0aW5ncy0+c2V0RGVmYXVsdEZpeGVk Rm9udFNpemUoZGVmYXVsdE1vbm9zcGFjZUZvbnRTaXplIC8gNzIuMCAqIERQSSk7Ci0gICAgc2V0 dGluZ3MtPnNldE1pbmltdW1Gb250U2l6ZShtaW5pbXVtRm9udFNpemUgLyA3Mi4wICogRFBJKTsK LSAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZShtaW5pbXVtTG9naWNhbEZv bnRTaXplIC8gNzIuMCAqIERQSSk7CisgICAgc2V0dGluZ3MtPnNldERlZmF1bHRGb250U2l6ZSh3 ZWJWaWV3Q29udmVydEZvbnRTaXplVG9QaXhlbHMod2ViVmlldywgZGVmYXVsdEZvbnRTaXplKSk7 CisgICAgc2V0dGluZ3MtPnNldERlZmF1bHRGaXhlZEZvbnRTaXplKHdlYlZpZXdDb252ZXJ0Rm9u dFNpemVUb1BpeGVscyh3ZWJWaWV3LCBkZWZhdWx0TW9ub3NwYWNlRm9udFNpemUpKTsKKyAgICBz ZXR0aW5ncy0+c2V0TWluaW11bUZvbnRTaXplKHdlYlZpZXdDb252ZXJ0Rm9udFNpemVUb1BpeGVs cyh3ZWJWaWV3LCBtaW5pbXVtRm9udFNpemUpKTsKKyAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxv Z2ljYWxGb250U2l6ZSh3ZWJWaWV3Q29udmVydEZvbnRTaXplVG9QaXhlbHMod2ViVmlldywgbWlu aW11bUxvZ2ljYWxGb250U2l6ZSkpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf ZHJhZ19lbmQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0RyYWdDb250ZXh0KiBjb250ZXh0KQpAQCAt MzMzNiwxMSArMzM0Nyw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0 dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICB3ZWJraXRfd2ViX3ZpZXdfc2NyZWVu X2NoYW5nZWQoR1RLX1dJREdFVCh3ZWJWaWV3KSwgTlVMTCk7CiB9CiAKLXN0YXRpYyBpbmxpbmUg Z2ludCBwaXhlbHNGcm9tU2l6ZShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBnaW50IHNpemUpCi17 Ci0gICAgcmV0dXJuIHNpemUgLyA3Mi4wICogd2ViVmlld0dldERQSSh3ZWJWaWV3KTsKLX0KLQog c3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldHRpbmdzX25vdGlmeShXZWJLaXRXZWJTZXR0 aW5ncyogd2ViU2V0dGluZ3MsIEdQYXJhbVNwZWMqIHBzcGVjLCBXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQogewogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGNvcmUod2ViVmlldyktPnNldHRpbmdz KCk7CkBAIC0zMzY1LDEzICszMzcxLDEzIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19z ZXR0aW5nc19ub3RpZnkoV2ViS2l0V2ViU2V0dGluZ3MqIHdlYlNldHRpbmdzLCBHUGFyCiAgICAg ZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoInNlcmlmLWZvbnQtZmFtaWx5IikpCiAg ICAgICAgIHNldHRpbmdzLT5zZXRTZXJpZkZvbnRGYW1pbHkoZ192YWx1ZV9nZXRfc3RyaW5nKCZ2 YWx1ZSkpOwogICAgIGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRlcm5fc3RyaW5nKCJkZWZhdWx0LWZv bnQtc2l6ZSIpKQotICAgICAgICBzZXR0aW5ncy0+c2V0RGVmYXVsdEZvbnRTaXplKHBpeGVsc0Zy b21TaXplKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2ludCgmdmFsdWUpKSk7CisgICAgICAgIHNldHRp bmdzLT5zZXREZWZhdWx0Rm9udFNpemUod2ViVmlld0NvbnZlcnRGb250U2l6ZVRvUGl4ZWxzKHdl YlZpZXcsIGdfdmFsdWVfZ2V0X2ludCgmdmFsdWUpKSk7CiAgICAgZWxzZSBpZiAobmFtZSA9PSBn X2ludGVybl9zdHJpbmcoImRlZmF1bHQtbW9ub3NwYWNlLWZvbnQtc2l6ZSIpKQotICAgICAgICBz ZXR0aW5ncy0+c2V0RGVmYXVsdEZpeGVkRm9udFNpemUocGl4ZWxzRnJvbVNpemUod2ViVmlldywg Z192YWx1ZV9nZXRfaW50KCZ2YWx1ZSkpKTsKKyAgICAgICAgc2V0dGluZ3MtPnNldERlZmF1bHRG aXhlZEZvbnRTaXplKHdlYlZpZXdDb252ZXJ0Rm9udFNpemVUb1BpeGVscyh3ZWJWaWV3LCBnX3Zh bHVlX2dldF9pbnQoJnZhbHVlKSkpOwogICAgIGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRlcm5fc3Ry aW5nKCJtaW5pbXVtLWZvbnQtc2l6ZSIpKQotICAgICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUZv bnRTaXplKHBpeGVsc0Zyb21TaXplKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2ludCgmdmFsdWUpKSk7 CisgICAgICAgIHNldHRpbmdzLT5zZXRNaW5pbXVtRm9udFNpemUod2ViVmlld0NvbnZlcnRGb250 U2l6ZVRvUGl4ZWxzKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2ludCgmdmFsdWUpKSk7CiAgICAgZWxz ZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoIm1pbmltdW0tbG9naWNhbC1mb250LXNpemUi KSkKLSAgICAgICAgc2V0dGluZ3MtPnNldE1pbmltdW1Mb2dpY2FsRm9udFNpemUocGl4ZWxzRnJv bVNpemUod2ViVmlldywgZ192YWx1ZV9nZXRfaW50KCZ2YWx1ZSkpKTsKKyAgICAgICAgc2V0dGlu Z3MtPnNldE1pbmltdW1Mb2dpY2FsRm9udFNpemUod2ViVmlld0NvbnZlcnRGb250U2l6ZVRvUGl4 ZWxzKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2ludCgmdmFsdWUpKSk7CiAgICAgZWxzZSBpZiAobmFt ZSA9PSBnX2ludGVybl9zdHJpbmcoImVuZm9yY2UtOTYtZHBpIikpCiAgICAgICAgIHdlYmtpdF93 ZWJfdmlld19zY3JlZW5fY2hhbmdlZChHVEtfV0lER0VUKHdlYlZpZXcpLCBOVUxMKTsKICAgICBl bHNlIGlmIChuYW1lID09IGdfaW50ZXJuX3N0cmluZygiYXV0by1sb2FkLWltYWdlcyIpKQo=