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

Revert back to an older snapshot that should build on ARM

13 files changed, 17 insertions, 397 deletions

diff --git a/Source/WebKit/blackberry/Api/BackingStore.cpp b/Source/WebKit/blackberry/Api/BackingStore.cpp
index 0f078f5e3..61b90cc24 100644
--- a/Source/WebKit/blackberry/Api/BackingStore.cpp
+++ b/Source/WebKit/blackberry/Api/BackingStore.cpp
@@ -206,7 +206,6 @@ BackingStorePrivate::BackingStorePrivate()
     , m_renderQueue(adoptPtr(new RenderQueue(this)))
     , m_defersBlit(true)
     , m_hasBlitJobs(false)
-    , m_webPageBackgroundColor(WebCore::Color::white)
     , m_currentWindowBackBuffer(0)
     , m_preferredTileMatrixDimension(Vertical)
 #if USE(ACCELERATED_COMPOSITING)
@@ -2367,38 +2366,9 @@ void BackingStorePrivate::fillWindow(Platform::Graphics::FillPattern pattern,
             "Empty window buffer, couldn't fillWindow");
     }
 
-    if (pattern == BlackBerry::Platform::Graphics::CheckerboardPattern && BlackBerry::Platform::Settings::isPublicBuild()) {
-        // For public builds, convey the impression of less checkerboard.
-        // For developer builds, keep the checkerboard to get it fixed better.
-        BlackBerry::Platform::Graphics::clearBuffer(dstBuffer, dstRect,
-            m_webPageBackgroundColor.red(), m_webPageBackgroundColor.green(),
-            m_webPageBackgroundColor.blue(), m_webPageBackgroundColor.alpha());
-        return;
-    }
-
     BlackBerry::Platform::Graphics::fillBuffer(dstBuffer, pattern, dstRect, contentsOrigin, contentsScale);
 }
 
-WebCore::Color BackingStorePrivate::webPageBackgroundColorUserInterfaceThread() const
-{
-    ASSERT(BlackBerry::Platform::userInterfaceThreadMessageClient()->isCurrentThread());
-    return m_webPageBackgroundColor;
-}
-
-void BackingStorePrivate::setWebPageBackgroundColor(const WebCore::Color& color)
-{
-    if (!BlackBerry::Platform::userInterfaceThreadMessageClient()->isCurrentThread()) {
-        typedef void (BlackBerry::WebKit::BackingStorePrivate::*FunctionType)(const WebCore::Color&);
-
-        BlackBerry::Platform::userInterfaceThreadMessageClient()->dispatchMessage(
-            BlackBerry::Platform::createMethodCallMessage<FunctionType, BackingStorePrivate, WebCore::Color>(
-                &BackingStorePrivate::setWebPageBackgroundColor, this, color));
-        return;
-    }
-
-    m_webPageBackgroundColor = color;
-}
-
 void BackingStorePrivate::invalidateWindow()
 {
     // Grab a rect appropriate for the current thread.
diff --git a/Source/WebKit/blackberry/Api/BackingStore_p.h b/Source/WebKit/blackberry/Api/BackingStore_p.h
index d2fd95cc0..8e52a12ae 100644
--- a/Source/WebKit/blackberry/Api/BackingStore_p.h
+++ b/Source/WebKit/blackberry/Api/BackingStore_p.h
@@ -20,7 +20,6 @@
 #define BackingStore_p_h
 
 #include "BackingStore.h"
-#include "Color.h"
 #include "RenderQueue.h"
 #include "TileIndex.h"
 #include "TileIndexHash.h"
@@ -320,9 +319,6 @@ public:
     void blitToWindow(const Platform::IntRect& dstRect, const BlackBerry::Platform::Graphics::Buffer* srcBuffer, const Platform::IntRect& srcRect, bool blend, unsigned char globalAlpha);
     void fillWindow(Platform::Graphics::FillPattern, const Platform::IntRect& dstRect, const Platform::IntPoint& contentsOrigin, double contentsScale);
 
-    WebCore::Color webPageBackgroundColorUserInterfaceThread() const; // use WebSettings::backgroundColor() for the WebKit thread
-    void setWebPageBackgroundColor(const WebCore::Color&);
-
     void invalidateWindow();
     void invalidateWindow(const Platform::IntRect& dst);
     void clearWindow(const Platform::IntRect&, unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha = 255);
@@ -367,8 +363,6 @@ public:
     bool m_defersBlit;
     bool m_hasBlitJobs;
 
-    WebCore::Color m_webPageBackgroundColor; // for user interface thread operations such as blitting
-
     mutable unsigned m_frontState;
     mutable unsigned m_backState;
 
diff --git a/Source/WebKit/blackberry/Api/WebPage.cpp b/Source/WebKit/blackberry/Api/WebPage.cpp
index aaf573db5..a2b354a5c 100644
--- a/Source/WebKit/blackberry/Api/WebPage.cpp
+++ b/Source/WebKit/blackberry/Api/WebPage.cpp
@@ -1033,11 +1033,6 @@ void WebPagePrivate::setLoadState(LoadState state)
     if (state == Finished && m_mainFrame && m_mainFrame->document())
         m_mainFrame->document()->updateStyleIfNeeded();
 
-    // Dispatch the backingstore background color at important state changes.
-    m_backingStore->d->setWebPageBackgroundColor(m_mainFrame && m_mainFrame->view()
-        ? m_mainFrame->view()->documentBackgroundColor()
-        : m_webSettings->backgroundColor());
-
     m_loadState = state;
 
 #if DEBUG_WEBPAGE_LOAD
@@ -5854,11 +5849,6 @@ void WebPagePrivate::didChangeSettings(WebSettings* webSettings)
         Platform::userInterfaceThreadMessageClient()->dispatchMessage(
             createMethodCallMessage(&WebPagePrivate::setCompositorBackgroundColor, this, backgroundColor));
     }
