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

Side by Side Diff: sky/engine/web/WebViewImpl.h

Issue 714783003: Remove some straggling zoom-related code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 | « sky/engine/web/WebSettingsImpl.cpp ('k') | sky/engine/web/WebViewImpl.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 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 virtual bool isActive() const override; 131 virtual bool isActive() const override;
132 virtual void setIsActive(bool value) override; 132 virtual void setIsActive(bool value) override;
133 virtual void setDomainRelaxationForbidden(bool, const WebString& scheme) ove rride; 133 virtual void setDomainRelaxationForbidden(bool, const WebString& scheme) ove rride;
134 virtual void setOpenedByDOM() override; 134 virtual void setOpenedByDOM() override;
135 virtual WebFrame* mainFrame() override; 135 virtual WebFrame* mainFrame() override;
136 virtual WebFrame* focusedFrame() override; 136 virtual WebFrame* focusedFrame() override;
137 virtual void setFocusedFrame(WebFrame*) override; 137 virtual void setFocusedFrame(WebFrame*) override;
138 virtual void setInitialFocus(bool reverse) override; 138 virtual void setInitialFocus(bool reverse) override;
139 virtual void clearFocusedElement() override; 139 virtual void clearFocusedElement() override;
140 virtual void scrollFocusedNodeIntoRect(const WebRect&) override; 140 virtual void scrollFocusedNodeIntoRect(const WebRect&) override;
141 virtual void zoomToFindInPageRect(const WebRect&) override;
142 virtual void advanceFocus(bool reverse) override; 141 virtual void advanceFocus(bool reverse) override;
143 virtual bool zoomToMultipleTargetsRect(const WebRect&) override;
144 virtual void setMainFrameScrollOffset(const WebPoint&) override; 142 virtual void setMainFrameScrollOffset(const WebPoint&) override;
145 virtual void resetScrollAndScaleState() override; 143 virtual void resetScrollAndScaleState() override;
146 virtual WebSize contentsPreferredMinimumSize() override; 144 virtual WebSize contentsPreferredMinimumSize() override;
147 145
148 virtual float deviceScaleFactor() const override; 146 virtual float deviceScaleFactor() const override;
149 virtual void setDeviceScaleFactor(float) override; 147 virtual void setDeviceScaleFactor(float) override;
150 148
151 virtual void setFixedLayoutSize(const WebSize&) override; 149 virtual void setFixedLayoutSize(const WebSize&) override;
152 150
153 virtual WebHitTestResult hitTestResultAt(const WebPoint&) override; 151 virtual WebHitTestResult hitTestResultAt(const WebPoint&) override;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 int keyCode, 268 int keyCode,
271 ScrollDirection*, 269 ScrollDirection*,
272 ScrollGranularity*); 270 ScrollGranularity*);
273 271
274 void computeScaleAndScrollForBlockRect(const WebPoint& hitPoint, const WebRe ct& blockRect, float padding, float defaultScaleWhenAlreadyLegible, float& scale , WebPoint& scroll); 272 void computeScaleAndScrollForBlockRect(const WebPoint& hitPoint, const WebRe ct& blockRect, float padding, float defaultScaleWhenAlreadyLegible, float& scale , WebPoint& scroll);
275 Node* bestTapNode(const PlatformGestureEvent& tapEvent); 273 Node* bestTapNode(const PlatformGestureEvent& tapEvent);
276 void enableTapHighlightAtPoint(const PlatformGestureEvent& tapEvent); 274 void enableTapHighlightAtPoint(const PlatformGestureEvent& tapEvent);
277 void enableTapHighlights(Vector<RawPtr<Node> >&); 275 void enableTapHighlights(Vector<RawPtr<Node> >&);
278 void computeScaleAndScrollForFocusedNode(Node* focusedNode, float& scale, In tPoint& scroll, bool& needAnimation); 276 void computeScaleAndScrollForFocusedNode(Node* focusedNode, float& scale, In tPoint& scroll, bool& needAnimation);
279 277
280 void animateDoubleTapZoom(const IntPoint&);
281
282 void clearCompositedSelectionBounds(); 278 void clearCompositedSelectionBounds();
283 279
284 // Exposed for the purpose of overriding device metrics. 280 // Exposed for the purpose of overriding device metrics.
285 void sendResizeEventAndRepaint(); 281 void sendResizeEventAndRepaint();
286 282
287 // Exposed for testing purposes. 283 // Exposed for testing purposes.
288 bool hasHorizontalScrollbar(); 284 bool hasHorizontalScrollbar();
289 bool hasVerticalScrollbar(); 285 bool hasVerticalScrollbar();
290 286
291 // Heuristic-based function for determining if we should disable workarounds 287 // Heuristic-based function for determining if we should disable workarounds
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 bool m_userGestureObserved; 450 bool m_userGestureObserved;
455 }; 451 };
456 452
457 // We have no ways to check if the specified WebView is an instance of 453 // We have no ways to check if the specified WebView is an instance of
458 // WebViewImpl because WebViewImpl is the only implementation of WebView. 454 // WebViewImpl because WebViewImpl is the only implementation of WebView.
459 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 455 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
460 456
461 } // namespace blink 457 } // namespace blink
462 458
463 #endif 459 #endif
OLDNEW
« no previous file with comments | « sky/engine/web/WebSettingsImpl.cpp ('k') | sky/engine/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698