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

Side by Side Diff: Source/WebKit/chromium/src/ViewportAnchor.cpp

Issue 13854008: Unguard VIEWPORT (always enabled) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Repatch to ToT Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/WebKit/chromium/src/ViewportAnchor.h ('k') | Source/WebKit/chromium/src/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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "ViewportAnchor.h" 32 #include "ViewportAnchor.h"
33 33
34 #include "core/dom/ContainerNode.h" 34 #include "core/dom/ContainerNode.h"
35 #include "core/dom/Node.h" 35 #include "core/dom/Node.h"
36 #include "core/page/EventHandler.h" 36 #include "core/page/EventHandler.h"
37 #include "core/rendering/HitTestResult.h" 37 #include "core/rendering/HitTestResult.h"
38 38
39 #if ENABLE(VIEWPORT)
40
41 using namespace WebCore; 39 using namespace WebCore;
42 40
43 namespace WebKit { 41 namespace WebKit {
44 42
45 namespace { 43 namespace {
46 44
47 static const float viewportAnchorRelativeEpsilon = 0.1f; 45 static const float viewportAnchorRelativeEpsilon = 0.1f;
48 static const int viewportToNodeMaxRelativeArea = 2; 46 static const int viewportToNodeMaxRelativeArea = 2;
49 47
50 template <typename RectType> 48 template <typename RectType>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 anchorOffsetFromNode.scale(m_anchorInNodeCoords.width(), m_anchorInNodeCoord s.height()); 118 anchorOffsetFromNode.scale(m_anchorInNodeCoords.width(), m_anchorInNodeCoord s.height());
121 FloatPoint anchorPoint = currentNodeBounds.location() + anchorOffsetFromNode ; 119 FloatPoint anchorPoint = currentNodeBounds.location() + anchorOffsetFromNode ;
122 120
123 // Compute the new origin point relative to the new anchor point 121 // Compute the new origin point relative to the new anchor point
124 FloatSize anchorOffsetFromOrigin = currentViewSize; 122 FloatSize anchorOffsetFromOrigin = currentViewSize;
125 anchorOffsetFromOrigin.scale(m_anchorInViewCoords.width(), m_anchorInViewCoo rds.height()); 123 anchorOffsetFromOrigin.scale(m_anchorInViewCoords.width(), m_anchorInViewCoo rds.height());
126 return flooredIntPoint(anchorPoint - anchorOffsetFromOrigin); 124 return flooredIntPoint(anchorPoint - anchorOffsetFromOrigin);
127 } 125 }
128 126
129 } // namespace WebKit 127 } // namespace WebKit
130
131 #endif // ENABLE(VIEWPORT)
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/ViewportAnchor.h ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698