Fix the last of the linker errors !

8 files changed, 58 insertions, 9 deletions

diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk
index cd1b423..91b4750 100644
--- a/WebCore/Android.v8.mk
+++ b/WebCore/Android.v8.mk
@@ -138,6 +138,7 @@ LOCAL_SRC_FILES := \
 	css/CSSVariablesRule.cpp \
 	css/FontFamilyValue.cpp \
 	css/FontValue.cpp \
+	css/Media.cpp \
 	css/MediaFeatureNames.cpp \
 	css/MediaList.cpp \
 	css/MediaQuery.cpp \
@@ -202,6 +203,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	dom/MessageChannel.cpp \
 	dom/MessageEvent.cpp \
 	dom/MessagePort.cpp \
+	dom/MessagePortChannel.cpp \
 	dom/MouseEvent.cpp \
 	dom/MouseRelatedEvent.cpp \
 	dom/MutationEvent.cpp \
@@ -247,6 +249,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	dom/XMLTokenizerLibxml2.cpp \
 	dom/XMLTokenizerScope.cpp \
 	\
+	dom/default/PlatformMessagePortChannel.cpp \
+	\
 	editing/AppendNodeCommand.cpp \
 	editing/ApplyStyleCommand.cpp \
 	editing/BreakBlockquoteCommand.cpp \
@@ -319,6 +323,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/ImageData.cpp \
 	html/PreloadScanner.cpp \
 	html/TimeRanges.cpp \
+	html/ValidityState.cpp \
 	\
 	html/canvas/CanvasGradient.cpp \
 	html/canvas/CanvasPattern.cpp \
@@ -348,6 +353,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	loader/MediaDocument.cpp \
 	loader/NavigationAction.cpp \
 	loader/NetscapePlugInStreamLoader.cpp \
+	loader/PlaceholderDocument.cpp \
 	loader/PluginDocument.cpp \
 	loader/ProgressTracker.cpp \
 	loader/Request.cpp \
@@ -544,6 +550,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/graphics/transforms/TransformationMatrix.cpp \
 	platform/graphics/transforms/TranslateTransformOperation.cpp \
 	\
+	platform/image-decoders/gif/GIFImageDecoder.cpp \
+	platform/image-decoders/gif/GIFImageReader.cpp \
 	platform/image-decoders/skia/ImageDecoderSkia.cpp \
 	\
 	platform/network/AuthenticationChallengeBase.cpp \
@@ -568,6 +576,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/sql/SQLValue.cpp \
 	platform/sql/SQLiteAuthorizer.cpp \
 	platform/sql/SQLiteDatabase.cpp \
+	platform/sql/SQLiteFileSystem.cpp \
 	platform/sql/SQLiteStatement.cpp \
 	platform/sql/SQLiteTransaction.cpp \
 	\
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 0489077..fc4dc7e 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -811,6 +811,8 @@ public:
 protected:
     Document(Frame*, bool isXHTML);
 
+    void setStyleSelector(CSSStyleSelector* styleSelector) {  m_styleSelector = styleSelector; }
+
 #if ENABLE(TOUCH_EVENTS) // Android
 public:
     typedef HashMap<Node*, unsigned > TouchListenerMap;
@@ -823,8 +825,6 @@ private:
     TouchListenerMap m_touchEventListeners;
 #endif  // ENABLE(TOUCH_EVENTS)
 
-    void setStyleSelector(CSSStyleSelector* styleSelector) {  m_styleSelector = styleSelector; }
-
 private:
     virtual void refScriptExecutionContext() { ref(); }
     virtual void derefScriptExecutionContext() { deref(); }
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 05d9652..632b0ce 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -57,10 +57,8 @@ class Document;
 class DocumentLoader;
 class GraphicsContext;
 class HitTestResult;
-class InspectorBackend;
 class InspectorClient;
 class InspectorDOMAgent;
-class InspectorFrontend;
 class JavaScriptCallFrame;
 class StorageArea;
 class KURL;
@@ -79,6 +77,11 @@ class InspectorDatabaseResource;
 class InspectorDOMStorageResource;
 class InspectorResource;
 
+#if !PLATFORM(ANDROID)
+class InspectorBackend;
+class InspectorFrontend;
+#endif
+
 class InspectorController
 #if ENABLE(JAVASCRIPT_DEBUGGER)
                           : JavaScriptDebugListener
@@ -157,7 +160,9 @@ public:
     InspectorController(Page*, InspectorClient*);
     ~InspectorController();
 
+#if !PLATFORM(ANDROID)
     InspectorBackend* inspectorBackend() { return m_inspectorBackend.get(); }
+#endif
 
     void inspectedPageDestroyed();
     void pageDestroyed() { m_page = 0; }
