17952 2008-03-19 11:41:07 -0700 Add "--cairo" flag to 'build-webkit' command 2008-06-20 15:24:21 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned oldest_to_newest 74457 0 bfulgham 2008-03-19 11:41:07 -0700 The build-webkit Script needs to be extended to allow a user to indicate that they wish to build the Cairo-based webkit. When the "--cairo" flag is added to the build-webkit command line, the "Debug" and "Release" targets are changed to "Debug_Cairo" and "Release_Cairo". This option is only honored for the Visual Studio build. It is ignored for all other build environments (Mac, Qt, GTK, etc.) 74460 1 19887 bfulgham 2008-03-19 11:50:45 -0700 Created attachment 19887 Extend build-webkit with new "--cairo" build option * Add "--cairo" to help screen for build-webkit script. * Add "isCairo" test and when present for the Visual Studio build switch to the Cairo debug/release targets. 75965 2 eric 2008-03-31 12:45:59 -0700 I'm confused as to why this is necessary? (Why do the executables need a _cairo suffix?) 76006 3 bfulgham 2008-03-31 15:18:47 -0700 (In reply to comment #2) > I'm confused as to why this is necessary? (Why do the executables need a > _cairo suffix?) The executables don't need a _cairo suffix. However, the naming of the Cairo-based build targets in Visual Studio are constructed with "_cairo" suffixes. This patch causes the build script to build using the "Release_cairo" and "Debug_cairo" build targets. Any executable output names are generated outside the scope of this patch. 76132 4 19887 darin 2008-04-02 02:43:54 -0700 Comment on attachment 19887 Extend build-webkit with new "--cairo" build option + if (checkArgv("--cairo")) { + $isCairo = 1; + } else { + $isWx = 0; + } Seems wrong to set $isWx here. But also, I think you'd want this setting to be a persistent one. It seems really inconvenient to have to pass --cairo every single time. It should work more like configuration where you can set it once and then it's persistent until you reset it. review- because of the $isWx mistake, but please consider my suggestion. 77108 5 20445 bfulgham 2008-04-09 16:26:17 -0700 Created attachment 20445 Support cairo via command-line flag Script modified per Darin's comments: * --cairo flag handled more like the --debug/--release flags, such that they persist in the Configuration file if the "set-webkit-configuration" script is used. * No longer incorrectly set the "isWx" value. 77571 6 20445 aroben 2008-04-14 08:27:43 -0700 Comment on attachment 20445 Support cairo via command-line flag + my $isCairo = grep(/^--cairo$/i, @ARGV); + for my $i (0 .. $#ARGV) { my $opt = $ARGV[$i]; if ($opt =~ /^--debug$/i || $opt =~ /^--devel/i) { splice(@ARGV, $i, 1); $passedConfiguration = "Debug"; + $passedConfiguration .= "_Cairo" if $isCairo; return; } if ($opt =~ /^--release$/i || $opt =~ /^--deploy/i) { splice(@ARGV, $i, 1); $passedConfiguration = "Release"; + $passedConfiguration .= "_Cairo" if $isCairo; return; } This seems very Windows-specific, since only the Windows .vcproj files have these _Cairo configurations. Perhaps the flag should only have an effect on Windows? Perhaps it should be named something more specific, like --cairo-win32? 83064 7 21650 bfulgham 2008-06-11 16:48:15 -0700 Created attachment 21650 Extend build-webkit with new "--cairo-win32" build option Updated based on Adam's comments: * Changed --cairo flag to --cairo-win32 * --cairo-win32 is only honored if "isCygwin()" is true 83065 8 21651 bfulgham 2008-06-11 16:54:19 -0700 Created attachment 21651 Minor update to merge against TOT Same as above, with minor update to build against TOT. 83104 9 21651 darin 2008-06-12 07:06:57 -0700 Comment on attachment 21651 Minor update to merge against TOT r=me 84008 10 dev+webkit 2008-06-20 15:24:21 -0700 Committed revision 34706. 19887 2008-03-19 11:50:45 -0700 2008-04-09 16:26:45 -0700 Extend build-webkit with new "--cairo" build option build-cairo.patch text/plain 2683 bfulgham SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDMxMTU2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDgtMDMtMTkgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRXh0ZW5kIHRoZSBidWlsZC13ZWJraXQgdG9vbCB0byBzdXBwb3J0IENhaXJv LWJhc2VkIHdlYmtpdC4KKyAgICAgICAgKHNlZSBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzk1MikKKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OiAgQWRk IC0tY2Fpcm8gdG8gaGVscCBtZXNzYWdlLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5w bTogRXh0ZW5kIHRvIHJlY29nbml6ZSAtLWNhaXJvIGZsYWcKKyAgICAgICAgICBhbmQgd2hlbiBw cmVzZW50IChmb3IgdGhlIFZpc3VhbCBTdHVkaW8gYnVpbGQpIHRvIGNoYW5nZQorICAgICAgICAg IHRoZSAiRGVidWciIGFuZCAiUmVsZWFzZSIgdGFyZ2V0cyB0byAiRGVidWdfQ2Fpcm8iIGFuZAor ICAgICAgICAgICJSZWxlYXNlX0NhaXJvIi4KKwogMjAwOC0wMy0xNyAgRXJpYyBTZWlkZWwgIDxl cmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5k ZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiAzMTE0MSkKKysrIFdlYktpdFRv b2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5nIGNvcHkpCkBAIC02Myw2ICs2Myw3IEBA IG15ICRwcm9ncmFtTmFtZSA9IGJhc2VuYW1lKCQwKTsKIG15ICR1c2FnZSA9IDw8RU9GOwogVXNh Z2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW29wdGlvbnMgdG8gcGFzcyB0byBidWlsZCBzeXN0 ZW1dCiAgIC0taGVscCAgICAgICAgICAgICAgICAgICAgICAgIFNob3cgdGhpcyBoZWxwIG1lc3Nh Z2UKKyAgLS1jYWlybyAgICAgICAgICAgICAgICAgICAgICAgQnVpbGQgdXNpbmcgQ2Fpcm8gKHJh dGhlciB0aGFuIENvcmVHcmFwaGljcykKICAgLS1jbGVhbiAgICAgICAgICAgICAgICAgICAgICAg UGVyZm9ybSBhIGNsZWFuIGJ1aWxkCiAgIC0tdW5pdmVyc2FsICAgICAgICAgICAgICAgICAgIEJ1 aWxkIDItd2F5IHVuaXZlcnNhbCAoUFBDIGFuZCBJbnRlbCAzMi1iaXQpCiAgIC0tNjQtYml0ICAg ICAgICAgICAgICAgICAgICAgIEJ1aWxkIDY0LWJpdCwgY29tYmluZSB3aXRoIC0tdW5pdmVyc2Fs IHRvIGJ1aWxkIDQtd2F5IHVuaXZlcnNhbApJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQkocmV2aXNpb24gMzExNDEpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0J KHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDcgQEAgbXkgJG9zWFZlcnNpb247CiBteSAkaXNR dDsKIG15ICRpc0d0azsKIG15ICRpc1d4OworbXkgJGlzQ2Fpcm87CiAKICMgVmFyaWFibGVzIGZv ciBXaW4zMiBzdXBwb3J0CiBteSAkdmNCdWlsZFBhdGg7CkBAIC0xNjcsNiArMTY4LDEzIEBAIHN1 YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGkKIHsKICAgICByZXR1cm4gaWYg ZGVmaW5lZCAkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbzsKICAgICBkZXRlcm1pbmVDb25m aWd1cmF0aW9uKCk7CisKKyAgICAjIERlYWwgd2l0aCBDYWlybyBidWlsZCBjYXNlCisgICAgaWYg KGlzQ2Fpcm8oKSkgeworICAgICAgICAkY29uZmlndXJhdGlvbiA9fiBzL0RlYnVnL0RlYnVnX0Nh aXJvLzsKKyAgICAgICAgJGNvbmZpZ3VyYXRpb24gPX4gcy9SZWxlYXNlL1JlbGVhc2VfQ2Fpcm8v OworICAgIH0KKwogICAgICRjb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvID0gJGNvbmZpZ3Vy YXRpb247CiAgICAgcmV0dXJuIHVubGVzcyAkY29uZmlndXJhdGlvbiBlcSAiRGVidWciOwogICAg IHNldHVwQ3lnd2luRW52KCk7CkBAIC01MTAsNiArNTE4LDIzIEBAIHN1YiBkZXRlcm1pbmVJc1d4 KCkKICAgICB9CiB9CiAKK3N1YiBpc0NhaXJvKCkKK3sKKyAgICBkZXRlcm1pbmVJc0NhaXJvKCk7 CisgICAgcmV0dXJuICRpc0NhaXJvOworfQorCitzdWIgZGV0ZXJtaW5lSXNDYWlybygpCit7Cisg ICAgcmV0dXJuIGlmIGRlZmluZWQoJGlzQ2Fpcm8pOworCisgICAgaWYgKGNoZWNrQXJndigiLS1j YWlybyIpKSB7CisgICAgICAgICRpc0NhaXJvID0gMTsKKyAgICB9IGVsc2UgeworICAgICAgICAk aXNXeCA9IDA7CisgICAgfQorfQorCiAjIERldGVybWluZSBpZiB0aGlzIGlzIGRlYmlhbiwgdWJ1 bnR1LCBsaW5zcGlyZSwgb3Igc29tZXRoaW5nIHNpbWlsYXIuCiBzdWIgaXNEZWJpYW5CYXNlZCgp CiB7Cg== 20445 2008-04-09 16:26:17 -0700 2008-06-11 16:48:24 -0700 Support cairo via command-line flag buildwebkit.patch text/plain 2426 bfulgham SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDMxNzYxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDgtMDQtMDkgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRXh0ZW5kIHRoZSBidWlsZC13ZWJraXQgKGFuZCBzZXQtd2Via2l0LWNvbmZp Z3VyYXRpb24pIHNjcmlwdCB0bworICAgICAgICBzdXBwb3J0IENhaXJvLWJhc2VkIHdlYmtpdC4g IChzZWUgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/MTc5NTIpCisKKyAgICAg ICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDogIEFkZCAtLWNhaXJvIHRvIGhlbHAgbWVzc2FnZQor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbTogIEV4dGVuZCB0byByZWNvZ25pemUgLS1j YWlybyBmbGFnIGFuZAorICAgICAgICAgIHdoZW4gcHJlc2VudCBjaGFuZ2UgdGhlIERlYnVnL1Jl bGVhc2UgdGFyZ2V0cyB0byBEZWJ1Z19DYWlybworICAgICAgICAgIGFuZCBSZWxlYXNlX0NhaXJv LgorCiAyMDA4LTA0LTA4ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAg Q2xlYW4gdXAgYWZ0ZXIgQnJhZHkuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLXdl YmtpdAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkocmV2 aXNpb24gMzE3NjApCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkod29ya2lu ZyBjb3B5KQpAQCAtNjQsNiArNjQsNyBAQCBteSAkcHJvZ3JhbU5hbWUgPSBiYXNlbmFtZSgkMCk7 CiBteSAkdXNhZ2UgPSA8PEVPRjsKIFVzYWdlOiAkcHJvZ3JhbU5hbWUgW29wdGlvbnNdIFtvcHRp b25zIHRvIHBhc3MgdG8gYnVpbGQgc3lzdGVtXQogICAtLWhlbHAgICAgICAgICAgICAgICAgICAg ICAgICBTaG93IHRoaXMgaGVscCBtZXNzYWdlCisgIC0tY2Fpcm8gICAgICAgICAgICAgICAgICAg ICAgIEJ1aWxkIHVzaW5nIENhaXJvIChyYXRoZXIgdGhhbiBDb3JlR3JhcGhpY3MpCiAgIC0tY2xl YW4gICAgICAgICAgICAgICAgICAgICAgIFBlcmZvcm0gYSBjbGVhbiBidWlsZAogICAtLXVuaXZl cnNhbCAgICAgICAgICAgICAgICAgICBCdWlsZCAyLXdheSB1bml2ZXJzYWwgKFBQQyBhbmQgSW50 ZWwgMzItYml0KQogICAtLTY0LWJpdCAgICAgICAgICAgICAgICAgICAgICBCdWlsZCA2NC1iaXQs IGNvbWJpbmUgd2l0aCAtLXVuaXZlcnNhbCB0byBidWlsZCA0LXdheSB1bml2ZXJzYWwKSW5kZXg6 IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDMxNzYwKQorKysgV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0yNjgsMTYgKzI2OCwy MSBAQCBzdWIgZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbgogewogICAgIHJldHVybiBpZiAk c2VhcmNoZWRGb3JQYXNzZWRDb25maWd1cmF0aW9uOwogICAgICRzZWFyY2hlZEZvclBhc3NlZENv bmZpZ3VyYXRpb24gPSAxOworCisgICAgbXkgJGlzQ2Fpcm8gPSBncmVwKC9eLS1jYWlybyQvaSwg QEFSR1YpOworCiAgICAgZm9yIG15ICRpICgwIC4uICQjQVJHVikgewogICAgICAgICBteSAkb3B0 ID0gJEFSR1ZbJGldOwogICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZGVidWckL2kgfHwgJG9wdCA9 fiAvXi0tZGV2ZWwvaSkgewogICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7CiAgICAg ICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJEZWJ1ZyI7CisgICAgICAgICAgICAkcGFz c2VkQ29uZmlndXJhdGlvbiAuPSAiX0NhaXJvIiBpZiAkaXNDYWlybzsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAoJG9wdCA9fiAvXi0tcmVsZWFzZSQvaSB8fCAk b3B0ID1+IC9eLS1kZXBsb3kvaSkgewogICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7 CiAgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJSZWxlYXNlIjsKKyAgICAgICAg ICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfQ2Fpcm8iIGlmICRpc0NhaXJvOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQo= 21650 2008-06-11 16:48:15 -0700 2008-06-11 16:54:19 -0700 Extend build-webkit with new "--cairo-win32" build option build_webkit.patch text/plain 2677 bfulgham SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDM0NDk5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMDYtMTEgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRXh0ZW5kIHRoZSBidWlsZC13ZWJraXQgKGFuZCBzZXQtd2Via2l0LWNvbmZp Z3VyYXRpb24pIHNjcmlwdCB0bworICAgICAgICBzdXBwb3J0IENhaXJvLWJhc2VkIHdlYmtpdCBi dWlsZHMuICAoc2VlIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpPzE3OTUyKQor CisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6ICBBZGQgLS1jYWlyby13aW4zMiB0byB0 aGUgaGVscCBtZXNzYWdlCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOiAgRXh0ZW5k IHRoZSAnZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbgorICAgICAgICAgIHN1YnJvdXRpbmUg dG8gcmVjb2duaXplIHRoZSAtLWNhaXJvLXdpbjMyIGZsYWcuICBXaGVuIHByZXNlbnQsCisgICAg ICAgICAgdGhlIGJ1aWxkIGNvbmZpZ3VyYXRpb24gaXMgY2hhbmdlZCBmcm9tIERlYnVnL1JlbGVh c2UgdG8KKyAgICAgICAgICBEZWJ1Z19DYWlyby9SZWxlYXNlX0NhaXJvLiAgVGhpcyBmbGFnIGlz IG9ubHkgYWN0aXZlIHdoZW4gdGhlCisgICAgICAgICAgaXNDeWd3aW4oKSB0ZXN0IGlzIHRydWUu CisKIDIwMDgtMDYtMTAgIEpvZXJnIEJvcm5lbWFubiAgPGpvZXJnLmJvcm5lbWFubkB0cm9sbHRl Y2guY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uLgpJbmRleDogV2ViS2l0VG9vbHMv U2NyaXB0cy9idWlsZC13ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9i dWlsZC13ZWJraXQJKHJldmlzaW9uIDM0NDcwKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9idWls ZC13ZWJraXQJKHdvcmtpbmcgY29weSkKQEAgLTY0LDYgKzY0LDcgQEAgbXkgJHByb2dyYW1OYW1l ID0gYmFzZW5hbWUoJDApOwogbXkgJHVzYWdlID0gPDxFT0Y7CiBVc2FnZTogJHByb2dyYW1OYW1l IFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0KICAgLS1oZWxwICAg ICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZQorICAtLWNhaXJvLXdp bjMyICAgICAgICAgICAgICAgICBCdWlsZCB1c2luZyBDYWlybyAocmF0aGVyIHRoYW4gQ29yZUdy YXBoaWNzKSBvbiBXaW5kb3dzCiAgIC0tY2xlYW4gICAgICAgICAgICAgICAgICAgICAgIENsZWFu dXAgdGhlIGJ1aWxkIGRpcmVjdG9yeQogICAtLXVuaXZlcnNhbCAgICAgICAgICAgICAgICAgICBC dWlsZCAyLXdheSB1bml2ZXJzYWwgKFBQQyBhbmQgSW50ZWwgMzItYml0KQogICAtLTY0LWJpdCAg ICAgICAgICAgICAgICAgICAgICBCdWlsZCA2NC1iaXQsIGNvbWJpbmUgd2l0aCAtLXVuaXZlcnNh bCB0byBidWlsZCA0LXdheSB1bml2ZXJzYWwKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0JKHJldmlzaW9uIDM0NDcwKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CSh3b3JraW5nIGNvcHkpCkBAIC0yNjksMTYgKzI2OSwyMSBAQCBzdWIgZGV0ZXJtaW5lUGFzc2Vk Q29uZmlndXJhdGlvbgogewogICAgIHJldHVybiBpZiAkc2VhcmNoZWRGb3JQYXNzZWRDb25maWd1 cmF0aW9uOwogICAgICRzZWFyY2hlZEZvclBhc3NlZENvbmZpZ3VyYXRpb24gPSAxOworCisgICAg bXkgJGlzV2luQ2Fpcm8gPSBncmVwKC9eLS1jYWlyby13aW4zMiQvaSwgQEFSR1YpOworCiAgICAg Zm9yIG15ICRpICgwIC4uICQjQVJHVikgewogICAgICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwog ICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZGVidWckL2kgfHwgJG9wdCA9fiAvXi0tZGV2ZWwvaSkg ewogICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7CiAgICAgICAgICAgICAkcGFzc2Vk Q29uZmlndXJhdGlvbiA9ICJEZWJ1ZyI7CisgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlv biAuPSAiX0NhaXJvIiBpZiAoJGlzV2luQ2Fpcm8gJiYgaXNDeWd3aW4oKSk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKCRvcHQgPX4gL14tLXJlbGVhc2UkL2kg fHwgJG9wdCA9fiAvXi0tZGVwbG95L2kpIHsKICAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGks IDEpOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiUmVsZWFzZSI7CisgICAg ICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAiX0NhaXJvIiBpZiAoJGlzV2luQ2Fpcm8g JiYgaXNDeWd3aW4oKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9Cg== 21651 2008-06-11 16:54:19 -0700 2008-06-12 07:06:57 -0700 Minor update to merge against TOT build_webkit.patch text/plain 2677 bfulgham SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDM0NDk5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMDYtMTEgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRXh0ZW5kIHRoZSBidWlsZC13ZWJraXQgKGFuZCBzZXQtd2Via2l0LWNvbmZp Z3VyYXRpb24pIHNjcmlwdCB0bworICAgICAgICBzdXBwb3J0IENhaXJvLWJhc2VkIHdlYmtpdCBi dWlsZHMuICAoc2VlIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpPzE3OTUyKQor CisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6ICBBZGQgLS1jYWlyby13aW4zMiB0byB0 aGUgaGVscCBtZXNzYWdlCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOiAgRXh0ZW5k IHRoZSAnZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbgorICAgICAgICAgIHN1YnJvdXRpbmUg dG8gcmVjb2duaXplIHRoZSAtLWNhaXJvLXdpbjMyIGZsYWcuICBXaGVuIHByZXNlbnQsCisgICAg ICAgICAgdGhlIGJ1aWxkIGNvbmZpZ3VyYXRpb24gaXMgY2hhbmdlZCBmcm9tIERlYnVnL1JlbGVh c2UgdG8KKyAgICAgICAgICBEZWJ1Z19DYWlyby9SZWxlYXNlX0NhaXJvLiAgVGhpcyBmbGFnIGlz IG9ubHkgYWN0aXZlIHdoZW4gdGhlCisgICAgICAgICAgaXNDeWd3aW4oKSB0ZXN0IGlzIHRydWUu CisKIDIwMDgtMDYtMTAgIEpvZXJnIEJvcm5lbWFubiAgPGpvZXJnLmJvcm5lbWFubkB0cm9sbHRl Y2guY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uLgpJbmRleDogV2ViS2l0VG9vbHMv U2NyaXB0cy9idWlsZC13ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9i dWlsZC13ZWJraXQJKHJldmlzaW9uIDM0NDk5KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9idWls ZC13ZWJraXQJKHdvcmtpbmcgY29weSkKQEAgLTY0LDYgKzY0LDcgQEAgbXkgJHByb2dyYW1OYW1l ID0gYmFzZW5hbWUoJDApOwogbXkgJHVzYWdlID0gPDxFT0Y7CiBVc2FnZTogJHByb2dyYW1OYW1l IFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0KICAgLS1oZWxwICAg ICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZQorICAtLWNhaXJvLXdp bjMyICAgICAgICAgICAgICAgICBCdWlsZCB1c2luZyBDYWlybyAocmF0aGVyIHRoYW4gQ29yZUdy YXBoaWNzKSBvbiBXaW5kb3dzCiAgIC0tY2xlYW4gICAgICAgICAgICAgICAgICAgICAgIENsZWFu dXAgdGhlIGJ1aWxkIGRpcmVjdG9yeQogICAtLXVuaXZlcnNhbCAgICAgICAgICAgICAgICAgICBC dWlsZCAyLXdheSB1bml2ZXJzYWwgKFBQQyBhbmQgSW50ZWwgMzItYml0KQogICAtLTY0LWJpdCAg ICAgICAgICAgICAgICAgICAgICBCdWlsZCA2NC1iaXQsIGNvbWJpbmUgd2l0aCAtLXVuaXZlcnNh bCB0byBidWlsZCA0LXdheSB1bml2ZXJzYWwKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0JKHJldmlzaW9uIDM0NDk5KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CSh3b3JraW5nIGNvcHkpCkBAIC0yNjksMTYgKzI2OSwyMSBAQCBzdWIgZGV0ZXJtaW5lUGFzc2Vk Q29uZmlndXJhdGlvbgogewogICAgIHJldHVybiBpZiAkc2VhcmNoZWRGb3JQYXNzZWRDb25maWd1 cmF0aW9uOwogICAgICRzZWFyY2hlZEZvclBhc3NlZENvbmZpZ3VyYXRpb24gPSAxOworCisgICAg bXkgJGlzV2luQ2Fpcm8gPSBncmVwKC9eLS1jYWlyby13aW4zMiQvaSwgQEFSR1YpOworCiAgICAg Zm9yIG15ICRpICgwIC4uICQjQVJHVikgewogICAgICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwog ICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZGVidWckL2kgfHwgJG9wdCA9fiAvXi0tZGV2ZWwvaSkg ewogICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7CiAgICAgICAgICAgICAkcGFzc2Vk Q29uZmlndXJhdGlvbiA9ICJEZWJ1ZyI7CisgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlv biAuPSAiX0NhaXJvIiBpZiAoJGlzV2luQ2Fpcm8gJiYgaXNDeWd3aW4oKSk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKCRvcHQgPX4gL14tLXJlbGVhc2UkL2kg fHwgJG9wdCA9fiAvXi0tZGVwbG95L2kpIHsKICAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGks IDEpOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiUmVsZWFzZSI7CisgICAg ICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAiX0NhaXJvIiBpZiAoJGlzV2luQ2Fpcm8g JiYgaXNDeWd3aW4oKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9Cg==