| Index: content/shell/renderer/test_runner/WebPermissions.cpp
|
| diff --git a/content/shell/renderer/test_runner/WebPermissions.cpp b/content/shell/renderer/test_runner/WebPermissions.cpp
|
| index 1eec6eb824ef5af094be3ffe1b68f785aebc7e54..fa59bb10a3c9724042ec9970498cb1eb4892322e 100644
|
| --- a/content/shell/renderer/test_runner/WebPermissions.cpp
|
| +++ b/content/shell/renderer/test_runner/WebPermissions.cpp
|
| @@ -23,33 +23,40 @@ WebPermissions::~WebPermissions()
|
| {
|
| }
|
|
|
| -bool WebPermissions::allowImage(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& imageURL)
|
| -{
|
| +bool WebPermissions::allowImage(blink::WebLocalFrame*,
|
| + bool enabledPerSettings,
|
| + const blink::WebURL& imageURL) {
|
| return allowImage(enabledPerSettings, imageURL);
|
| }
|
|
|
| -bool WebPermissions::allowScriptFromSource(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& scriptURL)
|
| -{
|
| +bool WebPermissions::allowScriptFromSource(blink::WebLocalFrame*,
|
| + bool enabledPerSettings,
|
| + const blink::WebURL& scriptURL) {
|
| return allowScriptFromSource(enabledPerSettings, scriptURL);
|
| }
|
|
|
| -bool WebPermissions::allowStorage(blink::WebFrame*, bool temp)
|
| -{
|
| +bool WebPermissions::allowStorage(blink::WebLocalFrame*, bool temp) {
|
| return allowStorage(temp);
|
| }
|
|
|
| -bool WebPermissions::allowPlugins(blink::WebFrame*, bool enabledPerSettings)
|
| -{
|
| +bool WebPermissions::allowPlugins(blink::WebLocalFrame*,
|
| + bool enabledPerSettings) {
|
| return enabledPerSettings && m_pluginsAllowed;
|
| }
|
|
|
| -bool WebPermissions::allowDisplayingInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin& temp1, const blink::WebURL& temp2)
|
| -{
|
| +bool WebPermissions::allowDisplayingInsecureContent(
|
| + blink::WebLocalFrame*,
|
| + bool enabledPerSettings,
|
| + const blink::WebSecurityOrigin& temp1,
|
| + const blink::WebURL& temp2) {
|
| return allowDisplayingInsecureContent(enabledPerSettings, temp1, temp2);
|
| }
|
|
|
| -bool WebPermissions::allowRunningInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin& temp1, const blink::WebURL& temp2)
|
| -{
|
| +bool WebPermissions::allowRunningInsecureContent(
|
| + blink::WebLocalFrame*,
|
| + bool enabledPerSettings,
|
| + const blink::WebSecurityOrigin& temp1,
|
| + const blink::WebURL& temp2) {
|
| return allowRunningInsecureContent(enabledPerSettings, temp1, temp2);
|
| }
|
|
|
|
|