diff options
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 4 | ||||
| -rw-r--r-- | WebKit/android/wds/client/ClientUtils.h | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index c358d90..afe0da9 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1674,13 +1674,13 @@ public: SkASSERT(count > 1); const Vector<HTMLElement*>& items = m_select->listItems(); - size_t totalItems = items.size(); + int totalItems = static_cast<int>(items.size()); // Keep track of the position of the value we are comparing against. int arrayIndex = 0; // The value we are comparing against. int selection = array[arrayIndex]; WebCore::HTMLOptionElement* option; - for (size_t listIndex = 0; listIndex < totalItems; listIndex++) { + for (int listIndex = 0; listIndex < totalItems; listIndex++) { if (items[listIndex]->hasLocalName(WebCore::HTMLNames::optionTag)) { option = static_cast<WebCore::HTMLOptionElement*>( items[listIndex]); diff --git a/WebKit/android/wds/client/ClientUtils.h b/WebKit/android/wds/client/ClientUtils.h index 0aa068e..261af27 100644 --- a/WebKit/android/wds/client/ClientUtils.h +++ b/WebKit/android/wds/client/ClientUtils.h @@ -28,6 +28,14 @@ #include <arpa/inet.h> +/* + * included for sockaddr_in structure, AF_INET definiton and etc. + */ +#ifdef __FreeBSD__ +#include <netinet/in.h> +#include <sys/socket.h> +#endif + // Callers need to include Log.h and errno.h to use this macro #define log_errno(str) LOGE("%s: %s", str, strerror(errno)) |