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

Side by Side Diff: Source/core/frame/PinchViewport.cpp

Issue 1162623007: Removed redundant rect methods on FrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/layout/LayoutBox.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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 return frame->view()->frameRect(); 521 return frame->view()->frameRect();
522 } 522 }
523 523
524 IntSize PinchViewport::contentsSize() const 524 IntSize PinchViewport::contentsSize() const
525 { 525 {
526 LocalFrame* frame = mainFrame(); 526 LocalFrame* frame = mainFrame();
527 527
528 if (!frame || !frame->view()) 528 if (!frame || !frame->view())
529 return IntSize(); 529 return IntSize();
530 530
531 ASSERT(frame->view()->visibleContentScaleFactor() == 1);
532 return frame->view()->visibleContentRect(IncludeScrollbars).size(); 531 return frame->view()->visibleContentRect(IncludeScrollbars).size();
533 } 532 }
534 533
535 void PinchViewport::invalidateScrollbarRect(Scrollbar*, const IntRect&) 534 void PinchViewport::invalidateScrollbarRect(Scrollbar*, const IntRect&)
536 { 535 {
537 // Do nothing. Pinch scrollbars live on the compositor thread and will 536 // Do nothing. Pinch scrollbars live on the compositor thread and will
538 // be updated when the viewport is synced to the CC. 537 // be updated when the viewport is synced to the CC.
539 } 538 }
540 539
541 void PinchViewport::setScrollOffset(const IntPoint& offset) 540 void PinchViewport::setScrollOffset(const IntPoint& offset)
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 } else if (graphicsLayer == m_rootTransformLayer) { 663 } else if (graphicsLayer == m_rootTransformLayer) {
665 name = "Root Transform Layer"; 664 name = "Root Transform Layer";
666 } else { 665 } else {
667 ASSERT_NOT_REACHED(); 666 ASSERT_NOT_REACHED();
668 } 667 }
669 668
670 return name; 669 return name;
671 } 670 }
672 671
673 } // namespace blink 672 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698