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

Unified Diff: third_party/WebKit/public/web/WebFrameOwnerProperties.h

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from dcheng@ Created 5 years, 2 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
Index: third_party/WebKit/public/web/WebFrameOwnerProperties.h
diff --git a/third_party/WebKit/public/platform/WebImageGenerator.h b/third_party/WebKit/public/web/WebFrameOwnerProperties.h
similarity index 71%
copy from third_party/WebKit/public/platform/WebImageGenerator.h
copy to third_party/WebKit/public/web/WebFrameOwnerProperties.h
index bb17f4d6df96a2dcc73efa069d2c6646a2338ab9..fb13c7cf899baf3a94f7b4dda69c5c409a7edf9b 100644
--- a/third_party/WebKit/public/platform/WebImageGenerator.h
+++ b/third_party/WebKit/public/web/WebFrameOwnerProperties.h
@@ -28,19 +28,36 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebImageGenerator_h
-#define WebImageGenerator_h
+#ifndef WebFrameOwnerProperties_h
+#define WebFrameOwnerProperties_h
-#include "WebCommon.h"
+namespace blink {
-class SkData;
-class SkImageGenerator;
+struct WebFrameOwnerProperties {
+ enum class ScrollingMode {
+ Auto,
+ AlwaysOff,
+ AlwaysOn,
+ Last = AlwaysOn
+ };
-namespace blink {
+ ScrollingMode scrollingMode;
+ int marginWidth;
+ int marginHeight;
+
+ WebFrameOwnerProperties()
+ : scrollingMode(ScrollingMode::Auto)
+ , marginWidth(-1)
+ , marginHeight(-1)
+ {
+ }
-class BLINK_EXPORT WebImageGenerator {
-public:
- static SkImageGenerator* create(SkData*);
+ WebFrameOwnerProperties(ScrollingMode scrollingMode, int marginWidth, int marginHeight)
dcheng 2015/10/12 04:50:01 I'd add a #if INSIDE_BLINK constructor that delega
lazyboy 2015/10/13 21:59:08 Done.
+ : scrollingMode(scrollingMode)
+ , marginWidth(marginWidth)
+ , marginHeight(marginHeight)
+ {
+ }
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698