@@ -269,8 +274,10 @@ public:
 #endif
 
 private:
+#if !PLATFORM(ANDROID)
     friend class InspectorBackend;
- 
+#endif
+
     // Following are used from InspectorBackend and internally.
     void scriptObjectReady(bool enableDOMAgent);
     void moveWindowBy(float x, float y) const;
@@ -305,7 +312,7 @@ private:
 
     Page* m_inspectedPage;
     InspectorClient* m_client;
-    OwnPtr<InspectorFrontend> m_frontend;
+
     RefPtr<InspectorDOMAgent> m_domAgent;
     Page* m_page;
     RefPtr<Node> m_nodeToFocus;
@@ -332,7 +339,10 @@ private:
     ConsoleMessage* m_previousMessage;
     bool m_resourceTrackingEnabled;
     bool m_resourceTrackingSettingsLoaded;
+#if !PLATFORM(ANDROID)
+    OwnPtr<InspectorFrontend> m_frontend;
     RefPtr<InspectorBackend> m_inspectorBackend;
+#endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     bool m_debuggerEnabled;
     bool m_attachDebuggerWhenShown;
diff --git a/WebCore/page/android/InspectorControllerAndroid.cpp b/WebCore/page/android/InspectorControllerAndroid.cpp
index 24d1412..328a6f3 100644
--- a/WebCore/page/android/InspectorControllerAndroid.cpp
+++ b/WebCore/page/android/InspectorControllerAndroid.cpp
@@ -90,9 +90,8 @@ void InspectorController::didReceiveContentLength(DocumentLoader*, unsigned long
 void InspectorController::didFinishLoading(DocumentLoader*, unsigned long) {}
 void InspectorController::didLoadResourceFromMemoryCache(DocumentLoader*, const CachedResource*) {}
 void InspectorController::frameDetachedFromParent(Frame*) {}
-
-void addMessageToConsole(MessageSource, MessageType, MessageLevel, ScriptCallStack*) { }
-void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID) { }
+void InspectorController::addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, WebCore::String const&, unsigned int, WebCore::String const&) {}
+void InspectorController::addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, ScriptCallStack*) {}
 #if ENABLE(DATABASE)
 void InspectorController::didOpenDatabase(Database*, String const&, String const&, String const&) {}
 #endif
diff --git a/WebCore/platform/android/LocalizedStringsAndroid.cpp b/WebCore/platform/android/LocalizedStringsAndroid.cpp
index 5ca7b95..fc3b63c 100644
--- a/WebCore/platform/android/LocalizedStringsAndroid.cpp
+++ b/WebCore/platform/android/LocalizedStringsAndroid.cpp
@@ -285,5 +285,20 @@ String searchableIndexIntroduction()
     return String();
 }
 
+String resetButtonDefaultLabel()
+{
+    return String("Reset");
+}
+
+String submitButtonDefaultLabel()
+{
+    return String("Submit");
+}
+
+String inputElementAltText()
+{
+    notImplemented();
+    return String();
+}
 
 } // namespace WebCore
diff --git a/WebCore/platform/graphics/android/PathAndroid.cpp b/WebCore/platform/graphics/android/PathAndroid.cpp
index 0eb1414..a643fc0 100644
--- a/WebCore/platform/graphics/android/PathAndroid.cpp
+++ b/WebCore/platform/graphics/android/PathAndroid.cpp
@@ -66,6 +66,11 @@ bool Path::isEmpty() const
     return m_path->isEmpty();
 }
 
+bool Path::hasCurrentPoint() const
+{
+    return !isEmpty();
+}
+
 bool Path::contains(const FloatPoint& point, WindRule rule) const
 {
     SkRegion    rgn, clip;
diff --git a/WebCore/platform/text/android/TextBreakIteratorInternalICU.cpp b/WebCore/platform/text/android/TextBreakIteratorInternalICU.cpp
index 9bebe74..fc31fc9 100644
--- a/WebCore/platform/text/android/TextBreakIteratorInternalICU.cpp
+++ b/WebCore/platform/text/android/TextBreakIteratorInternalICU.cpp
@@ -28,6 +28,12 @@
 
 namespace WebCore {
 
+const char* currentSearchLocaleID()
+{
+    // TODO(benm): Implement. Should return system locale.
+    return "";
+}
+
 const char* currentTextBreakLocaleID()
 {
     return "en_us";
diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp
index bb0212b..3fc36c8 100644
--- a/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -161,6 +161,11 @@ void PluginView::platformInit()
     m_npWindow.window = 0;
 }
 
+void PluginView::platformStart()
+{
+    notImplemented();
+}
+
 PluginView::~PluginView()
 {
     stop();