22250 2008-11-13 19:38:28 -0800 PLATFORM(CAIRO) should be defined by WIN_CAIRO define 2009-12-29 15:20:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric laszlo.gombos bfulgham commit-queue gustavo laszlo.gombos mjs webkit.review.bot oldest_to_newest 98715 0 eric 2008-11-13 19:38:28 -0800 CAIRO build should be defined by a __BUILDING_WIN_CAIRO define Right now to specify the CAIRO build we have a "blacklist" of what builds are not the CAIRO build. This is bad, IMO. We should instead of a whitelist of what builds *are* the cairo build. :) Right now every time someone ports WebCore they need to turn off cairo in JavaScriptCore/wtf/Platform.h or WebCore/config.h before they can turn on their own graphics system. 98726 1 eric 2008-11-13 20:26:51 -0800 The most recent example of this: http://trac.webkit.org/changeset/38382 167068 2 43988 laszlo.gombos 2009-11-28 19:14:39 -0800 Created attachment 43988 proposed solution Revision r45831 (http://trac.webkit.org/changeset/45831) - after this bug was filed - essentially introduced a solution. WIN_CAIRO is defined by the build system and can be used to detect the CAIRO build instead of the "blacklist" approach currently used in Platform.h. http://trac.webkit.org/changeset/45831 also defined WTF_PLATFORM_CAIRO in all relevant config.h files (it is not needed in JavaScriptCore/config.h as JavaScriptCore is not relying on the WTF_PLATFORM_CAIRO). The solution is to simply remove this part from Platform.h. 167073 3 eric 2009-11-29 07:07:05 -0800 I'm confused. Does WIN_CAIRO build JSC exactly the same as WIN_OS? if so, we can kill this, yes. 167084 4 laszlo.gombos 2009-11-29 08:06:47 -0800 (In reply to comment #3) > I'm confused. Does WIN_CAIRO build JSC exactly the same as WIN_OS? if so, we > can kill this, yes. Eric, it looks to me that that is the case. I searched for WIN_CAIRO in JavaScriptCore and the only hit was in Platform.h. 167090 5 bfulgham 2009-11-29 12:34:56 -0800 (In reply to comment #4) > (In reply to comment #3) > > I'm confused. Does WIN_CAIRO build JSC exactly the same as WIN_OS? if so, we > > can kill this, yes. > > Eric, it looks to me that that is the case. I searched for WIN_CAIRO in > JavaScriptCore and the only hit was in Platform.h. It is not exactly the same. It is built using the Open Source "OpenCFLite" version of CoreFoundation. This has slightly different headers included by default, so there were a handful of places where includes had to be modified. Please confirm that the WinCairo port builds after making this change before r+ this change. 167103 6 laszlo.gombos 2009-11-29 13:50:56 -0800 Brent, Thanks for looking into this. I did _not_ had a chance to confirm that the WinCairo port builds after making with the patch. I was hoping that maybe you or someone that you can recommend can help us with that. I had no intention to commit the patch before the build gets tested. Also, just to clarify my previous - somewhat vague - statement; under the JavaScriptCore directory there is no code behind any sort of CAIRO flag (WIN_CAIRO, PLATFORM(CAIRO), etc). Since WebCore and DumpRenderTree already properly sets PLATFORM(CAIRO) for WinCairo port in config.h - in theory - it should be safe to remove PLATFORM(CAIRO) from under JavaScriptCore/wtf/Platform.h. 167476 7 bfulgham 2009-11-30 17:10:32 -0800 I just applied this change, and am building the WinCairo version. I'll report back shortly! 167580 8 laszlo.gombos 2009-12-01 06:10:03 -0800 Brent, any update on this ? Thanks ! 167648 9 bfulgham 2009-12-01 09:05:03 -0800 Build worked just fine. Please go ahead and commit. 167673 10 43988 laszlo.gombos 2009-12-01 10:47:41 -0800 Comment on attachment 43988 proposed solution Thanks Brent for helping out testing this ! 167677 11 43988 commit-queue 2009-12-01 11:01:17 -0800 Comment on attachment 43988 proposed solution Clearing flags on attachment: 43988 Committed r51551: <http://trac.webkit.org/changeset/51551> 167678 12 commit-queue 2009-12-01 11:01:22 -0800 All reviewed patches have been landed. Closing bug. 167717 13 gustavo 2009-12-01 13:17:33 -0800 I reverted this commit because it broke GTK+ and nobody was around to fix it timely. 167822 14 44118 laszlo.gombos 2009-12-01 18:14:23 -0800 Created attachment 44118 2nd try GTK port is also using CAIRO not just the WinCairo port. Sorry for the build break. 167825 15 webkit.review.bot 2009-12-01 18:18:18 -0800 style-queue ran check-webkit-style on attachment 44118 without any errors. 175339 16 44118 mjs 2009-12-28 17:36:44 -0800 Comment on attachment 44118 2nd try r=me 175423 17 eric 2009-12-28 22:42:33 -0800 Attachment 44118 was posted by a committer and has review+, assigning to Laszlo Gombos for commit. 175690 18 44118 commit-queue 2009-12-29 13:16:29 -0800 Comment on attachment 44118 2nd try Rejecting patch 44118 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--quiet']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueueSVN/LayoutTests Testing 11854 test cases. svg/W3C-SVG-1.1/animate-elem-30-t.svg -> crashed Exiting early after 1 failures. 9849 tests run. 476.79s total testing time 9848 test cases (99%) succeeded 1 test case (<1%) crashed 7 test cases (<1%) had stderr output Full output: http://webkit-commit-queue.appspot.com/results/150846 175696 19 44118 eric 2009-12-29 13:27:36 -0800 Comment on attachment 44118 2nd try This failure was caused by bug 30098. The bots were about to fail, they were just behind. Re-queueing. 175724 20 44118 commit-queue 2009-12-29 15:19:57 -0800 Comment on attachment 44118 2nd try Clearing flags on attachment: 44118 Committed r52637: <http://trac.webkit.org/changeset/52637> 175725 21 commit-queue 2009-12-29 15:20:07 -0800 All reviewed patches have been landed. Closing bug. 43988 2009-11-28 19:14:39 -0800 2009-12-01 11:01:16 -0800 proposed solution 22250.patch text/plain 1163 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUxNDY1KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEtMjggIExhc3psbyBH b21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBMQVRGT1JNKENBSVJPKSBzaG91bGQgYmUgZGVm aW5lZCBieSBXSU5fQ0FJUk8gZGVmaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjI1MAorCisgICAgICAgICogd3RmL1BsYXRmb3JtLmg6IFJlbW92 ZSBXVEZfUExBVEZPUk1fQ0FJUk8gYXMgaXQgaXMgCisgICAgICAgIGFscmVhZHkgZGVmaW5lIGlu IGNvbmZpZy5oCisKIDIwMDktMTEtMjggIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NA bm9raWEuY29tPgogCkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gNTE0NjEpCisr KyBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMjA5LDEy ICsyMDksNiBAQAogI2VuZGlmCiAjZW5kaWYKIAotLyogTWFrZXMgUExBVEZPUk0oV0lOKSBkZWZh dWx0IHRvIFBMQVRGT1JNKENBSVJPKSAqLwotLyogRklYTUU6IFRoaXMgc2hvdWxkIGJlIGNoYW5n ZWQgZnJvbSBhIGJsYWNrbGlzdCB0byBhIHdoaXRlbGlzdCAqLwotI2lmICFQTEFURk9STShNQUMp ICYmICFQTEFURk9STShRVCkgJiYgIVBMQVRGT1JNKFdYKSAmJiAhUExBVEZPUk0oQ0hST01JVU0p ICYmICFQTEFURk9STShXSU5DRSkgJiYgIVBMQVRGT1JNKEhBSUtVKSAmJiAhUExBVEZPUk0oQU5E Uk9JRCkKLSNkZWZpbmUgV1RGX1BMQVRGT1JNX0NBSVJPIDEKLSNlbmRpZgotCiAvKiBDUFUgKi8K IAogLyogUExBVEZPUk0oUFBDKSAqLwo= 44118 2009-12-01 18:14:23 -0800 2009-12-29 15:19:57 -0800 2nd try 22250.patch text/plain 1223 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUxNTY5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTItMDEgIExhc3psbyBH b21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBMQVRGT1JNKENBSVJPKSBzaG91bGQgYmUgZGVm aW5lZCBieSBXSU5fQ0FJUk8gZGVmaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjI1MAorCisgICAgICAgICogd3RmL1BsYXRmb3JtLmg6IERlZmlu ZSBXVEZfUExBVEZPUk1fQ0FJUk8gZm9yIEdUSyBwb3J0IG9ubHkKKyAgICAgICAgRm9yIHRoZSBX aW5DYWlybyBwb3J0IFdURl9QTEFURk9STV9DQUlSTyBpcyBhbHJlYWR5IGRlZmluZWQgaW4gY29u ZmlnLmgKKwogMjAwOS0xMi0wMSAgSmVucyBBbGZrZSAgPHNuZWpAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogSmF2YVNjcmlwdENvcmUvd3Rm L1BsYXRmb3JtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgJ KHJldmlzaW9uIDUxNTY5KQorKysgSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgJKHdvcmtp bmcgY29weSkKQEAgLTIwNSw5ICsyMDUsNyBAQAogI2VuZGlmCiAjZW5kaWYKIAotLyogTWFrZXMg UExBVEZPUk0oV0lOKSBkZWZhdWx0IHRvIFBMQVRGT1JNKENBSVJPKSAqLwotLyogRklYTUU6IFRo aXMgc2hvdWxkIGJlIGNoYW5nZWQgZnJvbSBhIGJsYWNrbGlzdCB0byBhIHdoaXRlbGlzdCAqLwot I2lmICFQTEFURk9STShNQUMpICYmICFQTEFURk9STShRVCkgJiYgIVBMQVRGT1JNKFdYKSAmJiAh UExBVEZPUk0oQ0hST01JVU0pICYmICFQTEFURk9STShXSU5DRSkgJiYgIVBMQVRGT1JNKEhBSUtV KSAmJiAhUExBVEZPUk0oQU5EUk9JRCkKKyNpZiBQTEFURk9STShHVEspCiAjZGVmaW5lIFdURl9Q TEFURk9STV9DQUlSTyAxCiAjZW5kaWYKIAo=