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

Side by Side Diff: sky/engine/core/rendering/RenderView.cpp

Issue 714013002: Remove some more zoom-related code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 int RenderView::viewLogicalHeight() const 690 int RenderView::viewLogicalHeight() const
691 { 691 {
692 return viewHeight(ExcludeScrollbars); 692 return viewHeight(ExcludeScrollbars);
693 } 693 }
694 694
695 LayoutUnit RenderView::viewLogicalHeightForPercentages() const 695 LayoutUnit RenderView::viewLogicalHeightForPercentages() const
696 { 696 {
697 return viewLogicalHeight(); 697 return viewLogicalHeight();
698 } 698 }
699 699
700 float RenderView::zoomFactor() const
701 {
702 return m_frameView->frame().pageZoomFactor();
703 }
704
705 void RenderView::updateHitTestResult(HitTestResult& result, const LayoutPoint& p oint) 700 void RenderView::updateHitTestResult(HitTestResult& result, const LayoutPoint& p oint)
706 { 701 {
707 if (result.innerNode()) 702 if (result.innerNode())
708 return; 703 return;
709 704
710 Node* node = document().documentElement(); 705 Node* node = document().documentElement();
711 if (node) { 706 if (node) {
712 result.setInnerNode(node); 707 result.setInnerNode(node);
713 if (!result.innerNonSharedNode()) 708 if (!result.innerNonSharedNode())
714 result.setInnerNonSharedNode(node); 709 result.setInnerNonSharedNode(node);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 { 743 {
749 ASSERT(m_layoutState); 744 ASSERT(m_layoutState);
750 m_layoutState = m_layoutState->next(); 745 m_layoutState = m_layoutState->next();
751 } 746 }
752 747
753 bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const 748 bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const
754 { 749 {
755 return m_frameView->hasOpaqueBackground(); 750 return m_frameView->hasOpaqueBackground();
756 } 751 }
757 752
753 // FIXME(sky): remove
758 double RenderView::layoutViewportWidth() const 754 double RenderView::layoutViewportWidth() const
759 { 755 {
760 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; 756 return viewWidth(IncludeScrollbars);
761 return viewWidth(IncludeScrollbars) / scale;
762 } 757 }
763 758
759 // FIXME(sky): remove
764 double RenderView::layoutViewportHeight() const 760 double RenderView::layoutViewportHeight() const
765 { 761 {
766 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; 762 return viewHeight(IncludeScrollbars);
767 return viewHeight(IncludeScrollbars) / scale;
768 } 763 }
769 764
770 } // namespace blink 765 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderView.h ('k') | sky/engine/core/rendering/style/StyleVisualData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698