73713 2011-12-02 16:01:22 -0800 [GTK] TextureMapperNode should not use Qt types and functions 2011-12-03 02:09:45 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73634 1 alex webkit-unassigned noam oldest_to_newest 514249 0 alex 2011-12-02 16:01:22 -0800 Currently it is using qreal and qMin. 514251 1 117709 alex 2011-12-02 16:03:21 -0800 Created attachment 117709 Proposed patch 514275 2 117709 mrobinson 2011-12-02 16:51:27 -0800 Comment on attachment 117709 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=117709&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:835 > + return std::min(1.0, (floor(numSteps * t) + 1) / numSteps); I'm not certain, but I think its more typical to include MathExtras.h here and just use min. 514336 3 117709 noam 2011-12-02 18:17:47 -0800 Comment on attachment 117709 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=117709&action=review >> Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:835 >> + return std::min(1.0, (floor(numSteps * t) + 1) / numSteps); > > I'm not certain, but I think its more typical to include MathExtras.h here and just use min. True. Please fix before committing :) 514469 4 alex 2011-12-03 01:39:27 -0800 I've talked to Martin we checked that min is not directly included by MathExtras, he recommended to include it to add Windows support and use std:min. 514471 5 alex 2011-12-03 02:09:45 -0800 Landed! Thanks http://trac.webkit.org/changeset/101919 117709 2011-12-02 16:03:21 -0800 2011-12-02 18:17:47 -0800 Proposed patch mapper_node.patch text/plain 2536 alex Y29tbWl0IDEwNjVlODcxZWNhMDg3NWI4NWE1NjQxNzliNWRiOTAyY2E5ZThhMmMKQXV0aG9yOiBB bGVqYW5kcm8gRy4gQ2FzdHJvIDxhbGV4QGlnYWxpYS5jb20+CkRhdGU6ICAgU2F0IERlYyAzIDAx OjAxOjI5IDIwMTEgKzAxMDAKCiAgICAyMDExLTEyLTAyICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8 YWxleEBpZ2FsaWEuY29tPgogICAgCiAgICAgICAgICAgIFtHVEtdIFRleHR1cmVNYXBwZXJOb2Rl IHNob3VsZCBub3QgdXNlIFF0IHR5cGVzIGFuZCBmdW5jdGlvbnMKICAgICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNzEzCiAgICAKICAgICAgICAgICAg UmVwbGFjZSBxcmVhbCB3aXRoIGRvdWJsZSBhbmQgcU1pbiB3aXRoIHN0ZDo6bWluLgogICAgCiAg ICAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogICAgCiAgICAgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcDoKICAgICAgICAg ICAgKFdlYkNvcmU6OnNvbHZlQ3ViaWNCZXppZXJGdW5jdGlvbik6CiAgICAgICAgICAgIChXZWJD b3JlOjpzb2x2ZVN0ZXBzRnVuY3Rpb24pOgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYTI3NmQxLi41OGI1Y2M3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTEtMTItMDIgIEFsZWphbmRybyBHLiBD YXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVGV4dHVyZU1hcHBlck5v ZGUgc2hvdWxkIG5vdCB1c2UgUXQgdHlwZXMgYW5kIGZ1bmN0aW9ucworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM3MTMKKworICAgICAgICBSZXBsYWNl IHFyZWFsIHdpdGggZG91YmxlIGFuZCBxTWluIHdpdGggc3RkOjptaW4uCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c29sdmVDdWJp Y0JlemllckZ1bmN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OnNvbHZlU3RlcHNGdW5jdGlvbik6 CisKKzIwMTEtMTItMDIgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CisK ICAgICAgICAgW0dUS10gQUMgLSBBZGQgVGV4dHVyZU1hcHBlckNhaXJvIGltcGxlbWVudGF0aW9u IGFuZCB3aWRnZXQgZ2x1ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzM2MzQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAKaW5kZXggYTI3ZWM4Yy4u MTJlY2FkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwCkBAIC04MjMsNyArODIzLDcgQEAg c3RhdGljIGlubGluZSBkb3VibGUgc29sdmVFcHNpbG9uKGRvdWJsZSBkdXJhdGlvbikKICAgICBy ZXR1cm4gMS4wIC8gKDIwMC4wICogZHVyYXRpb24pOwogfQogCi1zdGF0aWMgaW5saW5lIGRvdWJs ZSBzb2x2ZUN1YmljQmV6aWVyRnVuY3Rpb24ocXJlYWwgcDF4LCBxcmVhbCBwMXksIHFyZWFsIHAy eCwgcXJlYWwgcDJ5LCBkb3VibGUgdCwgZG91YmxlIGR1cmF0aW9uKQorc3RhdGljIGlubGluZSBk b3VibGUgc29sdmVDdWJpY0JlemllckZ1bmN0aW9uKGRvdWJsZSBwMXgsIGRvdWJsZSBwMXksIGRv dWJsZSBwMngsIGRvdWJsZSBwMnksIGRvdWJsZSB0LCBkb3VibGUgZHVyYXRpb24pCiB7CiAgICAg VW5pdEJlemllciBiZXppZXIocDF4LCBwMXksIHAyeCwgcDJ5KTsKICAgICByZXR1cm4gYmV6aWVy LnNvbHZlKHQsIHNvbHZlRXBzaWxvbihkdXJhdGlvbikpOwpAQCAtODMyLDcgKzgzMiw3IEBAIHN0 YXRpYyBpbmxpbmUgZG91YmxlIHNvbHZlQ3ViaWNCZXppZXJGdW5jdGlvbihxcmVhbCBwMXgsIHFy ZWFsIHAxeSwgcXJlYWwgcDJ4LCBxCiBzdGF0aWMgaW5saW5lIGRvdWJsZSBzb2x2ZVN0ZXBzRnVu Y3Rpb24oaW50IG51bVN0ZXBzLCBib29sIHN0ZXBBdFN0YXJ0LCBkb3VibGUgdCkKIHsKICAgICBp ZiAoc3RlcEF0U3RhcnQpCi0gICAgICAgIHJldHVybiBxTWluKDEuMCwgKGZsb29yKG51bVN0ZXBz ICogdCkgKyAxKSAvIG51bVN0ZXBzKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWluKDEuMCwgKGZs b29yKG51bVN0ZXBzICogdCkgKyAxKSAvIG51bVN0ZXBzKTsKICAgICByZXR1cm4gZmxvb3IobnVt U3RlcHMgKiB0KSAvIG51bVN0ZXBzOwogfQogCg==