23057 2008-12-31 07:00:12 -0800 PurgeableBuffer #defines leave out functions on gtk MacOSX 10.4 build 2009-06-28 04:15:05 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.4 RESOLVED FIXED P2 Normal --- 0 lkcl webkit-unassigned devchan1 mrowe oldest_to_newest 103907 0 lkcl 2008-12-31 07:00:12 -0800 diff --git a/WebCore/platform/PurgeableBuffer.h b/WebCore/platform/PurgeableBuff index b8b5c73..20f0ed8 100644 --- a/WebCore/platform/PurgeableBuffer.h +++ b/WebCore/platform/PurgeableBuffer.h @@ -62,14 +62,14 @@ namespace WebCore { mutable State m_state; }; -#if !PLATFORM(DARWIN) || defined(BUILDING_ON_TIGER) || PLATFORM(QT) +/*#if !PLATFORM(DARWIN) || defined(BUILDING_ON_TIGER) || PLATFORM(QT)*/ inline PurgeableBuffer* PurgeableBuffer::create(const char*, size_t) { retu inline PurgeableBuffer::~PurgeableBuffer() { } inline const char* PurgeableBuffer::data() const { return 0; } inline void PurgeableBuffer::setPurgePriority(PurgePriority) { } inline bool PurgeableBuffer::wasPurged() const { return false; } inline bool PurgeableBuffer::makePurgeable(bool) { return false; } -#endif +/*#endif*/ } 103908 1 lkcl 2008-12-31 07:05:20 -0800 removing these #defines on macosx 10.4 result in a successful build. adding in PurgeableBuffermac.cpp (from WebCore/platform/mac) into WebCore/GNUMakefile.am results in a compile error about VM_VOLATILE missing etc. 103994 2 mrowe 2009-01-01 15:50:26 -0800 Either things need to be changed such that BUILDING_ON_TIGER will be defined when building the GTK port on Tiger, or the #if needs to be changed to always disable things for GTK, similar to how it is for Qt. 104054 3 lkcl 2009-01-02 03:43:11 -0800 oh - yes: i get it - "leave out" as in there's a #if defined(QT) which "brings in" the inline versions of the functions (in the header file) and adding || defined(GTK) ... i get it. 104056 4 26365 lkcl 2009-01-02 03:50:46 -0800 Created attachment 26365 add PLATFORM(GTK) to use inline versions of PurgeableBuffer functions yep - that did it. 104093 5 26365 darin 2009-01-02 09:29:49 -0800 Comment on attachment 26365 add PLATFORM(GTK) to use inline versions of PurgeableBuffer functions The change looks fine, but this needs a ChangeLog, so setting review-. Please put up the same patch with a ChangeLog entry. 128720 6 31990 jmalonzo 2009-06-28 00:10:15 -0700 Created attachment 31990 patch with changelog 128729 7 31990 eric 2009-06-28 02:52:13 -0700 Comment on attachment 31990 patch with changelog Ok. 128734 8 eric 2009-06-28 04:15:05 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/platform/PurgeableBuffer.h Committed r45327 http://trac.webkit.org/changeset/45327 26365 2009-01-02 03:50:46 -0800 2009-06-28 00:10:10 -0700 add PLATFORM(GTK) to use inline versions of PurgeableBuffer functions f text/plain 639 lkcl ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vUHVyZ2VhYmxlQnVmZmVyLmggYi9XZWJDb3Jl L3BsYXRmb3JtL1B1cmdlYWJsZUJ1ZmZlci5oCmluZGV4IGI4YjVjNzMuLmEwNTllZDUgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vUHVyZ2VhYmxlQnVmZmVyLmgKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9QdXJnZWFibGVCdWZmZXIuaApAQCAtNjIsNyArNjIsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIG11dGFibGUgU3RhdGUgbV9zdGF0ZTsKICAgICB9OwoKLSNpZiAhUExB VEZPUk0oREFSV0lOKSB8fCBkZWZpbmVkKEJVSUxESU5HX09OX1RJR0VSKSB8fCBQTEFURk9STShR VCkKKyNpZiAhUExBVEZPUk0oREFSV0lOKSB8fCBkZWZpbmVkKEJVSUxESU5HX09OX1RJR0VSKSB8 fCBQTEFURk9STShRVCkgfHwgUExBVEZPUk0oR1RLKQogICAgIGlubGluZSBQdXJnZWFibGVCdWZm ZXIqIFB1cmdlYWJsZUJ1ZmZlcjo6Y3JlYXRlKGNvbnN0IGNoYXIqLCBzaXplX3QpIHsgcmV0dXJu IDA7IH0KICAgICBpbmxpbmUgUHVyZ2VhYmxlQnVmZmVyOjp+UHVyZ2VhYmxlQnVmZmVyKCkgeyB9 CiAgICAgaW5saW5lIGNvbnN0IGNoYXIqIFB1cmdlYWJsZUJ1ZmZlcjo6ZGF0YSgpIGNvbnN0IHsg cmV0dXJuIDA7IH0K 31990 2009-06-28 00:10:15 -0700 2009-06-28 02:52:13 -0700 patch with changelog bugzilla_requires_a_filename.patch text/plain 1205 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzVjMWRkYi4uYTg4ODdjMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wNi0yOCAgTHVrZSBLZW5uZXRo IENhc3NvbiBMZWlnaHRvbiAgPGxrY2xAbGtjbC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHVyZ2VhYmxlQnVmZmVyICNkZWZpbmVzIGxlYXZl IG91dCBmdW5jdGlvbnMgb24gZ3RrIE1hY09TWCAxMC40IGJ1aWxkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA1NworCisgICAgICAgIERlZmluZSB0 aGVzZSBmdW5jdGlvbnMgZm9yIEd0ayBhcyB3ZWxsLgorCisgICAgICAgICogcGxhdGZvcm0vUHVy Z2VhYmxlQnVmZmVyLmg6CisKIDIwMDktMDYtMjcgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5n b21ib3NAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbiBBbG9uem8uCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL1B1cmdlYWJsZUJ1ZmZlci5oIGIvV2ViQ29yZS9wbGF0 Zm9ybS9QdXJnZWFibGVCdWZmZXIuaAppbmRleCBiZWUyMWI5Li45YzhlM2NiIDEwMDY0NAotLS0g YS9XZWJDb3JlL3BsYXRmb3JtL1B1cmdlYWJsZUJ1ZmZlci5oCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vUHVyZ2VhYmxlQnVmZmVyLmgKQEAgLTYyLDcgKzYyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICBtdXRhYmxlIFN0YXRlIG1fc3RhdGU7CiAgICAgfTsKIAotI2lmICFQTEFURk9S TShEQVJXSU4pIHx8IGRlZmluZWQoQlVJTERJTkdfT05fVElHRVIpIHx8IFBMQVRGT1JNKFFUKQor I2lmICFQTEFURk9STShEQVJXSU4pIHx8IGRlZmluZWQoQlVJTERJTkdfT05fVElHRVIpIHx8IFBM QVRGT1JNKFFUKSB8fCBQTEFURk9STShHVEspCiAgICAgaW5saW5lIFB1cmdlYWJsZUJ1ZmZlciog UHVyZ2VhYmxlQnVmZmVyOjpjcmVhdGUoY29uc3QgY2hhciosIHNpemVfdCkgeyByZXR1cm4gMDsg fQogICAgIGlubGluZSBQdXJnZWFibGVCdWZmZXI6On5QdXJnZWFibGVCdWZmZXIoKSB7IH0KICAg ICBpbmxpbmUgY29uc3QgY2hhciogUHVyZ2VhYmxlQnVmZmVyOjpkYXRhKCkgY29uc3QgeyByZXR1 cm4gMDsgfQo=