Adding <keygen> Content Setting (Blink)

chrome/renderer/content_settings_observer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 24 matching lines @@
       public blink::WebContentSettingsClient {
  public:
   // Set |should_whitelist| to true if |render_frame()| contains content that
   // should be whitelisted for content settings.
   ContentSettingsObserver(content::RenderFrame* render_frame,
                           extensions::Dispatcher* extension_dispatcher,
                           bool should_whitelist);
   ~ContentSettingsObserver() override;
 
   // Sets the content setting rules which back |AllowImage()|, |AllowScript()|,
-  // and |AllowScriptFromSource()|. |content_setting_rules| must outlive this
-  // |ContentSettingsObserver|.
+  // |AllowScriptFromSource()|, and |AllowKeygen()|. |content_setting_rules|

[Bernhard Bauer, 2015/11/05 17:17:33]

Revert this?

[svaldez, 2015/11/05 17:40:12]

Done.

+  // must outlive this |ContentSettingsObserver|.
   void SetContentSettingRules(
       const RendererContentSettingRules* content_setting_rules);
 
   bool IsPluginTemporarilyAllowed(const std::string& identifier);
 
   // Sends an IPC notification that the specified content type was blocked.
   void DidBlockContentType(ContentSettingsType settings_type);
 
   // Sends an IPC notification that the specified content type was blocked
   // with additional metadata.
   void DidBlockContentType(ContentSettingsType settings_type,
                            const base::string16& details);
 
   // blink::WebContentSettingsClient implementation.
   bool allowDatabase(const blink::WebString& name,
                      const blink::WebString& display_name,
                      unsigned long estimated_size) override;
   void requestFileSystemAccessAsync(
       const blink::WebContentSettingCallbacks& callbacks) override;
   bool allowImage(bool enabled_per_settings,
                   const blink::WebURL& image_url) override;
   bool allowIndexedDB(const blink::WebString& name,
                       const blink::WebSecurityOrigin& origin) override;
+  bool allowKeygen() override;
   bool allowPlugins(bool enabled_per_settings) override;
   bool allowScript(bool enabled_per_settings) override;
   bool allowScriptFromSource(bool enabled_per_settings,
                              const blink::WebURL& script_url) override;
   bool allowStorage(bool local) override;
   bool allowReadFromClipboard(bool default_value) override;
   bool allowWriteToClipboard(bool default_value) override;
   bool allowMutationEvents(bool default_value) override;
+  void didNotAllowKeygen() override;
   void didNotAllowPlugins() override;
   void didNotAllowScript() override;
   bool allowDisplayingInsecureContent(bool allowed_per_settings,
                                       const blink::WebSecurityOrigin& context,
                                       const blink::WebURL& url) override;
   bool allowRunningInsecureContent(bool allowed_per_settings,
                                    const blink::WebSecurityOrigin& context,
                                    const blink::WebURL& url) override;
 
   // This is used for cases when the NPAPI plugins malfunction if used.
@@ skipping 48 matching lines @@
   // Insecure content may be permitted for the duration of this render view.
   bool allow_displaying_insecure_content_;
   bool allow_running_insecure_content_;
 
   // A pointer to content setting rules stored by the renderer. Normally, the
   // |RendererContentSettingRules| object is owned by
   // |ChromeRenderProcessObserver|. In the tests it is owned by the caller of
   // |SetContentSettingRules|.
   const RendererContentSettingRules* content_setting_rules_;
 
-  // Stores if images, scripts, and plugins have actually been blocked.
+  // Stores if images, scripts, keygen, and plugins have actually been blocked.
   std::map<ContentSettingsType, bool> content_blocked_;
 
   // Caches the result of AllowStorage.
   typedef std::pair<GURL, bool> StoragePermissionsKey;
   std::map<StoragePermissionsKey, bool> cached_storage_permissions_;
 
-  // Caches the result of |AllowScript|.
+  // Caches the result of AllowScript.
   std::map<blink::WebFrame*, bool> cached_script_permissions_;
 
+  // Caches the result of AllowKeygen.
+  std::map<blink::WebFrame*, bool> cached_keygen_permissions_;
+
   std::set<std::string> temporarily_allowed_plugins_;
   bool is_interstitial_page_;
   bool npapi_plugins_blocked_;
 
   int current_request_id_;
   typedef std::map<int, blink::WebContentSettingCallbacks> PermissionRequestMap;
   PermissionRequestMap permission_requests_;
 
   // If true, IsWhitelistedForContentSettings will always return true.
   const bool should_whitelist_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
 };
 
 #endif  // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_