131089 2014-04-01 22:10:36 -0700 GMainLoopSource needs to link in WinCairo 2014-04-02 02:15:04 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Trivial --- 1 alex.christensen webkit-unassigned benjamin cgarcia cmarcelo commit-queue mrobinson ossy oldest_to_newest 996585 0 alex.christensen 2014-04-01 22:10:36 -0700 The new GMainLoopSource functions need to be exported in WTF.dll to link with where they are used in the GStreamer code in WebCore. Also, if video is disabled then I'm not using glib, so I'd like to add #if USE(GLIB) like the other wtf/gobject cpp files have. One fix for with video, one fix for without video. 996587 1 228362 alex.christensen 2014-04-01 22:15:46 -0700 Created attachment 228362 Patch 996638 2 228362 commit-queue 2014-04-02 02:15:00 -0700 Comment on attachment 228362 Patch Clearing flags on attachment: 228362 Committed r166636: <http://trac.webkit.org/changeset/166636> 996639 3 commit-queue 2014-04-02 02:15:04 -0700 All reviewed patches have been landed. Closing bug. 228362 2014-04-01 22:15:46 -0700 2014-04-02 02:15:00 -0700 Patch bug-131089-20140401231525.patch text/plain 5101 alex.christensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNjY2MzApCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA0LTAxICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dpbkNhaXJvXSBCdWlsZCBmaXgg d2l0aCBHTWFpbkxvb3BTb3VyY2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzEwODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHd0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5jcHA6CisgICAgICAg IE9ubHkgY29tcGlsZSBpZiBnbGliIGlzIHVzZWQsIHdoaWNoIGZpeGVzIGNvbXBpbGUgZXJyb3Jz IHdpdGggdmlkZW8gZGlzYWJsZWQgaW4gV2luQ2Fpcm8uCisgICAgICAgICogd3RmL2dvYmplY3Qv R01haW5Mb29wU291cmNlLmg6CisgICAgICAgIEV4cG9ydCB0aGUgR01haW5Mb29wU291cmNlIGZ1 bmN0aW9ucyB0byBXVEYuZGxsIHRvIGxpbmsgd2l0aCB3aGVyZSB0aGV5IGFyZSBjYWxsZWQgaW4g dGhlIEdTdHJlYW1lciBjb2RlLgorICAgICAgICBBbHNvIHJlbW92ZWQgc3BhY2VzIHRvIGFwcGVh c2Ugc3R5bGUgYm90LgorCiAyMDE0LTA0LTAxICBac29sdCBCb3JiZWx5ICA8enNib3JiZWx5LnUt c3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gUkVHUkVTU0lPTigx NjY1NjkpOiBJdCBtYWRlIERvWW91RXZlbkJlbmNoL0Z1bGwuaHRtbCwgQ1NTL1F1ZXJ5U2VsZWN0 b3IuaHRtbCBhbmQgRHJvbWFlbyBwZXJmb3JtYW5jZSB0ZXN0cyBjcmFzaApJbmRleDogU291cmNl L1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmNwcAkocmV2aXNpb24gMTY2NjMwKQor KysgU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNCw2ICsyNCw5IEBACiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgorCisjaWYg VVNFKEdMSUIpCisKICNpbmNsdWRlICJHTWFpbkxvb3BTb3VyY2UuaCIKIAogI2luY2x1ZGUgPGdp by9naW8uaD4KQEAgLTI2NSwzICsyNjgsNCBAQCBnYm9vbGVhbiBHTWFpbkxvb3BTb3VyY2U6OnNv Y2tldFNvdXJjZUNhCiAKIH0gLy8gbmFtZXNwYWNlIFdURgogCisjZW5kaWYgLy8gVVNFKEdMSUIp CkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmgJKHJldmlzaW9u IDE2NjYzMCkKKysrIFNvdXJjZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmgJKHdv cmtpbmcgY29weSkKQEAgLTQxLDIzICs0MSwyMyBAQCBjbGFzcyBHTWFpbkxvb3BTb3VyY2Ugewog cHVibGljOgogICAgIHN0YXRpYyBHTWFpbkxvb3BTb3VyY2UmIGNyZWF0ZUFuZERlbGV0ZU9uRGVz dHJveSgpOwogCi0gICAgR01haW5Mb29wU291cmNlKCk7Ci0gICAgfkdNYWluTG9vcFNvdXJjZSgp OworICAgIFdURl9FWFBPUlRfUFJJVkFURSBHTWFpbkxvb3BTb3VyY2UoKTsKKyAgICBXVEZfRVhQ T1JUX1BSSVZBVEUgfkdNYWluTG9vcFNvdXJjZSgpOwogCiAgICAgc3RhdGljIGNvbnN0IGJvb2wg U3RvcCA9IGZhbHNlOwogICAgIHN0YXRpYyBjb25zdCBib29sIENvbnRpbnVlID0gdHJ1ZTsKIAot ICAgIGJvb2wgaXNTY2hlZHVsZWQoKSBjb25zdDsKLSAgICBib29sIGlzQWN0aXZlKCkgY29uc3Q7 CisgICAgV1RGX0VYUE9SVF9QUklWQVRFIGJvb2wgaXNTY2hlZHVsZWQoKSBjb25zdDsKKyAgICBX VEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBpc0FjdGl2ZSgpIGNvbnN0OwogCi0gICAgdm9pZCBzY2hl ZHVsZShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+LCBpbnQgcHJpb3Jp dHkgPSBHX1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZGVzdHJveUZ1 bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOwotICAgIHZvaWQgc2No ZWR1bGUoY29uc3QgY2hhciogbmFtZSwgc3RkOjpmdW5jdGlvbjxib29sICgpPiwgaW50IHByaW9y aXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGRlc3Ryb3lG dW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKLSAgICB2b2lkIHNj aGVkdWxlKGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCAoR0lPQ29uZGl0aW9u KT4sIEdTb2NrZXQqLCBHSU9Db25kaXRpb24sIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZGVzdHJv eUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOwotICAgIHZvaWQg c2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCAo KT4sIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMsIGludCBwcmlvcml0eSA9IEdfUFJJT1JJVFlf REVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRy LCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7Ci0gICAgdm9pZCBzY2hlZHVsZUFmdGVyRGVsYXko Y29uc3QgY2hhciogbmFtZSwgc3RkOjpmdW5jdGlvbjxib29sICgpPiwgc3RkOjpjaHJvbm86Om1p bGxpc2Vjb25kcywgaW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0 aW9uPHZvaWQgKCk+IGRlc3Ryb3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBu dWxscHRyKTsKLSAgICB2b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFyKiBuYW1lLCBz dGQ6OmZ1bmN0aW9uPHZvaWQgKCk+LCBzdGQ6OmNocm9ubzo6c2Vjb25kcywgaW50IHByaW9yaXR5 ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGRlc3Ryb3lGdW5j dGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKLSAgICB2b2lkIHNjaGVk dWxlQWZ0ZXJEZWxheShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKCk+LCBz dGQ6OmNocm9ubzo6c2Vjb25kcywgaW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBz dGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGRlc3Ryb3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29u dGV4dCogPSBudWxscHRyKTsKLSAgICB2b2lkIGNhbmNlbCgpOworICAgIFdURl9FWFBPUlRfUFJJ VkFURSB2b2lkIHNjaGVkdWxlKGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgp PiwgaW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQo KT4gZGVzdHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOwor ICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIHNjaGVkdWxlKGNvbnN0IGNoYXIqIG5hbWUsIHN0 ZDo6ZnVuY3Rpb248Ym9vbCgpPiwgaW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBz dGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGVzdHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250 ZXh0KiA9IG51bGxwdHIpOworICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIHNjaGVkdWxlKGNv bnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbChHSU9Db25kaXRpb24pPiwgR1NvY2tl dCosIEdJT0NvbmRpdGlvbiwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ryb3lGdW5jdGlvbiA9 IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKKyAgICBXVEZfRVhQT1JUX1BSSVZB VEUgdm9pZCBzY2hlZHVsZUFmdGVyRGVsYXkoY29uc3QgY2hhciogbmFtZSwgc3RkOjpmdW5jdGlv bjx2b2lkKCk+LCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzLCBpbnQgcHJpb3JpdHkgPSBHX1BS SU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBkZXN0cm95RnVuY3Rpb24gPSBu dWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CisgICAgV1RGX0VYUE9SVF9QUklWQVRF IHZvaWQgc2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248 Ym9vbCgpPiwgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcywgaW50IHByaW9yaXR5ID0gR19QUklP UklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGVzdHJveUZ1bmN0aW9uID0gbnVs bHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOworICAgIFdURl9FWFBPUlRfUFJJVkFURSB2 b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6OmZ1bmN0aW9uPHZv aWQoKT4sIHN0ZDo6Y2hyb25vOjpzZWNvbmRzLCBpbnQgcHJpb3JpdHkgPSBHX1BSSU9SSVRZX0RF RkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBH TWFpbkNvbnRleHQqID0gbnVsbHB0cik7CisgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgc2No ZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCgpPiwg c3RkOjpjaHJvbm86OnNlY29uZHMsIGludCBwcmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwg c3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ryb3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29u dGV4dCogPSBudWxscHRyKTsKKyAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBjYW5jZWwoKTsK IAogcHJpdmF0ZToKICAgICBlbnVtIERlbGV0ZU9uRGVzdHJveVR5cGUgeyBEZWxldGVPbkRlc3Ry b3ksIERvTm90RGVsZXRlT25EZXN0cm95IH07Cg==