Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)

Revert back to an older snapshot that should build on ARM

5 files changed, 3 insertions, 267 deletions

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index d586fba43..b6dc5c975 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,168 +1,3 @@
-2012-11-08  Sheriff Bot  <webkit.review.bot@gmail.com>
-
-        Unreviewed, rolling out r134010.
-        http://trac.webkit.org/changeset/134010
-        https://bugs.webkit.org/show_bug.cgi?id=101716
-
-        Broke the chromium windows build. (Requested by noel_ on
-        #webkit).
-
-        * src/IDBCallbacksProxy.cpp:
-        * src/IDBDatabaseBackendProxy.cpp:
-        (WebKit::IDBDatabaseBackendProxy::transaction):
-        (WebKit):
-        * src/IDBDatabaseBackendProxy.h:
-        (IDBDatabaseBackendProxy):
-        * src/IDBObjectStoreBackendProxy.cpp:
-        (WebKit::IDBObjectStoreBackendProxy::putWithIndexKeys):
-        (WebKit):
-        (WebKit::IDBObjectStoreBackendProxy::setIndexKeys):
-        (WebKit::IDBObjectStoreBackendProxy::createIndex):
-        (WebKit::IDBObjectStoreBackendProxy::setIndexesReady):
-        (WebKit::IDBObjectStoreBackendProxy::index):
-        (WebKit::IDBObjectStoreBackendProxy::deleteIndex):
-        * src/IDBObjectStoreBackendProxy.h:
-        (IDBObjectStoreBackendProxy):
-        * src/WebIDBDatabaseImpl.cpp:
-        (WebKit::WebIDBDatabaseImpl::deleteObjectStore):
-        (WebKit):
-        (WebKit::WebIDBDatabaseImpl::transaction):
-        * src/WebIDBDatabaseImpl.h:
-        (WebIDBDatabaseImpl):
-        * src/WebIDBObjectStoreImpl.cpp:
-        (WebKit::WebIDBObjectStoreImpl::putWithIndexKeys):
-        (WebKit):
-        (WebKit::WebIDBObjectStoreImpl::setIndexKeys):
-        (WebKit::WebIDBObjectStoreImpl::setIndexesReady):
-        (WebKit::WebIDBObjectStoreImpl::index):
-        (WebKit::WebIDBObjectStoreImpl::deleteIndex):
-        * src/WebIDBObjectStoreImpl.h:
-        (WebIDBObjectStoreImpl):
-        * src/WebIDBTransactionImpl.cpp:
-        (WebKit::WebIDBTransactionImpl::objectStore):
-        (WebKit):
-        * src/WebIDBTransactionImpl.h:
-        * tests/IDBRequestTest.cpp:
-
-2012-11-08  Alec Flett  <alecflett@chromium.org>
-
-        IndexedDB: switch frontend to use int64_t-based references
-        https://bugs.webkit.org/show_bug.cgi?id=100426
-
-        Reviewed by Tony Chang.
-
-        Remove implementation stubs from chromium API for
-        methods obsoleted by https://bugs.webkit.org/show_bug.cgi?id=100425
-
-        * src/IDBObjectStoreBackendProxy.cpp:
-        * src/IDBObjectStoreBackendProxy.h:
-        (IDBObjectStoreBackendProxy):
-        * src/WebIDBDatabaseImpl.cpp:
-        * src/WebIDBDatabaseImpl.h:
-        (WebIDBDatabaseImpl):
-        * src/WebIDBObjectStoreImpl.cpp:
-        * src/WebIDBObjectStoreImpl.h:
-        (WebIDBObjectStoreImpl):
-
-2012-11-08  Keishi Hattori  <keishi@webkit.org>
-
-        WebPagePopupImpl::handleKeyEvent is called after WebPagePopupImpl::close
-        https://bugs.webkit.org/show_bug.cgi?id=93800
-
-        Reviewed by Kent Tamura.
-
-        We need to set m_closing to true in WebPagePopupImpl::close so we won't access m_page in WebPagePopupImpl::handleKeyEvent.
-
-        * src/WebPagePopupImpl.cpp:
-        (WebKit::WebPagePopupImpl::close): Set m_closing to true.
-
-2012-11-08  Sheriff Bot  <webkit.review.bot@gmail.com>
-
-        Unreviewed, rolling out r133984.
-        http://trac.webkit.org/changeset/133984
-        https://bugs.webkit.org/show_bug.cgi?id=101684
-
-        windows build error. (Requested by hayato on #webkit).
-
-        * src/IDBObjectStoreBackendProxy.cpp:
-        (WebKit::IDBObjectStoreBackendProxy::putWithIndexKeys):
-        (WebKit):
-        (WebKit::IDBObjectStoreBackendProxy::setIndexKeys):
-        (WebKit::IDBObjectStoreBackendProxy::createIndex):
-        (WebKit::IDBObjectStoreBackendProxy::setIndexesReady):
-        (WebKit::IDBObjectStoreBackendProxy::index):
-        (WebKit::IDBObjectStoreBackendProxy::deleteIndex):
-        * src/IDBObjectStoreBackendProxy.h:
-        (IDBObjectStoreBackendProxy):
-        * src/WebIDBDatabaseImpl.cpp:
-        (WebKit::WebIDBDatabaseImpl::deleteObjectStore):
-        (WebKit):
-        (WebKit::WebIDBDatabaseImpl::transaction):
-        * src/WebIDBDatabaseImpl.h:
-        (WebIDBDatabaseImpl):
-        * src/WebIDBObjectStoreImpl.cpp:
-        (WebKit::WebIDBObjectStoreImpl::putWithIndexKeys):
-        (WebKit):
-        (WebKit::WebIDBObjectStoreImpl::setIndexKeys):
-        (WebKit::WebIDBObjectStoreImpl::setIndexesReady):
-        (WebKit::WebIDBObjectStoreImpl::index):
-        (WebKit::WebIDBObjectStoreImpl::deleteIndex):
-        * src/WebIDBObjectStoreImpl.h:
-        (WebIDBObjectStoreImpl):
-        * src/WebIDBTransactionImpl.cpp:
-        (WebKit::WebIDBTransactionImpl::objectStore):
-        (WebKit):
-        * src/WebIDBTransactionImpl.h:
-
-2012-11-08  Alec Flett  <alecflett@chromium.org>
-
-        IndexedDB: switch frontend to use int64_t-based references
-        https://bugs.webkit.org/show_bug.cgi?id=100426
-
-        Reviewed by Tony Chang.
-
-        Remove implementation stubs from chromium API for
-        methods obsoleted by https://bugs.webkit.org/show_bug.cgi?id=100425
-
-        * src/IDBObjectStoreBackendProxy.cpp:
-        * src/IDBObjectStoreBackendProxy.h:
-        (IDBObjectStoreBackendProxy):
-        * src/WebIDBDatabaseImpl.cpp:
-        * src/WebIDBDatabaseImpl.h:
-        (WebIDBDatabaseImpl):
-        * src/WebIDBObjectStoreImpl.cpp:
-        * src/WebIDBObjectStoreImpl.h:
-        (WebIDBObjectStoreImpl):
-
-2012-11-07  Kent Tamura  <tkent@chromium.org>
-
-        [Chromium] WebElement::hasHTMLTagName returns true for non-HTML elements
-        https://bugs.webkit.org/show_bug.cgi?id=101537
-
-        Reviewed by Abhishek Arya.
-
-        We should not do ignore-case comparison for tagName, which is always
-        upper-case and createElementNS(xhtmlNS, "INPUT") doesn't create an
-        HTMLInputElement object. We need to check if localName is equal to
-        "input" in this case.
-
-        * src/WebElement.cpp:
-        (WebKit::WebElement::hasHTMLTagName):
-
-2012-11-08  Joshua Bell  <jsbell@chromium.org>
-
-        Expose snapshots in platform/leveldb wrapper API
-        https://bugs.webkit.org/show_bug.cgi?id=100786
-
-        Reviewed by Tony Chang.
-
-        Add unit tests for transactions/snapshots.
-
-        * tests/LevelDBTest.cpp:
-        (WebCore::encodeString): Don't append to pre-sized vector.
-        (WebCore::TEST):
-        (WebCore):
-
 2012-11-08  Adam Barth  <abarth@webkit.org>
 
         Unreviewed.
diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS
index a4968c57d..ba3dd966e 100644
--- a/Source/WebKit/chromium/DEPS
+++ b/Source/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': 'HEAD'
+  'chromium_rev': '166755'
 }
 
 deps = {
diff --git a/Source/WebKit/chromium/src/WebElement.cpp b/Source/WebKit/chromium/src/WebElement.cpp
index 96cf9791d..49fff0a07 100644
--- a/Source/WebKit/chromium/src/WebElement.cpp
+++ b/Source/WebKit/chromium/src/WebElement.cpp
@@ -66,13 +66,8 @@ bool WebElement::hasTagName(const WebString& tagName) const
 
 bool WebElement::hasHTMLTagName(const WebString& tagName) const
 {
-    // How to create                     class              nodeName localName
-    // createElement('input')            HTMLInputElement   INPUT    input
-    // createElement('INPUT')            HTMLInputElement   INPUT    input
-    // createElementNS(xhtmlNS, 'input') HTMLInputElement   INPUT    input
-    // createElementNS(xhtmlNS, 'INPUT') HTMLUnknownElement INPUT    INPUT
     const Element* element = constUnwrap<Element>();
-    return HTMLNames::xhtmlNamespaceURI == element->namespaceURI() && element->localName() == String(tagName).lower();
+    return HTMLNames::xhtmlNamespaceURI == element->namespaceURI() && equalIgnoringCase(element->tagName(), String(tagName));
 }
 
 bool WebElement::hasAttribute(const WebString& attrName) const
diff --git a/Source/WebKit/chromium/src/WebPagePopupImpl.cpp b/Source/WebKit/chromium/src/WebPagePopupImpl.cpp
index d10022a51..01cacda2a 100644
--- a/Source/WebKit/chromium/src/WebPagePopupImpl.cpp
+++ b/Source/WebKit/chromium/src/WebPagePopupImpl.cpp
@@ -304,7 +304,6 @@ void WebPagePopupImpl::setFocus(bool enable)
 
 void WebPagePopupImpl::close()
 {
-    m_closing = true;
     if (m_page && m_page->mainFrame())
         m_page->mainFrame()->loader()->frameDetached();
     m_page.clear();
diff --git a/Source/WebKit/chromium/tests/LevelDBTest.cpp b/Source/WebKit/chromium/tests/LevelDBTest.cpp
index 7dc0355df..2a00ae686 100644
--- a/Source/WebKit/chromium/tests/LevelDBTest.cpp
+++ b/Source/WebKit/chromium/tests/LevelDBTest.cpp
@@ -30,9 +30,7 @@
 #include "FileSystem.h"
 #include "LevelDBComparator.h"
 #include "LevelDBDatabase.h"
-#include "LevelDBIterator.h"
 #include "LevelDBSlice.h"
-#include "LevelDBTransaction.h"
 #include <gtest/gtest.h>
 #include <webkit/support/webkit_support.h>
 #include <wtf/Vector.h>
@@ -55,7 +53,7 @@ Vector<char> encodeString(const std::string& s)
 {
     Vector<char> ret(s.size());
     for (size_t i = 0; i < s.size(); ++i)
-        ret[i] = s[i];
+        ret.append(s[i]);
     return ret;
 }
 
@@ -102,97 +100,6 @@ TEST(LevelDBDatabaseTest, CorruptionTest)
     EXPECT_FALSE(success);
 }
 
-TEST(LevelDBDatabaseTest, Transaction)
-{
-    OwnPtr<webkit_support::ScopedTempDirectory> tempDirectory = adoptPtr(webkit_support::CreateScopedTempDirectory());
-    tempDirectory->CreateUniqueTempDir();
-    const String path = String::fromUTF8(tempDirectory->path().c_str());
-
-    const Vector<char> key = encodeString("key");
-    Vector<char> gotValue;
-    SimpleComparator comparator;
-
-    OwnPtr<LevelDBDatabase> leveldb = LevelDBDatabase::open(path, &comparator);
-    EXPECT_TRUE(leveldb);
-
-    const Vector<char> oldValue = encodeString("value");
-    bool success = leveldb->put(key, oldValue);
-    EXPECT_TRUE(success);
-
-    RefPtr<LevelDBTransaction> transaction = LevelDBTransaction::create(leveldb.get());
-
-    const Vector<char> newValue = encodeString("new value");
-    success = leveldb->put(key, newValue);
-    EXPECT_TRUE(success);
-
-    success = transaction->get(key, gotValue);
-    EXPECT_TRUE(success);
-    EXPECT_EQ(comparator.compare(gotValue, oldValue), 0);
-
-    success = leveldb->get(key, gotValue);
-    EXPECT_TRUE(success);
-    EXPECT_EQ(comparator.compare(gotValue, newValue), 0);
-
-    const Vector<char> addedKey = encodeString("added key");
-    const Vector<char> addedValue = encodeString("added value");
-    success = leveldb->put(addedKey, addedValue);
-    EXPECT_TRUE(success);
-
-    success = leveldb->get(addedKey, gotValue);
-    EXPECT_TRUE(success);
-    EXPECT_EQ(comparator.compare(gotValue, addedValue), 0);
-
-    success = transaction->get(addedKey, gotValue);
-    EXPECT_FALSE(success);
-}
-
-TEST(LevelDBDatabaseTest, TransactionIterator)
-{
-    OwnPtr<webkit_support::ScopedTempDirectory> tempDirectory = adoptPtr(webkit_support::CreateScopedTempDirectory());
-    tempDirectory->CreateUniqueTempDir();
-    const String path = String::fromUTF8(tempDirectory->path().c_str());
-
-    const Vector<char> start = encodeString("");
-    const Vector<char> key1 = encodeString("key1");
-    const Vector<char> value1 = encodeString("value1");
-    const Vector<char> key2 = encodeString("key2");
-    const Vector<char> value2 = encodeString("value2");
-
-    SimpleComparator comparator;
-    bool success;
-
-    OwnPtr<LevelDBDatabase> leveldb = LevelDBDatabase::open(path, &comparator);
-    EXPECT_TRUE(leveldb);
-
-    success = leveldb->put(key1, value1);
-    EXPECT_TRUE(success);
-    success = leveldb->put(key2, value2);
-    EXPECT_TRUE(success);
-
-    RefPtr<LevelDBTransaction> transaction = LevelDBTransaction::create(leveldb.get());
-
-    success = leveldb->remove(key2);
-    EXPECT_TRUE(success);
-
-    OwnPtr<LevelDBIterator> it = transaction->createIterator();
-
-    it->seek(start);
-
-    EXPECT_TRUE(it->isValid());
-    EXPECT_EQ(comparator.compare(it->key(), key1), 0);
-    EXPECT_EQ(comparator.compare(it->value(), value1), 0);
-
-    it->next();
-
-    EXPECT_TRUE(it->isValid());
-    EXPECT_EQ(comparator.compare(it->key(), key2), 0);
-    EXPECT_EQ(comparator.compare(it->value(), value2), 0);
-
-    it->next();
-
-    EXPECT_FALSE(it->isValid());
-}
-
 } // namespace
 
 #endif // USE(LEVELDB)