diff options
| author | Steve Block <steveblock@google.com> | 2010-03-17 18:23:16 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-03-17 18:57:45 +0000 |
| commit | 363d073b4eb761499b7bf1d6834b00e9551406e4 (patch) | |
| tree | a69daf74dcc42fb5a5b69df37ae86c511f8a37de /WebCore/page | |
| parent | 02fe43bef497d2b2f8ca88b5d495374cf86ba11d (diff) | |
| download | external_webkit-363d073b4eb761499b7bf1d6834b00e9551406e4.zip external_webkit-363d073b4eb761499b7bf1d6834b00e9551406e4.tar.gz external_webkit-363d073b4eb761499b7bf1d6834b00e9551406e4.tar.bz2 | |
Fixes the Mac build
- JavaInstanceJSC.cpp - Adds ANDROID guards around some temporary logging
- Geolocation.cpp - Adds ANDROID guards around changes waiting to be upstreamed
- WebChromeClient.h / EmptyClients.h - Pulls the Mac part of a WebKit change for which only the Android part was cherry-picked in https://android-git.corp.google.com/g/#change,41747
Change-Id: Ide97cb6b05e78528fe4b9430466837dedaadc4cf
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/Geolocation.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 6085b32..a885062 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -38,7 +38,9 @@ // END ANDROID #include "Frame.h" #include "Page.h" +#if PLATFORM(ANDROID) #include "PlatformBridge.h" +#endif #include <wtf/CurrentTime.h> #if ENABLE(CLIENT_BASED_GEOLOCATION) |