Source/core/frame/LocalDOMWindow.h - Issue 731413002: Adjust DOMWindow properties to emulate old style pinch semantics

Side by Side Diff: Source/core/frame/LocalDOMWindow.h

Issue 731413002: Adjust DOMWindow properties to emulate old style pinch semantics (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Check for scroll event handling in RAF callback Created 6 years, 1 month 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/core/frame/FrameView.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.	2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.

3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)	3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130 DOMSelection* getSelection() override;	130 DOMSelection* getSelection() override;

131 void focus(ExecutionContext* = 0) override;	131 void focus(ExecutionContext* = 0) override;

132 void blur() override;	132 void blur() override;

133 void close(ExecutionContext* = 0) override;	133 void close(ExecutionContext* = 0) override;

134 void print() override;	134 void print() override;

135 void stop() override;	135 void stop() override;

136 void alert(const String& message = String()) override;	136 void alert(const String& message = String()) override;

137 bool confirm(const String& message) override;	137 bool confirm(const String& message) override;

138 String prompt(const String& message, const String& defaultValue) override;	138 String prompt(const String& message, const String& defaultValue) override;

139 bool find(const String&, bool caseSensitive, bool backwards, bool wrap, bool wholeWord, bool searchInFrames, bool showDialog) const override;	139 bool find(const String&, bool caseSensitive, bool backwards, bool wrap, bool wholeWord, bool searchInFrames, bool showDialog) const override;

	140

	141 // FIXME: ScrollBehaviorSmooth is currently unsupported in PinchViewport.

	142 // crbug.com/434497

140 void scrollBy(double x, double y, ScrollBehavior = ScrollBehaviorAuto) const override;	143 void scrollBy(double x, double y, ScrollBehavior = ScrollBehaviorAuto) const override;

141 void scrollBy(double x, double y, const ScrollOptions&, ExceptionState&) con st override;	144 void scrollBy(double x, double y, const ScrollOptions&, ExceptionState&) con st override;

142 void scrollTo(double x, double y, ScrollBehavior = ScrollBehaviorAuto) const override;	145 void scrollTo(double x, double y, ScrollBehavior = ScrollBehaviorAuto) const override;

143 void scrollTo(double x, double y, const ScrollOptions&, ExceptionState&) con st override;	146 void scrollTo(double x, double y, const ScrollOptions&, ExceptionState&) con st override;

	147

144 void moveBy(float x, float y) const override;	148 void moveBy(float x, float y) const override;

145 void moveTo(float x, float y) const override;	149 void moveTo(float x, float y) const override;

146 void resizeBy(float x, float y) const override;	150 void resizeBy(float x, float y) const override;

147 void resizeTo(float width, float height) const override;	151 void resizeTo(float width, float height) const override;

148 PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&) override;	152 PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&) override;

149 PassRefPtrWillBeRawPtr<CSSStyleDeclaration> getComputedStyle(Element*, const String& pseudoElt) const override;	153 PassRefPtrWillBeRawPtr<CSSStyleDeclaration> getComputedStyle(Element*, const String& pseudoElt) const override;

150 PassRefPtrWillBeRawPtr<CSSRuleList> getMatchedCSSRules(Element*, const Strin g& pseudoElt) const override;	154 PassRefPtrWillBeRawPtr<CSSRuleList> getMatchedCSSRules(Element*, const Strin g& pseudoElt) const override;

151 int requestAnimationFrame(RequestAnimationFrameCallback*) override;	155 int requestAnimationFrame(RequestAnimationFrameCallback*) override;

152 int webkitRequestAnimationFrame(RequestAnimationFrameCallback*) override;	156 int webkitRequestAnimationFrame(RequestAnimationFrameCallback*) override;

153 void cancelAnimationFrame(int id) override;	157 void cancelAnimationFrame(int id) override;

(...skipping 183 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
337 }	341 }

338	342

339 inline String LocalDOMWindow::defaultStatus() const	343 inline String LocalDOMWindow::defaultStatus() const

340 {	344 {

341 return m_defaultStatus;	345 return m_defaultStatus;

342 }	346 }

343	347

344 } // namespace blink	348 } // namespace blink

345	349

346 #endif // LocalDOMWindow_h	350 #endif // LocalDOMWindow_h

OLD	NEW