104122 2012-12-05 07:50:49 -0800 [BlackBerry] meta viewport pages are rendered at a bad initial scale 2012-12-05 09:27:33 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jkjiang jkjiang anilsson mifenton rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 783744 0 jkjiang 2012-12-05 07:50:49 -0800 PR: 240378. 783764 1 177753 jkjiang 2012-12-05 08:14:31 -0800 Created attachment 177753 Patch 783775 2 177753 rwlbuis 2012-12-05 08:25:54 -0800 Comment on attachment 177753 Patch LGTM. 783836 3 jkjiang 2012-12-05 09:27:33 -0800 Committed r136700: <http://trac.webkit.org/changeset/136700> 177753 2012-12-05 08:14:31 -0800 2012-12-05 08:25:54 -0800 Patch bug-104122-20121205111156.patch text/plain 7281 jkjiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2Njg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAwMWI5YmI2ZGUzZWZkYmVjNGQ2NmMyOGY2YzVlYjE2YjNkOTZiODY5Li5hNTY0ZmE4MjE5 Y2QzODRjMjgxMzU1MzUzNGYwYWY0NjU4MjM1YTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxMi0xMi0wNSAgSmFja3kgSmlhbmcgIDx6aGFqaWFu Z0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBtZXRhIHZpZXdwb3J0IHBhZ2VzIGFy ZSByZW5kZXJlZCBhdCBhIGJhZCBpbml0aWFsIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQxMjIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKyAgICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBBcnZpZCBOaWxz c29uLgorCisgICAgICAgIFBSOiAyNDAzNzgKKyAgICAgICAgTWFueSB3ZWJzaXRlcyBhcmUgcmVu ZGVyZWQgYXQgYSB2ZXJ5IGJhZCBpbml0aWFsIHNjYWxlIGJlY2F1c2UgdGhleQorICAgICAgICBi b3RoIHNwZWNpZnkgbWV0YSB2aWV3cG9ydCB0YWcgYW5kIGhhdmUgbGFyZ2Ugd2lkdGggZWxlbWVu dHMuIEluIHN1Y2gKKyAgICAgICAgYSBjYXNlIHdlIHdpbGwgdGhpbmsgdGhlIG1ldGEgdmlld3Bv cnQgdGFnIGlzIGJyb2tlbiBpZiB0aGUgd2lkdGggb2YKKyAgICAgICAgYW55IGVsZW1lbnQgaXMg bGFyZ2VyIHRoYW4gdGhlIGNhbGN1bGF0ZWQgbGF5b3V0IHZpZXdwb3J0IHdpZHRoLgorICAgICAg ICBUaGUgZml4IHRvIHRoaXMgaXMgc3RyYWlnaHRmb3J3YXJkIHRoYXQgd2Ugd2lsbCB6b29tIHRo ZSBwYWdlIHRvIGZpdAorICAgICAgICB0aGUgc2NyZWVuIHRvIGhhdmUgYmV0dGVyIHVzZXIgZXhw ZXJpZW5jZSBpbnN0ZWFkIG9mIHJlc3BlY3RpbmcgdGhlCisgICAgICAgIG1ldGEgdmlld3BvcnQu IFRoaXMgY2FuIGZpeCB0aGUgaXNzdWUgb24gdGhlIHdlYnNpdGVzIHN1Y2ggYXMKKyAgICAgICAg d3d3LnRyYXZlbHBvZC5jb20sIHd3dy5mb3JiZXMuY29tLCBpbnRlcmZhY2VsaWZ0LmNvbSwgd3d3 LnNreS5jb20sCisgICAgICAgIHJhcGhhZWxqcy5jb20gYW5kIHNvIG9uLgorICAgICAgICBJZiBu b24tZW1wdHkgbV91c2VyVmlld3BvcnRBcmd1bWVudHMgaXMgYXBwbGllZCwgdGhlbiB3ZSB3aWxs IGZvcmNlIHRvCisgICAgICAgIHJlc3BlY3QgdGhlIHZpZXdwb3J0IGFyZ3VtZW50cy4gSW4gdGhp cyB3YXkgd2Ugd2lsbCByZXN0cmljdCB0aGUgZml4IHRvCisgICAgICAgIGJyb3dzZXIgb25seS4K KworICAgICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6V2ViUGFnZVByaXZhdGU6OldlYlBhZ2VQcml2YXRlKToKKyAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OnNldExvYWRTdGF0ZSk6CisgICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpyZXNwZWN0Vmlld3BvcnQpOgorICAgICAgICAo V2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6Omlu aXRpYWxTY2FsZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRl OjptYXhpbXVtU2NhbGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJp dmF0ZTo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UpOgorICAgICAgICAqIEFw aS9XZWJQYWdlX3AuaDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZh dGU6OmlzVXNlclNjYWxhYmxlKToKKyAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKKyAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6Om1pbmltdW1TY2FsZSk6CisKIDIw MTItMTItMDUgIFlvbmd4aW4gRGFpICA8eW9kYWlAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tC ZXJyeV0gQXZvaWQgc2hvd2luZyBGQ0Mgb24gZW1wdHkgdGV4dCBmaWVsZCBpbiBhIGRpZmZlcmVu dCB3YXkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IGZiZTAz Mjk4OTM0NTY4YTRmNmZjMDllMjQ5OGQ5Yzk0M2ZkNWE2MGUuLmRhM2ZkOTQzNTY1N2YzOTNhNGIy MTcxM2IxYTdiOGViMjU1ZmI2ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlLmNwcApAQCAtNDA1LDYgKzQwNSw3IEBAIFdlYlBhZ2VQcml2YXRlOjpXZWJQYWdlUHJpdmF0 ZShXZWJQYWdlKiB3ZWJQYWdlLCBXZWJQYWdlQ2xpZW50KiBjbGllbnQsIGNvbnN0IEluCiAgICAg LCBtX2luaXRpYWxTY2FsZSgtMS4wKQogICAgICwgbV9taW5pbXVtU2NhbGUoLTEuMCkKICAgICAs IG1fbWF4aW11bVNjYWxlKC0xLjApCisgICAgLCBtX2ZvcmNlUmVzcGVjdFZpZXdwb3J0QXJndW1l bnRzKGZhbHNlKQogICAgICwgbV9ibG9ja1pvb21GaW5hbFNjYWxlKDEuMCkKICAgICAsIG1fYW5j aG9ySW5Ob2RlUmVjdFJhdGlvKC0xLCAtMSkKICAgICAsIG1fY3VycmVudEJsb2NrWm9vbU5vZGUo MCkKQEAgLTEwODcsNiArMTA4OCw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldExvYWRTdGF0 ZShMb2FkU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICBtX3VzZXJQZXJmb3JtZWRNYW51YWxab29t ID0gZmFsc2U7CiAgICAgICAgICAgICBtX3VzZXJQZXJmb3JtZWRNYW51YWxTY3JvbGwgPSBmYWxz ZTsKICAgICAgICAgICAgIG1fc2hvdWxkVXNlRml4ZWREZXNrdG9wTW9kZSA9IGZhbHNlOworICAg ICAgICAgICAgbV9mb3JjZVJlc3BlY3RWaWV3cG9ydEFyZ3VtZW50cyA9IGZhbHNlOwogICAgICAg ICAgICAgaWYgKG1fcmVzZXRWaXJ0dWFsVmlld3BvcnRPbkNvbW1pdHRlZCkgLy8gRm9yIERSVC4K ICAgICAgICAgICAgICAgICBtX3ZpcnR1YWxWaWV3cG9ydFNpemUgPSBJbnRTaXplKCk7CiAgICAg ICAgICAgICBpZiAobV93ZWJTZXR0aW5ncy0+dmlld3BvcnRXaWR0aCgpID4gMCkKQEAgLTExMDgs NiArMTExMCw4IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldExvYWRTdGF0ZShMb2FkU3RhdGUg c3RhdGUpCiAgICAgICAgICAgICAgICAgLy8gdG8gYW55IGZhbGxiYWNrIHZhbHVlcy4gSWYgdGhl cmUgaXMgYSBtZXRhIHZpZXdwb3J0IGluIHRoZQogICAgICAgICAgICAgICAgIC8vIGNvbnRlbnQg aXQgd2lsbCBvdmVyd3JpdGUgdGhlIGZhbGxiYWNrIGFyZ3VtZW50cyBzb29uLgogICAgICAgICAg ICAgICAgIGRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKG1fdXNlclZpZXdwb3J0 QXJndW1lbnRzKTsKKyAgICAgICAgICAgICAgICBpZiAobV91c2VyVmlld3BvcnRBcmd1bWVudHMg IT0gZGVmYXVsdFZpZXdwb3J0QXJndW1lbnRzKQorICAgICAgICAgICAgICAgICAgICBtX2ZvcmNl UmVzcGVjdFZpZXdwb3J0QXJndW1lbnRzID0gdHJ1ZTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICAgICAgUGxhdGZvcm06OkludFNpemUgdmlydHVhbFZpZXdwb3J0ID0gcmVjb21w dXRlVmlydHVhbFZpZXdwb3J0RnJvbVZpZXdwb3J0QXJndW1lbnRzKCk7CiAgICAgICAgICAgICAg ICAgbV93ZWJQYWdlLT5zZXRWaXJ0dWFsVmlld3BvcnRTaXplKHZpcnR1YWxWaWV3cG9ydCk7CkBA IC0xNjk3LDkgKzE3MDEsMTUgQEAgZG91YmxlIFdlYlBhZ2VQcml2YXRlOjp6b29tVG9GaXRTY2Fs ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHN0ZDo6bWluKHpvb21Ub0ZpdFNjYWxlLCBtYXhpbXVtSW1h Z2VEb2N1bWVudFpvb21Ub0ZpdFNjYWxlKTsKIH0KIAorYm9vbCBXZWJQYWdlUHJpdmF0ZTo6cmVz cGVjdFZpZXdwb3J0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9mb3JjZVJlc3BlY3RWaWV3cG9y dEFyZ3VtZW50cyB8fCBjb250ZW50c1NpemUoKS53aWR0aCgpIDw9IG1fdmlydHVhbFZpZXdwb3J0 U2l6ZS53aWR0aCgpOworfQorCiBkb3VibGUgV2ViUGFnZVByaXZhdGU6OmluaXRpYWxTY2FsZSgp IGNvbnN0CiB7Ci0gICAgaWYgKG1faW5pdGlhbFNjYWxlID4gMC4wKQorCisgICAgaWYgKG1faW5p dGlhbFNjYWxlID4gMC4wICYmIHJlc3BlY3RWaWV3cG9ydCgpKQogICAgICAgICByZXR1cm4gbV9p bml0aWFsU2NhbGU7CiAKICAgICBpZiAobV93ZWJTZXR0aW5ncy0+aXNab29tVG9GaXRPbkxvYWQo KSkKQEAgLTE3NTUsNyArMTc2NSw3IEBAIHZvaWQgV2ViUGFnZTo6c2V0TWF4aW11bVNjYWxlKGRv dWJsZSBtYXhpbXVtU2NhbGUpCiAKIGRvdWJsZSBXZWJQYWdlUHJpdmF0ZTo6bWF4aW11bVNjYWxl KCkgY29uc3QKIHsKLSAgICBpZiAobV9tYXhpbXVtU2NhbGUgPj0gem9vbVRvRml0U2NhbGUoKSAm JiBtX21heGltdW1TY2FsZSA+PSBtX21pbmltdW1TY2FsZSkKKyAgICBpZiAobV9tYXhpbXVtU2Nh bGUgPj0gem9vbVRvRml0U2NhbGUoKSAmJiBtX21heGltdW1TY2FsZSA+PSBtX21pbmltdW1TY2Fs ZSAmJiByZXNwZWN0Vmlld3BvcnQoKSkKICAgICAgICAgcmV0dXJuIG1fbWF4aW11bVNjYWxlOwog CiAgICAgcmV0dXJuIGhhc1ZpcnR1YWxWaWV3cG9ydCgpID8gc3RkOjptYXg8ZG91YmxlPih6b29t VG9GaXRTY2FsZSgpLCA0LjApIDogNC4wOwpAQCAtMzQ2MSw5ICszNDcxLDEwIEBAIHZvaWQgV2Vi UGFnZVByaXZhdGU6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZp ZXdwb3J0QXJndW1lbnRzCiAKICAgICAvLyBJZiB0aGUgY2FsbGVyIGlzIHRyeWluZyB0byByZXNl dCB0byBkZWZhdWx0IGFyZ3VtZW50cywgdXNlIHRoZSB1c2VyIHN1cHBsaWVkIG9uZXMgaW5zdGVh ZC4KICAgICBzdGF0aWMgY29uc3QgVmlld3BvcnRBcmd1bWVudHMgZGVmYXVsdFZpZXdwb3J0QXJn dW1lbnRzOwotICAgIGlmIChhcmd1bWVudHMgPT0gZGVmYXVsdFZpZXdwb3J0QXJndW1lbnRzKQor ICAgIGlmIChhcmd1bWVudHMgPT0gZGVmYXVsdFZpZXdwb3J0QXJndW1lbnRzKSB7CiAgICAgICAg IG1fdmlld3BvcnRBcmd1bWVudHMgPSBtX3VzZXJWaWV3cG9ydEFyZ3VtZW50czsKLSAgICBlbHNl CisgICAgICAgIG1fZm9yY2VSZXNwZWN0Vmlld3BvcnRBcmd1bWVudHMgPSBtX3VzZXJWaWV3cG9y dEFyZ3VtZW50cyAhPSBkZWZhdWx0Vmlld3BvcnRBcmd1bWVudHM7CisgICAgfSBlbHNlCiAgICAg ICAgIG1fdmlld3BvcnRBcmd1bWVudHMgPSBhcmd1bWVudHM7CiAKICAgICAvLyAwIHdpZHRoIG9y IGhlaWdodCBpbiB2aWV3cG9ydCBhcmd1bWVudHMgbWFrZXMgbm8gc2Vuc2UsIGFuZCByZXN1bHRz IGluIGEgdmVyeSBsYXJnZSBpbml0aWFsIHNjYWxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZV9wLmgKaW5kZXggZWQ1NjNjZTJjY2VkMDllOWFiYzA2N2RkY2Q2NDZlMzE3Zjk5 ODI1OS4uZWRlYTdiYzI2NGNmMDZkODVhZWNkMjQ0MjBmMDdmZjE0NzIyMzcyMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCkBAIC0xNjcsNyArMTY3LDEyIEBAIHB1 YmxpYzoKIAogICAgIC8vIE1vZGlmaWVzIHRoZSB6b29tVG9GaXQgYWxnb3JpdGhtIGxvZ2ljIHRv IGNvbnN0cnVjdCBhIHNjYWxlIHN1Y2ggdGhhdCB0aGUgdmlld3BvcnRTaXplIGFib3ZlIGlzIGVx dWFsIHRvIHRoaXMgc2l6ZS4KICAgICBib29sIGhhc1ZpcnR1YWxWaWV3cG9ydCgpIGNvbnN0Owot ICAgIGJvb2wgaXNVc2VyU2NhbGFibGUoKSBjb25zdCB7IHJldHVybiBtX3VzZXJTY2FsYWJsZTsg fQorICAgIGJvb2wgaXNVc2VyU2NhbGFibGUoKSBjb25zdAorICAgIHsKKyAgICAgICAgaWYgKCFy ZXNwZWN0Vmlld3BvcnQoKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1 cm4gbV91c2VyU2NhbGFibGU7CisgICAgfQogICAgIHZvaWQgc2V0VXNlclNjYWxhYmxlKGJvb2wg dXNlclNjYWxhYmxlKSB7IG1fdXNlclNjYWxhYmxlID0gdXNlclNjYWxhYmxlOyB9CiAKICAgICAv LyBTZXRzIGRlZmF1bHQgbGF5b3V0IHNpemUgd2l0aG91dCBkb2luZyBsYXlvdXQgb3IgbWFya2lu ZyBhcyBuZWVkaW5nIGxheW91dC4KQEAgLTIzNCwxMSArMjM5LDEyIEBAIHB1YmxpYzoKICAgICAv LyBWYXJpb3VzIHNjYWxlIGZhY3RvcnMuCiAgICAgZG91YmxlIGN1cnJlbnRTY2FsZSgpIGNvbnN0 IHsgcmV0dXJuIG1fdHJhbnNmb3JtYXRpb25NYXRyaXgtPm0xMSgpOyB9CiAgICAgZG91YmxlIHpv b21Ub0ZpdFNjYWxlKCkgY29uc3Q7CisgICAgYm9vbCByZXNwZWN0Vmlld3BvcnQoKSBjb25zdDsK ICAgICBkb3VibGUgaW5pdGlhbFNjYWxlKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRJbml0aWFsU2Nh bGUoZG91YmxlIHNjYWxlKSB7IG1faW5pdGlhbFNjYWxlID0gc2NhbGU7IH0KICAgICBkb3VibGUg bWluaW11bVNjYWxlKCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiAobV9taW5pbXVtU2Nh bGUgPiB6b29tVG9GaXRTY2FsZSgpICYmIG1fbWluaW11bVNjYWxlIDw9IG1heGltdW1TY2FsZSgp KSA/IG1fbWluaW11bVNjYWxlIDogem9vbVRvRml0U2NhbGUoKTsKKyAgICAgICAgcmV0dXJuICht X21pbmltdW1TY2FsZSA+IHpvb21Ub0ZpdFNjYWxlKCkgJiYgbV9taW5pbXVtU2NhbGUgPD0gbWF4 aW11bVNjYWxlKCkgJiYgcmVzcGVjdFZpZXdwb3J0KCkpID8gbV9taW5pbXVtU2NhbGUgOiB6b29t VG9GaXRTY2FsZSgpOwogICAgIH0KIAogICAgIHZvaWQgc2V0TWluaW11bVNjYWxlKGRvdWJsZSBz Y2FsZSkgeyBtX21pbmltdW1TY2FsZSA9IHNjYWxlOyB9CkBAIC01MzMsNiArNTM5LDcgQEAgcHVi bGljOgogICAgIGRvdWJsZSBtX2luaXRpYWxTY2FsZTsKICAgICBkb3VibGUgbV9taW5pbXVtU2Nh bGU7CiAgICAgZG91YmxlIG1fbWF4aW11bVNjYWxlOworICAgIGJvb2wgbV9mb3JjZVJlc3BlY3RW aWV3cG9ydEFyZ3VtZW50czsKIAogICAgIC8vIEJsb2NrIHpvb20gYW5pbWF0aW9uIGRhdGEuCiAg ICAgV2ViQ29yZTo6RmxvYXRQb2ludCBtX2ZpbmFsQmxvY2tQb2ludDsK