diff options
author | Steve Block <steveblock@google.com> | 2010-10-22 01:54:35 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-22 01:54:35 -0700 |
commit | 316ab5ab03a283a98054fe192c4150536165fec3 (patch) | |
tree | d5734a2fc92f9b3b15a6d739ea3e0000ba1daa56 | |
parent | b92850e0391d674b9c4826b66105aaa3dd3eef96 (diff) | |
parent | 7082a91c23f6faa7d36c7ca2cbe3222e9345a19b (diff) | |
download | external_webkit-316ab5ab03a283a98054fe192c4150536165fec3.zip external_webkit-316ab5ab03a283a98054fe192c4150536165fec3.tar.gz external_webkit-316ab5ab03a283a98054fe192c4150536165fec3.tar.bz2 |
Merge "Fix a compiler warning in WebRequest.cpp"
-rw-r--r-- | WebKit/android/WebCoreSupport/WebRequest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequest.cpp b/WebKit/android/WebCoreSupport/WebRequest.cpp index 77e1acb..b584796 100644 --- a/WebKit/android/WebCoreSupport/WebRequest.cpp +++ b/WebKit/android/WebCoreSupport/WebRequest.cpp @@ -63,9 +63,9 @@ WebRequest::WebRequest(WebUrlLoaderClient* loader, const WebResourceRequest& web : m_urlLoader(loader) , m_inputStream(0) , m_androidUrl(false) - , m_loadState(Created) , m_url(webResourceRequest.url()) , m_userAgent(webResourceRequest.userAgent()) + , m_loadState(Created) { GURL gurl(m_url); @@ -81,9 +81,9 @@ WebRequest::WebRequest(WebUrlLoaderClient* loader, const WebResourceRequest& web WebRequest::WebRequest(WebUrlLoaderClient* loader, const WebResourceRequest& webResourceRequest, int inputStream) : m_urlLoader(loader) , m_androidUrl(true) - , m_loadState(Created) , m_url(webResourceRequest.url()) , m_userAgent(webResourceRequest.userAgent()) + , m_loadState(Created) { JNIEnv* env = JSC::Bindings::getJNIEnv(); m_inputStream = (int)env->NewGlobalRef((_jobject*)inputStream); |