diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 14:09:24 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:33 +0100 |
| commit | 3b523b87218c05c8dd49c191e3d5a7a114907e82 (patch) | |
| tree | 9cac2418495c9b21220887e2b785d5eb9bae11b3 /Source/WebCore/platform/android | |
| parent | 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 (diff) | |
| download | external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.zip external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.gz external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.bz2 | |
Merge WebKit at r80534: Fix makefiles.
Add new and remove deleted files to fix makefiles.
See http://trac.webkit.org/changeset/79861 for new
XSLTreeViewer generation.
Also remove a stub from TemporaryLInkStubs that we now get
by compiling the correct files in JSC (see
http://trac.webkit.org/changeset/78634).
Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
Diffstat (limited to 'Source/WebCore/platform/android')
| -rw-r--r-- | Source/WebCore/platform/android/TemporaryLinkStubs.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp index 126400a..ede06dc 100644 --- a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -465,22 +465,6 @@ void AXObjectCache::remove(Widget*) notImplemented(); } -#if USE(JSC) -using namespace JSC; - - -OpaqueJSClass::~OpaqueJSClass() -{ - notImplemented(); -} - -OpaqueJSClassContextData::~OpaqueJSClassContextData() -{ - notImplemented(); -} - -#endif - namespace WebCore { void setCookieStoragePrivateBrowsingEnabled(bool) |