-    if (m_backingStore) {
-        m_backingStore->d->setWebPageBackgroundColor(m_mainFrame && m_mainFrame->view()
-            ? m_mainFrame->view()->documentBackgroundColor()
-            : webSettings->backgroundColor());
-    }
 
     m_page->setDeviceScaleFactor(webSettings->devicePixelRatio());
 }
diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog
index b1abefb13..2ab4cf3b0 100644
--- a/Source/WebKit/blackberry/ChangeLog
+++ b/Source/WebKit/blackberry/ChangeLog
@@ -1,50 +1,3 @@
-2012-11-08  Chris Guan  <chris.guan@torchmobile.com.cn>
-
-        [BlackBerry] need to call closePopup at setValueAndClosePopup
-        https://bugs.webkit.org/show_bug.cgi?id=101568
-
-        Reviewed by George Staikos.
-
-        When early return occurs, we need to call closePopup
-        at setValueAndClosePopup function. See the comments
-        in WebCore/page/PagePopupClient.h. If we have not it,
-        Webkit thread is held and browser will be unresponsive 
-        in BlackBerry port.
-        
-        RIM PR 232962
-        Internally reviewed by Charles Wei.
-
-        * WebCoreSupport/SelectPopupClient.cpp:
-        (WebCore::SelectPopupClient::setValueAndClosePopup):
-
-2012-11-08  Jakob Petsovits  <jpetsovits@rim.com>
-
-        [BlackBerry] Replace checkerboard with page background color.
-        https://bugs.webkit.org/show_bug.cgi?id=101652
-        RIM PR 188235
-
-        Reviewed by George Staikos.
-
-        In order to do this, we introduce a new member variable for
-        BackingStore because when blitting, we can't access the
-        page background color in a threadsafe way.
-
-        Solid background color fill is still only used for public builds.
-        Developers and beta testers should still see checkerboard and
-        do something about it.
-
-        * Api/BackingStore.cpp:
-        (BlackBerry::WebKit::BackingStorePrivate::BackingStorePrivate):
-        (BlackBerry::WebKit::BackingStorePrivate::fillWindow):
-        (BlackBerry::WebKit::BackingStorePrivate::webPageBackgroundColorUserInterfaceThread):
-        (WebKit):
-        (BlackBerry::WebKit::BackingStorePrivate::setWebPageBackgroundColor):
-        * Api/BackingStore_p.h:
-        (BackingStorePrivate):
-        * Api/WebPage.cpp:
-        (BlackBerry::WebKit::WebPagePrivate::setLoadState):
-        (BlackBerry::WebKit::WebPagePrivate::didChangeSettings):
-
 2012-11-08  Tiancheng Jiang  <tijiang@rim.com>
 
         [BlackBerry] Update BB10 date input form.
