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

Side by Side Diff: third_party/WebKit/Source/core/dom/PendingScript.cpp

Issue 1887573002: Remove ENABLE(OILPAN) from ScriptRunner and PendingScript. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/ScriptRunner.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) 2010 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2010 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 29 matching lines...) Expand all
40 } 40 }
41 41
42 PendingScript::PendingScript(Element* element, ScriptResource* resource) 42 PendingScript::PendingScript(Element* element, ScriptResource* resource)
43 : m_watchingForLoad(false) 43 : m_watchingForLoad(false)
44 , m_element(element) 44 , m_element(element)
45 , m_integrityFailure(false) 45 , m_integrityFailure(false)
46 , m_parserBlockingLoadStartTime(0) 46 , m_parserBlockingLoadStartTime(0)
47 , m_client(nullptr) 47 , m_client(nullptr)
48 { 48 {
49 setScriptResource(resource); 49 setScriptResource(resource);
50 #if ENABLE(OILPAN)
51 ThreadState::current()->registerPreFinalizer(this); 50 ThreadState::current()->registerPreFinalizer(this);
52 #endif
53 } 51 }
54 52
55 PendingScript::~PendingScript() 53 PendingScript::~PendingScript()
56 { 54 {
57 } 55 }
58 56
59 void PendingScript::dispose() 57 void PendingScript::dispose()
60 { 58 {
61 if (!m_client) 59 if (!m_client)
62 return; 60 return;
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 bool PendingScript::errorOccurred() const 234 bool PendingScript::errorOccurred() const
237 { 235 {
238 if (resource()) 236 if (resource())
239 return resource()->errorOccurred(); 237 return resource()->errorOccurred();
240 if (m_streamer && m_streamer->resource()) 238 if (m_streamer && m_streamer->resource())
241 return m_streamer->resource()->errorOccurred(); 239 return m_streamer->resource()->errorOccurred();
242 return false; 240 return false;
243 } 241 }
244 242
245 } // namespace blink 243 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/ScriptRunner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698