Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 153 insertions, 0 deletions

diff --git a/Source/WebCore/page/DOMTimer.cpp b/Source/WebCore/page/DOMTimer.cpp
new file mode 100644
index 0000000..57e6512
--- /dev/null
+++ b/Source/WebCore/page/DOMTimer.cpp
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2008 Apple 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "config.h"
+#include "DOMTimer.h"
+
+#include "InspectorInstrumentation.h"
+#include "ScheduledAction.h"
+#include "ScriptExecutionContext.h"
+#include <wtf/HashSet.h>
+#include <wtf/StdLibExtras.h>
+
+using namespace std;
+
+namespace WebCore {
+
+static const int maxTimerNestingLevel = 5;
+static const double oneMillisecond = 0.001;
+double DOMTimer::s_minTimerInterval = 0.010; // 10 milliseconds
+
+static int timerNestingLevel = 0;
+
+DOMTimer::DOMTimer(ScriptExecutionContext* context, PassOwnPtr<ScheduledAction> action, int timeout, bool singleShot)
+    : SuspendableTimer(context)
+    , m_action(action)
+{
+    static int lastUsedTimeoutId = 0;
+    ++lastUsedTimeoutId;
+    // Avoid wraparound going negative on us.
+    if (lastUsedTimeoutId <= 0)
+        lastUsedTimeoutId = 1;
+    m_timeoutId = lastUsedTimeoutId;
+
+    m_nestingLevel = timerNestingLevel + 1;
+
+    scriptExecutionContext()->addTimeout(m_timeoutId, this);
+
+    double intervalMilliseconds = max(oneMillisecond, timeout * oneMillisecond);
+
+    if (intervalMilliseconds < s_minTimerInterval && m_nestingLevel >= maxTimerNestingLevel)
+        intervalMilliseconds = s_minTimerInterval;
+    if (singleShot)
+        startOneShot(intervalMilliseconds);
+    else
+        startRepeating(intervalMilliseconds);
+}
+
+DOMTimer::~DOMTimer()
+{
+    if (scriptExecutionContext())
+        scriptExecutionContext()->removeTimeout(m_timeoutId);
+}
+
+int DOMTimer::install(ScriptExecutionContext* context, PassOwnPtr<ScheduledAction> action, int timeout, bool singleShot)
+{
+    // DOMTimer constructor links the new timer into a list of ActiveDOMObjects held by the 'context'.
+    // The timer is deleted when context is deleted (DOMTimer::contextDestroyed) or explicitly via DOMTimer::removeById(),
+    // or if it is a one-time timer and it has fired (DOMTimer::fired).
+    DOMTimer* timer = new DOMTimer(context, action, timeout, singleShot);
+
+    InspectorInstrumentation::didInstallTimer(context, timer->m_timeoutId, timeout, singleShot);
+
+    return timer->m_timeoutId;
+}
+
+void DOMTimer::removeById(ScriptExecutionContext* context, int timeoutId)
+{
+    // timeout IDs have to be positive, and 0 and -1 are unsafe to
+    // even look up since they are the empty and deleted value
+    // respectively
+    if (timeoutId <= 0)
+        return;
+
+    InspectorInstrumentation::didRemoveTimer(context, timeoutId);
+
+    delete context->findTimeout(timeoutId);
+}
+
+void DOMTimer::fired()
+{
+    ScriptExecutionContext* context = scriptExecutionContext();
+    timerNestingLevel = m_nestingLevel;
+
+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireTimer(context, m_timeoutId);
+
+    // Simple case for non-one-shot timers.
+    if (isActive()) {
+        if (repeatInterval() && repeatInterval() < s_minTimerInterval) {
+            m_nestingLevel++;
+            if (m_nestingLevel >= maxTimerNestingLevel)
+                augmentRepeatInterval(s_minTimerInterval - repeatInterval());
+        }
+
+        // No access to member variables after this point, it can delete the timer.
+        m_action->execute(context);
+
+        InspectorInstrumentation::didFireTimer(cookie);
+
+        return;
+    }
+
+    // Delete timer before executing the action for one-shot timers.
+    OwnPtr<ScheduledAction> action = m_action.release();
+
+    // No access to member variables after this point.
+    delete this;
+
+    action->execute(context);
+
+    InspectorInstrumentation::didFireTimer(cookie);
+
+    timerNestingLevel = 0;
+}
+
+void DOMTimer::contextDestroyed()
+{
+    SuspendableTimer::contextDestroyed();
+    delete this;
+}
+
+void DOMTimer::stop()
+{
+    SuspendableTimer::stop();
+    // Need to release JS objects potentially protected by ScheduledAction
+    // because they can form circular references back to the ScriptExecutionContext
+    // which will cause a memory leak.
+    m_action.clear();
+}
+
+} // namespace WebCore