46317 2010-09-22 15:54:29 -0700 [EFL] Fix build due to latest EFL (Edje) changes. 2010-09-22 18:32:02 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 antognolli+webkit antognolli+webkit commit-queue oldest_to_newest 283316 0 antognolli+webkit 2010-09-22 15:54:29 -0700 [EFL] Fix build due to latest EFL (Edje) changes. 283319 1 68461 antognolli+webkit 2010-09-22 15:56:07 -0700 Created attachment 68461 Patch 283440 2 68461 commit-queue 2010-09-22 18:31:56 -0700 Comment on attachment 68461 Patch Clearing flags on attachment: 68461 Committed r68110: <http://trac.webkit.org/changeset/68110> 283442 3 commit-queue 2010-09-22 18:32:02 -0700 All reviewed patches have been landed. Closing bug. 68461 2010-09-22 15:56:07 -0700 2010-09-22 18:31:56 -0700 Patch bug-46317-20100922195607.patch text/plain 3445 antognolli+webkit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWRiNGU5NzhkZjg2NzZkNTg2ZDE1Y2QxZjEwM2NlYWUyMzZkMzBkZS4uZTg3MmUyOTcyMTMyOWM3 MTNlZTJkNTQ1ZDdiMTM4ZDJiOTY0ZWE1ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wOS0yMiAgUmFm YWVsIEFudG9nbm9sbGkgIDxhbnRvZ25vbGxpQHByb2Z1c2lvbi5tb2JpPgorCisgICAgICAgIFVu cmV2aWV3ZWQgYnVpbGQgZml4LgorCisgICAgICAgIFtFRkxdIEZpeCBidWlsZCBkdWUgdG8gbGF0 ZXN0IEVGTCAoRWRqZSkgY2hhbmdlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ2MzE3CisKKyAgICAgICAgTWFrZSB0aGUgY2hhbmdlIGludCAtPiBF ZGplX0xvYWRfRXJyb3IgKGVudW0pLgorCisgICAgICAgIE5vIG5ldyBmdW5jdGlvbmFsaXR5LCBz byBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVFZmw6OnRoZW1lUGFydENhY2hlRW50 cnlSZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUVmbDo6Y3JlYXRlRWRqZSk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUVmbDo6YXBwbHlQYXJ0RGVzY3JpcHRpb25z KToKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcDoKKyAgICAgICAgKFNj cm9sbGJhckVmbDo6c2V0UGFyZW50KToKKwogMjAxMC0wOS0yMSAgUGF0cmljayBHYW5zdGVyZXIg IDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFJvYmVuLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCmluZGV4IDEwMmY3NTQxMmJiOTAy MjMzYTc1MTBjNzYwMjdiMmIwZGZlNDk4MzIuLjUzOTk3YmVlNGFhNmYwZDQ1NjhmY2ZmMDBkMTY4 OGNhMzM4OTEyOWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1l RWZsLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAKQEAg LTc4LDcgKzc4LDcgQEAgYm9vbCBSZW5kZXJUaGVtZUVmbDo6dGhlbWVQYXJ0Q2FjaGVFbnRyeVJl c2V0KHN0cnVjdCBUaGVtZVBhcnRDYWNoZUVudHJ5KiBjZSwgRm8KICAgICBBU1NFUlQoZ3JvdXAp OwogCiAgICAgaWYgKCFlZGplX29iamVjdF9maWxlX3NldChjZS0+bywgZmlsZSwgZ3JvdXApKSB7 Ci0gICAgICAgIGludCBlcnIgPSBlZGplX29iamVjdF9sb2FkX2Vycm9yX2dldChjZS0+byk7Cisg ICAgICAgIEVkamVfTG9hZF9FcnJvciBlcnIgPSBlZGplX29iamVjdF9sb2FkX2Vycm9yX2dldChj ZS0+byk7CiAgICAgICAgIGNvbnN0IGNoYXIgKmVycm1zZyA9IGVkamVfbG9hZF9lcnJvcl9zdHIo ZXJyKTsKICAgICAgICAgRUlOQV9MT0dfRVJSKCJDb3VsZCBub3QgbG9hZCAnJXMnIGZyb20gdGhl bWUgJXM6ICVzIiwKICAgICAgICAgICAgICAgICAgICAgIGdyb3VwLCBmaWxlLCBlcnJtc2cpOwpA QCAtNDIxLDcgKzQyMSw3IEBAIHZvaWQgUmVuZGVyVGhlbWVFZmw6OmNyZWF0ZUVkamUoKQogICAg ICAgICBpZiAoIW1fZWRqZSkKICAgICAgICAgICAgIEVJTkFfTE9HX0VSUigiQ291bGQgbm90IGNy ZWF0ZSBiYXNlIGVkamUgb2JqZWN0LiIpOwogICAgICAgICBlbHNlIGlmICghZWRqZV9vYmplY3Rf ZmlsZV9zZXQobV9lZGplLCB0aGVtZS51dGY4KCkuZGF0YSgpLCAid2Via2l0L2Jhc2UiKSkgewot ICAgICAgICAgICAgaW50IGVyciA9IGVkamVfb2JqZWN0X2xvYWRfZXJyb3JfZ2V0KG1fZWRqZSk7 CisgICAgICAgICAgICBFZGplX0xvYWRfRXJyb3IgZXJyID0gZWRqZV9vYmplY3RfbG9hZF9lcnJv cl9nZXQobV9lZGplKTsKICAgICAgICAgICAgIGNvbnN0IGNoYXIqIGVycm1zZyA9IGVkamVfbG9h ZF9lcnJvcl9zdHIoZXJyKTsKICAgICAgICAgICAgIEVJTkFfTE9HX0VSUigiQ291bGQgbm90IGxv YWQgJ3dlYmtpdC9iYXNlJyBmcm9tIHRoZW1lICVzOiAlcyIsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgdGhlbWUudXRmOCgpLmRhdGEoKSwgZXJybXNnKTsKQEAgLTYwMCw3ICs2MDAsNyBAQCB2 b2lkIFJlbmRlclRoZW1lRWZsOjphcHBseVBhcnREZXNjcmlwdGlvbnMoKQogICAgICAgICBjb25z dCBjaGFyKiBncm91cCA9IGVkamVHcm91cEZyb21Gb3JtVHlwZSh0eXBlKTsKICAgICAgICAgbV9w YXJ0RGVzY3NbaV0udHlwZSA9IHR5cGU7CiAgICAgICAgIGlmICghZWRqZV9vYmplY3RfZmlsZV9z ZXQobywgZmlsZSwgZ3JvdXApKSB7Ci0gICAgICAgICAgICBpbnQgZXJyID0gZWRqZV9vYmplY3Rf bG9hZF9lcnJvcl9nZXQobyk7CisgICAgICAgICAgICBFZGplX0xvYWRfRXJyb3IgZXJyID0gZWRq ZV9vYmplY3RfbG9hZF9lcnJvcl9nZXQobyk7CiAgICAgICAgICAgICBjb25zdCBjaGFyKiBlcnJt c2cgPSBlZGplX2xvYWRfZXJyb3Jfc3RyKGVycik7CiAgICAgICAgICAgICBFSU5BX0xPR19FUlIo IkNvdWxkIG5vdCBzZXQgdGhlbWUgZ3JvdXAgJyVzJyBvZiBmaWxlICclcyc6ICVzIiwKICAgICAg ICAgICAgICAgICAgICAgICAgICBncm91cCwgZmlsZSwgZXJybXNnKTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2Vm bC9TY3JvbGxiYXJFZmwuY3BwCmluZGV4IDZiMDBhMzc4NGU4OTM4ZDhjYzYyMDFlMDUzMzQwMzU2 ZTQxZGNiZTkuLjI4MmNhN2NiYzFjNzFjMmFiMzE3Y2YxN2RmNmI3Yjc5MWI4OWRjODYgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcApAQCAtMTIyLDcgKzEyMiw3IEBAIHZvaWQg U2Nyb2xsYmFyRWZsOjpzZXRQYXJlbnQoU2Nyb2xsVmlldyogdmlldykKICAgICB9CiAKICAgICBp ZiAoIWVkamVfb2JqZWN0X2ZpbGVfc2V0KG8sIHRoZW1lLnV0ZjgoKS5kYXRhKCksIGdyb3VwKSkg ewotICAgICAgICBpbnQgZXJyID0gZWRqZV9vYmplY3RfbG9hZF9lcnJvcl9nZXQobyk7CisgICAg ICAgIEVkamVfTG9hZF9FcnJvciBlcnIgPSBlZGplX29iamVjdF9sb2FkX2Vycm9yX2dldChvKTsK ICAgICAgICAgY29uc3QgY2hhciogZXJybXNnID0gZWRqZV9sb2FkX2Vycm9yX3N0cihlcnIpOwog ICAgICAgICBFSU5BX0xPR19FUlIoIkNvdWxkIG5vdCBsb2FkIHRoZW1lICclcycgZnJvbSBmaWxl ICclcyc6ICMlZCAnJXMnIiwKICAgICAgICAgICAgICAgICAgICAgIGdyb3VwLCB0aGVtZS51dGY4 KCkuZGF0YSgpLCBlcnIsIGVycm1zZyk7Cg==