OLD | NEW |
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 11 matching lines...) Expand all Loading... |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/dom/DocumentMarkerController.h" | 32 #include "core/editing/markers/DocumentMarkerController.h" |
33 | 33 |
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" | |
38 #include "core/dom/Text.h" | 37 #include "core/dom/Text.h" |
39 #include "core/editing/EphemeralRange.h" | 38 #include "core/editing/EphemeralRange.h" |
| 39 #include "core/editing/markers/RenderedDocumentMarker.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 <gtest/gtest.h> | 44 #include <gtest/gtest.h> |
45 | 45 |
46 namespace blink { | 46 namespace blink { |
47 | 47 |
48 class DocumentMarkerControllerTest : public ::testing::Test { | 48 class DocumentMarkerControllerTest : public ::testing::Test { |
49 protected: | 49 protected: |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 EXPECT_NE(invalidRect, renderedRects[0]); | 211 EXPECT_NE(invalidRect, renderedRects[0]); |
212 | 212 |
213 div->setAttribute(HTMLNames::styleAttr, "margin: 200px"); | 213 div->setAttribute(HTMLNames::styleAttr, "margin: 200px"); |
214 document().updateLayout(); | 214 document().updateLayout(); |
215 Vector<IntRect> newRenderedRects = markerController().renderedRectsForMarker
s(DocumentMarker::Spelling); | 215 Vector<IntRect> newRenderedRects = markerController().renderedRectsForMarker
s(DocumentMarker::Spelling); |
216 EXPECT_EQ(1u, newRenderedRects.size()); | 216 EXPECT_EQ(1u, newRenderedRects.size()); |
217 EXPECT_NE(renderedRects[0], newRenderedRects[0]); | 217 EXPECT_NE(renderedRects[0], newRenderedRects[0]); |
218 } | 218 } |
219 | 219 |
220 } // namespace blink | 220 } // namespace blink |
OLD | NEW |