Changeset 92219 in webkit
- Timestamp:
- Aug 2, 2011 1:00:46 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r92215 r92219 1 2011-08-02 Jochen Eisinger <jochen@chromium.org> 2 3 Add a test for FrameLoaderClient::allowPlugins 4 https://bugs.webkit.org/show_bug.cgi?id=33991 5 6 Reviewed by Adam Barth. 7 8 * platform/chromium/permissionclient/plugin-permission-expected.txt: Added. 9 * platform/chromium/permissionclient/plugin-permission.html: Added. 10 1 11 2011-08-02 Zhenyao Mo <zmo@google.com> 2 12 -
trunk/Tools/ChangeLog
r92218 r92219 1 2011-08-02 Jochen Eisinger <jochen@chromium.org> 2 3 Implement WebPermissionClient::allowPlugins for layout tests 4 https://bugs.webkit.org/show_bug.cgi?id=33991 5 6 Reviewed by Adam Barth. 7 8 * DumpRenderTree/chromium/LayoutTestController.cpp: 9 (LayoutTestController::LayoutTestController): 10 (LayoutTestController::setPluginsAllowed): 11 * DumpRenderTree/chromium/LayoutTestController.h: 12 * DumpRenderTree/chromium/WebPermissions.cpp: 13 (WebPermissions::allowPlugins): 14 (WebPermissions::setPluginsAllowed): 15 (WebPermissions::reset): 16 * DumpRenderTree/chromium/WebPermissions.h: 17 1 18 2011-08-02 Adam Barth <abarth@webkit.org> 2 19 -
trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
r91708 r92219 194 194 bindMethod("setImagesAllowed", &LayoutTestController::setImagesAllowed); 195 195 bindMethod("setStorageAllowed", &LayoutTestController::setStorageAllowed); 196 bindMethod("setPluginsAllowed", &LayoutTestController::setPluginsAllowed); 196 197 197 198 // The following are stubs. … … 768 769 if (arguments.size() > 0 && arguments[0].isBool()) 769 770 m_shell->webPermissions()->setStorageAllowed(arguments[0].toBoolean()); 771 result->setNull(); 772 } 773 774 void LayoutTestController::setPluginsAllowed(const CppArgumentList& arguments, CppVariant* result) 775 { 776 if (arguments.size() > 0 && arguments[0].isBool()) 777 m_shell->webPermissions()->setPluginsAllowed(arguments[0].toBoolean()); 770 778 result->setNull(); 771 779 } -
trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h
r91708 r92219 383 383 void setImagesAllowed(const CppArgumentList&, CppVariant*); 384 384 void setStorageAllowed(const CppArgumentList&, CppVariant*); 385 void setPluginsAllowed(const CppArgumentList&, CppVariant*); 385 386 386 387 // Enable or disable plugins. -
trunk/Tools/DumpRenderTree/chromium/WebPermissions.cpp
r88377 r92219 51 51 } 52 52 53 bool WebPermissions::allowPlugins(WebKit::WebFrame*, bool enabledPerSettings) 54 { 55 return enabledPerSettings && m_pluginsAllowed; 56 } 57 53 58 bool WebPermissions::allowDisplayingInsecureContent(WebKit::WebFrame*, bool enabledPerSettings, 54 59 const WebKit::WebSecurityOrigin&, const WebKit::WebURL&) … … 73 78 } 74 79 80 void WebPermissions::setPluginsAllowed(bool pluginsAllowed) 81 { 82 m_pluginsAllowed = pluginsAllowed; 83 } 84 75 85 void WebPermissions::setDisplayingInsecureContentAllowed(bool allowed) 76 86 { … … 87 97 m_imagesAllowed = true; 88 98 m_storageAllowed = true; 99 m_pluginsAllowed = true; 89 100 m_displayingInsecureContentAllowed = false; 90 101 m_runningInsecureContentAllowed = false; -
trunk/Tools/DumpRenderTree/chromium/WebPermissions.h
r88377 r92219 42 42 virtual bool allowImages(WebKit::WebFrame*, bool enabledPerSettings); 43 43 virtual bool allowStorage(WebKit::WebFrame*, bool local); 44 virtual bool allowPlugins(WebKit::WebFrame*, bool enabledPerSettings); 44 45 virtual bool allowDisplayingInsecureContent(WebKit::WebFrame*, bool enabledPerSettings, 45 46 const WebKit::WebSecurityOrigin&, const WebKit::WebURL&); … … 50 51 void setImagesAllowed(bool); 51 52 void setStorageAllowed(bool); 53 void setPluginsAllowed(bool); 52 54 void setDisplayingInsecureContentAllowed(bool); 53 55 void setRunningInsecureContentAllowed(bool); … … 59 61 bool m_imagesAllowed; 60 62 bool m_storageAllowed; 63 bool m_pluginsAllowed; 61 64 bool m_displayingInsecureContentAllowed; 62 65 bool m_runningInsecureContentAllowed;
Note: See TracChangeset
for help on using the changeset viewer.