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

Side by Side Diff: Source/WebKit2/WebProcess/Plugins/PluginView.h

Issue 12408009: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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 unified diff | Download patch
« no previous file with comments | « Source/WebKit2/ChangeLog ('k') | Source/WebKit2/WebProcess/Plugins/PluginView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2010, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&); 153 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);
154 virtual void invalidateRect(const WebCore::IntRect&); 154 virtual void invalidateRect(const WebCore::IntRect&);
155 virtual void setFocus(bool); 155 virtual void setFocus(bool);
156 virtual void frameRectsChanged(); 156 virtual void frameRectsChanged();
157 virtual void setParent(WebCore::ScrollView*); 157 virtual void setParent(WebCore::ScrollView*);
158 virtual void handleEvent(WebCore::Event*); 158 virtual void handleEvent(WebCore::Event*);
159 virtual void notifyWidget(WebCore::WidgetNotification); 159 virtual void notifyWidget(WebCore::WidgetNotification);
160 virtual void show(); 160 virtual void show();
161 virtual void hide(); 161 virtual void hide();
162 virtual bool transformsAffectFrameRect(); 162 virtual bool transformsAffectFrameRect();
163 virtual void clipRectChanged() OVERRIDE;
163 164
164 // WebCore::MediaCanStartListener 165 // WebCore::MediaCanStartListener
165 virtual void mediaCanStart(); 166 virtual void mediaCanStart();
166 167
167 // PluginController 168 // PluginController
168 virtual bool isPluginVisible(); 169 virtual bool isPluginVisible();
169 virtual void invalidate(const WebCore::IntRect&); 170 virtual void invalidate(const WebCore::IntRect&);
170 virtual String userAgent(); 171 virtual String userAgent();
171 virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target, 172 virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
172 const WebCore::HTTPHeaderMap& headerFields, const Vecto r<uint8_t>& httpBody, bool allowPopups); 173 const WebCore::HTTPHeaderMap& headerFields, const Vecto r<uint8_t>& httpBody, bool allowPopups);
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 WebCore::DeferrableOneShotTimer<PluginView> m_pluginSnapshotTimer; 259 WebCore::DeferrableOneShotTimer<PluginView> m_pluginSnapshotTimer;
259 unsigned m_countSnapshotRetries; 260 unsigned m_countSnapshotRetries;
260 bool m_didReceiveUserInteraction; 261 bool m_didReceiveUserInteraction;
261 262
262 double m_pageScaleFactor; 263 double m_pageScaleFactor;
263 }; 264 };
264 265
265 } // namespace WebKit 266 } // namespace WebKit
266 267
267 #endif // PluginView_h 268 #endif // PluginView_h
OLDNEW
« no previous file with comments | « Source/WebKit2/ChangeLog ('k') | Source/WebKit2/WebProcess/Plugins/PluginView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698