Skip to content

Commit a5fb016

Browse files
author
[email protected]
committed
Update to Chromium revision beafd8cb (#314338).
- Remove unused CefContextMenuHandler::GetMisspellingHash() method. git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk/cef3@2020 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
1 parent 556750e commit a5fb016

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+330
-243
lines changed

‎CHROMIUM_BUILD_COMPATIBILITY.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# https://code.google.com/p/chromiumembedded/wiki/BranchesAndBuilding
88

99
{
10-
'chromium_checkout': 'd3cf92cac313434de99ae66f6e3e12d27ab536ef',
10+
'chromium_checkout': 'beafd8cb70f31a44502a9040af396b8cd61dcdb1',
1111
}

‎cef.gyp

+2-17
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,8 @@
867867
'<(DEPTH)/components/components.gyp:pdf_common',
868868
'<(DEPTH)/components/components.gyp:pdf_renderer',
869869
'<(DEPTH)/components/components.gyp:pref_registry',
870+
'<(DEPTH)/components/components.gyp:printing_common',
871+
'<(DEPTH)/components/components.gyp:printing_renderer',
870872
'<(DEPTH)/components/components.gyp:user_prefs',
871873
'<(DEPTH)/components/components.gyp:web_cache_renderer',
872874
'<(DEPTH)/content/content.gyp:content_app_both',
@@ -1136,25 +1138,15 @@
11361138
'<(DEPTH)/chrome/browser/printing/printer_query.h',
11371139
'<(DEPTH)/chrome/common/extensions/extension_constants.cc',
11381140
'<(DEPTH)/chrome/common/extensions/extension_constants.h',
1139-
'<(DEPTH)/chrome/common/print_messages.cc',
1140-
'<(DEPTH)/chrome/common/print_messages.h',
11411141
'<(DEPTH)/chrome/renderer/pepper/chrome_pdf_print_client.cc',
11421142
'<(DEPTH)/chrome/renderer/pepper/chrome_pdf_print_client.h',
1143-
'<(DEPTH)/chrome/renderer/printing/print_web_view_helper.cc',
1144-
'<(DEPTH)/chrome/renderer/printing/print_web_view_helper.h',
11451143
'<(DEPTH)/extensions/common/constants.cc',
11461144
'<(DEPTH)/extensions/common/constants.h',
11471145
# Include header for stub creation (BrowserProcess) so print_job_worker can
11481146
# determine the current locale.
11491147
'<(DEPTH)/chrome/browser/browser_process.cc',
11501148
'<(DEPTH)/chrome/browser/browser_process.h',
11511149
# Include sources for spell checking support.
1152-
'<(DEPTH)/chrome/browser/spellchecker/feedback.cc',
1153-
'<(DEPTH)/chrome/browser/spellchecker/feedback.h',
1154-
'<(DEPTH)/chrome/browser/spellchecker/feedback_sender.cc',
1155-
'<(DEPTH)/chrome/browser/spellchecker/feedback_sender.h',
1156-
'<(DEPTH)/chrome/browser/spellchecker/misspelling.cc',
1157-
'<(DEPTH)/chrome/browser/spellchecker/misspelling.h',
11581150
'<(DEPTH)/chrome/browser/spellchecker/spellcheck_action.cc',
11591151
'<(DEPTH)/chrome/browser/spellchecker/spellcheck_action.h',
11601152
'<(DEPTH)/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc',
@@ -1171,8 +1163,6 @@
11711163
'<(DEPTH)/chrome/browser/spellchecker/spellcheck_service.h',
11721164
'<(DEPTH)/chrome/browser/spellchecker/spelling_service_client.cc',
11731165
'<(DEPTH)/chrome/browser/spellchecker/spelling_service_client.h',
1174-
'<(DEPTH)/chrome/browser/spellchecker/word_trimmer.cc',
1175-
'<(DEPTH)/chrome/browser/spellchecker/word_trimmer.h',
11761166
'<(DEPTH)/chrome/common/chrome_constants.cc',
11771167
'<(DEPTH)/chrome/common/spellcheck_common.cc',
11781168
'<(DEPTH)/chrome/common/spellcheck_common.h',
@@ -1209,7 +1199,6 @@
12091199
'<(DEPTH)/chrome/browser/printing/pdf_to_emf_converter.cc',
12101200
'<(DEPTH)/chrome/browser/printing/pdf_to_emf_converter.h',
12111201
'<(DEPTH)/chrome/common/chrome_utility_printing_messages.h',
1212-
'<(DEPTH)/chrome/renderer/printing/print_web_view_helper_pdf_win.cc',
12131202
],
12141203
}],
12151204
[ 'OS=="mac"', {
@@ -1223,8 +1212,6 @@
12231212
'libcef/browser/render_widget_host_view_osr_mac.mm',
12241213
'libcef/browser/text_input_client_osr_mac.mm',
12251214
'libcef/browser/text_input_client_osr_mac.h',
1226-
# Include sources for printing.
1227-
'<(DEPTH)/chrome/renderer/printing/print_web_view_helper_mac.mm',
12281215
# Include sources for spell checking support.
12291216
'<(DEPTH)/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc',
12301217
'<(DEPTH)/chrome/browser/spellchecker/spellcheck_message_filter_mac.h',
@@ -1247,8 +1234,6 @@
12471234
'libcef/browser/render_widget_host_view_osr_linux.cc',
12481235
'libcef/browser/window_x11.cc',
12491236
'libcef/browser/window_x11.h',
1250-
#Include sources for printing.
1251-
'<(DEPTH)/chrome/renderer/printing/print_web_view_helper_linux.cc',
12521237
],
12531238
}],
12541239
['os_posix == 1 and OS != "mac" and android_webview_build != 1', {

‎cef.gypi

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
# Directory for CEF source files.
1414
[ 'OS=="win"', {
1515
'cef_directory' : '<!(echo %CEF_DIRECTORY%)',
16-
# Disable tcmalloc's debugallocation to avoid crashing during startup.
17-
'disable_debugallocation': 1,
1816
}, { # OS!="win"
1917
'cef_directory' : '<!(echo $CEF_DIRECTORY)',
2018
}],

‎include/capi/cef_context_menu_handler_capi.h

-7
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,6 @@ typedef struct _cef_context_menu_params_t {
206206
cef_string_userfree_t (CEF_CALLBACK *get_misspelled_word)(
207207
struct _cef_context_menu_params_t* self);
208208

209-
///
210-
// Returns the hash of the misspelled word, if any, that the context menu was
211-
// invoked on.
212-
///
213-
int (CEF_CALLBACK *get_misspelling_hash)(
214-
struct _cef_context_menu_params_t* self);
215-
216209
///
217210
// Returns true (1) if suggestions exist, false (0) otherwise. Fills in
218211
// |suggestions| from the spell check service for the misspelled word if there

‎include/cef_context_menu_handler.h

-7
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,6 @@ class CefContextMenuParams : public virtual CefBase {
200200
/*--cef()--*/
201201
virtual CefString GetMisspelledWord() =0;
202202

203-
///
204-
// Returns the hash of the misspelled word, if any, that the context menu was
205-
// invoked on.
206-
///
207-
/*--cef()--*/
208-
virtual int GetMisspellingHash() =0;
209-
210203
///
211204
// Returns true if suggestions exist, false otherwise. Fills in |suggestions|
212205
// from the spell check service for the misspelled word if there is one.

‎libcef/browser/browser_host_impl.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -983,9 +983,9 @@ void CefBrowserHostImpl::WasHidden(bool hidden) {
983983
web_contents()->GetRenderViewHost()->GetView());
984984
if (view) {
985985
if (hidden)
986-
view->WasHidden();
986+
view->Hide();
987987
else
988-
view->WasShown();
988+
view->Show();
989989
}
990990
}
991991

@@ -2492,7 +2492,7 @@ void CefBrowserHostImpl::DidFailLoad(
24922492
OnLoadEnd(frame, validated_url, error_code);
24932493
}
24942494

2495-
void CefBrowserHostImpl::FrameDetached(
2495+
void CefBrowserHostImpl::FrameDeleted(
24962496
content::RenderFrameHost* render_frame_host) {
24972497
base::AutoLock lock_scope(state_lock_);
24982498

‎libcef/browser/browser_host_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
443443
const GURL& validated_url,
444444
int error_code,
445445
const base::string16& error_description) override;
446-
void FrameDetached(
446+
void FrameDeleted(
447447
content::RenderFrameHost* render_frame_host) override;
448448
void PluginCrashed(const base::FilePath& plugin_path,
449449
base::ProcessId plugin_pid) override;

‎libcef/browser/context_menu_params_impl.cc

-5
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@ CefString CefContextMenuParamsImpl::GetMisspelledWord() {
100100
return const_value().misspelled_word;
101101
}
102102

103-
int CefContextMenuParamsImpl::GetMisspellingHash() {
104-
CEF_VALUE_VERIFY_RETURN(false, 0);
105-
return const_value().misspelling_hash;
106-
}
107-
108103
bool CefContextMenuParamsImpl::GetDictionarySuggestions(
109104
std::vector<CefString>& suggestions) {
110105
CEF_VALUE_VERIFY_RETURN(false, false);

‎libcef/browser/context_menu_params_impl.h

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class CefContextMenuParamsImpl
3232
MediaStateFlags GetMediaStateFlags() override;
3333
CefString GetSelectionText() override;
3434
CefString GetMisspelledWord() override;
35-
int GetMisspellingHash() override;
3635
bool GetDictionarySuggestions(
3736
std::vector<CefString>& suggestions) override;
3837
bool IsEditable() override;

‎libcef/browser/devtools_delegate.cc

+18-13
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "content/public/common/content_switches.h"
2929
#include "content/public/common/url_constants.h"
3030
#include "grit/cef_resources.h"
31+
#include "net/base/net_errors.h"
3132
#include "net/socket/tcp_server_socket.h"
3233
#include "ui/base/layout.h"
3334
#include "ui/base/resource/resource_bundle.h"
@@ -38,27 +39,36 @@ const char kTargetTypePage[] = "page";
3839
const char kTargetTypeServiceWorker[] = "service_worker";
3940
const char kTargetTypeOther[] = "other";
4041

42+
const int kBackLog = 10;
43+
4144
class TCPServerSocketFactory
4245
: public content::DevToolsHttpHandler::ServerSocketFactory {
4346
public:
44-
TCPServerSocketFactory(const std::string& address, uint16 port, int backlog)
45-
: content::DevToolsHttpHandler::ServerSocketFactory(
46-
address, port, backlog) {}
47+
TCPServerSocketFactory(const std::string& address, uint16 port)
48+
: address_(address), port_(port) {
49+
}
4750

4851
private:
49-
// content::DevToolsHttpHandler::ServerSocketFactory.
50-
scoped_ptr<net::ServerSocket> Create() const override {
51-
return scoped_ptr<net::ServerSocket>(
52-
new net::TCPServerSocket(NULL, net::NetLog::Source()));
52+
// DevToolsHttpHandler::ServerSocketFactory.
53+
scoped_ptr<net::ServerSocket> CreateForHttpServer() override {
54+
scoped_ptr<net::ServerSocket> socket(
55+
new net::TCPServerSocket(nullptr, net::NetLog::Source()));
56+
if (socket->ListenWithAddressAndPort(address_, port_, kBackLog) != net::OK)
57+
return scoped_ptr<net::ServerSocket>();
58+
59+
return socket;
5360
}
5461

62+
std::string address_;
63+
uint16 port_;
64+
5565
DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
5666
};
5767

5868
scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>
5969
CreateSocketFactory(uint16 port) {
6070
return scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>(
61-
new TCPServerSocketFactory("127.0.0.1", port, 1));
71+
new TCPServerSocketFactory("127.0.0.1", port));
6272
}
6373

6474
class Target : public content::DevToolsTarget {
@@ -156,11 +166,6 @@ base::FilePath CefDevToolsDelegate::GetDebugFrontendDir() {
156166
return base::FilePath();
157167
}
158168

159-
scoped_ptr<net::ServerSocket>
160-
CefDevToolsDelegate::CreateSocketForTethering(std::string* name) {
161-
return scoped_ptr<net::ServerSocket>();
162-
}
163-
164169
std::string CefDevToolsDelegate::GetChromeDevToolsURL() {
165170
return base::StringPrintf("%s://%s/devtools.html",
166171
content::kChromeDevToolsScheme, scheme::kChromeDevToolsHost);

‎libcef/browser/devtools_delegate.h

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
3333
std::string GetDiscoveryPageHTML() override;
3434
bool BundlesFrontendResources() override;
3535
base::FilePath GetDebugFrontendDir() override;
36-
scoped_ptr<net::ServerSocket> CreateSocketForTethering(
37-
std::string* name) override;
3836

3937
// Returns the chrome-devtools URL.
4038
std::string GetChromeDevToolsURL();

‎libcef/browser/printing/print_view_manager.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "chrome/browser/browser_process.h"
1313
#include "chrome/browser/printing/print_job_manager.h"
1414
#include "chrome/browser/printing/print_preview_dialog_controller.h"
15-
#include "chrome/common/print_messages.h"
15+
#include "components/printing/common/print_messages.h"
1616
#include "content/public/browser/browser_thread.h"
1717
#include "content/public/browser/web_contents.h"
1818

‎libcef/browser/printing/print_view_manager_base.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "chrome/browser/printing/print_job_manager.h"
1818
#include "chrome/browser/printing/printer_query.h"
1919
#include "chrome/common/pref_names.h"
20-
#include "chrome/common/print_messages.h"
2120
#include "chrome/grit/generated_resources.h"
21+
#include "components/printing/common/print_messages.h"
2222
#include "content/public/browser/browser_thread.h"
2323
#include "content/public/browser/notification_details.h"
2424
#include "content/public/browser/notification_service.h"

‎libcef/browser/printing/printing_message_filter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "chrome/browser/browser_process.h"
1111
#include "chrome/browser/printing/print_job_manager.h"
1212
#include "chrome/browser/printing/printer_query.h"
13-
#include "chrome/common/print_messages.h"
13+
#include "components/printing/common/print_messages.h"
1414
#include "content/public/browser/browser_thread.h"
1515
#include "content/public/browser/render_view_host.h"
1616
#include "content/public/browser/web_contents.h"

‎libcef/browser/process_util_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ bool CefLaunchProcess(CefRefPtr<CefCommandLine> command_line) {
2727
CefValueController::AutoLock lock_scope(impl->controller());
2828

2929
base::LaunchOptions options;
30-
return base::LaunchProcess(impl->command_line(), options, NULL);
30+
return base::LaunchProcess(impl->command_line(), options).IsValid();
3131
}

0 commit comments

Comments
 (0)