Title: [219116] trunk/Source/WebCore
- Revision
- 219116
- Author
- [email protected]
- Date
- 2017-07-04 04:12:26 -0700 (Tue, 04 Jul 2017)
Log Message
[EME] Solve a couple of compiler warnings
https://bugs.webkit.org/show_bug.cgi?id=174020
Reviewed by Michael Catanzaro.
* Modules/encryptedmedia/CDM.cpp:
(WebCore::CDM::isPersistentType): Added default return and
assertion.
* Modules/encryptedmedia/MediaKeySession.cpp:
(WebCore::MediaKeySession::updateKeyStatuses): This warning was
already solved but I think adding an assertion for the default
case can help catch errors in the future.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (219115 => 219116)
--- trunk/Source/WebCore/ChangeLog 2017-07-04 08:03:06 UTC (rev 219115)
+++ trunk/Source/WebCore/ChangeLog 2017-07-04 11:12:26 UTC (rev 219116)
@@ -1,3 +1,18 @@
+2017-07-04 Xabier Rodriguez Calvar <[email protected]>
+
+ [EME] Solve a couple of compiler warnings
+ https://bugs.webkit.org/show_bug.cgi?id=174020
+
+ Reviewed by Michael Catanzaro.
+
+ * Modules/encryptedmedia/CDM.cpp:
+ (WebCore::CDM::isPersistentType): Added default return and
+ assertion.
+ * Modules/encryptedmedia/MediaKeySession.cpp:
+ (WebCore::MediaKeySession::updateKeyStatuses): This warning was
+ already solved but I think adding an assertion for the default
+ case can help catch errors in the future.
+
2017-07-04 Joseph Pecoraro <[email protected]>
Cleanup some StringBuilder use
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (219115 => 219116)
--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2017-07-04 08:03:06 UTC (rev 219115)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2017-07-04 11:12:26 UTC (rev 219116)
@@ -181,6 +181,9 @@
// ↳ "persistent-license"
return true;
}
+
+ ASSERT_NOT_REACHED();
+ return false;
}
std::optional<MediaKeySystemConfiguration> CDM::getSupportedConfiguration(const MediaKeySystemConfiguration& candidateConfiguration, MediaKeysRestrictions& restrictions)
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (219115 => 219116)
--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2017-07-04 08:03:06 UTC (rev 219115)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2017-07-04 11:12:26 UTC (rev 219116)
@@ -632,8 +632,10 @@
case CDMInstance::KeyStatus::StatusPending:
return MediaKeyStatus::StatusPending;
case CDMInstance::KeyStatus::InternalError:
- break;
+ return MediaKeyStatus::InternalError;
};
+
+ ASSERT_NOT_REACHED();
return MediaKeyStatus::InternalError;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
