| Index: Source/testing/runner/WebPermissions.cpp
|
| diff --git a/Source/testing/runner/WebPermissions.cpp b/Source/testing/runner/WebPermissions.cpp
|
| index d345801961f5e4f1fdbfbf2798bbb0f179533932..e7da7d6c95d8fb0fff1ec2ad812bf9bd510dbc79 100644
|
| --- a/Source/testing/runner/WebPermissions.cpp
|
| +++ b/Source/testing/runner/WebPermissions.cpp
|
| @@ -57,6 +57,14 @@ bool WebPermissions::allowImage(WebKit::WebFrame*, bool enabledPerSettings, cons
|
| return allowed;
|
| }
|
|
|
| +bool WebPermissions::allowMedia(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebURL& mediaURL)
|
| +{
|
| + bool allowed = enabledPerSettings && m_mediaAllowed;
|
| + if (m_dumpCallbacks && m_delegate)
|
| + m_delegate->printMessage(std::string("PERMISSION CLIENT: allowMedia(") + normalizeLayoutTestURL(mediaURL.spec()) + "): " + (allowed ? "true" : "false") + "\n");
|
| + return allowed;
|
| +}
|
| +
|
| bool WebPermissions::allowScriptFromSource(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebURL& scriptURL)
|
| {
|
| bool allowed = enabledPerSettings && m_scriptsAllowed;
|
| @@ -90,6 +98,11 @@ void WebPermissions::setImagesAllowed(bool imagesAllowed)
|
| m_imagesAllowed = imagesAllowed;
|
| }
|
|
|
| +void WebPermissions::setMediaAllowed(bool mediaAllowed)
|
| +{
|
| + m_mediaAllowed = mediaAllowed;
|
| +}
|
| +
|
| void WebPermissions::setScriptsAllowed(bool scriptsAllowed)
|
| {
|
| m_scriptsAllowed = scriptsAllowed;
|
| @@ -129,6 +142,7 @@ void WebPermissions::reset()
|
| {
|
| m_dumpCallbacks = false;
|
| m_imagesAllowed = true;
|
| + m_mediaAllowed = true;
|
| m_scriptsAllowed = true;
|
| m_storageAllowed = true;
|
| m_pluginsAllowed = true;
|
|
|