| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With this webproxy: authorized extensions can connect to ws://127.0.0.1:10101/tcpproxy,
pass authorization_token:hostname:port: in first frame,
then webproxy establishes TCP connection to hostname:port and forwards any subsequent
communication.
Subsequent communication between extension and webproxy is base64-encoded.
TODO(dilmah): remove this temporary solution, get rid of separate thread and listening socket,
instead provide the same functionality via hooks into websocket layer.
BUG=chromium-os:9667
TEST=Manual
Review URL: http://codereview.chromium.org/6801008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84795 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
BUG=none
TEST=none
R=thakis@chromium.org
Review URL: http://codereview.chromium.org/6985009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84725 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
build:
Autofill phone number enhancements and integration of Phone Number Util Library: part 1
Temporarily the whole library is included, until the patch is upstreamed.
BUG=71443
TEST=Unit-tested
Review URL: http://codereview.chromium.org/6930013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84174 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
BUG=76997
TEST=NONE
Review URL: http://codereview.chromium.org/6879131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84082 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Number Util Library: part 1
Temporarily the whole library is included, until the patch is upstreamed.
BUG=71443
TEST=Unit-tested
Review URL: http://codereview.chromium.org/6803005
TBR=georgey@chromium.org
Review URL: http://codereview.chromium.org/6920006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84009 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
Library: part 1
Temporarily the whole library is included, until the patch is upstreamed.
BUG=71443
TEST=Unit-tested
Review URL: http://codereview.chromium.org/6803005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84000 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
No code modifications other than removing chromium licence block.
BUG=80617
TEST=none
Review URL: http://codereview.chromium.org/6901059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83979 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
This source file was moved from protobuf_full to protobuf_lite in r62331,
but accidentally left in both libraries.
Review URL: http://codereview.chromium.org/6913006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83823 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
BUG=none
TEST=unit_tests
Review URL: http://codereview.chromium.org/6904168
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83752 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
to third_party.
All third party libraries should be in third_party.
The presubmit check complains about jstemplate's README.chromium
being nonstandard; I will fix that in a follow-up.
The interesting changes are to the .grd file and the .py file.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6901102
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/6905149
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83632 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
All third_party libraries should be directly in third_party, not scattered throughout the tree.
Note that net/third_party contains a folder of the same name, I will
move files in there into third_party/mozilla_security_manager later.
BUG=80916
TEST=none
Review URL: http://codereview.chromium.org/6902141
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/6901139
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83627 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
All third_party libraries should be directly in third_party, not scattered throughout the tree.
Note that net/third_party contains a folder of the same name, I will
move files in there into third_party/mozilla_security_manager later.
BUG=80916
TEST=none
Review URL: http://codereview.chromium.org/6902141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83569 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
Allow spaces in the "Name:" field and colors in "Version:".
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6893125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83543 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
All third party libraries should be in third_party.
The presubmit check complains about jstemplate's README.chromium
being nonstandard; I will fix that in a follow-up.
The interesting changes are to the .grd file and the .py file.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6901102
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83452 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
r11696 to r12081.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6905109
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83423 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
Patch from Fabien Tassin <fta@sofaraway.org>.
Review URL: http://codereview.chromium.org/6880214
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83079 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
On Mac, if certificate revocation checking is disabled in the preferences, absolutely no revocation checking will occur, which now also includes bypassing/ignoring the local CRL and OCSP caches.
R=wtc
BUG=78523
TEST=none
Review URL: http://codereview.chromium.org/6879095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82617 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It was removed by error in r77339.
NO CODE CHANGE.
R=mpcomplete@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/6899014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82609 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
This is primarily so I can easly continue to ensure we don't diverge any more from the upstream headers.
BUG=None
TEST=N/A
Review URL: http://codereview.chromium.org/6873157
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82499 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6873055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82007 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
| |
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81788 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
BUG=74035
TEST=see bug
Review URL: http://codereview.chromium.org/6813099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81786 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
the OS settings on OS X.
R=agl
BUG=78523, 79533
TEST=See bug for test case
Review URL: http://codereview.chromium.org/6824069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81702 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
This could help us to cacth code that is accessing free'd memory.
TEST=None
BUG=78791
R=jar
Review URL: http://codereview.chromium.org/6814038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81668 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
Patch from Fabien Tassin <fta@sofaraway.org>.
Review URL: http://codereview.chromium.org/6854031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81645 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The renderer sandbox breaks the Chinese Handwriting shortcut while Chrome
is running, even when Chrome is not active: In a nutshell, Carbon tries to load
the IME in every process, and if that fails, it uninstalls the toggle shorcut. It
fails in the renderer process due to the sandbox. See the bug for details.
Prewarming (patch set 1) doesn't work because that opens up clipboard
access to the renderer – the IME doesn't load correctly if it doesn't have
clipboard access.
dyld __interpose based interposing (patch set 2) doesn't work because
TISCreateInputSourceList and its broken caller are in the same
framework (HIToolbox).
Hence, use binary rewriting to return an arbitrary array with size > 0 to make
HIToolbox believe that the IME loads correctly, so that it doesn't uninstall the
global handwriting keyboard shortcut (only on >= 10.6).
BUG=31225
TEST=Enable Chinese in the input menu. Make sure Chrome's not running.
Note that ctrl-shift-space opens and dismisses the Handwriting IME
(you need a multitouch trackpad for that). Open Chrome, note that the
IME still works.
(If you run Chrome without this patch, the IME will be broken until you do
ps aux | grep Chinese
and then
kill $CHINESE_HANDWRITING_PID
and then toggle the IME once through the Menu Extra menu.)
It is a good idea to have a Terminal open during testing, because killing
the task is the only way to dismiss the IME with the keyboard without this
CL.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=81308
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=81332
Review URL: http://codereview.chromium.org/6801056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81500 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
SQLite generally distributes using a script-generated "Giant file of
stuff", called the amalgamation. It's apparently faster, due to more
opportunities for optimization, but for Chromium the attraction is
that we don't need as many patches to SQLite. Imports of future
versions of SQLite should be simpler, so long as an Ubuntu box is
available.
BUG=71731
TEST=automated testing and watching closely.
Review URL: http://codereview.chromium.org/6835006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81471 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
regression in vm_size_final_r on Mac 10.5 only: http://build.chromium.org/f/chromium/perf/mac-release-10.5/intl2/report.html?history=150&rev=-1&graph=vm_size_final_r]
Revert 81332 - Mac: Let chrome coexist with the Chinese Handwriting IME.The renderer sandbox breaks the Chinese Handwriting shortcut while Chromeis running, even when Chrome is not active: In a nutshell, Carbon tries to loadthe IME in every process, and if that fails, it uninstalls the toggle shorcut. Itfails in the renderer process due to the sandbox. See the bug for details.Prewarming (patch set 1) doesn't work because that opens up clipboardaccess to the renderer - the IME doesn't load correctly if it doesn't haveclipboard access.dyld __interpose based interposing (patch set 2) doesn't work becauseTISCreateInputSourceList and its broken caller are in the sameframework (HIToolbox).Hence, use binary rewriting to return an arbitrary array with size > 0 to makeHIToolbox believe that the IME loads correctly, so that it doesn't uninstall theglobal handwriting keyboard shortcut.BUG=31225TEST=Enable Chinese in the input menu. Make sure Chrome's not running.Note that ctrl-shift-space opens and dismisses the Handwriting IME(you need a multitouch trackpad for that). Open Chrome, note that theIME still works.(If you run Chrome without this patch, the IME will be broken until you do ps aux | grep Chineseand then kill $CHINESE_HANDWRITING_PIDand then toggle the IME once through the Menu Extra menu.)It is a good idea to have a Terminal open during testing, because killingthe task is the only way to dismiss the IME with the keyboard without thisCL.Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=81308Review URL: http://codereview.chromium.org/6801056
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/6836022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81468 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
BUG=none
TEST=none
TBR=mark
Review URL: http://codereview.chromium.org/6834009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81337 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The renderer sandbox breaks the Chinese Handwriting shortcut while Chrome
is running, even when Chrome is not active: In a nutshell, Carbon tries to load
the IME in every process, and if that fails, it uninstalls the toggle shorcut. It
fails in the renderer process due to the sandbox. See the bug for details.
Prewarming (patch set 1) doesn't work because that opens up clipboard
access to the renderer – the IME doesn't load correctly if it doesn't have
clipboard access.
dyld __interpose based interposing (patch set 2) doesn't work because
TISCreateInputSourceList and its broken caller are in the same
framework (HIToolbox).
Hence, use binary rewriting to return an arbitrary array with size > 0 to make
HIToolbox believe that the IME loads correctly, so that it doesn't uninstall the
global handwriting keyboard shortcut.
BUG=31225
TEST=Enable Chinese in the input menu. Make sure Chrome's not running.
Note that ctrl-shift-space opens and dismisses the Handwriting IME
(you need a multitouch trackpad for that). Open Chrome, note that the
IME still works.
(If you run Chrome without this patch, the IME will be broken until you do
ps aux | grep Chinese
and then
kill $CHINESE_HANDWRITING_PID
and then toggle the IME once through the Menu Extra menu.)
It is a good idea to have a Terminal open during testing, because killing
the task is the only way to dismiss the IME with the keyboard without this
CL.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=81308
Review URL: http://codereview.chromium.org/6801056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81332 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
Handwriting IME.The renderer sandbox breaks the Chinese Handwriting shortcut while Chromeis running, even when Chrome is not active: In a nutshell, Carbon tries to loadthe IME in every process, and if that fails, it uninstalls the toggle shorcut. Itfails in the renderer process due to the sandbox. See the bug for details.Prewarming (patch set 1) doesn't work because that opens up clipboardaccess to the renderer – the IME doesn't load correctly if it doesn't haveclipboard access.dyld __interpose based interposing (patch set 2) doesn't work becauseTISCreateInputSourceList and its broken caller are in the sameframework (HIToolbox).Hence, use binary rewriting to return an arbitrary array with size > 0 to makeHIToolbox believe that the IME loads correctly, so that it doesn't uninstall theglobal handwriting keyboard shortcut.BUG=31225TEST=Enable Chinese in the input menu. Make sure Chrome's not running.Note that ctrl-shift-space opens and dismisses the Handwriting IME(you need a multitouch trackpad for that). Open Chrome, note that theIME still works.(If you run Chrome without this patch, the IME will be broken until you do ps aux | grep Chineseand then kill $CHINESE_HANDWRITING_PIDand then toggle the IME once through the Menu Extra menu.)It is a good idea to have a Terminal open during testing, because killingthe task is the only way to dismiss the IME with the keyboard without thisCL.Review URL: http://codereview.chromium.org/6801056
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/6839001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81318 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The renderer sandbox breaks the Chinese Handwriting shortcut while Chrome
is running, even when Chrome is not active: In a nutshell, Carbon tries to load
the IME in every process, and if that fails, it uninstalls the toggle shorcut. It
fails in the renderer process due to the sandbox. See the bug for details.
Prewarming (patch set 1) doesn't work because that opens up clipboard
access to the renderer – the IME doesn't load correctly if it doesn't have
clipboard access.
dyld __interpose based interposing (patch set 2) doesn't work because
TISCreateInputSourceList and its broken caller are in the same
framework (HIToolbox).
Hence, use binary rewriting to return an arbitrary array with size > 0 to make
HIToolbox believe that the IME loads correctly, so that it doesn't uninstall the
global handwriting keyboard shortcut.
BUG=31225
TEST=Enable Chinese in the input menu. Make sure Chrome's not running.
Note that ctrl-shift-space opens and dismisses the Handwriting IME
(you need a multitouch trackpad for that). Open Chrome, note that the
IME still works.
(If you run Chrome without this patch, the IME will be broken until you do
ps aux | grep Chinese
and then
kill $CHINESE_HANDWRITING_PID
and then toggle the IME once through the Menu Extra menu.)
It is a good idea to have a Terminal open during testing, because killing
the task is the only way to dismiss the IME with the keyboard without this
CL.
Review URL: http://codereview.chromium.org/6801056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81308 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Get things spic-n-span for converting to the amalgamation, then SQLite
3.7.x.
sqlite3Preload -> sqlite3_preload because in the amalgamation, sqlite3_ is the key bit to make sure things aren't marked static.
AFAICT, SQLite 3.6.18 was not imported correctly last time, throwing
up spurious deltas. Re-import and re-apply patches.
Remove a bunch of Gears-related stuff. Quite some time ago the
Chromium and Gears SQLite imports were brought into line, but they
were never fully shared. Nowadays these are completely useless:
- remove fts1 patches.
- add a Chromium test to make sure fts1 doesn't sneak in.
- drop the Symbian stuff.
- drop database poisoning.
Pull out the WebDatabase patch into a patch file. Move ICU shell
changes into a distinct patch file. Pull out testing patches into a
separate test.patch.
BUG=71731
TEST=automated testing and watching closely.
Review URL: http://codereview.chromium.org/6823057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81296 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
No behavior change.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6825059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81184 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It looked at the wrong file contents for its checks, and it had
a redundant check for name. The "Security Critical" text had a
different spelling than in README.chromium.template.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6820055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81181 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
Split off the C++ protobuf files into its own library.
BUG=
TEST=
Review URL: http://codereview.chromium.org/6801033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80969 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It was renamed to files2 to avoid conflicts with existing files. Now
that it's been on the tree for a while as files2, it's safe to rename
it back.
BUG=
TEST=
Review URL: http://codereview.chromium.org/6810035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80951 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Temporarily rename the subdirectory files to files2 to avoid problems
with the trybots/buildbots.
BUG=
TEST=
Review URL: http://codereview.chromium.org/6810030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80868 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
BUG=N/A
TEST=N/A
Review URL: http://codereview.chromium.org/6816003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80727 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This removes the explicit dependency on base/scoped_ptr.h.
Also set chromium_code=1, as all compile warnings/errors with that setting
have been fixed.
BUG=77804
TEST=
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=80431
Review URL: http://codereview.chromium.org/6794042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80517 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This removes the explicit dependency on base/scoped_ptr.h.
Also set chromium_code=1, as all compile warnings/errors with that setting
have been fixed.
BUG=77804
TEST=
Review URL: http://codereview.chromium.org/6794042
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/6792046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80433 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This removes the explicit dependency on base/scoped_ptr.h.
Also set chromium_code=1, as all compile warnings/errors with that setting
have been fixed.
BUG=77804
TEST=
Review URL: http://codereview.chromium.org/6794042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80431 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
Patch originally by Pascal Massimino:
http://codereview.chromium.org/6760004/
Review URL: http://codereview.chromium.org/6793035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80421 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
Patch from Fabien Tassin <fta@sofaraway.org>.
Review URL: http://codereview.chromium.org/6720028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80371 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(This is a reland of r80810.)
1) Got an upstream diff 346:371 from svn
2) Pruned files from the diff that we don't have, as well as
descriptor.pb.*
3) Applied and fixed the merge failures.
4) Copied the code (less descriptor.pb.*) back into the svn source.
5) Manually fixed descriptor.pb.* and plugin.pb.* there.
6) Ran ./generate_descriptor_proto.sh and copied the updated files back.
7) Added new source files to the protoc target in protobuf.gyp.
BUG=none
TEST=sync_unit_tests
Review URL: http://codereview.chromium.org/6737030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80265 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
This reverts commit r80180
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80183 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1) Got an upstream diff 346:371 from svn
2) Pruned files from the diff that we don't have, as well as
descriptor.pb.*
3) Applied and fixed the merge failures.
4) Copied the code (less descriptor.pb.*) back into the svn source.
5) Manually fixed descriptor.pb.* and plugin.pb.* there.
6) Ran ./generate_descriptor_proto.sh and copied the updated files back.
7) Added new source files to the protoc target in protobuf.gyp.
BUG=none
TEST=sync_unit_tests
Review URL: http://codereview.chromium.org/6737030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80180 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
and contain the proper meta data when files within third_party are modified.
Also fixed _CheckNoInterfacesInBase() which was broken on win32 as the path seperator was hardcoded.
BUG=None
TEST=N/A
Review URL: http://codereview.chromium.org/6713009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80051 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
enables [wk_]png_get_image_width, [wk_]png_get_image_height, and
[wk_]png_get_interlace_type, required for
https://bugs.webkit.org/show_bug.cgi?id=54406.
This is needed to allow WebKit to build with libpng 1.5, which no longer allows
direct access to the underlying struct members without using the "easy access"
accessors.
BUG=webkit:54406
TEST=That patch can land without breaking Chromium
Review URL: http://codereview.chromium.org/6708113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79710 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
I'm going to use this to write layout test checksums to the
expected png files.
Review URL: http://codereview.chromium.org/6696085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79592 0039d316-1c4b-4281-b951-d872f2087c98
|