30905 2009-10-29 07:01:16 -0700 [Qt] Fix Qt build on Windows. 2009-11-02 10:17:29 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 2000 RESOLVED FIXED Qt P2 Blocker --- 1 jturcotte webkit-unassigned commit-queue oldest_to_newest 158882 0 jturcotte 2009-10-29 07:01:16 -0700 Implemented: BitmapImage(QPixmap* pixmap,...) BitmapImage::create(HBITMAP hBitmap) 158883 1 42095 jturcotte 2009-10-29 07:02:54 -0700 Created attachment 42095 Patch 158923 2 42106 jturcotte 2009-10-29 09:07:12 -0700 Created attachment 42106 Patch v2 The previous patch would not apply. This one should. 159831 3 42106 commit-queue 2009-11-02 10:17:26 -0800 Comment on attachment 42106 Patch v2 Clearing flags on attachment: 42106 Committed r50416: <http://trac.webkit.org/changeset/50416> 159832 4 commit-queue 2009-11-02 10:17:29 -0800 All reviewed patches have been landed. Closing bug. 42095 2009-10-29 07:02:54 -0700 2009-10-29 09:07:12 -0700 Patch bitmapimage_windowsbuildfix.patch text/plain 3669 jturcotte ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmUwZDQ3ZS4uZDBkN2ZhNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0xMC0yOSAgSm9jZWx5biBUdXJj b3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IFF0IGJ1aWxkIG9uIFdpbmRvd3Mu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDkwNQor CisgICAgICAgICogV2ViQ29yZS5wcm86CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQml0 bWFwSW1hZ2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpCaXRtYXBJbWFnZSk6CisgICAgICAgIChX ZWJDb3JlOjpCaXRtYXBJbWFnZTo6Y3JlYXRlKToKKwogMjAwOS0xMC0yOCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5 IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUucHJvIGIvV2ViQ29yZS9XZWJD b3JlLnBybwppbmRleCA5YTRlOWQ4Li5lODFkMTVkIDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNv cmUucHJvCisrKyBiL1dlYkNvcmUvV2ViQ29yZS5wcm8KQEAgLTI1MDAsMTMgKzI1MDAsMTUgQEAg Y29udGFpbnMoREVGSU5FUywgRU5BQkxFX05FVFNDQVBFX1BMVUdJTl9BUEk9MSkgewogICAgICAg ICB9CiAgICAgCiAgICAgICAgIHdpbjMyLSogewotICAgICAgICAgICAgSU5DTFVERVBBVEggKz0g JCRQV0QvcGx1Z2lucy93aW4KKyAgICAgICAgICAgIElOQ0xVREVQQVRIICs9ICQkUFdEL3BsdWdp bnMvd2luIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICQkUFdEL3BsYXRmb3JtL3dpbgog ICAgIAogICAgICAgICAgICAgU09VUkNFUyArPSBwYWdlL3dpbi9QYWdlV2luLmNwcCBcCiAgICAg ICAgICAgICAgICAgICAgICAgIHBsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcCBcCiAg ICAgICAgICAgICAgICAgICAgICAgIHBsdWdpbnMvd2luL1BsdWdpblBhY2thZ2VXaW4uY3BwIFwK ICAgICAgICAgICAgICAgICAgICAgICAgcGx1Z2lucy93aW4vUGx1Z2luTWVzc2FnZVRocm90dGxl cldpbi5jcHAgXAotICAgICAgICAgICAgICAgICAgICAgICBwbHVnaW5zL3dpbi9QbHVnaW5WaWV3 V2luLmNwcAorICAgICAgICAgICAgICAgICAgICAgICBwbHVnaW5zL3dpbi9QbHVnaW5WaWV3V2lu LmNwcCBcCisgICAgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtL3dpbi9CaXRtYXBJbmZvLmNw cAogICAgIAogICAgICAgICAgICAgTElCUyArPSBcCiAgICAgICAgICAgICAgICAgLWxhZHZhcGkz MiBcCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmgg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmgKaW5kZXggZDcxMmVmYi4u N2U4ZjJiMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFn ZS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaApAQCAtMTQw LDggKzE0MCwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBDR0ltYWdlUmVmIGdldENHSW1hZ2VS ZWYoKTsKICNlbmRpZgogCi0jaWYgUExBVEZPUk0oV0lOKQorI2lmIFBMQVRGT1JNKFdJTikgfHwg KFBMQVRGT1JNKFFUKSAmJiBQTEFURk9STShXSU5fT1MpKQogICAgIHN0YXRpYyBQYXNzUmVmUHRy PEJpdG1hcEltYWdlPiBjcmVhdGUoSEJJVE1BUCk7CisjZW5kaWYKKyNpZiBQTEFURk9STShXSU4p CiAgICAgdmlydHVhbCBib29sIGdldEhCSVRNQVAoSEJJVE1BUCk7CiAgICAgdmlydHVhbCBib29s IGdldEhCSVRNQVBPZlNpemUoSEJJVE1BUCwgTFBTSVpFKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcCBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKaW5kZXggZGE2ZGRhYy4uYjY3MTEwNyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCkBAIC0xMjAsNiArMTIwLDM4IEBA IHZvaWQgSW1hZ2U6OmRyYXdQYXR0ZXJuKEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxv YXRSZWN0JiB0aWxlUmVjdCwgY29uc3QKICAgICAgICAgaW1hZ2VPYnNlcnZlcigpLT5kaWREcmF3 KHRoaXMpOwogfQogCitCaXRtYXBJbWFnZTo6Qml0bWFwSW1hZ2UoUVBpeG1hcCogcGl4bWFwLCBJ bWFnZU9ic2VydmVyKiBvYnNlcnZlcikKKyAgICA6IEltYWdlKG9ic2VydmVyKQorICAgICwgbV9j dXJyZW50RnJhbWUoMCkKKyAgICAsIG1fZnJhbWVzKDApCisgICAgLCBtX2ZyYW1lVGltZXIoMCkK KyAgICAsIG1fcmVwZXRpdGlvbkNvdW50KGNBbmltYXRpb25Ob25lKQorICAgICwgbV9yZXBldGl0 aW9uQ291bnRTdGF0dXMoVW5rbm93bikKKyAgICAsIG1fcmVwZXRpdGlvbnNDb21wbGV0ZSgwKQor ICAgICwgbV9pc1NvbGlkQ29sb3IoZmFsc2UpCisgICAgLCBtX2NoZWNrZWRGb3JTb2xpZENvbG9y KGZhbHNlKQorICAgICwgbV9hbmltYXRpb25GaW5pc2hlZCh0cnVlKQorICAgICwgbV9hbGxEYXRh UmVjZWl2ZWQodHJ1ZSkKKyAgICAsIG1faGF2ZVNpemUodHJ1ZSkKKyAgICAsIG1fc2l6ZUF2YWls YWJsZSh0cnVlKQorICAgICwgbV9kZWNvZGVkU2l6ZSgwKQorICAgICwgbV9oYXZlRnJhbWVDb3Vu dCh0cnVlKQorICAgICwgbV9mcmFtZUNvdW50KDEpCit7CisgICAgaW5pdFBsYXRmb3JtRGF0YSgp OworCisgICAgaW50IHdpZHRoID0gcGl4bWFwLT53aWR0aCgpOworICAgIGludCBoZWlnaHQgPSBw aXhtYXAtPmhlaWdodCgpOworICAgIG1fZGVjb2RlZFNpemUgPSB3aWR0aCAqIGhlaWdodCAqIDQ7 CisgICAgbV9zaXplID0gSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KTsKKworICAgIG1fZnJhbWVzLmdy b3coMSk7CisgICAgbV9mcmFtZXNbMF0ubV9mcmFtZSA9IHBpeG1hcDsKKyAgICBtX2ZyYW1lc1sw XS5tX2hhc0FscGhhID0gcGl4bWFwLT5oYXNBbHBoYSgpOworICAgIG1fZnJhbWVzWzBdLm1faGF2 ZU1ldGFkYXRhID0gdHJ1ZTsKKyAgICBjaGVja0ZvclNvbGlkQ29sb3IoKTsKK30KKwogdm9pZCBC aXRtYXBJbWFnZTo6aW5pdFBsYXRmb3JtRGF0YSgpCiB7CiB9CkBAIC0xODEsNiArMjEzLDEzIEBA IHZvaWQgQml0bWFwSW1hZ2U6OmNoZWNrRm9yU29saWRDb2xvcigpCiAgICAgbV9zb2xpZENvbG9y ID0gUUNvbG9yOjpmcm9tUmdiYShmcmFtZVBpeG1hcC0+dG9JbWFnZSgpLnBpeGVsKDAsIDApKTsK IH0KIAorI2lmIFBMQVRGT1JNKFdJTl9PUykKK1Bhc3NSZWZQdHI8Qml0bWFwSW1hZ2U+IEJpdG1h cEltYWdlOjpjcmVhdGUoSEJJVE1BUCBoQml0bWFwKQoreworICAgIHJldHVybiBCaXRtYXBJbWFn ZTo6Y3JlYXRlKG5ldyBRUGl4bWFwKFFQaXhtYXA6OmZyb21XaW5IQklUTUFQKGhCaXRtYXApKSk7 Cit9CisjZW5kaWYKKwogfQogCiAK 42106 2009-10-29 09:07:12 -0700 2009-11-02 10:17:26 -0800 Patch v2 bitmapimage_windowsbuildfix.patch text/plain 3669 jturcotte ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmUwZDQ3ZS4uZDBkN2ZhNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0xMC0yOSAgSm9jZWx5biBUdXJj b3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IFF0IGJ1aWxkIG9uIFdpbmRvd3Mu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDkwNQor CisgICAgICAgICogV2ViQ29yZS5wcm86CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQml0 bWFwSW1hZ2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpCaXRtYXBJbWFnZSk6CisgICAgICAgIChX ZWJDb3JlOjpCaXRtYXBJbWFnZTo6Y3JlYXRlKToKKwogMjAwOS0xMC0yOCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5 IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUucHJvIGIvV2ViQ29yZS9XZWJD b3JlLnBybwppbmRleCA5YTRlOWQ4Li5lODFkMTVkIDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNv cmUucHJvCisrKyBiL1dlYkNvcmUvV2ViQ29yZS5wcm8KQEAgLTI1MDAsMTMgKzI1MDAsMTUgQEAg Y29udGFpbnMoREVGSU5FUywgRU5BQkxFX05FVFNDQVBFX1BMVUdJTl9BUEk9MSkgewogICAgICAg ICB9CiAgICAgCiAgICAgICAgIHdpbjMyLSogewotICAgICAgICAgICAgSU5DTFVERVBBVEggKz0g JCRQV0QvcGx1Z2lucy93aW4KKyAgICAgICAgICAgIElOQ0xVREVQQVRIICs9ICQkUFdEL3BsdWdp bnMvd2luIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICQkUFdEL3BsYXRmb3JtL3dpbgog ICAgIAogICAgICAgICAgICAgU09VUkNFUyArPSBwYWdlL3dpbi9QYWdlV2luLmNwcCBcCiAgICAg ICAgICAgICAgICAgICAgICAgIHBsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcCBcCiAg ICAgICAgICAgICAgICAgICAgICAgIHBsdWdpbnMvd2luL1BsdWdpblBhY2thZ2VXaW4uY3BwIFwK ICAgICAgICAgICAgICAgICAgICAgICAgcGx1Z2lucy93aW4vUGx1Z2luTWVzc2FnZVRocm90dGxl cldpbi5jcHAgXAotICAgICAgICAgICAgICAgICAgICAgICBwbHVnaW5zL3dpbi9QbHVnaW5WaWV3 V2luLmNwcAorICAgICAgICAgICAgICAgICAgICAgICBwbHVnaW5zL3dpbi9QbHVnaW5WaWV3V2lu LmNwcCBcCisgICAgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtL3dpbi9CaXRtYXBJbmZvLmNw cAogICAgIAogICAgICAgICAgICAgTElCUyArPSBcCiAgICAgICAgICAgICAgICAgLWxhZHZhcGkz MiBcCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmgg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmgKaW5kZXggZDcxMmVmYi4u N2U4ZjJiMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFn ZS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaApAQCAtMTQw LDggKzE0MCwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBDR0ltYWdlUmVmIGdldENHSW1hZ2VS ZWYoKTsKICNlbmRpZgogCi0jaWYgUExBVEZPUk0oV0lOKQorI2lmIFBMQVRGT1JNKFdJTikgfHwg KFBMQVRGT1JNKFFUKSAmJiBQTEFURk9STShXSU5fT1MpKQogICAgIHN0YXRpYyBQYXNzUmVmUHRy PEJpdG1hcEltYWdlPiBjcmVhdGUoSEJJVE1BUCk7CisjZW5kaWYKKyNpZiBQTEFURk9STShXSU4p CiAgICAgdmlydHVhbCBib29sIGdldEhCSVRNQVAoSEJJVE1BUCk7CiAgICAgdmlydHVhbCBib29s IGdldEhCSVRNQVBPZlNpemUoSEJJVE1BUCwgTFBTSVpFKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcCBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKaW5kZXggZGE2ZGRhYy4uYjY3MTEwNyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCkBAIC0xMjAsNiArMTIwLDM4IEBA IHZvaWQgSW1hZ2U6OmRyYXdQYXR0ZXJuKEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxv YXRSZWN0JiB0aWxlUmVjdCwgY29uc3QKICAgICAgICAgaW1hZ2VPYnNlcnZlcigpLT5kaWREcmF3 KHRoaXMpOwogfQogCitCaXRtYXBJbWFnZTo6Qml0bWFwSW1hZ2UoUVBpeG1hcCogcGl4bWFwLCBJ bWFnZU9ic2VydmVyKiBvYnNlcnZlcikKKyAgICA6IEltYWdlKG9ic2VydmVyKQorICAgICwgbV9j dXJyZW50RnJhbWUoMCkKKyAgICAsIG1fZnJhbWVzKDApCisgICAgLCBtX2ZyYW1lVGltZXIoMCkK KyAgICAsIG1fcmVwZXRpdGlvbkNvdW50KGNBbmltYXRpb25Ob25lKQorICAgICwgbV9yZXBldGl0 aW9uQ291bnRTdGF0dXMoVW5rbm93bikKKyAgICAsIG1fcmVwZXRpdGlvbnNDb21wbGV0ZSgwKQor ICAgICwgbV9pc1NvbGlkQ29sb3IoZmFsc2UpCisgICAgLCBtX2NoZWNrZWRGb3JTb2xpZENvbG9y KGZhbHNlKQorICAgICwgbV9hbmltYXRpb25GaW5pc2hlZCh0cnVlKQorICAgICwgbV9hbGxEYXRh UmVjZWl2ZWQodHJ1ZSkKKyAgICAsIG1faGF2ZVNpemUodHJ1ZSkKKyAgICAsIG1fc2l6ZUF2YWls YWJsZSh0cnVlKQorICAgICwgbV9kZWNvZGVkU2l6ZSgwKQorICAgICwgbV9oYXZlRnJhbWVDb3Vu dCh0cnVlKQorICAgICwgbV9mcmFtZUNvdW50KDEpCit7CisgICAgaW5pdFBsYXRmb3JtRGF0YSgp OworCisgICAgaW50IHdpZHRoID0gcGl4bWFwLT53aWR0aCgpOworICAgIGludCBoZWlnaHQgPSBw aXhtYXAtPmhlaWdodCgpOworICAgIG1fZGVjb2RlZFNpemUgPSB3aWR0aCAqIGhlaWdodCAqIDQ7 CisgICAgbV9zaXplID0gSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KTsKKworICAgIG1fZnJhbWVzLmdy b3coMSk7CisgICAgbV9mcmFtZXNbMF0ubV9mcmFtZSA9IHBpeG1hcDsKKyAgICBtX2ZyYW1lc1sw XS5tX2hhc0FscGhhID0gcGl4bWFwLT5oYXNBbHBoYSgpOworICAgIG1fZnJhbWVzWzBdLm1faGF2 ZU1ldGFkYXRhID0gdHJ1ZTsKKyAgICBjaGVja0ZvclNvbGlkQ29sb3IoKTsKK30KKwogdm9pZCBC aXRtYXBJbWFnZTo6aW5pdFBsYXRmb3JtRGF0YSgpCiB7CiB9CkBAIC0xODEsNiArMjEzLDEzIEBA IHZvaWQgQml0bWFwSW1hZ2U6OmNoZWNrRm9yU29saWRDb2xvcigpCiAgICAgbV9zb2xpZENvbG9y ID0gUUNvbG9yOjpmcm9tUmdiYShmcmFtZVBpeG1hcC0+dG9JbWFnZSgpLnBpeGVsKDAsIDApKTsK IH0KIAorI2lmIFBMQVRGT1JNKFdJTl9PUykKK1Bhc3NSZWZQdHI8Qml0bWFwSW1hZ2U+IEJpdG1h cEltYWdlOjpjcmVhdGUoSEJJVE1BUCBoQml0bWFwKQoreworICAgIHJldHVybiBCaXRtYXBJbWFn ZTo6Y3JlYXRlKG5ldyBRUGl4bWFwKFFQaXhtYXA6OmZyb21XaW5IQklUTUFQKGhCaXRtYXApKSk7 Cit9CisjZW5kaWYKKwogfQogCiAK