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

Side by Side Diff: Source/core/dom/DocumentMarkerControllerTest.cpp

Issue 1257203002: Fix ODR violation that can break WTF::String pretty printing in tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Really fix Created 5 years, 4 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 | Annotate | Revision Log
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 23 matching lines...) Expand all
34 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 34 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
35 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
36 #include "core/dom/Range.h" 36 #include "core/dom/Range.h"
37 #include "core/dom/RenderedDocumentMarker.h" 37 #include "core/dom/RenderedDocumentMarker.h"
38 #include "core/dom/Text.h" 38 #include "core/dom/Text.h"
39 #include "core/editing/EphemeralRange.h" 39 #include "core/editing/EphemeralRange.h"
40 #include "core/html/HTMLElement.h" 40 #include "core/html/HTMLElement.h"
41 #include "core/testing/DummyPageHolder.h" 41 #include "core/testing/DummyPageHolder.h"
42 #include "wtf/PassRefPtr.h" 42 #include "wtf/PassRefPtr.h"
43 #include "wtf/RefPtr.h" 43 #include "wtf/RefPtr.h"
44 #include "wtf/testing/WTFTestHelpers.h"
45 #include <gtest/gtest.h> 44 #include <gtest/gtest.h>
46 45
47 namespace blink { 46 namespace blink {
48 47
49 class DocumentMarkerControllerTest : public ::testing::Test { 48 class DocumentMarkerControllerTest : public ::testing::Test {
50 protected: 49 protected:
51 void SetUp() override; 50 void SetUp() override;
52 51
53 Document& document() const { return *m_document; } 52 Document& document() const { return *m_document; }
54 DocumentMarkerController& markerController() const { return m_document->mark ers(); } 53 DocumentMarkerController& markerController() const { return m_document->mark ers(); }
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 EXPECT_NE(invalidRect, renderedRects[0]); 211 EXPECT_NE(invalidRect, renderedRects[0]);
213 212
214 div->setAttribute(HTMLNames::styleAttr, "margin: 200px"); 213 div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
215 document().updateLayout(); 214 document().updateLayout();
216 Vector<IntRect> newRenderedRects = markerController().renderedRectsForMarker s(DocumentMarker::Spelling); 215 Vector<IntRect> newRenderedRects = markerController().renderedRectsForMarker s(DocumentMarker::Spelling);
217 EXPECT_EQ(1u, newRenderedRects.size()); 216 EXPECT_EQ(1u, newRenderedRects.size());
218 EXPECT_NE(renderedRects[0], newRenderedRects[0]); 217 EXPECT_NE(renderedRects[0], newRenderedRects[0]);
219 } 218 }
220 219
221 } // namespace blink 220 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/shadow/ComposedTreeTraversalTest.cpp » ('j') | Source/wtf/text/WTFString.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698