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

Unified Diff: sky/engine/core/frame/FrameView.cpp

Issue 878303002: Remove more scrolling code from Sky (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/FrameView.cpp
diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
index d9fce728eda4182a8e9d3910bfe19f0ac13723a8..7decafd286e60f99c52c5b6e8f0916bd630db437 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -327,7 +327,7 @@ void FrameView::layout(bool allowSubtree)
if (m_firstLayout) {
m_firstLayout = false;
m_firstLayoutCallbackPending = true;
- m_lastViewportSize = layoutSize(IncludeScrollbars);
+ m_lastViewportSize = layoutSize();
}
m_size = LayoutSize(layoutSize().width(), layoutSize().height());
@@ -388,7 +388,7 @@ bool FrameView::shouldSetCursor() const
}
// FIXME(sky): remove
-IntSize FrameView::layoutSize(IncludeScrollbarsInRect) const
+IntSize FrameView::layoutSize() const
{
return m_layoutSize;
}
@@ -577,7 +577,7 @@ void FrameView::performPostLayoutTasks()
bool FrameView::wasViewportResized()
{
- return layoutSize(IncludeScrollbars) != m_lastViewportSize;
+ return layoutSize() != m_lastViewportSize;
}
void FrameView::sendResizeEventIfNeeded()
@@ -585,7 +585,7 @@ void FrameView::sendResizeEventIfNeeded()
if (!wasViewportResized())
return;
- m_lastViewportSize = layoutSize(IncludeScrollbars);
+ m_lastViewportSize = layoutSize();
m_frame->document()->enqueueResizeEvent();
}
@@ -594,7 +594,7 @@ void FrameView::postLayoutTimerFired(Timer<FrameView>*)
performPostLayoutTasks();
}
-IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) const
+IntRect FrameView::windowClipRect() const
{
ASSERT(m_frame->view() == this);
@@ -602,7 +602,7 @@ IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) co
return IntRect(IntPoint(), size());
// Set our clip rect to be our contents.
- IntRect clipRect = contentsToWindow(visibleContentRect(scrollbarInclusion));
+ IntRect clipRect = contentsToWindow(visibleContentRect());
return clipRect;
}
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698