diff options
8 files changed, 24 insertions, 31 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index e8120f9..576cfe8 100644 --- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -273,24 +273,14 @@ void GraphicsLayerAndroid::setPosition(const FloatPoint& point) if (point == m_position) return; - FloatPoint pos(point); -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - // Add the scroll position back in. When scrolling a layer, all the children - // are positioned based on the content scroll. Adding the scroll position - // back in allows the children to draw based on 0,0. - RenderLayer* layer = renderLayerFromClient(m_client); - if (layer && layer->parent() && layer->parent()->hasOverflowScroll()) - pos += layer->parent()->scrolledContentOffset(); -#endif - - GraphicsLayer::setPosition(pos); + GraphicsLayer::setPosition(point); #ifdef LAYER_DEBUG_2 LOG("(%x) setPosition(%.2f,%.2f) pos(%.2f, %.2f) anchor(%.2f,%.2f) size(%.2f, %.2f)", this, point.x(), point.y(), m_position.x(), m_position.y(), m_anchorPoint.x(), m_anchorPoint.y(), m_size.width(), m_size.height()); #endif - m_contentLayer->setPosition(pos.x(), pos.y()); + m_contentLayer->setPosition(point.x(), point.y()); askForSync(); } diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h index 8166eb7..bea78eb 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h +++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h @@ -58,6 +58,7 @@ #include <base/tuple.h> #include <chrome/browser/net/sqlite_persistent_cookie_store.h> #include <net/base/auth.h> +#include <net/base/cert_verifier.h> #include <net/base/cookie_monster.h> #include <net/base/cookie_policy.h> #include <net/base/data_url.h> @@ -86,7 +87,7 @@ #include <base/string16.h> #include <base/utf_string_conversions.h> #include <chrome/browser/autofill/autofill_host.h> -#include <chrome/browser/profile.h> +#include <chrome/browser/profiles/profile.h> #include <chrome/browser/tab_contents/tab_contents.h> #include <webkit/glue/form_data.h> #endif diff --git a/Source/WebKit/android/WebCoreSupport/WebCache.cpp b/Source/WebKit/android/WebCoreSupport/WebCache.cpp index be9a700..a15bf7f 100644 --- a/Source/WebKit/android/WebCoreSupport/WebCache.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebCache.cpp @@ -116,6 +116,7 @@ WebCache::WebCache(bool isPrivateBrowsing) } m_cache = new net::HttpCache(m_hostResolver.get(), + new CertVerifier(), 0, // dnsrr_resolver 0, // dns_cert_checker net::ProxyService::CreateWithoutProxyResolver(m_proxyConfigService, 0 /* net_log */), diff --git a/Source/WebKit/android/WebCoreSupport/WebRequest.cpp b/Source/WebKit/android/WebCoreSupport/WebRequest.cpp index a7321da..7c6b9ea 100644 --- a/Source/WebKit/android/WebCoreSupport/WebRequest.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebRequest.cpp @@ -75,7 +75,7 @@ WebRequest::WebRequest(WebUrlLoaderClient* loader, const WebResourceRequest& web { GURL gurl(m_url); - m_request = new URLRequest(gurl, this); + m_request = new net::URLRequest(gurl, this); m_request->SetExtraRequestHeaders(webResourceRequest.requestHeaders()); m_request->set_referrer(webResourceRequest.referrer()); @@ -367,7 +367,7 @@ void WebRequest::handleBrowserURL(GURL url) // The caller must set |*defer_redirect| to false, so that delegates do not // need to set it if they are happy with the default behavior of not // deferring redirect. -void WebRequest::OnReceivedRedirect(URLRequest* newRequest, const GURL& newUrl, bool* deferRedirect) +void WebRequest::OnReceivedRedirect(net::URLRequest* newRequest, const GURL& newUrl, bool* deferRedirect) { ASSERT(m_loadState < Response, "Redirect after receiving response"); ASSERT(newRequest && newRequest->status().is_success(), "Invalid redirect"); @@ -386,7 +386,7 @@ void WebRequest::OnReceivedRedirect(URLRequest* newRequest, const GURL& newUrl, // or request->CancelAuth() to cancel the login and display the error page. // When it does so, the request will be reissued, restarting the sequence // of On* callbacks. -void WebRequest::OnAuthRequired(URLRequest* request, net::AuthChallengeInfo* authInfo) +void WebRequest::OnAuthRequired(net::URLRequest* request, net::AuthChallengeInfo* authInfo) { ASSERT(m_loadState == Started, "OnAuthRequired called on a WebRequest not in STARTED state (state=%d)", m_loadState); @@ -400,10 +400,11 @@ void WebRequest::OnAuthRequired(URLRequest* request, net::AuthChallengeInfo* aut // Called when we received an SSL certificate error. The delegate will provide // the user the options to proceed, cancel, or view certificates. -void WebRequest::OnSSLCertificateError(URLRequest* request, int cert_error, net::X509Certificate* cert) +void WebRequest::OnSSLCertificateError(net::URLRequest* request, int cert_error, net::X509Certificate* cert) { + scoped_refptr<net::X509Certificate> scoped_cert = cert; m_urlLoader->maybeCallOnMainThread(NewRunnableMethod( - m_urlLoader.get(), &WebUrlLoaderClient::reportSslCertError, cert_error, cert)); + m_urlLoader.get(), &WebUrlLoaderClient::reportSslCertError, cert_error, scoped_cert)); } // After calling Start(), the delegate will receive an OnResponseStarted @@ -412,7 +413,7 @@ void WebRequest::OnSSLCertificateError(URLRequest* request, int cert_error, net: // followed and the final response is beginning to arrive. At this point, // meta data about the response is available, including for example HTTP // response headers if this is a request for a HTTP resource. -void WebRequest::OnResponseStarted(URLRequest* request) +void WebRequest::OnResponseStarted(net::URLRequest* request) { ASSERT(m_loadState == Started, "Got response after receiving response"); @@ -511,7 +512,7 @@ bool WebRequest::read(int* bytesRead) // // If an error occurred, request->status() will contain the error, // and bytes read will be -1. -void WebRequest::OnReadCompleted(URLRequest* request, int bytesRead) +void WebRequest::OnReadCompleted(net::URLRequest* request, int bytesRead) { ASSERT(m_loadState == Response || m_loadState == GotData, "OnReadCompleted in state other than RESPONSE and GOTDATA"); diff --git a/Source/WebKit/android/WebCoreSupport/WebRequest.h b/Source/WebKit/android/WebCoreSupport/WebRequest.h index 252267b..4d18599 100644 --- a/Source/WebKit/android/WebCoreSupport/WebRequest.h +++ b/Source/WebKit/android/WebCoreSupport/WebRequest.h @@ -50,7 +50,7 @@ class WebResourceRequest; class WebUrlLoaderClient; // All methods in this class must be called on the io thread -class WebRequest : public URLRequest::Delegate, public base::RefCountedThreadSafe<WebRequest> { +class WebRequest : public net::URLRequest::Delegate, public base::RefCountedThreadSafe<WebRequest> { public: WebRequest(WebUrlLoaderClient*, const WebResourceRequest&); @@ -72,11 +72,11 @@ public: void pauseLoad(bool pause); // From URLRequest::Delegate - virtual void OnReceivedRedirect(URLRequest*, const GURL&, bool* deferRedirect); - virtual void OnResponseStarted(URLRequest*); - virtual void OnReadCompleted(URLRequest*, int bytesRead); - virtual void OnAuthRequired(URLRequest*, net::AuthChallengeInfo*); - virtual void OnSSLCertificateError(URLRequest* request, int cert_error, net::X509Certificate* cert); + virtual void OnReceivedRedirect(net::URLRequest*, const GURL&, bool* deferRedirect); + virtual void OnResponseStarted(net::URLRequest*); + virtual void OnReadCompleted(net::URLRequest*, int bytesRead); + virtual void OnAuthRequired(net::URLRequest*, net::AuthChallengeInfo*); + virtual void OnSSLCertificateError(net::URLRequest* request, int cert_error, net::X509Certificate* cert); // Methods called during a request by the UI code (via WebUrlLoaderClient). void setAuth(const string16& username, const string16& password); @@ -102,7 +102,7 @@ private: void updateLoadFlags(int& loadFlags); scoped_refptr<WebUrlLoaderClient> m_urlLoader; - OwnPtr<URLRequest> m_request; + OwnPtr<net::URLRequest> m_request; scoped_refptr<net::IOBuffer> m_networkBuffer; scoped_ptr<UrlInterceptResponse> m_interceptResponse; bool m_androidUrl; diff --git a/Source/WebKit/android/WebCoreSupport/WebResponse.cpp b/Source/WebKit/android/WebCoreSupport/WebResponse.cpp index 4d297d7..0f6d236 100644 --- a/Source/WebKit/android/WebCoreSupport/WebResponse.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebResponse.cpp @@ -37,7 +37,7 @@ using namespace std; namespace android { -WebResponse::WebResponse(URLRequest* request) +WebResponse::WebResponse(net::URLRequest* request) : m_httpStatusCode(0) { // The misleadingly-named os_error() is actually a net::Error enum constant. diff --git a/Source/WebKit/android/WebCoreSupport/WebResponse.h b/Source/WebKit/android/WebCoreSupport/WebResponse.h index 88c8917..44a2e65 100644 --- a/Source/WebKit/android/WebCoreSupport/WebResponse.h +++ b/Source/WebKit/android/WebCoreSupport/WebResponse.h @@ -44,7 +44,7 @@ class WebResponse { public: WebResponse() {} - WebResponse(URLRequest*); + WebResponse(net::URLRequest*); WebResponse(const std::string &url, const std::string &mimeType, long long expectedSize, const std::string &encoding, int httpStatusCode); const std::string& getUrl() const; diff --git a/Source/WebKit/android/jni/CookieManager.cpp b/Source/WebKit/android/jni/CookieManager.cpp index 0bdf303..f8c2dee 100644 --- a/Source/WebKit/android/jni/CookieManager.cpp +++ b/Source/WebKit/android/jni/CookieManager.cpp @@ -110,8 +110,8 @@ static void removeSessionCookies(WebCookieJar* cookieJar) { #if USE(CHROME_NETWORK_STACK) CookieMonster* cookieMonster = cookieJar->cookieStore()->GetCookieMonster(); - CookieMonster::CookieList cookies = cookieMonster->GetAllCookies(); - for (CookieMonster::CookieList::const_iterator iter = cookies.begin(); iter != cookies.end(); ++iter) { + CookieList cookies = cookieMonster->GetAllCookies(); + for (CookieList::const_iterator iter = cookies.begin(); iter != cookies.end(); ++iter) { if (iter->IsSessionCookie()) cookieMonster->DeleteCanonicalCookie(*iter); } |