145510 2015-06-01 04:39:58 -0700 Fix the !ENABLE(VIDEO_TRACK) build after r184799 2015-06-01 08:29:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 145228 1 ossy ossy commit-queue eric.carlson jer.noble ossy oldest_to_newest 1098478 0 ossy 2015-06-01 04:39:58 -0700 http://trac.webkit.org/changeset/184799 broke the !ENABLE(VIDEO_TRACK) build: ../../Source/WebCore/testing/Internals.cpp: In member function 'WTF::Vector<WTF::String> WebCore::Internals::userPreferredAudioCharacteristics() const': ../../Source/WebCore/testing/Internals.cpp:1301:37: error: invalid use of incomplete type 'class WebCore::PageGroup' In file included from ../../Source/WebCore/inspector/InspectorInstrumentation.h:41:0, from ../../Source/WebCore/testing/Internals.cpp:73: ../../Source/WebCore/page/Page.h:92:7: error: forward declaration of 'class WebCore::PageGroup' ../../Source/WebCore/testing/Internals.cpp: In member function 'void WebCore::Internals::setUserPreferredAudioCharacteristic(const WTF::String&)': ../../Source/WebCore/testing/Internals.cpp:1309:30: error: invalid use of incomplete type 'class WebCore::PageGroup' In file included from ../../Source/WebCore/inspector/InspectorInstrumentation.h:41:0, from ../../Source/WebCore/testing/Internals.cpp:73: ../../Source/WebCore/page/Page.h:92:7: error: forward declaration of 'class WebCore::PageGroup' ../../Source/WebCore/testing/Internals.cpp: In member function 'WTF::Vector<WTF::String> WebCore::Internals::userPreferredAudioCharacteristics() const': ../../Source/WebCore/testing/Internals.cpp:1302:1: error: control reaches end of non-void function [-Werror=return-type] 1098479 1 253993 ossy 2015-06-01 04:41:14 -0700 Created attachment 253993 Patch 1098495 2 253993 eric.carlson 2015-06-01 07:41:37 -0700 Comment on attachment 253993 Patch Sorry about that Ossy, and thanks for the fix! 1098497 3 253993 commit-queue 2015-06-01 08:29:12 -0700 Comment on attachment 253993 Patch Clearing flags on attachment: 253993 Committed r185058: <http://trac.webkit.org/changeset/185058> 1098498 4 commit-queue 2015-06-01 08:29:16 -0700 All reviewed patches have been landed. Closing bug. 253993 2015-06-01 04:41:14 -0700 2015-06-01 08:29:12 -0700 Patch bug-145510-20150601044056.patch text/plain 1910 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVkMzhmNTkwZTc3M2Uw NDhhM2IyMTNjZWViNWYwNjRkM2MzYzU3Mi4uNDFjNTcxNmQxZTM2ZTQ1YjNmYmU4MWQwYmZkMzYy OTBhMjYwY2UxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA2LTAxICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IHRoZSAhRU5B QkxFKFZJREVPX1RSQUNLKSBidWlsZCBhZnRlciByMTg0Nzk5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU1MTAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6dXNlclByZWZlcnJlZEF1ZGlvQ2hhcmFjdGVyaXN0 aWNzKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0VXNlclByZWZlcnJlZEF1ZGlv Q2hhcmFjdGVyaXN0aWMpOgorCiAyMDE1LTA1LTMxICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFBhbnRoZXIgc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGlu Zy9JbnRlcm5hbHMuY3BwCmluZGV4IDUzODA4ODFiMTM3Nzk5OTFiMDA3ZWE2NTU4OTZjZTZlZjQ3 ZWUwMzAuLmU1N2RjMTljMmY5YWVkNTI1NjEyNzgyZDNmMDI4OGRjMTQwN2I3ZjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTEzMDMsNyArMTMwMywxMSBAQCBWZWN0b3I8 U3RyaW5nPiBJbnRlcm5hbHM6OnVzZXJQcmVmZXJyZWRBdWRpb0NoYXJhY3RlcmlzdGljcygpIGNv bnN0CiAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gY29udGV4dERvY3VtZW50KCk7CiAgICAgaWYg KCFkb2N1bWVudCB8fCAhZG9jdW1lbnQtPnBhZ2UoKSkKICAgICAgICAgcmV0dXJuIFZlY3RvcjxT dHJpbmc+KCk7CisjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIHJldHVybiBkb2N1bWVudC0+ cGFnZSgpLT5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLT5wcmVmZXJyZWRBdWRpb0NoYXJh Y3RlcmlzdGljcygpOworI2Vsc2UKKyAgICByZXR1cm4gVmVjdG9yPFN0cmluZz4oKTsKKyNlbmRp ZgogfQogCiB2b2lkIEludGVybmFsczo6c2V0VXNlclByZWZlcnJlZEF1ZGlvQ2hhcmFjdGVyaXN0 aWMoY29uc3QgU3RyaW5nJiBjaGFyYWN0ZXJpc3RpYykKQEAgLTEzMTEsNyArMTMxNSwxMSBAQCB2 b2lkIEludGVybmFsczo6c2V0VXNlclByZWZlcnJlZEF1ZGlvQ2hhcmFjdGVyaXN0aWMoY29uc3Qg U3RyaW5nJiBjaGFyYWN0ZXJpc3RpYwogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGNvbnRleHRE b2N1bWVudCgpOwogICAgIGlmICghZG9jdW1lbnQgfHwgIWRvY3VtZW50LT5wYWdlKCkpCiAgICAg ICAgIHJldHVybjsKKyNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgZG9jdW1lbnQtPnBhZ2Uo KS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKS0+c2V0UHJlZmVycmVkQXVkaW9DaGFyYWN0 ZXJpc3RpYyhjaGFyYWN0ZXJpc3RpYyk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShjaGFyYWN0 ZXJpc3RpYyk7CisjZW5kaWYKIH0KIAogdW5zaWduZWQgSW50ZXJuYWxzOjp3aGVlbEV2ZW50SGFu ZGxlckNvdW50KEV4Y2VwdGlvbkNvZGUmIGVjKQo=