OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 for (HTMLImport* child = m_import->firstChild(); child; child = child->next(
)) { | 60 for (HTMLImport* child = m_import->firstChild(); child; child = child->next(
)) { |
61 if (isBlockingFollowers(child)) | 61 if (isBlockingFollowers(child)) |
62 return true; | 62 return true; |
63 } | 63 } |
64 | 64 |
65 return false; | 65 return false; |
66 } | 66 } |
67 | 67 |
68 inline bool HTMLImportStateResolver::isActive() const | 68 inline bool HTMLImportStateResolver::isActive() const |
69 { | 69 { |
70 return !m_import->isDone(); | 70 return !m_import->hasFinishedLoading(); |
71 } | 71 } |
72 | 72 |
73 HTMLImportState HTMLImportStateResolver::resolve() const | 73 HTMLImportState HTMLImportStateResolver::resolve() const |
74 { | 74 { |
75 if (shouldBlockScriptExecution()) | 75 if (shouldBlockScriptExecution()) |
76 return HTMLImportState(HTMLImportState::BlockingScriptExecution); | 76 return HTMLImportState(HTMLImportState::BlockingScriptExecution); |
77 if (isActive()) | 77 if (isActive()) |
78 return HTMLImportState(HTMLImportState::Active); | 78 return HTMLImportState(HTMLImportState::Active); |
79 return HTMLImportState(HTMLImportState::Ready); | 79 return HTMLImportState(HTMLImportState::Ready); |
80 } | 80 } |
81 | 81 |
82 } | 82 } |
83 | 83 |
OLD | NEW |