Revert "Compilation and link error fixes for new webkit r47420."

This reverts commit 632f4508222c2a617e6820e9388867c0f4821db8.

7 files changed, 25 insertions, 23 deletions

diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk
index 347f678..91b4750 100644
--- a/WebCore/Android.v8.mk
+++ b/WebCore/Android.v8.mk
@@ -767,7 +767,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	storage/SQLResultSetRowList.cpp \
 	storage/SQLStatement.cpp \
 	storage/SQLTransaction.cpp \
-	storage/SQLTransactionCoordinator.cpp \
 	storage/Storage.cpp \
 	storage/StorageAreaImpl.cpp \
 	storage/StorageAreaSync.cpp \
diff --git a/WebCore/dom/Node.h b/WebCore/dom/Node.h
index 054761e..d1f58dc 100644
--- a/WebCore/dom/Node.h
+++ b/WebCore/dom/Node.h
@@ -507,6 +507,19 @@ public:
     static size_t reportDOMNodesSize();
 #endif
 
+protected:
+    virtual void willMoveToNewOwnerDocument();
+    virtual void didMoveToNewOwnerDocument();
+    
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const { }
+    void setTabIndexExplicitly(short);
+    
+    bool hasRareData() const { return m_hasRareData; }
+    
+    NodeRareData* rareData() const;
+    NodeRareData* ensureRareData();
+
+public:
     virtual Node* toNode() { return this; }
 
     virtual ScriptExecutionContext* scriptExecutionContext() const;
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index f5f88d2..f8cc111 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -332,7 +332,7 @@ void Geolocation::requestPermission()
     page->chrome()->requestGeolocationPermissionForFrame(m_frame, this);
 }
 
-void Geolocation::geolocationServicePositionChanged(GeolocationService* service)
+void Geolocation::geolocationServicePositionChanged(GeolocationService*)
 {
     ASSERT_UNUSED(service, service == m_service);
     ASSERT(m_service->lastPosition());
diff --git a/WebCore/page/android/InspectorControllerAndroid.cpp b/WebCore/page/android/InspectorControllerAndroid.cpp
index 7bf1865..328a6f3 100644
--- a/WebCore/page/android/InspectorControllerAndroid.cpp
+++ b/WebCore/page/android/InspectorControllerAndroid.cpp
@@ -105,6 +105,7 @@ void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identi
 void InspectorController::scriptImported(unsigned long identifier, const String& sourceString) {}
 void InspectorController::inspectedPageDestroyed() {}
 
+void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame) {}
 void InspectorController::startGroup(MessageSource source, ScriptCallStack* callFrame) {}
 void InspectorController::endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL) {}
 void InspectorController::startTiming(const String& title) {}
diff --git a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
index c376ca7..89d841d 100644
--- a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
@@ -86,7 +86,7 @@ Image* ImageBuffer::image() const
     return m_image.get();
 }
 
-PassRefPtr<ImageData> ImageBuffer::getUnmultipliedImageData(const IntRect& rect) const
+PassRefPtr<ImageData> ImageBuffer::getImageData(const IntRect& rect) const
 {
     GraphicsContext* gc = this->context();
     if (!gc) {
@@ -149,13 +149,7 @@ PassRefPtr<ImageData> ImageBuffer::getUnmultipliedImageData(const IntRect& rect)
     return result;
 }
 
-PassRefPtr<ImageData> ImageBuffer::getPremultipliedImageData(const IntRect& rect) const
-{
-    notImplemented();
-    return 0;
-}
-
-void ImageBuffer::putUnmultipliedImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint)
+void ImageBuffer::putImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint)
 {
     GraphicsContext* gc = this->context();
     if (!gc) {
@@ -193,7 +187,7 @@ void ImageBuffer::putUnmultipliedImageData(ImageData* source, const IntRect& sou
     int endy = destPoint.y() + sourceRect.bottom();
     ASSERT(endy <= m_size.height());
     int numRows = endy - desty;
-
+    
     unsigned srcBytesPerRow = 4 * source->width();
     unsigned dstPixelsPerRow = dst.rowBytesAsPixels();
     
@@ -212,11 +206,6 @@ void ImageBuffer::putUnmultipliedImageData(ImageData* source, const IntRect& sou
     }
 }
 
-void ImageBuffer::putPremultipliedImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint)
-{
-    notImplemented();
-}
-
     
 String ImageBuffer::toDataURL(const String&) const
 {
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 7b80563..3ede30a 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1439,7 +1439,7 @@ WebCore::String WebViewCore::getSelection(SkRegion* selRgn)
         if (end < -1) // use node if endNode is not valid
             endNode = node;
         if (end <= 0)
-            end = static_cast<WebCore::Text*>(endNode)->dataImpl()->length();
+            end = static_cast<WebCore::Text*>(endNode)->string()->length();
         DBG_NAV_LOGD("node=%p start=%d endNode=%p end=%d", node, start, endNode, end);
         WebCore::Node* startNode = node;
         do {
@@ -1448,7 +1448,7 @@ WebCore::String WebViewCore::getSelection(SkRegion* selRgn)
             if (node->getRect().isEmpty())
                 continue;
             WebCore::Text* textNode = static_cast<WebCore::Text*>(node);
-            WebCore::StringImpl* string = textNode->dataImpl();
+            WebCore::StringImpl* string = textNode->string();
             if (!string->length())
                 continue;
             const UChar* chars = string->characters();
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 05c1c66..56cb2ae 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -2410,7 +2410,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node,
     CachedNodeType* type, String* exported) const
 {
     Text* textNode = static_cast<Text*>(node);
-    StringImpl* string = textNode->dataImpl();
+    StringImpl* string = textNode->string();
     const UChar* baseChars = string->characters();
 //    const UChar* originalBase = baseChars;
     int length = string->length();
@@ -2515,7 +2515,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node,
                             exported->truncate(0);
                             do {
                                 Text* tempText = static_cast<Text*>(temp);
-                                StringImpl* string = tempText->dataImpl();
+                                StringImpl* string = tempText->string();
                                 int end = tempText == walk->mFinalNode ? 
                                     walk->mEnd : string->length();
                                 exported->append(String(string->substring(
@@ -2575,7 +2575,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node,
                 } while (renderer == NULL);
                 baseInline = renderer->firstTextBox();
             } while (baseInline == NULL);
-            string = nextNode->dataImpl();
+            string = nextNode->string();
             baseChars = string->characters();
             inlineTextBox = baseInline;
             start = inlineTextBox->start();
@@ -2585,7 +2585,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node,
 tryNextCheckType:
         node = textNode;
         baseInline = saveInline;
-        string = textNode->dataImpl();
+        string = textNode->string();
         baseChars = string->characters();
     }
     if (foundBetter) {
@@ -2844,7 +2844,7 @@ bool CacheBuilder::ConstructTextRect(Text* textNode,
 {
     RenderText* renderText = (RenderText*) textNode->renderer();
     EVisibility vis = renderText->style()->visibility();
-    StringImpl* string = textNode->dataImpl();
+    StringImpl* string = textNode->string();
     const UChar* chars = string->characters();
     FloatPoint pt = renderText->localToAbsolute();
     do {