Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1449)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/browser_plugin/mock_browser_plugin.h

Issue 12207144: Apply merge from @fsamuel. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin_browsertest.cc ('k') | content/renderer/browser_plugin/mock_browser_plugin.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/browser_plugin/mock_browser_plugin.h
===================================================================
--- content/renderer/browser_plugin/mock_browser_plugin.h (revision 182101)
+++ content/renderer/browser_plugin/mock_browser_plugin.h (working copy)
@@ -19,15 +19,10 @@
virtual ~MockBrowserPlugin();
- virtual TransportDIB* CreateTransportDIB(const size_t size) OVERRIDE;
- virtual void FreeDamageBuffer(TransportDIB** damage_buffer) OVERRIDE;
-
// Allow poking at a few private members.
using BrowserPlugin::guest_crashed_;
using BrowserPlugin::pending_damage_buffer_;
-
- private:
- int transport_dib_next_sequence_number_;
+ using BrowserPlugin::damage_buffer_sequence_id_;
};
} // namespace content
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin_browsertest.cc ('k') | content/renderer/browser_plugin/mock_browser_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698