21781 2008-10-21 19:14:05 -0700 WebCore::Settings should have a maximum decoded image size setting 2008-10-22 19:54:09 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer koivisto oldest_to_newest 96133 0 ddkilzer 2008-10-21 19:14:05 -0700 * SUMMARY It would be nice for WebCore::Settings to have a maximum image size setting to limit the size of images on some platforms. 96134 1 24549 ddkilzer 2008-10-21 19:19:15 -0700 Created attachment 24549 Patch v1 96204 2 24549 koivisto 2008-10-22 12:17:47 -0700 Comment on attachment 24549 Patch v1 r=me, with some comments. + frame = docLoader() ? docLoader()->frame() : 0; + DocLoader* docLoader() const { return m_docLoader; } + The CachedResource::m_docLoader is non-zero only in some special cases (it should have a better name). Using m_request->docLoader() covers all cases we care about. These changes are probably not needed. // FIXME: I'm not convinced this case can even be hit. I guess this FIXME can go now. We clearly can hit this case when maxImageSize is limited (plus it was not true even before). + void setMaximumImageSize(size_t size) { m_maximumImageSize = size; } + size_t maximumImageSize() const { return m_maximumImageSize; } How about maximumDecodedImageSize to avoid confusion between encoded and decoded size? 96287 3 ddkilzer 2008-10-22 19:53:20 -0700 Committed r37803 96288 4 ddkilzer 2008-10-22 19:54:09 -0700 (In reply to comment #2) > (From update of attachment 24549 [edit]) > r=me, with some comments. I made all of these recommended changes before landing. http://trac.webkit.org/changeset/37803 24549 2008-10-21 19:19:15 -0700 2008-10-22 12:17:47 -0700 Patch v1 bug-21781-v1.diff text/plain 6612 ddkilzer Y29tbWl0IDQ0YzM2MzNkNGI2YjU2OTk3NDI5NDYyMzBlZTdiOGQzMzEwZTc1MDcKQXV0aG9yOiBE YXZpZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4KRGF0ZTogICBUdWUgT2N0IDIxIDE5OjE4 OjIyIDIwMDggLTA3MDAKCiAgICAgICAgICAgIEJ1ZyAyMTc4MTogV2ViQ29yZTo6U2V0dGluZ3Mg c2hvdWxkIGhhdmUgYSBtYXhpbXVtIGltYWdlIHNpemUgc2V0dGluZwogICAgCiAgICAgICAgICAg IDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3ODE+CiAgICAKICAg ICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgTm8g dGVzdHMgc2luY2UgdGhlcmUgaXMgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgogICAgCiAgICAgICAg ICAgICogbG9hZGVyL0NhY2hlZEltYWdlLmNwcDoKICAgICAgICAgICAgKFdlYkNvcmU6OkNhY2hl ZEltYWdlOjptYXhpbXVtSW1hZ2VTaXplKTogQWRkZWQuICBSZXR1cm5zCiAgICAgICAgICAgIFdl YkNvcmU6OlNldHRpbmdzOjptYXhpbXVtSW1hZ2VTaXplKCkuCiAgICAgICAgICAgIChXZWJDb3Jl OjpDYWNoZWRJbWFnZTo6ZGF0YSk6IEZsYWcgYW4gZXJyb3IgaWYgdGhlIGltYWdlIGJlaW5nCiAg ICAgICAgICAgIGxvYWRlZCBpcyB0b28gYmlnLgogICAgICAgICAgICAqIGxvYWRlci9DYWNoZWRJ bWFnZS5oOgogICAgICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkSW1hZ2U6Om1heGltdW1JbWFnZVNp emUpOiBBZGRlZCBkZWNsYXJhdGlvbi4KICAgICAgICAgICAgKiBsb2FkZXIvQ2FjaGVkUmVzb3Vy Y2UuaDoKICAgICAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjpkb2NMb2FkZXIpOiBB ZGRlZCBwcm90ZWN0ZWQgbWV0aG9kLgogICAgICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgog ICAgICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdzKTogSW5pdGlhbGl6ZSBtX21h eGltdW1JbWFnZVNpemUgdG8gdGhlCiAgICAgICAgICAgIG1heGltdW0gdmFsdWUgb2Ygc2l6ZV90 LgogICAgICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKICAgICAgICAgICAgKFdlYkNvcmU6OlNl dHRpbmdzOjpzZXRNYXhpbXVtSW1hZ2VTaXplKTogQWRkZWQgcHVibGljIG1ldGhvZC4KICAgICAg ICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjptYXhpbXVtSW1hZ2VTaXplKTogRGl0dG8uCgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NDQ3 Y2VlLi42NzA1ZTY4IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDA4LTEwLTIxICBEYXZpZCBLaWx6ZXIgIDxk ZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgQnVnIDIxNzgxOiBXZWJDb3JlOjpTZXR0aW5n cyBzaG91bGQgaGF2ZSBhIG1heGltdW0gaW1hZ2Ugc2l6ZSBzZXR0aW5nCisKKyAgICAgICAgPGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc4MT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyB0ZXN0cyBzaW5jZSB0aGVy ZSBpcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBsb2FkZXIvQ2FjaGVkSW1h Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkSW1hZ2U6Om1heGltdW1JbWFnZVNpemUp OiBBZGRlZC4gIFJldHVybnMKKyAgICAgICAgV2ViQ29yZTo6U2V0dGluZ3M6Om1heGltdW1JbWFn ZVNpemUoKS4KKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEltYWdlOjpkYXRhKTogRmxhZyBhbiBl cnJvciBpZiB0aGUgaW1hZ2UgYmVpbmcKKyAgICAgICAgbG9hZGVkIGlzIHRvbyBiaWcuCisgICAg ICAgICogbG9hZGVyL0NhY2hlZEltYWdlLmg6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRJbWFn ZTo6bWF4aW11bUltYWdlU2l6ZSk6IEFkZGVkIGRlY2xhcmF0aW9uLgorICAgICAgICAqIGxvYWRl ci9DYWNoZWRSZXNvdXJjZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6OmRv Y0xvYWRlcik6IEFkZGVkIHByb3RlY3RlZCBtZXRob2QuCisgICAgICAgICogcGFnZS9TZXR0aW5n cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6U2V0dGluZ3MpOiBJbml0aWFsaXpl IG1fbWF4aW11bUltYWdlU2l6ZSB0byB0aGUKKyAgICAgICAgbWF4aW11bSB2YWx1ZSBvZiBzaXpl X3QuCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGlu Z3M6OnNldE1heGltdW1JbWFnZVNpemUpOiBBZGRlZCBwdWJsaWMgbWV0aG9kLgorICAgICAgICAo V2ViQ29yZTo6U2V0dGluZ3M6Om1heGltdW1JbWFnZVNpemUpOiBEaXR0by4KKwogMjAwOC0xMC0x MyAgTWFyY28gQmFyaXNpb25lICA8bWFyY28uYmFyaXNpb25lQGNvbGxhYm9yYS5jby51az4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4gTGFuZGVkIGJ5IEphbiBBbG9uem8uCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9DYWNoZWRJbWFnZS5jcHAgYi9XZWJDb3JlL2xvYWRl ci9DYWNoZWRJbWFnZS5jcHAKaW5kZXggNzdhNThlMS4uYmZmZTRmNyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9sb2FkZXIvQ2FjaGVkSW1hZ2UuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL0NhY2hlZElt YWdlLmNwcApAQCAtMjksOCArMjksMTAgQEAKICNpbmNsdWRlICJDYWNoZWRSZXNvdXJjZUNsaWVu dC5oIgogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlQ2xpZW50V2Fsa2VyLmgiCiAjaW5jbHVkZSAi RG9jTG9hZGVyLmgiCisjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIK ICNpbmNsdWRlICJSZXF1ZXN0LmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJT eXN0ZW1UaW1lLmgiCiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCkBAIC0yMjUsNiArMjI3LDE4 IEBAIGlubGluZSB2b2lkIENhY2hlZEltYWdlOjpjcmVhdGVJbWFnZSgpCiAgICAgbV9pbWFnZSA9 IEJpdG1hcEltYWdlOjpjcmVhdGUodGhpcyk7CiB9CiAKK3NpemVfdCBDYWNoZWRJbWFnZTo6bWF4 aW11bUltYWdlU2l6ZSgpCit7CisgICAgRnJhbWUqIGZyYW1lID0gbV9yZXF1ZXN0ID8gbV9yZXF1 ZXN0LT5kb2NMb2FkZXIoKS0+ZnJhbWUoKSA6IDA7CisgICAgaWYgKCFmcmFtZSkgeworICAgICAg ICBmcmFtZSA9IGRvY0xvYWRlcigpID8gZG9jTG9hZGVyKCktPmZyYW1lKCkgOiAwOworICAgICAg ICBpZiAoIWZyYW1lKQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgfQorICAgIFNldHRpbmdz ICpzZXR0aW5ncyA9IGZyYW1lLT5zZXR0aW5ncygpOworICAgIHJldHVybiBzZXR0aW5ncyA/IHNl dHRpbmdzLT5tYXhpbXVtSW1hZ2VTaXplKCkgOiAwOworfQorCiB2b2lkIENhY2hlZEltYWdlOjpk YXRhKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkK IHsKICAgICBtX2RhdGEgPSBkYXRhOwpAQCAtMjQzLDcgKzI1NywxMCBAQCB2b2lkIENhY2hlZElt YWdlOjpkYXRhKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBkYXRhLCBib29sIGFsbERhdGFSZWNl aXZlZCkKICAgICAvLyBuZXR3b3JrIGNhdXNlcyBvYnNlcnZlcnMgdG8gcmVwYWludCwgd2hpY2gg d2lsbCBmb3JjZSB0aGF0IGNodW5rCiAgICAgLy8gdG8gZGVjb2RlLgogICAgIGlmIChzaXplQXZh aWxhYmxlIHx8IGFsbERhdGFSZWNlaXZlZCkgewotICAgICAgICBpZiAobV9pbWFnZS0+aXNOdWxs KCkpIHsKKyAgICAgICAgc2l6ZV90IG1heEltYWdlU2l6ZSA9IG1heGltdW1JbWFnZVNpemUoKTsK KyAgICAgICAgSW50U2l6ZSBzID0gaW1hZ2VTaXplKDEuMGYpOworICAgICAgICBzaXplX3QgYWN0 dWFsSW1hZ2VTaXplID0gcy53aWR0aCgpICogcy5oZWlnaHQoKSAqIDQ7IC8vIG5vIG92ZXJmbG93 IGNoZWNrCisgICAgICAgIGlmIChtX2ltYWdlLT5pc051bGwoKSB8fCAobWF4SW1hZ2VTaXplID4g MCAmJiBhY3R1YWxJbWFnZVNpemUgPiBtYXhJbWFnZVNpemUpKSB7CiAgICAgICAgICAgICAvLyBG SVhNRTogSSdtIG5vdCBjb252aW5jZWQgdGhpcyBjYXNlIGNhbiBldmVuIGJlIGhpdC4KICAgICAg ICAgICAgIGVycm9yKCk7CiAgICAgICAgICAgICBpZiAoaW5DYWNoZSgpKQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9sb2FkZXIvQ2FjaGVkSW1hZ2UuaCBiL1dlYkNvcmUvbG9hZGVyL0NhY2hlZEltYWdl LmgKaW5kZXggOThjYmFhNS4uZWY4YzY3OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvQ2Fj aGVkSW1hZ2UuaAorKysgYi9XZWJDb3JlL2xvYWRlci9DYWNoZWRJbWFnZS5oCkBAIC04Nyw2ICs4 Nyw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZUltYWdlKCk7CisgICAg c2l6ZV90IG1heGltdW1JbWFnZVNpemUoKTsKICAgICB2b2lkIG5vdGlmeU9ic2VydmVycygpOwog CiAgICAgUmVmUHRyPEltYWdlPiBtX2ltYWdlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIv Q2FjaGVkUmVzb3VyY2UuaCBiL1dlYkNvcmUvbG9hZGVyL0NhY2hlZFJlc291cmNlLmgKaW5kZXgg NWU0NjlkZC4uYzhlZDhlYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvQ2FjaGVkUmVzb3Vy Y2UuaAorKysgYi9XZWJDb3JlL2xvYWRlci9DYWNoZWRSZXNvdXJjZS5oCkBAIC0xNjgsNyArMTY4 LDkgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgc2V0RW5jb2RlZFNpemUodW5zaWduZWQpOwogICAg IHZvaWQgc2V0RGVjb2RlZFNpemUodW5zaWduZWQpOwogICAgIHZvaWQgZGlkQWNjZXNzRGVjb2Rl ZERhdGEoZG91YmxlIHRpbWVTdGFtcCk7Ci0gICAgCisKKyAgICBEb2NMb2FkZXIqIGRvY0xvYWRl cigpIGNvbnN0IHsgcmV0dXJuIG1fZG9jTG9hZGVyOyB9CisKICAgICBIYXNoQ291bnRlZFNldDxD YWNoZWRSZXNvdXJjZUNsaWVudCo+IG1fY2xpZW50czsKIAogICAgIFN0cmluZyBtX3VybDsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9XZWJDb3JlL3BhZ2UvU2V0dGlu Z3MuY3BwCmluZGV4IDE2MjM1MDEuLjk0NzVmYjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9T ZXR0aW5ncy5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApAQCAtMzEsNiArMzEs NyBAQAogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQYWdlQ2FjaGUuaCIKICNpbmNsdWRl ICJIaXN0b3J5SXRlbS5oIgorI2luY2x1ZGUgPGxpbWl0cz4KIAogI2lmIEVOQUJMRShEQVRBQkFT RSkKICNpbmNsdWRlICJEYXRhYmFzZVRyYWNrZXIuaCIKQEAgLTg0LDYgKzg1LDcgQEAgU2V0dGlu Z3M6OlNldHRpbmdzKFBhZ2UqIHBhZ2UpCiAgICAgLCBtX3Nob3VsZFBhaW50Q3VzdG9tU2Nyb2xs YmFycyhmYWxzZSkKICAgICAsIG1fem9vbXNUZXh0T25seShmYWxzZSkKICAgICAsIG1fZW5mb3Jj ZUNTU01JTUVUeXBlSW5TdHJpY3RNb2RlKHRydWUpCisgICAgLCBtX21heGltdW1JbWFnZVNpemUo c3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSkKIHsKICAgICAvLyBBIEZyYW1lIG1h eSBub3QgaGF2ZSBiZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNT dHJpbmcgCiAgICAgLy8gaGFzaCBiZWZvcmUgdHJ5aW5nIHRvIHVzZSBpdC4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oIGIvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKaW5kZXgg ZjY1ODA1Ny4uYjVlZTYwMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKKysr IGIvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKQEAgLTE3NCw3ICsxNzQsMTAgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICAKICAgICAgICAgdm9pZCBzZXRFbmZvcmNlQ1NTTUlNRVR5cGVJ blN0cmljdE1vZGUoYm9vbCk7CiAgICAgICAgIGJvb2wgZW5mb3JjZUNTU01JTUVUeXBlSW5TdHJp Y3RNb2RlKCkgeyByZXR1cm4gbV9lbmZvcmNlQ1NTTUlNRVR5cGVJblN0cmljdE1vZGU7IH0KLSAK KworICAgICAgICB2b2lkIHNldE1heGltdW1JbWFnZVNpemUoc2l6ZV90IHNpemUpIHsgbV9tYXhp bXVtSW1hZ2VTaXplID0gc2l6ZTsgfQorICAgICAgICBzaXplX3QgbWF4aW11bUltYWdlU2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fbWF4aW11bUltYWdlU2l6ZTsgfQorCiAjaWYgVVNFKFNBRkFSSV9U SEVNRSkKICAgICAgICAgLy8gV2luZG93cyBkZWJ1Z2dpbmcgcHJlZiAoZ2xvYmFsKSBmb3Igc3dp dGNoaW5nIGJldHdlZW4gdGhlIEFxdWEgbG9vayBhbmQgYSBuYXRpdmUgd2luZG93cyBsb29rLgog ICAgICAgICBzdGF0aWMgdm9pZCBzZXRTaG91bGRQYWludE5hdGl2ZUNvbnRyb2xzKGJvb2wpOwpA QCAtMjI4LDYgKzIzMSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX3No b3VsZFBhaW50Q3VzdG9tU2Nyb2xsYmFycyA6IDE7CiAgICAgICAgIGJvb2wgbV96b29tc1RleHRP bmx5IDogMTsKICAgICAgICAgYm9vbCBtX2VuZm9yY2VDU1NNSU1FVHlwZUluU3RyaWN0TW9kZSA6 IDE7CisgICAgICAgIHNpemVfdCBtX21heGltdW1JbWFnZVNpemU7CiAKICNpZiBVU0UoU0FGQVJJ X1RIRU1FKQogICAgICAgICBzdGF0aWMgYm9vbCBnU2hvdWxkUGFpbnROYXRpdmVDb250cm9sczsK