133286 2014-05-26 09:36:24 -0700 Split the call to adjustForLocalZoom out into a separate expression. 2014-05-26 13:18:58 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan cmarcelo commit-queue darin esprehn+autocc kangil.han oldest_to_newest 1011782 0 zalan 2014-05-26 09:36:24 -0700 to ensure that adjustForLocalZoom is always evaluated before using the zoomFactor value. 1011789 1 232082 zalan 2014-05-26 10:06:06 -0700 Created attachment 232082 Patch 1011825 2 232082 commit-queue 2014-05-26 13:18:55 -0700 Comment on attachment 232082 Patch Clearing flags on attachment: 232082 Committed r169359: <http://trac.webkit.org/changeset/169359> 1011826 3 commit-queue 2014-05-26 13:18:58 -0700 All reviewed patches have been landed. Closing bug. 232082 2014-05-26 10:06:06 -0700 2014-05-26 13:18:54 -0700 Patch bug-133286-20140526100542.patch text/plain 2429 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWU1NTZmMWNhNzM4NmI2 MTRhZTRmNTFjOTU5MWMzNTkyODEzMTQ0Ny4uZGQ5YzdiOGUyNzk3MTcyNzJhZGI1YWMzZGI1MzMw MGQxNWVkZjQxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA1LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU3BsaXQgdGhlIGNhbGwgdG8g YWRqdXN0Rm9yTG9jYWxab29tIG91dCBpbnRvIGEgc2VwYXJhdGUgZXhwcmVzc2lvbi4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzI4NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZW5z dXJlcyB0aGF0IGFkanVzdEZvckxvY2FsWm9vbSgpIGFsd2F5cyBnZXRzIGNhbGxlZCBiZWZvcmUg d2UgbG9vayBhdAorICAgICAgICB6b29tRmFjdG9yJ3MgdmFsdWUuIChhbmQgbm90IHJlbHkgb24g dGhlIHVuZGVmaW5lZCBiZWhhdmlvciBvZiB0aGUgb3JkZXIgb2YgZnVuY3Rpb24gYXJndW1lbnQg ZXZhbHVhdGlvbikKKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkVsZW1lbnQ6Om9mZnNldExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6b2Zm c2V0VG9wKToKKwogMjAxNC0wNS0yNiAgSmF2aWVyIEZlcm5hbmRleiAgPGpmZXJuYW5kZXpAaWdh bGlhLmNvbT4KIAogICAgICAgICBbQ1NTIEdyaWQgTGF5b3V0XSBJbXBsZW1lbnRhdGlvbiBvZiB0 aGUgImdyaWQiIHNob3J0aGFuZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCAzNDhjMTg0Y2Uy NWJmYzU0ZDNjYjk0MWIxOTg4NDYxMWU3ZTMzZGViLi45ZDg2NzYzMzhlZWQyZDk3ODdlYWYwMDVj MzdhMjdmMzU4NmMxZGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC02NzEsNyArNjcxLDgg QEAgZG91YmxlIEVsZW1lbnQ6Om9mZnNldExlZnQoKQogICAgIGRvY3VtZW50KCkudXBkYXRlTGF5 b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CiAgICAgaWYgKFJlbmRlckJveE1vZGVsT2Jq ZWN0KiByZW5kZXJlciA9IHJlbmRlckJveE1vZGVsT2JqZWN0KCkpIHsKICAgICAgICAgZG91Ymxl IHpvb21GYWN0b3IgPSAxOwotICAgICAgICByZXR1cm4gY29udmVydFRvTm9uU3VicGl4ZWxWYWx1 ZUlmTmVlZGVkKGFkanVzdEZvckxvY2FsWm9vbShyZW5kZXJlci0+b2Zmc2V0TGVmdCgpLCAqcmVu ZGVyZXIsIHpvb21GYWN0b3IpLCByZW5kZXJlci0+ZG9jdW1lbnQoKSwgem9vbUZhY3RvciA9PSAx ID8gRmxvb3IgOiBSb3VuZCk7CisgICAgICAgIGRvdWJsZSBvZmZzZXRMZWZ0VmFsdWUgPSBhZGp1 c3RGb3JMb2NhbFpvb20ocmVuZGVyZXItPm9mZnNldExlZnQoKSwgKnJlbmRlcmVyLCB6b29tRmFj dG9yKTsKKyAgICAgICAgcmV0dXJuIGNvbnZlcnRUb05vblN1YnBpeGVsVmFsdWVJZk5lZWRlZChv ZmZzZXRMZWZ0VmFsdWUsIHJlbmRlcmVyLT5kb2N1bWVudCgpLCB6b29tRmFjdG9yID09IDEgPyBG bG9vciA6IFJvdW5kKTsKICAgICB9CiAgICAgcmV0dXJuIDA7CiB9CkBAIC02ODEsNyArNjgyLDgg QEAgZG91YmxlIEVsZW1lbnQ6Om9mZnNldFRvcCgpCiAgICAgZG9jdW1lbnQoKS51cGRhdGVMYXlv dXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKICAgICBpZiAoUmVuZGVyQm94TW9kZWxPYmpl Y3QqIHJlbmRlcmVyID0gcmVuZGVyQm94TW9kZWxPYmplY3QoKSkgewogICAgICAgICBkb3VibGUg em9vbUZhY3RvciA9IDE7Ci0gICAgICAgIHJldHVybiBjb252ZXJ0VG9Ob25TdWJwaXhlbFZhbHVl SWZOZWVkZWQoYWRqdXN0Rm9yTG9jYWxab29tKHJlbmRlcmVyLT5vZmZzZXRUb3AoKSwgKnJlbmRl cmVyLCB6b29tRmFjdG9yKSwgcmVuZGVyZXItPmRvY3VtZW50KCksIHpvb21GYWN0b3IgPT0gMSA/ IEZsb29yIDogUm91bmQpOworICAgICAgICBkb3VibGUgb2Zmc2V0VG9wVmFsdWUgPSBhZGp1c3RG b3JMb2NhbFpvb20ocmVuZGVyZXItPm9mZnNldFRvcCgpLCAqcmVuZGVyZXIsIHpvb21GYWN0b3Ip OworICAgICAgICByZXR1cm4gY29udmVydFRvTm9uU3VicGl4ZWxWYWx1ZUlmTmVlZGVkKG9mZnNl dFRvcFZhbHVlLCByZW5kZXJlci0+ZG9jdW1lbnQoKSwgem9vbUZhY3RvciA9PSAxID8gRmxvb3Ig OiBSb3VuZCk7CiAgICAgfQogICAgIHJldHVybiAwOwogfQo=