132843 2014-05-12 16:08:56 -0700 Add debug dumping for ViewportConfiguration 2014-05-12 17:14:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser benjamin commit-queue simon.fraser thorton oldest_to_newest 1008772 0 simon.fraser 2014-05-12 16:08:56 -0700 Add debug dumping for ViewportConfiguration 1008776 1 231339 simon.fraser 2014-05-12 16:11:32 -0700 Created attachment 231339 Patch 1008777 2 231339 benjamin 2014-05-12 16:16:54 -0700 Comment on attachment 231339 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231339&action=review > Source/WebCore/page/ViewportConfiguration.cpp:237 > + Nope. > Source/WebCore/page/ViewportConfiguration.cpp:340 > +template <class T> class -> typename? 1008811 3 simon.fraser 2014-05-12 17:14:44 -0700 https://trac.webkit.org/r168660 231339 2014-05-12 16:11:32 -0700 2014-05-12 17:13:50 -0700 Patch bug-132843-20140512161109.patch text/plain 7635 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODVhMTcyYjY0ODQxNDhk NWMyMzlhMTA5ZWEyNmQ2NDE3ZjcwODMyOS4uZjA0ZDIwZDYzMTg3MjA5OTI2MjU2ZGFkNjkwNTgz Y2U4NjdhMGQwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA1LTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBkZWJ1ZyBk dW1waW5nIGZvciBWaWV3cG9ydENvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjg0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzb21lIFRleHRTdHJlYW0tYmFzZWQgZHVtcGlu ZyBmb3IgVmlld3BvcnRDb25maWd1cmF0aW9uLgorCisgICAgICAgICogcGFnZS9WaWV3cG9ydENv bmZpZ3VyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9u Ojp1cGRhdGVDb25maWd1cmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmln dXJhdGlvblRleHRTdHJlYW06OlZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW0pOgorICAg ICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uVGV4dFN0cmVhbTo6aW5jcmVhc2VJ bmRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uVGV4dFN0cmVh bTo6ZGVjcmVhc2VJbmRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6ZHVtcFByb3BlcnR5KToKKyAg ICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW06OndyaXRlSW5k ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW06 Om9wZXJhdG9yPDwpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjpk ZXNjcmlwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246OmR1 bXApOgorICAgICAgICAqIHBhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmg6CisKIDIwMTQtMDUt MTIgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgogCiAgICAgICAgIEludmFsaWQg aW5mb3JtYXRpb24gcmVtYWluaW5nIGluIGxpbmVUb1JlZ2lvbiBtYXAgb2YgUmVuZGVyRmxvd1Ro cmVhZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmNwcApp bmRleCBmZGI3MTM5OWI4MGMyMDM4YzIzYzU0NGU1ZGNjOWIyNDAyYzRmNGM5Li40ZDAyYTkwZWEx ODM3ZjFhMTRjYmQ2NmY0MTJjYzExYjI0NTY3ZGMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwCkBAIC0yNiw4ICsyNiwxMCBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIlZpZXdwb3J0Q29uZmlndXJhdGlvbi5oIgogCisjaW5jbHVk ZSA8V2ViQ29yZS9UZXh0U3RyZWFtLmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KICNp bmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K IAogI2lmIFBMQVRGT1JNKElPUykKICNpbmNsdWRlICJXZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgi CkBAIC0yMzIsNyArMjM0LDcgQEAgdm9pZCBWaWV3cG9ydENvbmZpZ3VyYXRpb246OnVwZGF0ZUNv bmZpZ3VyYXRpb24oKQogICAgIGRvdWJsZSBtYXhpbXVtVmlld3BvcnRBcmd1bWVudHNEaW1lbnNp b24gPSAxMDAwMDsKICAgICBhcHBseVZpZXdwb3J0QXJndW1lbnQobV9jb25maWd1cmF0aW9uLndp ZHRoLCB2aWV3cG9ydEFyZ3VtZW50c092ZXJyaWRlc1dpZHRoLCBtX3ZpZXdwb3J0QXJndW1lbnRz LndpZHRoLCBtaW5pbXVtVmlld3BvcnRBcmd1bWVudHNEaW1lbnNpb24sIG1heGltdW1WaWV3cG9y dEFyZ3VtZW50c0RpbWVuc2lvbik7CiAgICAgYXBwbHlWaWV3cG9ydEFyZ3VtZW50KG1fY29uZmln dXJhdGlvbi5oZWlnaHQsIHZpZXdwb3J0QXJndW1lbnRzT3ZlcnJpZGVzSGVpZ2h0LCBtX3ZpZXdw b3J0QXJndW1lbnRzLmhlaWdodCwgbWluaW11bVZpZXdwb3J0QXJndW1lbnRzRGltZW5zaW9uLCBt YXhpbXVtVmlld3BvcnRBcmd1bWVudHNEaW1lbnNpb24pOwotCisgICAgCiAgICAgaWYgKHZpZXdw b3J0QXJndW1lbnRzT3ZlcnJpZGVzSW5pdGlhbFNjYWxlIHx8IHZpZXdwb3J0QXJndW1lbnRzT3Zl cnJpZGVzV2lkdGggfHwgdmlld3BvcnRBcmd1bWVudHNPdmVycmlkZXNIZWlnaHQpIHsKICAgICAg ICAgbV9jb25maWd1cmF0aW9uLmluaXRpYWxTY2FsZUlzU2V0ID0gdmlld3BvcnRBcmd1bWVudHNP dmVycmlkZXNJbml0aWFsU2NhbGU7CiAgICAgICAgIG1fY29uZmlndXJhdGlvbi53aWR0aElzU2V0 ID0gdmlld3BvcnRBcmd1bWVudHNPdmVycmlkZXNXaWR0aDsKQEAgLTMxMyw0ICszMTUsMTQ3IEBA IGludCBWaWV3cG9ydENvbmZpZ3VyYXRpb246OmxheW91dEhlaWdodCgpIGNvbnN0CiAgICAgcmV0 dXJuIG1fbWluaW11bUxheW91dFNpemUuaGVpZ2h0KCk7CiB9CiAKKyNpZm5kZWYgTkRFQlVHCitj bGFzcyBWaWV3cG9ydENvbmZpZ3VyYXRpb25UZXh0U3RyZWFtIDogcHVibGljIFRleHRTdHJlYW0g eworcHVibGljOgorICAgIFZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW0oKQorICAgICAg ICA6IG1faW5kZW50KDApCisgICAgeworICAgIH0KKyAgICAKKyAgICB1c2luZyBUZXh0U3RyZWFt OjpvcGVyYXRvcjw8OworICAgIAorICAgIFZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW0m IG9wZXJhdG9yPDwoY29uc3QgVmlld3BvcnRDb25maWd1cmF0aW9uOjpQYXJhbWV0ZXJzJik7Cisg ICAgVmlld3BvcnRDb25maWd1cmF0aW9uVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChjb25zdCBWaWV3 cG9ydEFyZ3VtZW50cyYpOworICAgIAorICAgIHZvaWQgaW5jcmVhc2VJbmRlbnQoKSB7ICsrbV9p bmRlbnQ7IH0KKyAgICB2b2lkIGRlY3JlYXNlSW5kZW50KCkgeyAtLW1faW5kZW50OyBBU1NFUlQo bV9pbmRlbnQgPj0gMCk7IH0KKworICAgIHZvaWQgd3JpdGVJbmRlbnQoKTsKKworcHJpdmF0ZToK KyAgICBpbnQgbV9pbmRlbnQ7Cit9OworICAgIAordGVtcGxhdGUgPGNsYXNzIFQ+CitzdGF0aWMg dm9pZCBkdW1wUHJvcGVydHkoVmlld3BvcnRDb25maWd1cmF0aW9uVGV4dFN0cmVhbSYgdHMsIFN0 cmluZyBuYW1lLCBUIHZhbHVlKQoreworICAgIHRzIDw8ICJcbiI7CisgICAgdHMuaW5jcmVhc2VJ bmRlbnQoKTsKKyAgICB0cy53cml0ZUluZGVudCgpOworICAgIHRzIDw8ICIoIiA8PCBuYW1lIDw8 ICIgIjsKKyAgICB0cyA8PCB2YWx1ZSA8PCAiKSI7CisgICAgdHMuZGVjcmVhc2VJbmRlbnQoKTsK K30KKyAgICAKK3ZvaWQgVmlld3BvcnRDb25maWd1cmF0aW9uVGV4dFN0cmVhbTo6d3JpdGVJbmRl bnQoKQoreworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbV9pbmRlbnQ7ICsraSkKKyAgICAgICAg KnRoaXMgPDwgIiAgIjsKK30KKyAgICAKK1ZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW0m IFZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW06Om9wZXJhdG9yPDwoY29uc3QgVmlld3Bv cnRDb25maWd1cmF0aW9uOjpQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQoreworICAgIFZpZXdwb3J0 Q29uZmlndXJhdGlvblRleHRTdHJlYW0mIHRzID0gKnRoaXM7CisgICAgCisgICAgdHMuaW5jcmVh c2VJbmRlbnQoKTsKKyAgICB0cyA8PCAiXG4iOworICAgIHRzLndyaXRlSW5kZW50KCk7CisgICAg dHMgPDwgIih3aWR0aCAiIDw8IHBhcmFtZXRlcnMud2lkdGggPDwgIiwgc2V0OiAiIDw8IChwYXJh bWV0ZXJzLndpZHRoSXNTZXQgPyAidHJ1ZSIgOiAiZmFsc2UiKSA8PCAiKSI7CisgICAgCisgICAg dHMgPDwgIlxuIjsKKyAgICB0cy53cml0ZUluZGVudCgpOworICAgIHRzIDw8ICIoaGVpZ2h0ICIg PDwgcGFyYW1ldGVycy5oZWlnaHQgPDwgIiwgc2V0OiAiIDw8IChwYXJhbWV0ZXJzLmhlaWdodElz U2V0ID8gInRydWUiIDogImZhbHNlIikgPDwgIikiOworICAgIAorICAgIHRzIDw8ICJcbiI7Cisg ICAgdHMud3JpdGVJbmRlbnQoKTsKKyAgICB0cyA8PCAiKGluaXRpYWxTY2FsZSAiIDw8IHBhcmFt ZXRlcnMud2lkdGggPDwgIiwgc2V0OiAiIDw8IChwYXJhbWV0ZXJzLmluaXRpYWxTY2FsZUlzU2V0 ID8gInRydWUiIDogImZhbHNlIikgPDwgIikiOworICAgIHRzLmRlY3JlYXNlSW5kZW50KCk7Cisg ICAgCisgICAgZHVtcFByb3BlcnR5KHRzLCAibWluaW11bVNjYWxlIiwgcGFyYW1ldGVycy5taW5p bXVtU2NhbGUpOworICAgIGR1bXBQcm9wZXJ0eSh0cywgIm1heGltdW1TY2FsZSIsIHBhcmFtZXRl cnMubWF4aW11bVNjYWxlKTsKKyAgICBkdW1wUHJvcGVydHkodHMsICJhbGxvd3NVc2VyU2NhbGlu ZyIsIHBhcmFtZXRlcnMuYWxsb3dzVXNlclNjYWxpbmcpOworICAgIAorICAgIHJldHVybiB0czsK K30KKyAgICAKK1ZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW0mIFZpZXdwb3J0Q29uZmln dXJhdGlvblRleHRTdHJlYW06Om9wZXJhdG9yPDwoY29uc3QgVmlld3BvcnRBcmd1bWVudHMmIHZp ZXdwb3J0QXJndW1lbnRzKQoreworICAgIFZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW0m IHRzID0gKnRoaXM7CisgICAgCisgICAgdHMuaW5jcmVhc2VJbmRlbnQoKTsKKyAgICAKKyAgICB0 cyA8PCAiXG4iOworICAgIHRzLndyaXRlSW5kZW50KCk7CisgICAgdHMgPDwgIih3aWR0aCAiIDw8 IHZpZXdwb3J0QXJndW1lbnRzLndpZHRoIDw8ICIsIG1pbldpZHRoICIgPDwgdmlld3BvcnRBcmd1 bWVudHMubWluV2lkdGggPDwgIiwgbWF4V2lkdGggIiA8PCB2aWV3cG9ydEFyZ3VtZW50cy5tYXhX aWR0aCA8PCAiKSI7CisgICAgCisgICAgdHMgPDwgIlxuIjsKKyAgICB0cy53cml0ZUluZGVudCgp OworICAgIHRzIDw8ICIoaGVpZ2h0ICIgPDwgdmlld3BvcnRBcmd1bWVudHMuaGVpZ2h0IDw8ICIs IG1pbkhlaWdodCAiIDw8IHZpZXdwb3J0QXJndW1lbnRzLm1pbkhlaWdodCA8PCAiLCBtYXhIZWln aHQgIiA8PCB2aWV3cG9ydEFyZ3VtZW50cy5tYXhIZWlnaHQgPDwgIikiOworICAgIAorICAgIHRz IDw8ICJcbiI7CisgICAgdHMud3JpdGVJbmRlbnQoKTsKKyAgICB0cyA8PCAiKHpvb20gIiA8PCB2 aWV3cG9ydEFyZ3VtZW50cy56b29tIDw8ICIsIG1pblpvb20gIiA8PCB2aWV3cG9ydEFyZ3VtZW50 cy5taW5ab29tIDw8ICIsIG1heFpvb20gIiA8PCB2aWV3cG9ydEFyZ3VtZW50cy5tYXhab29tIDw8 ICIpIjsKKyAgICB0cy5kZWNyZWFzZUluZGVudCgpOworICAgIAorI2lmIFBMQVRGT1JNKElPUykK KyAgICBkdW1wUHJvcGVydHkodHMsICJtaW5pbWFsVUkiLCB2aWV3cG9ydEFyZ3VtZW50cy5taW5p bWFsVUkpOworI2VuZGlmCisgICAgcmV0dXJuIHRzOworfQorICAgIAorQ1N0cmluZyBWaWV3cG9y dENvbmZpZ3VyYXRpb246OmRlc2NyaXB0aW9uKCkgY29uc3QKK3sKKyAgICBWaWV3cG9ydENvbmZp Z3VyYXRpb25UZXh0U3RyZWFtIHRzOworICAgIAorICAgIHRzIDw8ICIodmlld3BvcnQtY29uZmln dXJhdGlvbiAiIDw8ICh2b2lkKil0aGlzOworICAgIHRzIDw8ICJcbiI7CisgICAgdHMuaW5jcmVh c2VJbmRlbnQoKTsKKyAgICB0cy53cml0ZUluZGVudCgpOworICAgIHRzIDw8ICIodmlld3BvcnQg YXJndW1lbnRzIjsKKyAgICB0cyA8PCBtX3ZpZXdwb3J0QXJndW1lbnRzOworICAgIHRzIDw8ICIp IjsKKyAgICB0cy5kZWNyZWFzZUluZGVudCgpOworICAgIAorICAgIHRzIDw8ICJcbiI7CisgICAg dHMuaW5jcmVhc2VJbmRlbnQoKTsKKyAgICB0cy53cml0ZUluZGVudCgpOworICAgIHRzIDw8ICIo Y29uZmlndXJhdGlvbiI7CisgICAgdHMgPDwgbV9jb25maWd1cmF0aW9uOworICAgIHRzIDw8ICIp IjsKKyAgICB0cy5kZWNyZWFzZUluZGVudCgpOworICAgIAorICAgIHRzIDw8ICJcbiI7CisgICAg dHMuaW5jcmVhc2VJbmRlbnQoKTsKKyAgICB0cy53cml0ZUluZGVudCgpOworICAgIHRzIDw8ICIo ZGVmYXVsdCBjb25maWd1cmF0aW9uIjsKKyAgICB0cyA8PCBtX2RlZmF1bHRDb25maWd1cmF0aW9u OworICAgIHRzIDw8ICIpIjsKKyAgICB0cy5kZWNyZWFzZUluZGVudCgpOworICAgIAorICAgIGR1 bXBQcm9wZXJ0eSh0cywgImNvbnRlbnRTaXplIiwgbV9jb250ZW50U2l6ZSk7CisgICAgZHVtcFBy b3BlcnR5KHRzLCAibWluaW11bUxheW91dFNpemUiLCBtX21pbmltdW1MYXlvdXRTaXplKTsKKyAg ICAKKyAgICB0cyA8PCAiXG4iOworICAgIHRzLmluY3JlYXNlSW5kZW50KCk7CisgICAgdHMud3Jp dGVJbmRlbnQoKTsKKyAgICB0cyA8PCAiKGNvbXB1dGVkIGluaXRpYWwgc2NhbGUgIiA8PCBpbml0 aWFsU2NhbGUoKSA8PCAiKVxuIjsKKyAgICB0cy53cml0ZUluZGVudCgpOworICAgIHRzIDw8ICIo Y29tcHV0ZWQgbWluaW11bSBzY2FsZSAiIDw8IG1pbmltdW1TY2FsZSgpIDw8ICIpXG4iOworICAg IHRzLndyaXRlSW5kZW50KCk7CisgICAgdHMgPDwgIihjb21wdXRlZCBsYXlvdXQgc2l6ZSAiIDw8 IGxheW91dFNpemUoKSA8PCAiKSI7CisgICAgdHMuZGVjcmVhc2VJbmRlbnQoKTsKKyAgICAKKyAg ICB0cyA8PCAiKVxuIjsKKyAgICAKKyAgICByZXR1cm4gdHMucmVsZWFzZSgpLnV0ZjgoKTsKK30K KyAgICAKK3ZvaWQgVmlld3BvcnRDb25maWd1cmF0aW9uOjpkdW1wKCkgY29uc3QKK3sKKyAgICBm cHJpbnRmKHN0ZGVyciwgIiVzIiwgZGVzY3JpcHRpb24oKS5kYXRhKCkpOworfQorICAgIAorI2Vu ZGlmCisgICAgCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9W aWV3cG9ydENvbmZpZ3VyYXRpb24uaAppbmRleCBjMjk5OWJlMDE5M2M5MzMxYWVmMGE0YzIyNjlh NWNkNWU4YzZkZDU4Li5lYWE1YmY0NDhlMDYxZjdjZDBjYTdkN2NhOTFjZTcyZGY1NjQ5ZTY3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKQEAgLTg3LDcg Kzg3LDEyIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFyYW1ldGVycyB0ZXh0RG9jdW1lbnRQYXJh bWV0ZXJzKCk7CiAgICAgc3RhdGljIFBhcmFtZXRlcnMgaW1hZ2VEb2N1bWVudFBhcmFtZXRlcnMo KTsKICAgICBzdGF0aWMgUGFyYW1ldGVycyB4aHRtbE1vYmlsZVBhcmFtZXRlcnMoKTsKLQorICAg IAorI2lmbmRlZiBOREVCVUcKKyAgICBXVEY6OkNTdHJpbmcgZGVzY3JpcHRpb24oKSBjb25zdDsK KyAgICB2b2lkIGR1bXAoKSBjb25zdDsKKyNlbmRpZgorICAgIAogcHJpdmF0ZToKICAgICB2b2lk IHVwZGF0ZUNvbmZpZ3VyYXRpb24oKTsKICAgICBpbnQgbGF5b3V0V2lkdGgoKSBjb25zdDsK