OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 27 matching lines...) Expand all Loading... |
38 #include "WebSettings.h" | 38 #include "WebSettings.h" |
39 #include "WebViewClient.h" | 39 #include "WebViewClient.h" |
40 #include "WebViewImpl.h" | 40 #include "WebViewImpl.h" |
41 #include "public/platform/Platform.h" | 41 #include "public/platform/Platform.h" |
42 #include "public/platform/WebString.h" | 42 #include "public/platform/WebString.h" |
43 #include "public/platform/WebThread.h" | 43 #include "public/platform/WebThread.h" |
44 #include "public/platform/WebURLRequest.h" | 44 #include "public/platform/WebURLRequest.h" |
45 #include "public/platform/WebURLResponse.h" | 45 #include "public/platform/WebURLResponse.h" |
46 #include "public/platform/WebUnitTestSupport.h" | 46 #include "public/platform/WebUnitTestSupport.h" |
47 | 47 |
48 namespace WebKit { | 48 namespace blink { |
49 namespace FrameTestHelpers { | 49 namespace FrameTestHelpers { |
50 | 50 |
51 namespace { | 51 namespace { |
52 | 52 |
53 class QuitTask : public WebThread::Task { | 53 class QuitTask : public WebThread::Task { |
54 public: | 54 public: |
55 void PostThis(WebCore::Timer<QuitTask>*) | 55 void PostThis(WebCore::Timer<QuitTask>*) |
56 { | 56 { |
57 // We don't just quit here because the SharedTimer may be part-way | 57 // We don't just quit here because the SharedTimer may be part-way |
58 // through the current queue of tasks when runPendingTasks was called, | 58 // through the current queue of tasks when runPendingTasks was called, |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 m_webView->close(); | 147 m_webView->close(); |
148 m_webView = 0; | 148 m_webView = 0; |
149 } | 149 } |
150 if (m_mainFrame) { | 150 if (m_mainFrame) { |
151 m_mainFrame->close(); | 151 m_mainFrame->close(); |
152 m_mainFrame = 0; | 152 m_mainFrame = 0; |
153 } | 153 } |
154 } | 154 } |
155 | 155 |
156 } // namespace FrameTestHelpers | 156 } // namespace FrameTestHelpers |
157 } // namespace WebKit | 157 } // namespace blink |
OLD | NEW |