183963 2018-03-23 16:39:41 -0700 [Extra zoom mode] Fix some localizable strings after r229878 2018-03-23 17:34:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh commit-queue mitz thorton webkit-bug-importer oldest_to_newest 1408958 0 wenson_hsieh 2018-03-23 16:39:41 -0700 Some localized strings pertaining to extra zoom mode need to be fixed, due to incorrect usage of the WEB_UI_STRING macro in r227646. 1408970 1 336441 wenson_hsieh 2018-03-23 16:54:16 -0700 Created attachment 336441 Patch 1408987 2 336441 commit-queue 2018-03-23 17:33:57 -0700 Comment on attachment 336441 Patch Clearing flags on attachment: 336441 Committed r229939: <https://trac.webkit.org/changeset/229939> 1408988 3 commit-queue 2018-03-23 17:33:58 -0700 All reviewed patches have been landed. Closing bug. 1408989 4 webkit-bug-importer 2018-03-23 17:34:18 -0700 <rdar://problem/38814186> 336441 2018-03-23 16:54:16 -0700 2018-03-23 17:33:57 -0700 Patch bug-183963-20180323165415.patch text/plain 6005 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTYyMTEwNDYyYmNmY2Y1 YWJlYjA2YjFmOGNmOWYyNjcyNjRmYzkyMC4uY2M4MjQzNjE1MTgyZGViNzNkZGRhMWQzM2E1MzBm ZTI3MjcxOGM0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTAzLTIzICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtFeHRyYSB6b29t IG1vZGVdIEZpeCBzb21lIGxvY2FsaXphYmxlIHN0cmluZ3MgYWZ0ZXIgcjIyOTg3OAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzOTYzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFdFQl9VSV9TVFJJ TkcgbWFjcm8gd2FzIGluY29ycmVjdGx5IHVzZWQgZm9yIGNlcnRhaW4gbG9jYWxpemVkIHN0cmlu Z3MgcGVydGFpbmluZyB0byBleHRyYSB6b29tIG1vZGUuIFRvCisgICAgICAgIGNvcnJlY3QgdGhp cywgbWFrZSB0aGUgIkRvbmUiIHN0cmluZyB1c2UgV0VCX1VJX1NUUklORyB3aXRoIGFjdHVhbCBV SS1mYWNpbmcgdGV4dDsgc2luY2UgZGF5LCB5ZWFyIGFuZCBtb250aAorICAgICAgICBsYWJlbHMg aW4gdGhlIGRhdGUgcGlja2VyIGFyZSBsZXNzIGdlbmVyYWxpemFibGUgdG8gb3RoZXIgVUksIGxl YXZlIHRoZXNlIGFzIHVuaXF1ZSBrZXlzLCBidXQgY2hhbmdlIHRoZW0gdG8KKyAgICAgICAgdXNl IFdFQl9VSV9TVFJJTkdfS0VZIGluc3RlYWQuCisKKyAgICAgICAgQWRkaXRpb25hbGx5LCByZW1v dmUgbm93LXVudXNlZCBsb2NhbGl6YWJsZSBzdHJpbmdzIGZvciB0aGUgdGV4dCBpbnB1dCB2aWV3 IGNvbnRyb2xsZXIuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmlu Z3M6CisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpmb3JtQ29udHJvbERvbmVCdXR0b25UaXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpk YXRlUGlja2VyRGF5TGFiZWxUaXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpkYXRlUGlja2VyTW9u dGhMYWJlbFRpdGxlKToKKyAgICAgICAgKFdlYkNvcmU6OmRhdGVQaWNrZXJZZWFyTGFiZWxUaXRs ZSk6CisKIDIwMTgtMDMtMjMgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAg ICAgICAgTG9jYWwgc3RvcmFnZSBnZXRJdGVtKCkgZm9yIGFuIGVtcHR5IHN0cmluZyByZXR1cm5l ZCBVTkRFRklORUQgdmFsdWUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxw cm9qL0xvY2FsaXphYmxlLnN0cmluZ3MgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xv Y2FsaXphYmxlLnN0cmluZ3MKaW5kZXggYTg1MmQ5OWY3YjY3YjdkN2NhODBkMWNmOGIwOTllMzUw NTlkYzgzYS4uMzYxYmM1MjFiNmY0YThiNjgyZGY3NmJkODk3MTQ3OTlkNTQ1ZmM1NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCisr KyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncwpAQCAt MjEyLDcgKzIxMiw3IEBACiAiQ3V0IChVbmRvIGFjdGlvbiBuYW1lKSIgPSAiQ3V0IjsKIAogLyog RGF5IGxhYmVsIGluIGRhdGUgcGlja2VyICovCi0iRGF5IGxhYmVsIGluIGRhdGUgcGlja2VyIiA9 ICJEYXkgbGFiZWwgaW4gZGF0ZSBwaWNrZXIiOworIkRheSAoRGF0ZSBwaWNrZXIgZm9yIGV4dHJh IHpvb20gbW9kZSkiID0gIkRheSI7CiAKIC8qIEZ1bGxzY3JlZW4gRGVjZXB0aXZlIFdlYnNpdGUg V2FybmluZyBTaGVldCBUaXRsZSAqLwogIkRlY2VwdGl2ZSBXZWJzaXRlIFdhcm5pbmciID0gIkRl Y2VwdGl2ZSBXZWJzaXRlIFdhcm5pbmciOwpAQCAtMjMwLDcgKzIzMCw3IEBACiAiRGljdGF0aW9u IChVbmRvIGFjdGlvbiBuYW1lKSIgPSAiRGljdGF0aW9uIjsKIAogLyogVGl0bGUgb2YgdGhlIERv bmUgYnV0dG9uIGZvciB6b29tZWQgZm9ybSBjb250cm9scy4gKi8KLSJEb25lIChleHRyYSB6b29t ZWQgZm9ybSBjb250cm9scykiID0gIkRvbmUgKGV4dHJhIHpvb21lZCBmb3JtIGNvbnRyb2xzKSI7 CisiRG9uZSIgPSAiRG9uZSI7CiAKIC8qIERvd25sb2FkIEF1ZGlvIFRvIERpc2sgY29udGV4dCBt ZW51IGl0ZW0gKi8KICJEb3dubG9hZCBBdWRpbyIgPSAiRG93bmxvYWQgQXVkaW8iOwpAQCAtNDE2 LDcgKzQxNiw3IEBACiAiTWlzc2luZyBQbHVnLWluIiA9ICJNaXNzaW5nIFBsdWctaW4iOwogCiAv KiBNb250aCBsYWJlbCBpbiBkYXRlIHBpY2tlciAqLwotIk1vbnRoIGxhYmVsIGluIGRhdGUgcGlj a2VyIiA9ICJNb250aCBsYWJlbCBpbiBkYXRlIHBpY2tlciI7CisiTW9udGggKERhdGUgcGlja2Vy IGZvciBleHRyYSB6b29tIG1vZGUpIiA9ICJNb250aCI7CiAKIC8qIE1lZGlhIE11dGUgY29udGV4 dCBtZW51IGl0ZW0gKi8KICJNdXRlIiA9ICJNdXRlIjsKQEAgLTYyNSw5ICs2MjUsNiBAQAogLyog VGl0bGUgb2YgdGhlIGxhYmVsIHRvIHNob3cgb24gYSBzbmFwc2hvdHRlZCBwbHVnLWluICovCiAi U25hcHNob3R0ZWQgUGx1Zy1JbiIgPSAiU25hcHNob3R0ZWQgUGx1Zy1JbiI7CiAKLS8qIFRpdGxl IG9mIHRoZSBkaWN0YXRpb24gYnV0dG9uIGZvciB6b29tZWQgZm9ybSBjb250cm9scy4gKi8KLSJT cGVhayIgPSAiU3BlYWsiOwotCiAvKiBTcGVlY2ggY29udGV4dCBzdWItbWVudSBpdGVtICovCiAi U3BlZWNoIiA9ICJTcGVlY2giOwogCkBAIC04MzUsMTEgKzgzMiw4IEBACiAvKiBXZWJLaXRFcnJv ckludGVybmFsIGRlc2NyaXB0aW9uICovCiAiV2ViS2l0IGVuY291bnRlcmVkIGFuIGludGVybmFs IGVycm9yIiA9ICJXZWJLaXQgZW5jb3VudGVyZWQgYW4gaW50ZXJuYWwgZXJyb3IiOwogCi0vKiBU aXRsZSBvZiB0aGUgd3JpdGluZyBidXR0b24gZm9yIHpvb21lZCBmb3JtIGNvbnRyb2xzLiAqLwot IldyaXRlIiA9ICJXcml0ZSI7Ci0KIC8qIFllYXIgbGFiZWwgaW4gZGF0ZSBwaWNrZXIgKi8KLSJZ ZWFyIGxhYmVsIGluIGRhdGUgcGlja2VyIiA9ICJZZWFyIGxhYmVsIGluIGRhdGUgcGlja2VyIjsK KyJZZWFyIChEYXRlIHBpY2tlciBmb3IgZXh0cmEgem9vbSBtb2RlKSIgPSAiWWVhciI7CiAKIC8q IG1lc3NhZ2UgaW4gYXV0aGVudGljYXRpb24gcGFuZWwgKi8KICJZb3VyIGxvZ2luIGluZm9ybWF0 aW9uIHdpbGwgYmUgc2VudCBzZWN1cmVseS4iID0gIllvdXIgbG9naW4gaW5mb3JtYXRpb24gd2ls bCBiZSBzZW50IHNlY3VyZWx5LiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXpl ZFN0cmluZ3MuY3BwCmluZGV4IGNmMDJhZGVjY2QwZTJkZDNjYmQwZDkxOGUyMjg1NDExMTg2NmFi NjguLjQxZWQzOTRjZmEwZGQxOTM0MWZlMGExZTQyOTExYjQxOGJlZDk1NmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwCkBAIC0xMDM4LDcgKzEwMzgs NyBAQCBTdHJpbmcgd2ViQ3J5cHRvTWFzdGVyS2V5S2V5Y2hhaW5Db21tZW50KCkKIAogU3RyaW5n IGZvcm1Db250cm9sRG9uZUJ1dHRvblRpdGxlKCkKIHsKLSAgICByZXR1cm4gV0VCX1VJX1NUUklO RygiRG9uZSAoZXh0cmEgem9vbWVkIGZvcm0gY29udHJvbHMpIiwgIlRpdGxlIG9mIHRoZSBEb25l IGJ1dHRvbiBmb3Igem9vbWVkIGZvcm0gY29udHJvbHMuIik7CisgICAgcmV0dXJuIFdFQl9VSV9T VFJJTkcoIkRvbmUiLCAiVGl0bGUgb2YgdGhlIERvbmUgYnV0dG9uIGZvciB6b29tZWQgZm9ybSBj b250cm9scy4iKTsKIH0KIAogU3RyaW5nIGZvcm1Db250cm9sQ2FuY2VsQnV0dG9uVGl0bGUoKQpA QCAtMTA2MSwyOSArMTA2MSwxOSBAQCBTdHJpbmcgZm9ybUNvbnRyb2xTZWFyY2hCdXR0b25UaXRs ZSgpCiAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkcoIlNlYXJjaCIsICJUaXRsZSBvZiB0aGUgU2Vh cmNoIGJ1dHRvbiBmb3Igem9vbWVkIGZvcm0gY29udHJvbHMuIik7CiB9CiAKLVN0cmluZyB0ZXh0 SW5wdXRNb2RlV3JpdGVCdXR0b25UaXRsZSgpCi17Ci0gICAgcmV0dXJuIFdFQl9VSV9TVFJJTkco IldyaXRlIiwgIlRpdGxlIG9mIHRoZSB3cml0aW5nIGJ1dHRvbiBmb3Igem9vbWVkIGZvcm0gY29u dHJvbHMuIik7Ci19Ci0KLVN0cmluZyB0ZXh0SW5wdXRNb2RlU3BlZWNoQnV0dG9uVGl0bGUoKQot ewotICAgIHJldHVybiBXRUJfVUlfU1RSSU5HKCJTcGVhayIsICJUaXRsZSBvZiB0aGUgZGljdGF0 aW9uIGJ1dHRvbiBmb3Igem9vbWVkIGZvcm0gY29udHJvbHMuIik7Ci19Ci0KIFN0cmluZyBkYXRl UGlja2VyRGF5TGFiZWxUaXRsZSgpCiB7Ci0gICAgcmV0dXJuIFdFQl9VSV9TVFJJTkcoIkRheSBs YWJlbCBpbiBkYXRlIHBpY2tlciIsICJEYXkgbGFiZWwgaW4gZGF0ZSBwaWNrZXIiKTsKKyAgICBy ZXR1cm4gV0VCX1VJX1NUUklOR19LRVkoIkRheSIsICJEYXkgKERhdGUgcGlja2VyIGZvciBleHRy YSB6b29tIG1vZGUpIiwgIkRheSBsYWJlbCBpbiBkYXRlIHBpY2tlciIpOwogfQogCiBTdHJpbmcg ZGF0ZVBpY2tlck1vbnRoTGFiZWxUaXRsZSgpCiB7Ci0gICAgcmV0dXJuIFdFQl9VSV9TVFJJTkco Ik1vbnRoIGxhYmVsIGluIGRhdGUgcGlja2VyIiwgIk1vbnRoIGxhYmVsIGluIGRhdGUgcGlja2Vy Iik7CisgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJNb250aCIsICJNb250aCAoRGF0ZSBw aWNrZXIgZm9yIGV4dHJhIHpvb20gbW9kZSkiLCAiTW9udGggbGFiZWwgaW4gZGF0ZSBwaWNrZXIi KTsKIH0KIAogU3RyaW5nIGRhdGVQaWNrZXJZZWFyTGFiZWxUaXRsZSgpCiB7Ci0gICAgcmV0dXJu IFdFQl9VSV9TVFJJTkcoIlllYXIgbGFiZWwgaW4gZGF0ZSBwaWNrZXIiLCAiWWVhciBsYWJlbCBp biBkYXRlIHBpY2tlciIpOworICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiWWVhciIsICJZ ZWFyIChEYXRlIHBpY2tlciBmb3IgZXh0cmEgem9vbSBtb2RlKSIsICJZZWFyIGxhYmVsIGluIGRh dGUgcGlja2VyIik7CiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxp emVkU3RyaW5ncy5oCmluZGV4IDQyYmJhMjVhNmMwNzI0MWI5NjZhNzg0ZjZhMTI2NDQxY2VjODJm ZDAuLmI3MTRhOGUyYzRmZWM2NTcyYzhmMmRmNTk0NDdhY2U0MjBhNWU2YzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmgKQEAgLTMyMiw4ICszMjIsNiBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5nIGZvcm1Db250cm9s SGlkZUJ1dHRvblRpdGxlKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5nIGZvcm1Db250cm9s R29CdXR0b25UaXRsZSgpOwogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBmb3JtQ29udHJvbFNl YXJjaEJ1dHRvblRpdGxlKCk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5nIHRleHRJbnB1dE1v ZGVXcml0ZUJ1dHRvblRpdGxlKCk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5nIHRleHRJbnB1 dE1vZGVTcGVlY2hCdXR0b25UaXRsZSgpOwogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBkYXRl UGlja2VyRGF5TGFiZWxUaXRsZSgpOwogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBkYXRlUGlj a2VyTW9udGhMYWJlbFRpdGxlKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5nIGRhdGVQaWNr ZXJZZWFyTGFiZWxUaXRsZSgpOwo=