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

Side by Side Diff: Source/web/PopupContainerTest.cpp

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/web/PopupContainer.h ('k') | Source/web/PopupListBox.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 14 matching lines...) Expand all
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "web/PopupContainer.h" 27 #include "web/PopupContainer.h"
28 28
29 #include <gtest/gtest.h> 29 #include <gtest/gtest.h>
30 30
31 using namespace blink; 31 using namespace blink;
32 32
33 class MockPopupContent : public PopupContent { 33 class MockPopupContent : public PopupContent {
34 public: 34 public:
35 virtual void setMaxHeight(int max) OVERRIDE { maxHeight = max; } 35 virtual void setMaxHeight(int max) override { maxHeight = max; }
36 virtual int popupContentHeight() const OVERRIDE { return height; } 36 virtual int popupContentHeight() const override { return height; }
37 virtual ~MockPopupContent() { } 37 virtual ~MockPopupContent() { }
38 38
39 virtual void layout() OVERRIDE 39 virtual void layout() override
40 { 40 {
41 layoutCount++; 41 layoutCount++;
42 width = std::min(maxWidth, width); 42 width = std::min(maxWidth, width);
43 height = std::min(maxHeight, height); 43 height = std::min(maxHeight, height);
44 height -= height % 16; 44 height -= height % 16;
45 } 45 }
46 46
47 virtual void setMaxWidthAndLayout(int max) OVERRIDE 47 virtual void setMaxWidthAndLayout(int max) override
48 { 48 {
49 maxWidth = max; 49 maxWidth = max;
50 layout(); 50 layout();
51 } 51 }
52 52
53 MockPopupContent(const IntSize& widgetSize) 53 MockPopupContent(const IntSize& widgetSize)
54 : width(widgetSize.width() - borderSize * 2) 54 : width(widgetSize.width() - borderSize * 2)
55 , height(widgetSize.height() - borderSize * 2) 55 , height(widgetSize.height() - borderSize * 2)
56 , maxWidth(width) 56 , maxWidth(width)
57 , maxHeight(height) 57 , maxHeight(height)
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 { 187 {
188 // Test for --webkit-transform:rotate(-53deg). 188 // Test for --webkit-transform:rotate(-53deg).
189 IntRect initialRect(100, 700, targetControlWidth, 258); 189 IntRect initialRect(100, 700, targetControlWidth, 258);
190 MockPopupContent content(initialRect.size()); 190 MockPopupContent content(initialRect.size());
191 IntSize transformOffset(4, -8); 191 IntSize transformOffset(4, -8);
192 IntRect resultRect = calculatePositionWithTransformAndRTL(initialRect, t ransformOffset, 104, &content); 192 IntRect resultRect = calculatePositionWithTransformAndRTL(initialRect, t ransformOffset, 104, &content);
193 EXPECT_EQ(IntRect(96, 430, targetControlWidth, 258), resultRect); 193 EXPECT_EQ(IntRect(96, 430, targetControlWidth, 258), resultRect);
194 EXPECT_EQ(0u, content.layoutCount); 194 EXPECT_EQ(0u, content.layoutCount);
195 } 195 }
196 } 196 }
OLDNEW
« no previous file with comments | « Source/web/PopupContainer.h ('k') | Source/web/PopupListBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698