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

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

Issue 1127023002: Oilpan: address ScrollableArea-induced build breakage from r194957. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/core/frame/PinchViewport.h ('k') | Source/core/frame/RootFrameViewport.h » ('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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 , m_scale(1) 73 , m_scale(1)
74 , m_topControlsAdjustment(0) 74 , m_topControlsAdjustment(0)
75 { 75 {
76 reset(); 76 reset();
77 } 77 }
78 78
79 PinchViewport::~PinchViewport() 79 PinchViewport::~PinchViewport()
80 { 80 {
81 } 81 }
82 82
83 DEFINE_TRACE(PinchViewport)
84 {
85 visitor->trace(m_frameHost);
86 }
87
88 void PinchViewport::setSize(const IntSize& size) 83 void PinchViewport::setSize(const IntSize& size)
89 { 84 {
90 // When the main frame is remote, we won't have an associated frame. 85 // When the main frame is remote, we won't have an associated frame.
91 if (!mainFrame()) 86 if (!mainFrame())
92 return; 87 return;
93 88
94 if (m_size == size) 89 if (m_size == size)
95 return; 90 return;
96 91
97 bool autosizerNeedsUpdating = 92 bool autosizerNeedsUpdating =
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 } else if (graphicsLayer == m_rootTransformLayer) { 664 } else if (graphicsLayer == m_rootTransformLayer) {
670 name = "Root Transform Layer"; 665 name = "Root Transform Layer";
671 } else { 666 } else {
672 ASSERT_NOT_REACHED(); 667 ASSERT_NOT_REACHED();
673 } 668 }
674 669
675 return name; 670 return name;
676 } 671 }
677 672
678 } // namespace blink 673 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/PinchViewport.h ('k') | Source/core/frame/RootFrameViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698