diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-17 10:10:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-17 10:10:35 -0700 |
| commit | 69f588f94a1f7829b6b8a1c45319ffc4f17ea5e6 (patch) | |
| tree | c6d7bed61901815f83dc338319ef77cc6214baf5 /WebCore | |
| parent | 02a23642eaae7e2fdd441eddffd2c085fbee3b49 (diff) | |
| parent | 01b3621287e7fe5318d3b7d0b74c5810dd717a57 (diff) | |
| download | external_webkit-69f588f94a1f7829b6b8a1c45319ffc4f17ea5e6.zip external_webkit-69f588f94a1f7829b6b8a1c45319ffc4f17ea5e6.tar.gz external_webkit-69f588f94a1f7829b6b8a1c45319ffc4f17ea5e6.tar.bz2 | |
Merge change 21503 into master-webkit-merge
* changes:
A bunch of linker error fixes
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.v8.mk | 3 | ||||
| -rw-r--r-- | WebCore/platform/android/LocalizedStringsAndroid.cpp | 19 | ||||
| -rw-r--r-- | WebCore/platform/android/RenderThemeAndroid.cpp | 6 |
4 files changed, 29 insertions, 0 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 336500c..3de7e2f 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -668,6 +668,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ page/Settings.cpp \ page/WindowFeatures.cpp \ page/WorkerNavigator.cpp \ + page/XSSAuditor.cpp \ \ page/android/DragControllerAndroid.cpp \ page/android/EventHandlerAndroid.cpp \ diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk index 7339400..bf3d131 100644 --- a/WebCore/Android.v8.mk +++ b/WebCore/Android.v8.mk @@ -189,6 +189,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/Element.cpp \ dom/Entity.cpp \ dom/EntityReference.cpp \ + dom/ErrorEvent.cpp \ dom/Event.cpp \ dom/EventNames.cpp \ dom/EventTarget.cpp \ @@ -356,6 +357,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ loader/ThreadableLoader.cpp \ loader/appcache/ApplicationCache.cpp \ loader/appcache/ApplicationCacheGroup.cpp \ + loader/appcache/ApplicationCacheHost.cpp \ loader/appcache/ApplicationCacheResource.cpp \ loader/appcache/ApplicationCacheStorage.cpp \ loader/appcache/DOMApplicationCache.cpp \ @@ -399,6 +401,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ page/Settings.cpp \ page/WindowFeatures.cpp \ page/WorkerNavigator.cpp \ + page/XSSAuditor.cpp \ \ page/android/DragControllerAndroid.cpp \ page/android/EventHandlerAndroid.cpp \ 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() { } |