diff options
Diffstat (limited to 'Source/WebKit/android')
61 files changed, 192 insertions, 141 deletions
diff --git a/Source/WebKit/android/AndroidLog.h b/Source/WebKit/android/AndroidLog.h index a69dce6..3d3eaaa 100644 --- a/Source/WebKit/android/AndroidLog.h +++ b/Source/WebKit/android/AndroidLog.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANDROIDLOG_H_ -#define ANDROIDLOG_H_ +#ifndef AndroidLog_h +#define AndroidLog_h #ifdef ANDROID_DOM_LOGGING #include <stdio.h> @@ -45,4 +45,4 @@ extern FILE* gRenderTreeFile; #define DISPLAY_TREE_LOG_FILE "/sdcard/displayTree.txt" #define LAYERS_TREE_LOG_FILE "/sdcard/layersTree.plist" -#endif /* ANDROIDLOG_H_ */ +#endif // AndroidLog_h diff --git a/Source/WebKit/android/JavaVM/jni.h b/Source/WebKit/android/JavaVM/jni.h index da02603..dec77aa 100644 --- a/Source/WebKit/android/JavaVM/jni.h +++ b/Source/WebKit/android/JavaVM/jni.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _JNI_COVER_H_ -#define _JNI_COVER_H_ +#ifndef jni_h +#define jni_h #include "nativehelper/jni.h" #define AttachCurrentThread(a, b) AttachCurrentThread((JNIEnv**) a, b) diff --git a/Source/WebKit/android/RenderSkinRadio.cpp b/Source/WebKit/android/RenderSkinRadio.cpp index 5dfee4a..46198d3 100644 --- a/Source/WebKit/android/RenderSkinRadio.cpp +++ b/Source/WebKit/android/RenderSkinRadio.cpp @@ -88,7 +88,7 @@ void RenderSkinRadio::Draw(SkCanvas* canvas, Node* element, const IntRect& ir, canvas->scale(scale, scale); bool checked = false; - if (InputElement* inputElement = toInputElement(static_cast<Element*>(element))) { + if (InputElement* inputElement = element->toInputElement()) { checked = inputElement->isChecked(); } diff --git a/Source/WebKit/android/TimeCounter.h b/Source/WebKit/android/TimeCounter.h index 64908d1..ecede27 100644 --- a/Source/WebKit/android/TimeCounter.h +++ b/Source/WebKit/android/TimeCounter.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TIME_COUNTER_H -#define TIME_COUNTER_H +#ifndef TimeCounter_h +#define TimeCounter_h #include "hardware_legacy/qemu_tracing.h" diff --git a/Source/WebKit/android/TimerClient.h b/Source/WebKit/android/TimerClient.h index 0c3c84c..2a56e6f 100644 --- a/Source/WebKit/android/TimerClient.h +++ b/Source/WebKit/android/TimerClient.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TIMER_CLIENT_H -#define TIMER_CLIENT_H +#ifndef TimerClient_h +#define TimerClient_h namespace android { diff --git a/Source/WebKit/android/WebCoreSupport/CookieClient.h b/Source/WebKit/android/WebCoreSupport/CookieClient.h index 56d9382..5e02f13 100644 --- a/Source/WebKit/android/WebCoreSupport/CookieClient.h +++ b/Source/WebKit/android/WebCoreSupport/CookieClient.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef COOKIE_CLIENT_H -#define COOKIE_CLIENT_H +#ifndef CookieClient_h +#define CookieClient_h #include <KURL.h> #include <PlatformString.h> diff --git a/Source/WebKit/android/WebCoreSupport/FileSystemClient.h b/Source/WebKit/android/WebCoreSupport/FileSystemClient.h index 5bde18a..bfa37c0 100644 --- a/Source/WebKit/android/WebCoreSupport/FileSystemClient.h +++ b/Source/WebKit/android/WebCoreSupport/FileSystemClient.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FILESYSTEM_CLIENT_H -#define FILESYSTEM_CLIENT_H +#ifndef FileSystemClient_h +#define FileSystemClient_h #include "PlatformString.h" diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index af54fee..8d75dfc 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -251,14 +251,16 @@ void FrameLoaderClientAndroid::dispatchDidReceiveIcon() { return; WTF::String url(m_frame->document()->url().string()); // Try to obtain the icon image. - WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL( - url, WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(url, WebCore::IntSize(16, 16)); // If the request fails, try the original request url. if (!icon) { DocumentLoader* docLoader = m_frame->loader()->activeDocumentLoader(); KURL originalURL = docLoader->originalRequest().url(); - icon = WebCore::iconDatabase().iconForPageURL( - originalURL, WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + icon = WebCore::iconDatabase().synchronousIconForPageURL(originalURL, WebCore::IntSize(16, 16)); } // There is a bug in webkit where cancelling an icon load is treated as a // failure. When this is fixed, we can ASSERT again that we have an icon. @@ -1279,9 +1281,8 @@ void FrameLoaderClientAndroid::transferLoadingResourceFromPage(unsigned long, Do // This function is used by the <OBJECT> element to determine the type of // the contents and work out if it can render it. -ObjectContentType FrameLoaderClientAndroid::objectContentType(const KURL& url, - const String& mimeType) { - return FrameLoader::defaultObjectContentType(url, mimeType); +ObjectContentType FrameLoaderClientAndroid::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages) { + return FrameLoader::defaultObjectContentType(url, mimeType, shouldPreferPlugInsForImages); } // This function allows the application to set the correct CSS media diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index 9615041..62ec9e0 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -193,7 +193,7 @@ namespace android { virtual WTF::PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const WTF::Vector<String>& paramNames, const WTF::Vector<String>& paramValues); - virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType); + virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages); virtual String overrideMediaType() const; virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*); diff --git a/Source/WebKit/android/WebCoreSupport/KeyGeneratorClient.h b/Source/WebKit/android/WebCoreSupport/KeyGeneratorClient.h index 1bcd8e8..595f138 100644 --- a/Source/WebKit/android/WebCoreSupport/KeyGeneratorClient.h +++ b/Source/WebKit/android/WebCoreSupport/KeyGeneratorClient.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef KEY_GENERATOR_CLIENT_H -#define KEY_GENERATOR_CLIENT_H +#ifndef KeyGeneratorClient_h +#define KeyGeneratorClient_h #include "KURL.h" #include "PlatformString.h" diff --git a/Source/WebKit/android/WebCoreSupport/autofill/MainThreadProxy.h b/Source/WebKit/android/WebCoreSupport/autofill/MainThreadProxy.h index d9310bb..cfd31ee 100644 --- a/Source/WebKit/android/WebCoreSupport/autofill/MainThreadProxy.h +++ b/Source/WebKit/android/WebCoreSupport/autofill/MainThreadProxy.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MAIN_THREAD_PROXY_H -#define MAIN_THREAD_PROXY_H +#ifndef MainThreadProxy_h +#define MainThreadProxy_h typedef void CallOnMainThreadFunction(void*); diff --git a/Source/WebKit/android/benchmark/Intercept.h b/Source/WebKit/android/benchmark/Intercept.h index edd5123..6694dba 100644 --- a/Source/WebKit/android/benchmark/Intercept.h +++ b/Source/WebKit/android/benchmark/Intercept.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef INTERCEPT_H -#define INTERCEPT_H +#ifndef Intercept_h +#define Intercept_h #include "MyJavaVM.h" #include "PlatformString.h" diff --git a/Source/WebKit/android/benchmark/MyJavaVM.h b/Source/WebKit/android/benchmark/MyJavaVM.h index 36d478d..3092161 100644 --- a/Source/WebKit/android/benchmark/MyJavaVM.h +++ b/Source/WebKit/android/benchmark/MyJavaVM.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MY_JAVA_VM_H -#define MY_JAVA_VM_H +#ifndef MyJavaVM_h +#define MyJavaVM_h // Make it 1 just to appease any assertions or checks for valid objects #define MY_JOBJECT ((jobject) 1) diff --git a/Source/WebKit/android/icu/unicode/ucnv.h b/Source/WebKit/android/icu/unicode/ucnv.h index 5ddaedb..1ac6e84 100644 --- a/Source/WebKit/android/icu/unicode/ucnv.h +++ b/Source/WebKit/android/icu/unicode/ucnv.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANDROID_UCNV_H -#define ANDROID_UCNV_H +#ifndef ucnv_h +#define ucnv_h // Include the real ucnv.h file from icu. Use a more exact reference so we do // not conflict with this file. diff --git a/Source/WebKit/android/jni/JavaSharedClient.h b/Source/WebKit/android/jni/JavaSharedClient.h index 9a09280..b432b31 100644 --- a/Source/WebKit/android/jni/JavaSharedClient.h +++ b/Source/WebKit/android/jni/JavaSharedClient.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef JAVA_SHARED_CLIENT_H -#define JAVA_SHARED_CLIENT_H +#ifndef JavaSharedClient_h +#define JavaSharedClient_h namespace android { diff --git a/Source/WebKit/android/jni/PictureSet.h b/Source/WebKit/android/jni/PictureSet.h index b04337c..647d177 100644 --- a/Source/WebKit/android/jni/PictureSet.h +++ b/Source/WebKit/android/jni/PictureSet.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PICTURESET_H -#define PICTURESET_H +#ifndef PictureSet_h +#define PictureSet_h #define PICTURE_SET_DUMP 0 #define PICTURE_SET_DEBUG 0 diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 29cd17d..be38a16 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -576,7 +576,9 @@ WebFrame::loadStarted(WebCore::Frame* frame) // send it along with the page started notification. jobject favicon = NULL; if (isMainFrame) { - WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL(urlString, WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(urlString, WebCore::IntSize(16, 16)); if (icon) favicon = webcoreImageToJavaBitmap(env, icon); LOGV("favicons", "Starting load with icon %p for %s", icon, url.string().utf8().data()); diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.h b/Source/WebKit/android/jni/WebCoreFrameBridge.h index 6522a5f..2e2468c 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.h +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.h @@ -25,8 +25,8 @@ // TODO: change name to WebFrame.h -#ifndef WEBFRAME_H -#define WEBFRAME_H +#ifndef WebCoreFrameBridge_h +#define WebCoreFrameBridge_h #include "FrameLoaderClient.h" #include "PlatformBridge.h" @@ -170,4 +170,4 @@ private: } // namespace android -#endif // WEBFRAME_H +#endif // WebCoreFrameBridge_h diff --git a/Source/WebKit/android/jni/WebCoreJni.h b/Source/WebKit/android/jni/WebCoreJni.h index ec25c8f..0f77cc6 100644 --- a/Source/WebKit/android/jni/WebCoreJni.h +++ b/Source/WebKit/android/jni/WebCoreJni.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANDROID_WEBKIT_WEBCOREJNI_H -#define ANDROID_WEBKIT_WEBCOREJNI_H +#ifndef WebCoreJni_h +#define WebCoreJni_h #include "ChromiumIncludes.h" #include "PlatformString.h" diff --git a/Source/WebKit/android/jni/WebCoreResourceLoader.h b/Source/WebKit/android/jni/WebCoreResourceLoader.h index c60b3f5..0e34a5b 100644 --- a/Source/WebKit/android/jni/WebCoreResourceLoader.h +++ b/Source/WebKit/android/jni/WebCoreResourceLoader.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANDROID_WEBKIT_RESOURCELOADLISTENER_H -#define ANDROID_WEBKIT_RESOURCELOADLISTENER_H +#ifndef WebCoreResourceLoader_h +#define WebCoreResourceLoader_h #include <KURL.h> #include <ResourceLoaderAndroid.h> diff --git a/Source/WebKit/android/jni/WebCoreViewBridge.h b/Source/WebKit/android/jni/WebCoreViewBridge.h index 59e1c9a..f247602 100644 --- a/Source/WebKit/android/jni/WebCoreViewBridge.h +++ b/Source/WebKit/android/jni/WebCoreViewBridge.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WEBCORE_VIEW_BRIDGE_H -#define WEBCORE_VIEW_BRIDGE_H +#ifndef WebCoreViewBridge_h +#define WebCoreViewBridge_h // TODO: move this outside of jni directory @@ -103,4 +103,4 @@ private: WebCore::IntRect m_visibleBounds; }; -#endif // WEBCORE_VIEW_BRIDGE_H +#endif // WebCoreViewBridge_h diff --git a/Source/WebKit/android/jni/WebFrameView.h b/Source/WebKit/android/jni/WebFrameView.h index 823f2b4..117b603 100644 --- a/Source/WebKit/android/jni/WebFrameView.h +++ b/Source/WebKit/android/jni/WebFrameView.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WEB_FRAMEVIEW_H -#define WEB_FRAMEVIEW_H +#ifndef WebFrameView_h +#define WebFrameView_h #include "WebCoreViewBridge.h" @@ -62,4 +62,4 @@ namespace android { } // namespace android -#endif // WEB_FRAMEVIEW_H +#endif // WebFrameView_h diff --git a/Source/WebKit/android/jni/WebHistory.cpp b/Source/WebKit/android/jni/WebHistory.cpp index dd68a4e..c0a0906 100644 --- a/Source/WebKit/android/jni/WebHistory.cpp +++ b/Source/WebKit/android/jni/WebHistory.cpp @@ -291,8 +291,9 @@ void WebHistoryItem::updateHistoryItem(WebCore::HistoryItem* item) { int refIndex = url.reverseFind('#'); url = url.substring(0, refIndex); } - WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL(url, - WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(url, WebCore::IntSize(16, 16)); if (icon) favicon = webcoreImageToJavaBitmap(env, icon); diff --git a/Source/WebKit/android/jni/WebHistory.h b/Source/WebKit/android/jni/WebHistory.h index 2d86aa4..fc0b340 100644 --- a/Source/WebKit/android/jni/WebHistory.h +++ b/Source/WebKit/android/jni/WebHistory.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANDROID_WEBKIT_WEBHISTORY_H -#define ANDROID_WEBKIT_WEBHISTORY_H +#ifndef WebHistory_h +#define WebHistory_h #include "AndroidWebHistoryBridge.h" diff --git a/Source/WebKit/android/jni/WebIconDatabase.cpp b/Source/WebKit/android/jni/WebIconDatabase.cpp index 83c46f4..d5f8947 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.cpp +++ b/Source/WebKit/android/jni/WebIconDatabase.cpp @@ -66,9 +66,18 @@ jobject webcoreImageToJavaBitmap(JNIEnv* env, WebCore::Image* icon) static WebIconDatabase* gIconDatabaseClient = new WebIconDatabase(); -// XXX: Called by the IconDatabase thread -void WebIconDatabase::dispatchDidAddIconForPageURL(const WTF::String& pageURL) +bool WebIconDatabase::performImport() { + // We don't do do any old-style database importing. + return true; +} + +// Called on the WebCore thread +void WebIconDatabase::didImportIconURLForPageURL(const WTF::String& pageURL) +{ + // FIXME: After http://trac.webkit.org/changeset/81719 this method is called + // on the WebCore thread, so switching threads via this queue is superfluous + // and should be removed. http://b/4565022 mNotificationsMutex.lock(); mNotifications.append(pageURL); if (!mDeliveryRequested) { @@ -78,6 +87,26 @@ void WebIconDatabase::dispatchDidAddIconForPageURL(const WTF::String& pageURL) mNotificationsMutex.unlock(); } +void WebIconDatabase::didImportIconDataForPageURL(const WTF::String& pageURL) +{ + // WebKit1 only has a single "icon did change" notification. + didImportIconURLForPageURL(pageURL); +} + +void WebIconDatabase::didChangeIconForPageURL(const WTF::String& pageURL) +{ + // WebKit1 only has a single "icon did change" notification. + didImportIconURLForPageURL(pageURL); +} + +void WebIconDatabase::didRemoveAllIcons() +{ +} + +void WebIconDatabase::didFinishURLImport() +{ +} + // Called in the WebCore thread void WebIconDatabase::RegisterForIconNotification(WebIconDatabaseClient* client) { @@ -134,7 +163,7 @@ void WebIconDatabase::deliverNotifications() static void Open(JNIEnv* env, jobject obj, jstring path) { - WebCore::IconDatabase& iconDb = WebCore::iconDatabase(); + WebCore::IconDatabaseBase& iconDb = WebCore::iconDatabase(); if (iconDb.isOpen()) return; iconDb.setEnabled(true); @@ -157,7 +186,7 @@ static void Open(JNIEnv* env, jobject obj, jstring path) } if (didSetPermissions) { LOGV("Opening WebIconDatabase file '%s'", pathStr.latin1().data()); - bool res = iconDb.open(pathStr); + bool res = iconDb.open(pathStr, WebCore::IconDatabase::defaultDatabaseFilename()); if (!res) LOGE("Open failed!"); } else @@ -180,8 +209,9 @@ static jobject IconForPageUrl(JNIEnv* env, jobject obj, jstring url) LOG_ASSERT(url, "No url given to iconForPageUrl"); WTF::String urlStr = jstringToWtfString(env, url); - WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL(urlStr, - WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(urlStr, WebCore::IntSize(16, 16)); LOGV("Retrieving icon for '%s' %p", urlStr.latin1().data(), icon); return webcoreImageToJavaBitmap(env, icon); } diff --git a/Source/WebKit/android/jni/WebIconDatabase.h b/Source/WebKit/android/jni/WebIconDatabase.h index b2169aa..3011b9f 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.h +++ b/Source/WebKit/android/jni/WebIconDatabase.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANDROID_WEBKIT_WEBICONDATABASE_H -#define ANDROID_WEBKIT_WEBICONDATABASE_H +#ifndef WebIconDatabase_h +#define WebIconDatabase_h #include "IconDatabaseClient.h" #include "PlatformString.h" @@ -47,8 +47,13 @@ namespace android { class WebIconDatabase : public WebCore::IconDatabaseClient { public: WebIconDatabase() : mDeliveryRequested(false) {} - // IconDatabaseClient method - virtual void dispatchDidAddIconForPageURL(const WTF::String& pageURL); + // IconDatabaseClient methods + virtual bool performImport(); + virtual void didRemoveAllIcons(); + virtual void didImportIconURLForPageURL(const WTF::String&); + virtual void didImportIconDataForPageURL(const WTF::String&); + virtual void didChangeIconForPageURL(const WTF::String&); + virtual void didFinishURLImport(); static void RegisterForIconNotification(WebIconDatabaseClient* client); static void UnregisterForIconNotification(WebIconDatabaseClient* client); diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 601d4ee..a2db69d 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -160,6 +160,10 @@ FILE* gRenderTreeFile = 0; #include "RenderLayerCompositor.h" #endif +#if USE(V8) +#include <v8.h> +#endif + /* We pass this flag when recording the actual content, so that we don't spend time actually regionizing complex path clips, when all we really want to do is record them. @@ -428,6 +432,12 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m #if USE(CHROME_NETWORK_STACK) AndroidNetworkLibraryImpl::InitWithApplicationContext(env, 0); #endif + +#if USE(V8) + // FIXME: This is a work-around for a V8 bug regarding initializing the + // default isolate and should be removed when it is fixed. + v8::V8::Initialize(); +#endif } WebViewCore::~WebViewCore() @@ -2112,7 +2122,7 @@ void WebViewCore::setSelection(int start, int end) bool isPasswordField = false; if (focus->isElementNode()) { WebCore::Element* element = static_cast<WebCore::Element*>(focus); - if (WebCore::InputElement* inputElement = WebCore::toInputElement(element)) + if (WebCore::InputElement* inputElement = element->toInputElement()) isPasswordField = static_cast<WebCore::HTMLInputElement*>(inputElement)->isPasswordField(); } // For password fields, this is done in the UI side via diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h index 0dd45da..877f716 100644 --- a/Source/WebKit/android/jni/WebViewCore.h +++ b/Source/WebKit/android/jni/WebViewCore.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WEBVIEWCORE_H -#define WEBVIEWCORE_H +#ifndef WebViewCore_h +#define WebViewCore_h #include "CacheBuilder.h" #include "CachedHistory.h" @@ -715,4 +715,4 @@ namespace android { } // namespace android -#endif // WEBVIEWCORE_H +#endif // WebViewCore_h diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp index 019ac49..a31169b 100644 --- a/Source/WebKit/android/nav/CacheBuilder.cpp +++ b/Source/WebKit/android/nav/CacheBuilder.cpp @@ -1171,7 +1171,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame, goto keepNode; } // Only use the root contentEditable element - if (node->isContentEditable() && !node->parentOrHostNode()->isContentEditable()) { + if (node->rendererIsEditable() && !node->parentOrHostNode()->rendererIsEditable()) { bounds = absBounds; takesFocus = true; type = CONTENT_EDITABLE_CACHEDNODETYPE; diff --git a/Source/WebKit/android/nav/CacheBuilder.h b/Source/WebKit/android/nav/CacheBuilder.h index d48a045..8f1cc72 100644 --- a/Source/WebKit/android/nav/CacheBuilder.h +++ b/Source/WebKit/android/nav/CacheBuilder.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CacheBuilder_H -#define CacheBuilder_H +#ifndef CacheBuilder_h +#define CacheBuilder_h #include "CachedDebug.h" #include "CachedNodeType.h" diff --git a/Source/WebKit/android/nav/CachedColor.h b/Source/WebKit/android/nav/CachedColor.h index 4b39810..2ba9b18 100644 --- a/Source/WebKit/android/nav/CachedColor.h +++ b/Source/WebKit/android/nav/CachedColor.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedColor_H -#define CachedColor_H +#ifndef CachedColor_h +#define CachedColor_h #include "CachedDebug.h" #include "Color.h" diff --git a/Source/WebKit/android/nav/CachedDebug.h b/Source/WebKit/android/nav/CachedDebug.h index 3d9e012..f77c07a 100644 --- a/Source/WebKit/android/nav/CachedDebug.h +++ b/Source/WebKit/android/nav/CachedDebug.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedDebug_H -#define CachedDebug_H +#ifndef CachedDebug_h +#define CachedDebug_h #define DUMP_NAV_CACHE 0 #define DEBUG_NAV_UI 0 diff --git a/Source/WebKit/android/nav/CachedFrame.h b/Source/WebKit/android/nav/CachedFrame.h index 5802e36..da86521 100644 --- a/Source/WebKit/android/nav/CachedFrame.h +++ b/Source/WebKit/android/nav/CachedFrame.h @@ -23,8 +23,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedFrame_H -#define CachedFrame_H +// FIXME: A file of this name already exists in WebCore/history. +// This file should be renamed. +#ifndef AndroidCachedFrame_h +#define AndroidCachedFrame_h #include "CachedColor.h" #include "CachedInput.h" @@ -282,4 +284,4 @@ public: } -#endif +#endif // AndroidCachedFrame_h diff --git a/Source/WebKit/android/nav/CachedHistory.h b/Source/WebKit/android/nav/CachedHistory.h index e8c1ad9..96975ca 100644 --- a/Source/WebKit/android/nav/CachedHistory.h +++ b/Source/WebKit/android/nav/CachedHistory.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedHistory_H -#define CachedHistory_H +#ifndef CachedHistory_h +#define CachedHistory_h #include "CachedFrame.h" diff --git a/Source/WebKit/android/nav/CachedInput.h b/Source/WebKit/android/nav/CachedInput.h index f7f9eea..a3eabc7 100644 --- a/Source/WebKit/android/nav/CachedInput.h +++ b/Source/WebKit/android/nav/CachedInput.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedInput_H -#define CachedInput_H +#ifndef CachedInput_h +#define CachedInput_h #include "CachedDebug.h" #include "HTMLInputElement.h" diff --git a/Source/WebKit/android/nav/CachedLayer.h b/Source/WebKit/android/nav/CachedLayer.h index 3d963e0..fa427d2 100644 --- a/Source/WebKit/android/nav/CachedLayer.h +++ b/Source/WebKit/android/nav/CachedLayer.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedLayer_H -#define CachedLayer_H +#ifndef CachedLayer_h +#define CachedLayer_h #include "CachedDebug.h" #include "IntRect.h" diff --git a/Source/WebKit/android/nav/CachedNode.h b/Source/WebKit/android/nav/CachedNode.h index f9bcbed..602dda6 100644 --- a/Source/WebKit/android/nav/CachedNode.h +++ b/Source/WebKit/android/nav/CachedNode.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedNode_H -#define CachedNode_H +#ifndef CachedNode_h +#define CachedNode_h #include "CachedDebug.h" #include "CachedNodeType.h" diff --git a/Source/WebKit/android/nav/CachedNodeType.h b/Source/WebKit/android/nav/CachedNodeType.h index 8bc9328..f922946 100644 --- a/Source/WebKit/android/nav/CachedNodeType.h +++ b/Source/WebKit/android/nav/CachedNodeType.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedNodeType_H -#define CachedNodeType_H +#ifndef CachedNodeType_h +#define CachedNodeType_h namespace android { diff --git a/Source/WebKit/android/nav/CachedPrefix.h b/Source/WebKit/android/nav/CachedPrefix.h index 73a5c2c..576aa4a 100644 --- a/Source/WebKit/android/nav/CachedPrefix.h +++ b/Source/WebKit/android/nav/CachedPrefix.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedPrefix_H -#define CachedPrefix_H +#ifndef CachedPrefix_h +#define CachedPrefix_h #ifndef LOG_TAG #define LOG_TAG "navcache" diff --git a/Source/WebKit/android/nav/CachedRoot.h b/Source/WebKit/android/nav/CachedRoot.h index 1f8b851..45fc27a 100644 --- a/Source/WebKit/android/nav/CachedRoot.h +++ b/Source/WebKit/android/nav/CachedRoot.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CachedRoot_H -#define CachedRoot_H +#ifndef CachedRoot_h +#define CachedRoot_h #include "CachedFrame.h" #include "IntRect.h" diff --git a/Source/WebKit/android/nav/ParseCanvas.h b/Source/WebKit/android/nav/ParseCanvas.h index 9b7a889..a34e4ad 100644 --- a/Source/WebKit/android/nav/ParseCanvas.h +++ b/Source/WebKit/android/nav/ParseCanvas.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PARSE_CANVAS_H -#define PARSE_CANVAS_H +#ifndef ParseCanvas_h +#define ParseCanvas_h #include "SkCanvas.h" diff --git a/Source/WebKit/android/nav/SelectText.h b/Source/WebKit/android/nav/SelectText.h index 42239cf..de577ac 100644 --- a/Source/WebKit/android/nav/SelectText.h +++ b/Source/WebKit/android/nav/SelectText.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SELECT_TEXT_H -#define SELECT_TEXT_H +#ifndef SelectText_h +#define SelectText_h #include "DrawExtra.h" #include "IntPoint.h" diff --git a/Source/WebKit/android/plugins/ANPOpenGL_npapi.h b/Source/WebKit/android/plugins/ANPOpenGL_npapi.h index 5aabbc4..0e336a6 100644 --- a/Source/WebKit/android/plugins/ANPOpenGL_npapi.h +++ b/Source/WebKit/android/plugins/ANPOpenGL_npapi.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANPOpenGL_npapi_H -#define ANPOpenGL_npapi_H +#ifndef ANPOpenGL_npapi_h +#define ANPOpenGL_npapi_h #include "android_npapi.h" #include <EGL/egl.h> @@ -60,4 +60,4 @@ struct ANPOpenGLInterfaceV0 : ANPInterface { void (*invertPluginContent)(NPP instance, bool isContentInverted); }; -#endif //ANPOpenGL_npapi_H +#endif // ANPOpenGL_npapi_h diff --git a/Source/WebKit/android/plugins/ANPSurface_npapi.h b/Source/WebKit/android/plugins/ANPSurface_npapi.h index 910a948..5eb240d 100644 --- a/Source/WebKit/android/plugins/ANPSurface_npapi.h +++ b/Source/WebKit/android/plugins/ANPSurface_npapi.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANPSurface_npapi_H -#define ANPSurface_npapi_H +#ifndef ANPSurface_npapi_h +#define ANPSurface_npapi_h #include "android_npapi.h" #include <jni.h> @@ -45,4 +45,4 @@ struct ANPSurfaceInterfaceV0 : ANPInterface { void (*unlock)(JNIEnv* env, jobject surface); }; -#endif //ANPSurface_npapi_H +#endif // ANPSurface_npapi_h diff --git a/Source/WebKit/android/plugins/ANPSystem_npapi.h b/Source/WebKit/android/plugins/ANPSystem_npapi.h index 835bc7c..83cec3b 100644 --- a/Source/WebKit/android/plugins/ANPSystem_npapi.h +++ b/Source/WebKit/android/plugins/ANPSystem_npapi.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANPSystem_npapi_H -#define ANPSystem_npapi_H +#ifndef ANPSystem_npapi_h +#define ANPSystem_npapi_h #include "android_npapi.h" #include <jni.h> @@ -69,4 +69,4 @@ struct ANPSystemInterfaceV2 : ANPInterface { void (*setPowerState)(NPP instance, ANPPowerState powerState); }; -#endif //ANPSystem_npapi_H +#endif // ANPSystem_npapi_h diff --git a/Source/WebKit/android/plugins/ANPVideo_npapi.h b/Source/WebKit/android/plugins/ANPVideo_npapi.h index 18e0231..3d234f2 100644 --- a/Source/WebKit/android/plugins/ANPVideo_npapi.h +++ b/Source/WebKit/android/plugins/ANPVideo_npapi.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANPVideo_npapi_H -#define ANPVideo_npapi_H +#ifndef ANPVideo_npapi_h +#define ANPVideo_npapi_h #include "android_npapi.h" #include <android/native_window.h> @@ -58,4 +58,4 @@ struct ANPVideoInterfaceV0 : ANPInterface { void (*releaseNativeWindow)(NPP instance, ANativeWindow* window); }; -#endif //ANPVideo_npapi_H +#endif // ANPVideo_npapi_h diff --git a/Source/WebKit/android/plugins/PluginDebugAndroid.h b/Source/WebKit/android/plugins/PluginDebugAndroid.h index 5002882..25db830 100644 --- a/Source/WebKit/android/plugins/PluginDebugAndroid.h +++ b/Source/WebKit/android/plugins/PluginDebugAndroid.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PLUGIN_DEBUG_ANDROID_H__ -#define PLUGIN_DEBUG_ANDROID_H__ +#ifndef PluginDebugAndroid_h +#define PluginDebugAndroid_h #include "android_npapi.h" @@ -55,4 +55,4 @@ void anp_logPluginEvent(void* npp, const ANPEvent* event, int16_t returnVal, int #endif -#endif // defined(PLUGIN_DEBUG_ANDROID_H__) +#endif // defined(PluginDebugAndroid_h) diff --git a/Source/WebKit/android/plugins/PluginTimer.h b/Source/WebKit/android/plugins/PluginTimer.h index 231dca5..8aab09f 100644 --- a/Source/WebKit/android/plugins/PluginTimer.h +++ b/Source/WebKit/android/plugins/PluginTimer.h @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PluginTimer_H -#define PluginTimer_H +#ifndef PluginTimer_h +#define PluginTimer_h #include "FastAllocBase.h" #include "RefCounted.h" diff --git a/Source/WebKit/android/plugins/PluginViewBridgeAndroid.h b/Source/WebKit/android/plugins/PluginViewBridgeAndroid.h index 5d16f46..50dd3fc 100644 --- a/Source/WebKit/android/plugins/PluginViewBridgeAndroid.h +++ b/Source/WebKit/android/plugins/PluginViewBridgeAndroid.h @@ -25,8 +25,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PluginViewBridgeAndroid_H -#define PluginViewBridgeAndroid_H +#ifndef PluginViewBridgeAndroid_h +#define PluginViewBridgeAndroid_h #include "PluginView.h" #include "WebCoreViewBridge.h" diff --git a/Source/WebKit/android/plugins/PluginWidgetAndroid.h b/Source/WebKit/android/plugins/PluginWidgetAndroid.h index cbebb7f..0e4cf7e 100644 --- a/Source/WebKit/android/plugins/PluginWidgetAndroid.h +++ b/Source/WebKit/android/plugins/PluginWidgetAndroid.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PluginWidgetAndroid_H -#define PluginWidgetAndroid_H +#ifndef PluginWidgetAndroid_h +#define PluginWidgetAndroid_h #include "android_npapi.h" #include "ANPSystem_npapi.h" diff --git a/Source/WebKit/android/plugins/SurfaceCallback.h b/Source/WebKit/android/plugins/SurfaceCallback.h index 945fc3f..6ed95bd 100644 --- a/Source/WebKit/android/plugins/SurfaceCallback.h +++ b/Source/WebKit/android/plugins/SurfaceCallback.h @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SurfaceCallback_H -#define SurfaceCallback_H +#ifndef SurfaceCallback_h +#define SurfaceCallback_h namespace android { diff --git a/Source/WebKit/android/plugins/android_npapi.h b/Source/WebKit/android/plugins/android_npapi.h index 4ff45c8..23db70b 100644 --- a/Source/WebKit/android/plugins/android_npapi.h +++ b/Source/WebKit/android/plugins/android_npapi.h @@ -32,8 +32,8 @@ functionality is provided via function-ptrs (e.g. time, sound) */ -#ifndef android_npapi_H -#define android_npapi_H +#ifndef android_npapi_h +#define android_npapi_h #include <stdint.h> diff --git a/Source/WebKit/android/smoke/MessageThread.h b/Source/WebKit/android/smoke/MessageThread.h index ca0115b..34ff4af 100644 --- a/Source/WebKit/android/smoke/MessageThread.h +++ b/Source/WebKit/android/smoke/MessageThread.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANDROID_WEBKIT_MESSAGETHREAD_H -#define ANDROID_WEBKIT_MESSAGETHREAD_H +#ifndef MessageThread_h +#define MessageThread_h #include <list> @@ -105,4 +105,4 @@ MessageThread* messageThread(); } // namespace android -#endif // ANDROID_WEBKIT_MESSAGETHREAD_H +#endif // MessageThread_h diff --git a/Source/WebKit/android/smoke/MessageTypes.h b/Source/WebKit/android/smoke/MessageTypes.h index 7da6cb8..4d30648 100644 --- a/Source/WebKit/android/smoke/MessageTypes.h +++ b/Source/WebKit/android/smoke/MessageTypes.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANDROID_WEBKIT_MESSAGETYPES_H_ -#define ANDROID_WEBKIT_MESSAGETYPES_H_ +#ifndef MessageTypes_h +#define MessageTypes_h #include <wtf/CurrentTime.h> @@ -156,4 +156,4 @@ inline Message* NewDelayedMessage(T* object, void (T::*member)(A1), } // namespace android -#endif // ANDROID_WEBKIT_MESSAGETYPES_H_ +#endif // MessageTypes_h diff --git a/Source/WebKit/android/wds/Command.h b/Source/WebKit/android/wds/Command.h index 90861d4..f70559f 100644 --- a/Source/WebKit/android/wds/Command.h +++ b/Source/WebKit/android/wds/Command.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WDS_COMMAND_H -#define WDS_COMMAND_H +#ifndef Command_h +#define Command_h #include "wtf/MainThread.h" #include "wtf/Vector.h" diff --git a/Source/WebKit/android/wds/Connection.h b/Source/WebKit/android/wds/Connection.h index d67179e..2519337 100644 --- a/Source/WebKit/android/wds/Connection.h +++ b/Source/WebKit/android/wds/Connection.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WDS_CONNECTION_H -#define WDS_CONNECTION_H +#ifndef Connection_h +#define Connection_h #include <unistd.h> #include <sys/socket.h> diff --git a/Source/WebKit/android/wds/DebugServer.h b/Source/WebKit/android/wds/DebugServer.h index 3d7a539..693d11a 100644 --- a/Source/WebKit/android/wds/DebugServer.h +++ b/Source/WebKit/android/wds/DebugServer.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DEBUGSERVER_H -#define DEBUGSERVER_H +#ifndef DebugServer_h +#define DebugServer_h // Turn on the wds feature in webkit #define ENABLE_WDS 0 diff --git a/Source/WebKit/android/wds/client/AdbConnection.h b/Source/WebKit/android/wds/client/AdbConnection.h index 58bad67..93e5cda 100644 --- a/Source/WebKit/android/wds/client/AdbConnection.h +++ b/Source/WebKit/android/wds/client/AdbConnection.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WDS_ADB_CONNECTION_H -#define WDS_ADB_CONNECTION_H +#ifndef AdbConnection_h +#define AdbConnection_h #include "DeviceList.h" diff --git a/Source/WebKit/android/wds/client/ClientUtils.h b/Source/WebKit/android/wds/client/ClientUtils.h index 5da1624..7d0db30 100644 --- a/Source/WebKit/android/wds/client/ClientUtils.h +++ b/Source/WebKit/android/wds/client/ClientUtils.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WDS_CLIENT_UTILS_H -#define WDS_CLIENT_UTILS_H +#ifndef ClientUtils_h +#define ClientUtils_h #include <arpa/inet.h> diff --git a/Source/WebKit/android/wds/client/Device.h b/Source/WebKit/android/wds/client/Device.h index 39d4b12..101e2c3 100644 --- a/Source/WebKit/android/wds/client/Device.h +++ b/Source/WebKit/android/wds/client/Device.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WDS_DEVICE_H -#define WDS_DEVICE_H +#ifndef Device_h +#define Device_h #include <stdlib.h> diff --git a/Source/WebKit/android/wds/client/DeviceList.h b/Source/WebKit/android/wds/client/DeviceList.h index 45bfb87..6e2691e 100644 --- a/Source/WebKit/android/wds/client/DeviceList.h +++ b/Source/WebKit/android/wds/client/DeviceList.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WDS_DEVICE_LIST_H -#define WDS_DEVICE_LIST_H +#ifndef DeviceList_h +#define DeviceList_h #include <utils/Vector.h> |