bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 208345.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1313 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-07-18 22:37:02 +00:00
parent 5ccc4f8bfb
commit fdbb62a272
8 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -17,5 +17,5 @@
{ {
'chromium_url': 'http://src.chromium.org/svn/trunk/src', 'chromium_url': 'http://src.chromium.org/svn/trunk/src',
'chromium_revision': '207871', 'chromium_revision': '208345',
} }

4
cef.gyp
View File

@@ -789,7 +789,8 @@
], ],
'include_dirs': [ 'include_dirs': [
'.', '.',
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/public', '<(DEPTH)/third_party/WebKit/public/platform',
'<(DEPTH)/third_party/WebKit/public/web',
# CEF grit resource includes # CEF grit resource includes
'<(grit_out_dir)', '<(grit_out_dir)',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings',
@@ -809,7 +810,6 @@
'<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_prefs', '<(DEPTH)/base/base.gyp:base_prefs',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/ipc/ipc.gyp:ipc', '<(DEPTH)/ipc/ipc.gyp:ipc',
'<(DEPTH)/media/media.gyp:media', '<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/net/net.gyp:net', '<(DEPTH)/net/net.gyp:net',

25
libcef/browser/browser_host_impl.cc
View File

@@ -424,25 +424,12 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::GetBrowserByChildID(
int render_process_id) { int render_process_id) {
if (CEF_CURRENTLY_ON_UIT()) { if (CEF_CURRENTLY_ON_UIT()) {
// Use the non-thread-safe but potentially faster approach. // Use the non-thread-safe but potentially faster approach.
content::RenderProcessHost* render_process_host = content::RenderWidgetHost::List widgets =
content::RenderProcessHost::FromID(render_process_id); content::RenderWidgetHost::GetRenderWidgetHosts();
if (!render_process_host) for (size_t i = 0; i < widgets.size(); ++i) {
return NULL; if (widgets[i]->GetProcess()->GetID() == render_process_id &&
widgets[i]->IsRenderView()) {
content::RenderProcessHost::RenderWidgetHostsIterator iter( return GetBrowserForHost(content::RenderViewHost::From(widgets[i]));
render_process_host->GetRenderWidgetHostsIterator());
if (!iter.IsAtEnd()) {
const content::RenderWidgetHost* widget = iter.GetCurrentValue();
// This implementation is based on an assumption that each process hosts a
// single renderer. Revisit this implementation if the assumption proves
// false.
iter.Advance();
DCHECK(iter.IsAtEnd());
if (widget && widget->IsRenderView()) {
return GetBrowserForHost(content::RenderViewHost::From(
const_cast<content::RenderWidgetHost*>(widget)));
} }
} }

14
libcef/browser/devtools_delegate.cc
View File

@@ -60,17 +60,13 @@ content::DevToolsAgentHost* CefDevToolsBindingHandler::ForIdentifier(
if (!render_process_host->HasConnection()) if (!render_process_host->HasConnection())
continue; continue;
content::RenderProcessHost::RenderWidgetHostsIterator rwit( content::RenderWidgetHost::List widgets =
render_process_host->GetRenderWidgetHostsIterator()); content::RenderWidgetHost::GetRenderWidgetHosts();
for (; !rwit.IsAtEnd(); rwit.Advance()) { for (size_t i = 0; i < widgets.size(); ++i) {
const content::RenderWidgetHost* widget = rwit.GetCurrentValue(); if (!widgets[i]->IsRenderView())
DCHECK(widget);
if (!widget || !widget->IsRenderView())
continue; continue;
content::RenderViewHost* host = content::RenderViewHost* host = content::RenderViewHost::From(widgets[i]);
content::RenderViewHost::From(
const_cast<content::RenderWidgetHost*>(widget));
if (GetIdentifier(host) == identifier) { if (GetIdentifier(host) == identifier) {
// May create a new agent host. // May create a new agent host.
scoped_refptr<content::DevToolsAgentHost> agent_host( scoped_refptr<content::DevToolsAgentHost> agent_host(

4
libcef/browser/javascript_dialog_mac.mm
View File

@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "base/memory/scoped_nsobject.h" #import "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
@@ -16,7 +16,7 @@
// going away. Is responsible for cleaning itself up. // going away. Is responsible for cleaning itself up.
@interface CefJavaScriptDialogHelper : NSObject<NSAlertDelegate> { @interface CefJavaScriptDialogHelper : NSObject<NSAlertDelegate> {
@private @private
scoped_nsobject<NSAlert> alert_; base::scoped_nsobject<NSAlert> alert_;
NSTextField* textField_; // WEAK; owned by alert_ NSTextField* textField_; // WEAK; owned by alert_
// Copies of the fields in CefJavaScriptDialog because they're private. // Copies of the fields in CefJavaScriptDialog because they're private.

4
libcef/browser/text_input_client_osr_mac.h
View File

@@ -11,7 +11,7 @@
#include "libcef/browser/render_widget_host_view_osr.h" #include "libcef/browser/render_widget_host_view_osr.h"
#include "base/memory/scoped_nsobject.h" #include "base/mac/scoped_nsobject.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/common/edit_command.h" #include "content/common/edit_command.h"
@@ -36,7 +36,7 @@
@private @private
// Represents the input-method attributes supported by this object. // Represents the input-method attributes supported by this object.
scoped_nsobject<NSArray> validAttributesForMarkedText_; base::scoped_nsobject<NSArray> validAttributesForMarkedText_;
// Indicates if we are currently handling a key down event. // Indicates if we are currently handling a key down event.
BOOL handlingKeyDown_; BOOL handlingKeyDown_;

30
libcef/common/main_delegate.cc
View File

@@ -283,12 +283,16 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
} }
// Initialize logging. // Initialize logging.
base::FilePath log_file = logging::LoggingSettings log_settings;
command_line->GetSwitchValuePath(switches::kLogFile); log_settings.log_file =
std::string log_severity_str = command_line->GetSwitchValuePath(switches::kLogFile).value().c_str();
command_line->GetSwitchValueASCII(switches::kLogSeverity); log_settings.lock_log = logging::DONT_LOCK_LOG_FILE;
log_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
logging::LogSeverity log_severity = logging::LOG_INFO; logging::LogSeverity log_severity = logging::LOG_INFO;
std::string log_severity_str =
command_line->GetSwitchValueASCII(switches::kLogSeverity);
if (!log_severity_str.empty()) { if (!log_severity_str.empty()) {
if (LowerCaseEqualsASCII(log_severity_str, if (LowerCaseEqualsASCII(log_severity_str,
switches::kLogSeverity_Verbose)) { switches::kLogSeverity_Verbose)) {
@@ -308,22 +312,22 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
} }
} }
logging::LoggingDestination logging_dest;
if (log_severity == LOGSEVERITY_DISABLE) { if (log_severity == LOGSEVERITY_DISABLE) {
logging_dest = logging::LOG_NONE; log_settings.logging_dest = logging::LOG_NONE;
} else { } else {
logging_dest = logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG; log_settings.logging_dest = logging::LOG_TO_ALL;
logging::SetMinLogLevel(log_severity); logging::SetMinLogLevel(log_severity);
} }
logging::DcheckState dcheck_state = if (command_line->HasSwitch(switches::kEnableReleaseDcheck)) {
log_settings.dcheck_state =
logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
} else {
log_settings.dcheck_state =
logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
if (command_line->HasSwitch(switches::kEnableReleaseDcheck)) }
dcheck_state = logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
logging::InitLogging(log_file.value().c_str(), logging_dest, logging::InitLogging(log_settings);
logging::DONT_LOCK_LOG_FILE, logging::APPEND_TO_OLD_LOG_FILE,
dcheck_state);
content::SetContentClient(&content_client_); content::SetContentClient(&content_client_);

16
patch/patches/webkit_popups.patch
View File

@@ -1,6 +1,6 @@
Index: public/web/WebView.h Index: public/web/WebView.h
=================================================================== ===================================================================
--- public/web/WebView.h (revision 152832) --- public/web/WebView.h (revision 152953)
+++ public/web/WebView.h (working copy) +++ public/web/WebView.h (working copy)
@@ -421,6 +421,7 @@ @@ -421,6 +421,7 @@
@@ -12,9 +12,9 @@ Index: public/web/WebView.h
// Visited link state -------------------------------------------------- // Visited link state --------------------------------------------------
Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
=================================================================== ===================================================================
--- Source/WebKit/chromium/src/ChromeClientImpl.cpp (revision 152832) --- Source/WebKit/chromium/src/ChromeClientImpl.cpp (revision 152953)
+++ Source/WebKit/chromium/src/ChromeClientImpl.cpp (working copy) +++ Source/WebKit/chromium/src/ChromeClientImpl.cpp (working copy)
@@ -893,7 +893,7 @@ @@ -895,7 +895,7 @@
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
{ {
@@ -25,9 +25,9 @@ Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
return adoptRef(new PopupMenuChromium(frame, client)); return adoptRef(new PopupMenuChromium(frame, client));
Index: Source/WebKit/chromium/src/WebViewImpl.cpp Index: Source/WebKit/chromium/src/WebViewImpl.cpp
=================================================================== ===================================================================
--- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 152832) --- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 152953)
+++ Source/WebKit/chromium/src/WebViewImpl.cpp (working copy) +++ Source/WebKit/chromium/src/WebViewImpl.cpp (working copy)
@@ -392,6 +392,7 @@ @@ -393,6 +393,7 @@
, m_fakeDoubleTapPageScaleFactor(0) , m_fakeDoubleTapPageScaleFactor(0)
, m_fakeDoubleTapUseAnchor(false) , m_fakeDoubleTapUseAnchor(false)
, m_contextMenuAllowed(false) , m_contextMenuAllowed(false)
@@ -35,7 +35,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
, m_doingDragAndDrop(false) , m_doingDragAndDrop(false)
, m_ignoreInputEvents(false) , m_ignoreInputEvents(false)
, m_suppressNextKeypressEvent(false) , m_suppressNextKeypressEvent(false)
@@ -3660,9 +3661,14 @@ @@ -3676,9 +3677,14 @@
updateLayerTreeViewport(); updateLayerTreeViewport();
} }
@@ -53,7 +53,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor) void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor)
Index: Source/WebKit/chromium/src/WebViewImpl.h Index: Source/WebKit/chromium/src/WebViewImpl.h
=================================================================== ===================================================================
--- Source/WebKit/chromium/src/WebViewImpl.h (revision 152832) --- Source/WebKit/chromium/src/WebViewImpl.h (revision 152953)
+++ Source/WebKit/chromium/src/WebViewImpl.h (working copy) +++ Source/WebKit/chromium/src/WebViewImpl.h (working copy)
@@ -415,7 +415,8 @@ @@ -415,7 +415,8 @@
@@ -65,7 +65,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.h
bool contextMenuAllowed() const bool contextMenuAllowed() const
{ {
@@ -731,6 +732,8 @@ @@ -733,6 +734,8 @@
bool m_contextMenuAllowed; bool m_contextMenuAllowed;