OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/test_runner/test_runner.h" | 5 #include "components/test_runner/test_runner.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <limits> | 8 #include <limits> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 55 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
56 #include "third_party/WebKit/public/web/WebPageImportanceSignals.h" | 56 #include "third_party/WebKit/public/web/WebPageImportanceSignals.h" |
57 #include "third_party/WebKit/public/web/WebScriptSource.h" | 57 #include "third_party/WebKit/public/web/WebScriptSource.h" |
58 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" | 58 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" |
59 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h" | 59 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h" |
60 #include "third_party/WebKit/public/web/WebSettings.h" | 60 #include "third_party/WebKit/public/web/WebSettings.h" |
61 #include "third_party/WebKit/public/web/WebSurroundingText.h" | 61 #include "third_party/WebKit/public/web/WebSurroundingText.h" |
62 #include "third_party/WebKit/public/web/WebView.h" | 62 #include "third_party/WebKit/public/web/WebView.h" |
63 #include "third_party/skia/include/core/SkBitmap.h" | 63 #include "third_party/skia/include/core/SkBitmap.h" |
64 #include "third_party/skia/include/core/SkCanvas.h" | 64 #include "third_party/skia/include/core/SkCanvas.h" |
| 65 #include "ui/display/display_switches.h" |
65 #include "ui/gfx/geometry/rect.h" | 66 #include "ui/gfx/geometry/rect.h" |
66 #include "ui/gfx/geometry/rect_f.h" | 67 #include "ui/gfx/geometry/rect_f.h" |
67 #include "ui/gfx/geometry/size.h" | 68 #include "ui/gfx/geometry/size.h" |
68 #include "ui/gfx/skia_util.h" | 69 #include "ui/gfx/skia_util.h" |
69 #include "ui/gfx/switches.h" | |
70 | 70 |
71 #if defined(__linux__) || defined(ANDROID) | 71 #if defined(__linux__) || defined(ANDROID) |
72 #include "third_party/WebKit/public/web/linux/WebFontRendering.h" | 72 #include "third_party/WebKit/public/web/linux/WebFontRendering.h" |
73 #endif | 73 #endif |
74 | 74 |
75 using namespace blink; | 75 using namespace blink; |
76 | 76 |
77 namespace test_runner { | 77 namespace test_runner { |
78 | 78 |
79 namespace { | 79 namespace { |
(...skipping 2698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2778 | 2778 |
2779 void TestRunner::CompleteNotifyDone() { | 2779 void TestRunner::CompleteNotifyDone() { |
2780 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && | 2780 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && |
2781 work_queue_.is_empty()) | 2781 work_queue_.is_empty()) |
2782 delegate_->TestFinished(); | 2782 delegate_->TestFinished(); |
2783 layout_test_runtime_flags_.set_wait_until_done(false); | 2783 layout_test_runtime_flags_.set_wait_until_done(false); |
2784 OnLayoutTestRuntimeFlagsChanged(); | 2784 OnLayoutTestRuntimeFlagsChanged(); |
2785 } | 2785 } |
2786 | 2786 |
2787 } // namespace test_runner | 2787 } // namespace test_runner |
OLD | NEW |