| 3c3d37e22bc472db3c836a0d97e7467058f62c9e |
|
10-Jan-2012 |
Steve Block <steveblock@google.com> |
Fix code including Chromium headers to use WebKit LOG macro, rather than framework LOG macro
Previosuly, the framework, WebKit and Chromium all defined a LOG macro. Logic
in ChromiumIncludes.h made sure that LOG always referred to the framework
implementation.
The framework LOG macro has now been renamed ALOG (b/5449033), so we should
update this logic to make LOG refer to the WebKit implementation.
Bug: 5449033
Change-Id: Ia4793114a8ec0d9da7cbbd261093b73dd9657c93
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| e65004065e90be33dd07d0156623c0777e0cb24d |
|
11-Jan-2012 |
Steve Block <steveblock@google.com> |
Simplify workaround for LOG_ASSERT conflict
Change-Id: Id96b88951fb574a7ab67bd8c5a310d4770111d0e
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| 7bb0007897a2cf3446f14e68f3beb720f46a7bd7 |
|
11-Jan-2012 |
Steve Block <steveblock@google.com> |
Avoid LOG_ASSERT conflicts between the framework and Chromium in AOSP
AOSP defines LOG_ASSERT as well as ALOG_ASSERT, and the former conflicts with
Chromium's LOG_ASSERT. We need to work arund this until LOG_ASSERT is removed
from the framework in AOSP.
Change-Id: I8357486bfd17ea9deb402d07485e8834571f6a22
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| 6dd76b804786ec760bb04b137a6bf017064226dc |
|
09-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519
Bug: 5449033
Change-Id: Icaed25ccf4d689b533101e966e8303810b61b0d4
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| dd14b5fc24b7b5dc7542e8af7249d239efb87516 |
|
09-Nov-2011 |
Kristian Monsen <kristianm@google.com> |
Part of fix for bug 5584571 Add HTTP request header with app name
Getting the app package name from JNI. Cache the string after the
first call.
Add a header to every request with:
X-Requested-With: com.package.name
Change-Id: If9d8c131f6c4203036678516ccae6a7ec9131df9
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| 638aaf75a16aa7ad95fd6a129f52f3890274b2e9 |
|
26-Oct-2011 |
Steve Block <steveblock@google.com> |
Fix debug build
- FrameLoaderClientAndroid::dispatchDidClearWindowObjectInWorld()
FrameLoader::url() was removed in
http://trac.webkit.org/changeset/76872. We should use Document::url()
instead.
- ImageBufferAndroid
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
- Add PluginDebug.cpp to build
- ChromiumIncludes.h
Don't build Chromium code without NDEBUG set
- Frame.cpp
We should not include WebKit files from WebCore. WebViewCore.h introduces
problems due to the change to ChromiumIncludes.h and is not required here.
Bug: 5448972
Change-Id: I82c5c95591bf01fb65179282d03f865df4255c89
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| 5e7eff9cd1c05477ab0e215f5a3d128b6497fc27 |
|
28-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Preparation for fixing bug 5065047: build libchromium as a shared lib
Use FormField from chromium, it is already populated it FormManagerAndroid,
so there is no need for the Android implementation anymore.
Change-Id: I1ee0fbf6895bd64b2fd1d9a6fbd2f0a93e578831
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| 826e01386cb56b34308be375ddf336894081d9a8 |
|
25-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Preparation for fixing bug 5065047: build libchromium as a shared lib
The chrome stack used to just declare the needed jni functions from
webkit and use them as they were static linked. This is not possible
when built as a shared library.
Change-Id: I1c81bc8c8e840dfda49e3941dc5a74d129030f43
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| d20466cbeb31c73eace8f0c4eb6c717b1e1ae540 |
|
21-Jul-2011 |
Shimeng (Simon) Wang <swang@google.com> |
Safely convert punycode IDN to Unicode for display.
Use chromium's net::IDNToUnicode to accomplish this, which adopts
safe measures for converting.
issue: 4384726
Change-Id: If265a849ff0e9d6782705fc1639391bab9e6bcab
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| ebf2dce03f8bdd209dc0aaae609cd6bad8686345 |
|
07-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Updating include paths
chromium CL:
http://codereview.chromium.org/6714032
Also fix another orderding when I was there.
Change-Id: Ie3d53bc3816760f8f0d1a41c5d458968c35afc80
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| 24111c7f4d848be14284815bb6c9a2218740a263 |
|
30-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Compile fix, update include location
chrome/browser/tab_contents/tab_contents.h has moved to
content/browser/tab_contents/tab_contents.h
Change-Id: I899af0a4895f0d6a30850c65c22fbc67c7bedd88
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| 56793b97e67f4ec1e4191836ed00e0a4267fb598 |
|
15-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge changes I637b26fb,Icf028ea9
* changes:
Merge Chromium at r11.0.672.0: Fix autofill
Merge Chromium at r11.0.672.0: Compile fixes
|
| eec5cd31a627a9d05aefe27fe25ff9df92ad1a53 |
|
02-Jun-2011 |
Brian Carlstrom <bdc@google.com> |
Implement net::URLRequest::Delegate::OnCertificateRequested
Following the example of OnSSLCertificateError, implement OnCertificateRequested
ERROR CASE CLIENT CERT CASE
net::URLRequest::Delegate::OnSSLCertificateError net::URLRequest::Delegate::OnCertificateRequested
WebRequest::OnSSLCertificateError WebRequest::OnCertificateRequested
WebUrlLoaderClient::reportSslCertError WebUrlLoaderClient::requestClientCert
WebFrame::reportSslCertError WebFrame::requestClientCert
android.webkit.BrowserFrame.reportSslCertError android.webkit.BrowserFrame.requestClientCert
<... See frameworks/base ...> <... See frameworks/base ...>
android.webkit.BrowserFrame.nativeSslCertErrorProceed android.webkit.BrowserFrame.nativeSslClientCert
WebCoreFrameBridge::SslCertErrorProceed WebCoreFrameBridge::SslClientCert
WebUrlLoaderClient::proceedSslCertError WebUrlLoaderClient::sslClientCert
WebRequest::proceedSslCertError WebRequest::sslClientCert
net::URLRequest::ContinueDespiteLastError net::URLRequest::ContinueWithCertificate
Change-Id: I6513678a3c553bf329640119ff96df9a39a41e49
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| e4a6ca290c7810f10ff4fc136a07db2149422492 |
|
07-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Compile fixes
WebRequestContext.h:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924
Other files:
base/lock.h moved to base/synchronization/lock.h contents
to base namespace:
http://codereview.chromium.org/6018013
Change-Id: Icf028ea9cd32746c6681751bc86935aefb7c0084
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| f5c16878840c58e6e0b1622e0cd950fe27ae7832 |
|
25-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge chromium at 10.0.634.0: Compile fixes
base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/6028009
base/condition_variable.h base/lock.h moved to base/synchronization
and classes added to base namespace:
http://codereview.chromium.org/6018013
Change-Id: I74d14224d6b17df33bc1cc9a5521fd267f4e830c
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| 13cce8a43dd90bd4eec763fbdacb551929cf68c0 |
|
13-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: New argument in the Cache CTOR
Create a default one as it will crash if set to NULL.
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414
Change-Id: Ic22277a95f3cbdb1fa0b6ac65b01f835fb4a407e
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| e76f99d730137b02cb24a8b723fc7526ffe03773 |
|
13-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: profile.h moved to profiles/profile.h
Upstream:
http://codereview.chromium.org/5606002
Change-Id: Ia714f1a1abaca9bef00442f98476d0e8f43eb3e7
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|
| a2c606d1d8312a5d063e4a11e5911d9c8e4a3d19 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Move WebKit/android files to Source
Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
/external/webkit/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
|