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

Side by Side Diff: Tools/DumpRenderTree/chromium/TestShell.cpp

Issue 15861022: Build WTF as dll in component build (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix AutoDrainedPool ctor and ThreadSpecificThreadExit exports Created 7 years, 7 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
« no previous file with comments | « Source/wtf/wtf.gypi ('k') | no next file » | 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 { 133 {
134 m_testInterfaces = adoptPtr(new WebTestInterfaces()); 134 m_testInterfaces = adoptPtr(new WebTestInterfaces());
135 platformSupport->setInterfaces(m_testInterfaces.get()); 135 platformSupport->setInterfaces(m_testInterfaces.get());
136 m_devToolsTestInterfaces = adoptPtr(new WebTestInterfaces()); 136 m_devToolsTestInterfaces = adoptPtr(new WebTestInterfaces());
137 m_prerenderingSupport = adoptPtr(new MockWebPrerenderingSupport()); 137 m_prerenderingSupport = adoptPtr(new MockWebPrerenderingSupport());
138 #if !defined(USE_DEFAULT_RENDER_THEME) && (OS(WINDOWS) || OS(DARWIN)) 138 #if !defined(USE_DEFAULT_RENDER_THEME) && (OS(WINDOWS) || OS(DARWIN))
139 // Set theme engine. 139 // Set theme engine.
140 webkit_support::SetThemeEngine(m_testInterfaces->themeEngine()); 140 webkit_support::SetThemeEngine(m_testInterfaces->themeEngine());
141 #endif 141 #endif
142 142
143 WTF::initializeThreading();
144
145 if (m_threadedCompositingEnabled) 143 if (m_threadedCompositingEnabled)
146 m_webCompositorThread = adoptPtr(WebKit::Platform::current()->createThre ad("Compositor")); 144 m_webCompositorThread = adoptPtr(WebKit::Platform::current()->createThre ad("Compositor"));
147 webkit_support::SetThreadedCompositorEnabled(m_threadedCompositingEnabled); 145 webkit_support::SetThreadedCompositorEnabled(m_threadedCompositingEnabled);
148 146
149 createMainWindow(); 147 createMainWindow();
150 } 148 }
151 149
152 void TestShell::createMainWindow() 150 void TestShell::createMainWindow()
153 { 151 {
154 m_drtDevToolsAgent = adoptPtr(new DRTDevToolsAgent); 152 m_drtDevToolsAgent = adoptPtr(new DRTDevToolsAgent);
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 for (size_t index = 0; index < entryCount; ++index) { 554 for (size_t index = 0; index < entryCount; ++index) {
557 WebHistoryItem historyItem = navigationController.entryAtIndex(index)->c ontentState(); 555 WebHistoryItem historyItem = navigationController.entryAtIndex(index)->c ontentState();
558 if (historyItem.isNull()) { 556 if (historyItem.isNull()) {
559 historyItem.initialize(); 557 historyItem.initialize();
560 historyItem.setURLString(navigationController.entryAtIndex(index)->U RL().spec().utf16()); 558 historyItem.setURLString(navigationController.entryAtIndex(index)->U RL().spec().utf16());
561 } 559 }
562 result[index] = historyItem; 560 result[index] = historyItem;
563 } 561 }
564 history->swap(result); 562 history->swap(result);
565 } 563 }
OLDNEW
« no previous file with comments | « Source/wtf/wtf.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698