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

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

Issue 100433005: [oilpan] Rename PauseScope to SafePointScope (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years 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
« Source/heap/ThreadState.cpp ('K') | « Source/oilpan-chromium.patch ('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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 shell.setDumpWhenFinished(isLastLoad); 118 shell.setDumpWhenFinished(isLastLoad);
119 shell.resetTestController(); 119 shell.resetTestController();
120 shell.runFileTest(params, command.shouldDumpPixels || forceDumpPixels) ; 120 shell.runFileTest(params, command.shouldDumpPixels || forceDumpPixels) ;
121 } 121 }
122 } else { 122 } else {
123 shell.resetTestController(); 123 shell.resetTestController();
124 shell.runFileTest(params, command.shouldDumpPixels || forceDumpPixels); 124 shell.runFileTest(params, command.shouldDumpPixels || forceDumpPixels);
125 } 125 }
126 shell.setLayoutTestTimeout(oldTimeoutMsec); 126 shell.setLayoutTestTimeout(oldTimeoutMsec);
127 127
128 // FIXME(oilpan): we mark thread as paused after each task completion (see H andleScopeManager). This causes us to arrive here in a paused state which is wro ng. 128 // FIXME(oilpan): Enter thread in safe point after each task completion.
129 // Need a better integration of the main thread event loop with the ThreadSt ate, but it is outside of WebKit. So for now just forcefully reset paused state. 129 // This causes us to arrive here in a paused state which is wrong.
130 WebCore::ThreadState::Current()->resumed(); 130 // Need a better integration of the main thread event loop with the ThreadSt ate,
131 // but it is outside of WebKit. So for now just forcefully leave safe point.
132 WebCore::ThreadState::Current()->leaveSafePoint();
131 shell.callJSGC(); 133 shell.callJSGC();
132 if (WebCore::RuntimeEnabledFeatures::timeMeasurementEnabled()) 134 if (WebCore::RuntimeEnabledFeatures::timeMeasurementEnabled())
133 fprintf(stderr, "RecalcStyle = %lf ms\n", recalcStyleStat.accumulated()) ; 135 fprintf(stderr, "RecalcStyle = %lf ms\n", recalcStyleStat.accumulated()) ;
134 } 136 }
135 137
136 int main(int argc, char* argv[]) 138 int main(int argc, char* argv[])
137 { 139 {
138 intptr_t stackMark; 140 intptr_t stackMark;
139 WebKitSupportTestEnvironment testEnvironment(&stackMark); 141 WebKitSupportTestEnvironment testEnvironment(&stackMark);
140 platformInit(&argc, &argv); 142 platformInit(&argc, &argv);
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 shell.callJSGC(); 286 shell.callJSGC();
285 287
286 // When we finish the last test, cleanup the DRTTestRunner. 288 // When we finish the last test, cleanup the DRTTestRunner.
287 // It may have references to not-yet-cleaned up windows. By cleaning up 289 // It may have references to not-yet-cleaned up windows. By cleaning up
288 // here we help purify reports. 290 // here we help purify reports.
289 shell.resetTestController(); 291 shell.resetTestController();
290 } 292 }
291 293
292 return EXIT_SUCCESS; 294 return EXIT_SUCCESS;
293 } 295 }
OLDNEW
« Source/heap/ThreadState.cpp ('K') | « Source/oilpan-chromium.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698