Merge change 21503 into master-webkit-merge

* changes:
  A bunch of linker error fixes

2 files changed, 25 insertions, 0 deletions

diff --git a/WebCore/platform/android/LocalizedStringsAndroid.cpp b/WebCore/platform/android/LocalizedStringsAndroid.cpp
index 1fe80d8..46a5c3a 100644
--- a/WebCore/platform/android/LocalizedStringsAndroid.cpp
+++ b/WebCore/platform/android/LocalizedStringsAndroid.cpp
@@ -51,4 +51,23 @@ String imageTitle(const String& filename, const IntSize& size)
     return String();
 }
 
+String mediaElementLoadingStateText()
+{
+    notImplemented();
+    return String();
+}
+
+String mediaElementLiveBroadcastStateText()
+{
+    notImplemented();
+    return String();
+}
+
+String searchableIndexIntroduction()
+{
+    notImplemented();
+    return String();
+}
+
+
 } // namespace WebCore
diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index b81d377..299ae00 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -65,6 +65,12 @@ RenderTheme* theme()
     return &androidTheme;
 }
 
+PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
+{
+    RefPtr<RenderThemeAndroid> androidTheme = new RenderThemeAndroid();
+    return androidTheme.release();
+}
+
 RenderThemeAndroid::RenderThemeAndroid()
 {
 }