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

Unified Diff: Source/core/frame/TopControls.h

Issue 945233002: Oilpan: fix build after r190610 (214ee03e). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: adjust const position Created 5 years, 10 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 | « no previous file | Source/core/frame/TopControls.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/TopControls.h
diff --git a/Source/core/frame/TopControls.h b/Source/core/frame/TopControls.h
index ac9ba59c9db5413bed5ea7eedc4205ad07bc250b..dec537ed5e6469343f0262ce8870f51b23d1f124 100644
--- a/Source/core/frame/TopControls.h
+++ b/Source/core/frame/TopControls.h
@@ -1,27 +1,6 @@
-/*
- * Copyright (C) 2015 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
#ifndef TopControls_h
#define TopControls_h
@@ -46,6 +25,9 @@ public:
return adoptPtrWillBeNoop(new TopControls(host));
}
+ ~TopControls();
+ void trace(Visitor*);
+
// The amount that the viewport was shrunk by to accommodate the top
// controls.
float layoutHeight();
@@ -71,7 +53,7 @@ private:
explicit TopControls(const FrameHost&);
void resetBaseline();
- const FrameHost& m_frameHost;
+ RawPtrWillBeMember<const FrameHost> m_frameHost;
// The top controls height regardless of whether it is visible or not.
float m_height;
« no previous file with comments | « no previous file | Source/core/frame/TopControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698