HTML Imports: Get rid of needsProcessOrStop() from dom/custom/

Source/core/dom/custom/CustomElementMicrotaskImportStep.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 48 matching lines @@
 {
     m_queue = CustomElementMicrotaskQueue::create();
     m_import.clear();
 }
 
 bool CustomElementMicrotaskImportStep::shouldWaitForImport() const
 {
     return m_import && !m_import->isLoaded();
 }
 
-bool CustomElementMicrotaskImportStep::shouldStopProcessing() const
+bool CustomElementMicrotaskImportStep::isSync() const

[dominicc (has gone to gerrit), 2014/05/27 23:41:25]

It looks like this is only used during that initial enqueuing, so having a whole
method seems heavy. Would you consider a parameter to the enqueue method?

Even if you keep the method, it might be confusing that it can change when the
import is cleared. It doesn't change the nature of the queued task.

[Hajime Morrita, 2014/05/28 00:41:37]

Probably that's better. Will do.

 {
     return m_import && m_import->isSync();
 }
 
 void CustomElementMicrotaskImportStep::didUpgradeAllCustomElements()
 {
     ASSERT(m_queue);
     if (m_import)
         m_import->didFinishUpgradingCustomElements();
 }
 
 CustomElementMicrotaskStep::Result CustomElementMicrotaskImportStep::process()
 {
-    Result result = m_queue->dispatch();
-    if (!(result & ShouldStop) && !shouldWaitForImport())
-        didUpgradeAllCustomElements();
+    m_queue->dispatch();
+    if (!m_queue->isEmpty() || shouldWaitForImport())
+        return Processing;
 
-    if (shouldWaitForImport())
-        result = Result(result | ShouldRemain | ShouldStop);
-    if (!shouldStopProcessing())
-        result = Result(result & ~ShouldStop);
-    return result;
-}
-
-bool CustomElementMicrotaskImportStep::needsProcessOrStop() const
-{
-    return shouldStopProcessing() || m_queue->needsProcessOrStop();
+    didUpgradeAllCustomElements();
+    return FinishedProcessing;
 }
 
 #if !defined(NDEBUG)
 void CustomElementMicrotaskImportStep::show(unsigned indent)
 {
-    fprintf(stderr, "%*sImport(wait=%d sync=%d, url=%s)\n", indent, "", shouldWaitForImport(), shouldStopProcessing(), m_import ? m_import->url().string().utf8().data() : "null");
+    fprintf(stderr, "%*sImport(wait=%d sync=%d, url=%s)\n", indent, "", shouldWaitForImport(), m_import && m_import->isSync(), m_import ? m_import->url().string().utf8().data() : "null");
     m_queue->show(indent + 1);
 }
 #endif
 
 } // namespace WebCore