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

Side by Side Diff: Source/testing/runner/TestInterfaces.cpp

Issue 61773005: Rename WebKit namespace to blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « Source/testing/runner/TestInterfaces.h ('k') | Source/testing/runner/TestPlugin.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 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 26 matching lines...) Expand all
37 #include "TextInputController.h" 37 #include "TextInputController.h"
38 #include "public/platform/WebString.h" 38 #include "public/platform/WebString.h"
39 #include "public/platform/WebURL.h" 39 #include "public/platform/WebURL.h"
40 #include "public/testing/WebTestProxy.h" 40 #include "public/testing/WebTestProxy.h"
41 #include "public/web/WebCache.h" 41 #include "public/web/WebCache.h"
42 #include "public/web/WebKit.h" 42 #include "public/web/WebKit.h"
43 #include "public/web/WebRuntimeFeatures.h" 43 #include "public/web/WebRuntimeFeatures.h"
44 #include "public/web/WebView.h" 44 #include "public/web/WebView.h"
45 #include <string> 45 #include <string>
46 46
47 using namespace WebKit; 47 using namespace blink;
48 using namespace std; 48 using namespace std;
49 49
50 namespace WebTestRunner { 50 namespace WebTestRunner {
51 51
52 TestInterfaces::TestInterfaces() 52 TestInterfaces::TestInterfaces()
53 : m_accessibilityController(new AccessibilityController()) 53 : m_accessibilityController(new AccessibilityController())
54 , m_eventSender(new EventSender(this)) 54 , m_eventSender(new EventSender(this))
55 , m_gamepadController(new GamepadController()) 55 , m_gamepadController(new GamepadController())
56 , m_textInputController(new TextInputController()) 56 , m_textInputController(new TextInputController())
57 , m_testRunner(new TestRunner(this)) 57 , m_testRunner(new TestRunner(this))
58 , m_delegate(0) 58 , m_delegate(0)
59 { 59 {
60 WebKit::setLayoutTestMode(true); 60 blink::setLayoutTestMode(true);
61 61
62 // NOTE: please don't put feature specific enable flags here, 62 // NOTE: please don't put feature specific enable flags here,
63 // instead add them to RuntimeEnabledFeatures.in 63 // instead add them to RuntimeEnabledFeatures.in
64 64
65 resetAll(); 65 resetAll();
66 } 66 }
67 67
68 TestInterfaces::~TestInterfaces() 68 TestInterfaces::~TestInterfaces()
69 { 69 {
70 m_accessibilityController->setWebView(0); 70 m_accessibilityController->setWebView(0);
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 m_themeEngine.reset(new WebTestThemeEngineWin()); 203 m_themeEngine.reset(new WebTestThemeEngineWin());
204 return m_themeEngine.get(); 204 return m_themeEngine.get();
205 #elif defined(__APPLE__) 205 #elif defined(__APPLE__)
206 if (!m_themeEngine.get()) 206 if (!m_themeEngine.get())
207 m_themeEngine.reset(new WebTestThemeEngineMac()); 207 m_themeEngine.reset(new WebTestThemeEngineMac());
208 return m_themeEngine.get(); 208 return m_themeEngine.get();
209 #endif 209 #endif
210 } 210 }
211 211
212 } 212 }
OLDNEW
« no previous file with comments | « Source/testing/runner/TestInterfaces.h ('k') | Source/testing/runner/TestPlugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698