diff --git a/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp b/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp
index b1af6fa63..b37b5e668 100644
--- a/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp
+++ b/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp
@@ -173,11 +173,8 @@ void SelectPopupClient::setValueAndClosePopup(int, const String& stringValue)
 
         const Vector<HTMLElement*>& items = m_element->listItems();
 
-        // If element changed after select UI showed, do nothing but closePopup().
-        if (items.size() != static_cast<unsigned>(m_size)) {
-            closePopup();
+        if (items.size() != static_cast<unsigned int>(m_size))
             return;
-        }
 
         HTMLOptionElement* option;
         for (unsigned i = 0; i < m_size; i++) {
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)
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 639d1029f..f005f8586 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,30 +1,3 @@
-2012-11-08  Timothy Hatcher  <timothy@apple.com>
-
-        Always use a textured window for the Web Inspector.
-
-        https://bugs.webkit.org/show_bug.cgi?id=101693
-
-        Reviewed by Joseph Pecoraro.
-
-        * WebCoreSupport/WebInspectorClient.mm:
-        (-[WebInspectorWindowController window]): Removed the conditional for a textured window.
-
-2012-11-08  Roger Fong  <roger_fong@apple.com>
-
-        Null check URL key entries into WebHistory hash table. 
-        https://bugs.webkit.org/show_bug.cgi?id=101664
-        <rdar://problem/12440852>
-
-        Reviewed by Brady Eidson.
-        
-        Sometimes the _entriesByURL hash table used to keep track of web history is erroneously passed in null key entries, which causes an exception to fire.
-        This prevents the desired page navigation from taking effect. This is a workaround for the problem.
-        Ideally we would figure out where the null values for the key are coming from but for now we'll just set it to "" to prevent the exception from being thrown
-        so that navigation can continue as expected.
-
-        * History/WebHistory.mm:
-        (-[WebHistoryPrivate visitedURL:withTitle:increaseVisitCount:]):
-
 2012-11-07  Andreas Kling  <akling@apple.com>
 
         Remove build-webkit dependency on Java SDK for Apple Mac WebKit.
diff --git a/Source/WebKit/mac/History/WebHistory.mm b/Source/WebKit/mac/History/WebHistory.mm
index 591cc04b0..e781d32fd 100644
--- a/Source/WebKit/mac/History/WebHistory.mm
+++ b/Source/WebKit/mac/History/WebHistory.mm
@@ -296,8 +296,6 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
     ASSERT(title);
     
     NSString *URLString = [url _web_originalDataAsString];
-    if (!URLString)
-        URLString = @"";
     WebHistoryItem *entry = [_entriesByURL objectForKey:URLString];
 
     if (entry) {
diff --git a/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm b/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
index 0b9041d73..f432cd51f 100644
--- a/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
@@ -336,13 +336,22 @@ void WebInspectorFrontendClient::updateWindowTitle() const
     if (window)
         return window;
 
-    NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask);
+    bool useTexturedWindow = useWebKitWebInspector();
+
+    NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask);
+
+    if (useTexturedWindow)
+        styleMask |= NSTexturedBackgroundWindowMask;
+
     window = [[NSWindow alloc] initWithContentRect:NSMakeRect(60.0, 200.0, 750.0, 650.0) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
     [window setDelegate:self];
     [window setMinSize:NSMakeSize(400.0, 400.0)];
-    [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
-    [window setContentBorderThickness:55. forEdge:NSMaxYEdge];
-    WKNSWindowMakeBottomCornersSquare(window);
+
+    if (useTexturedWindow) {
+        [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
+        [window setContentBorderThickness:55. forEdge:NSMaxYEdge];
+        WKNSWindowMakeBottomCornersSquare(window);
+    }
 
     [self setWindow:window];
     [window release];