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

Update to Chromium revision 207871.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1281 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-06-22 02:06:32 +00:00
parent 45691556e4
commit 2fc9788311
60 changed files with 201 additions and 210 deletions
Show Stats 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': '203701', 'chromium_revision': '207871',
} }

12
cef.gyp
View File

@ -804,14 +804,15 @@
'<(DEPTH)/net/net.gyp:net_with_v8', '<(DEPTH)/net/net.gyp:net_with_v8',
'<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/libxml/libxml.gyp:libxml', '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
'<(DEPTH)/third_party/WebKit/Source/core/core.gyp/core.gyp:webcore', '<(DEPTH)/third_party/WebKit/Source/core/core.gyp:webcore',
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
'<(DEPTH)/third_party/zlib/zlib.gyp:minizip', '<(DEPTH)/third_party/zlib/zlib.gyp:minizip',
'<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/ui/ui.gyp:ui',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
'<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
'<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
'<(DEPTH)/webkit/support/webkit_support.gyp:glue', '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage',
# Necessary to generate the grit include files. # Necessary to generate the grit include files.
'cef_pak', 'cef_pak',
], ],
@ -1042,11 +1043,6 @@
'libcef/browser/text_input_client_osr_mac.h', 'libcef/browser/text_input_client_osr_mac.h',
'libcef/browser/web_contents_view_osr.cc', 'libcef/browser/web_contents_view_osr.cc',
'libcef/browser/web_contents_view_osr.h', 'libcef/browser/web_contents_view_osr.h',
# Include sources for context menu implementation.
'<(DEPTH)/chrome/browser/ui/cocoa/event_utils.mm',
'<(DEPTH)/chrome/browser/ui/cocoa/event_utils.h',
'<(DEPTH)/chrome/browser/ui/cocoa/menu_controller.mm',
'<(DEPTH)/chrome/browser/ui/cocoa/menu_controller.h',
], ],
}], }],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {

8
cef.gypi
View File

@ -20,11 +20,17 @@
'clang_use_chrome_plugins': 0, 'clang_use_chrome_plugins': 0,
}], }],
] ]
}, 'target_defaults': {
'defines': [
# Temporary work-around for v8::Persistent changes.
# See https://code.google.com/p/chromiumembedded/issues/detail?id=1001
'V8_USE_UNSAFE_HANDLES=1',
],
}, 'conditions': [ }, 'conditions': [
['os_posix==1 and OS!="mac" and OS!="android"', { ['os_posix==1 and OS!="mac" and OS!="android"', {
'target_defaults': { 'target_defaults': {
'cflags_cc': ['-Wno-deprecated-declarations'], 'cflags_cc': ['-Wno-deprecated-declarations'],
}, },
}] }]
] ],
} }

8
include/cef_application_mac.h
View File

@ -37,12 +37,12 @@
#ifdef BUILDING_CEF_SHARED #ifdef BUILDING_CEF_SHARED
// Use the existing CrAppProtocol definition.
#import "base/message_pump_mac.h"
// Use the existing CrAppControlProtocol definition. // Use the existing CrAppControlProtocol definition.
#import "base/mac/scoped_sending_event.h" #import "base/mac/scoped_sending_event.h"
// Use the existing CrAppProtocol definition.
#import "base/message_loop/message_pump_mac.h"
// Use the existing UnderlayableSurface definition. // Use the existing UnderlayableSurface definition.
#import "ui/base/cocoa/underlay_opengl_hosting_window.h" #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
@ -54,7 +54,7 @@
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
// Copy of definition from base/message_pump_mac.h. // Copy of definition from base/message_loop/message_pump_mac.h.
@protocol CrAppProtocol @protocol CrAppProtocol
// Must return true if -[NSApplication sendEvent:] is currently on the stack. // Must return true if -[NSApplication sendEvent:] is currently on the stack.
- (BOOL)isHandlingSendEvent; - (BOOL)isHandlingSendEvent;

2
include/internal/cef_string_wrappers.h
View File

@ -36,7 +36,7 @@
#include "include/internal/cef_string_types.h" #include "include/internal/cef_string_types.h"
#ifdef BUILDING_CEF_SHARED #ifdef BUILDING_CEF_SHARED
#include "base/string16.h" #include "base/strings/string16.h"
#endif #endif

2
libcef/browser/application_mac.mm
View File

@ -5,8 +5,8 @@
#include "libcef/browser/application_mac.h" #include "libcef/browser/application_mac.h"
#include "base/message_pump_mac.h"
#include "base/mac/scoped_sending_event.h" #include "base/mac/scoped_sending_event.h"
#include "base/message_loop/message_pump_mac.h"
@interface CefCrApplication : NSApplication<CrAppProtocol, @interface CefCrApplication : NSApplication<CrAppProtocol,
CrAppControlProtocol> { CrAppControlProtocol> {

2
libcef/browser/browser_host_impl.h
View File

@ -21,7 +21,7 @@
#include "libcef/common/response_manager.h" #include "libcef/common/response_manager.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/string16.h" #include "base/strings/string16.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_registrar.h"

2
libcef/browser/browser_host_impl_gtk.cc
View File

@ -10,7 +10,7 @@
#include "libcef/browser/thread_util.h" #include "libcef/browser/thread_util.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents_view.h"
#include "content/public/common/file_chooser_params.h" #include "content/public/common/file_chooser_params.h"
#include "content/public/common/renderer_preferences.h" #include "content/public/common/renderer_preferences.h"

6
libcef/browser/browser_host_impl_mac.mm
View File

@ -14,7 +14,7 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/mac/mac_util.h" #include "base/mac/mac_util.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/native_web_keyboard_event.h"
@ -23,8 +23,8 @@
#include "content/public/common/file_chooser_params.h" #include "content/public/common/file_chooser_params.h"
#include "grit/ui_strings.h" #include "grit/ui_strings.h"
#include "net/base/mime_util.h" #include "net/base/mime_util.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" #include "third_party/WebKit/public/web/mac/WebInputEventFactory.h"
#import "ui/base/cocoa/underlay_opengl_hosting_window.h" #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
#include "ui/base/keycodes/keyboard_codes_posix.h" #include "ui/base/keycodes/keyboard_codes_posix.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"

8
libcef/browser/browser_host_impl_win.cc
View File

@ -14,8 +14,8 @@
#include "libcef/browser/thread_util.h" #include "libcef/browser/thread_util.h"
#include "base/i18n/case_conversion.h" #include "base/i18n/case_conversion.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h" #include "base/win/registry.h"
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/native_web_keyboard_event.h"
@ -24,8 +24,8 @@
#include "grit/cef_strings.h" #include "grit/cef_strings.h"
#include "grit/ui_strings.h" #include "grit/ui_strings.h"
#include "net/base/mime_util.h" #include "net/base/mime_util.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" #include "third_party/WebKit/public/web/win/WebInputEventFactory.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/base/win/hwnd_util.h" #include "ui/base/win/hwnd_util.h"

5
libcef/browser/browser_main.cc
View File

@ -15,7 +15,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "chrome/browser/net/proxy_service_factory.h" #include "chrome/browser/net/proxy_service_factory.h"
#include "content/browser/webui/content_web_ui_controller_factory.h" #include "content/browser/webui/content_web_ui_controller_factory.h"
#include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/gpu_data_manager.h"
@ -38,7 +38,6 @@ base::StringPiece ResourceProvider(int resource_id) {
CefBrowserMainParts::CefBrowserMainParts( CefBrowserMainParts::CefBrowserMainParts(
const content::MainFunctionParams& parameters) const content::MainFunctionParams& parameters)
: BrowserMainParts(), : BrowserMainParts(),
devtools_delegate_(NULL),
proxy_v8_isolate_(NULL) { proxy_v8_isolate_(NULL) {
} }
@ -112,7 +111,7 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
command_line.GetSwitchValueASCII(switches::kRemoteDebuggingPort); command_line.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
int port; int port;
if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) { if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) {
devtools_delegate_ = new CefDevToolsDelegate(port); devtools_delegate_.reset(new CefDevToolsDelegate(port));
} else { } else {
LOG(WARNING) << "Invalid http debugger port number " << port; LOG(WARNING) << "Invalid http debugger port number " << port;
} }

4
libcef/browser/browser_main.h
View File

@ -45,7 +45,7 @@ class CefBrowserMainParts : public content::BrowserMainParts {
virtual void PostDestroyThreads() OVERRIDE; virtual void PostDestroyThreads() OVERRIDE;
CefBrowserContext* browser_context() const { return browser_context_.get(); } CefBrowserContext* browser_context() const { return browser_context_.get(); }
CefDevToolsDelegate* devtools_delegate() const { return devtools_delegate_; } CefDevToolsDelegate* devtools_delegate() const { return devtools_delegate_.get(); }
PrefService* pref_service() const { return pref_service_.get(); } PrefService* pref_service() const { return pref_service_.get(); }
scoped_ptr<net::ProxyConfigService> proxy_config_service() { scoped_ptr<net::ProxyConfigService> proxy_config_service() {
return proxy_config_service_.Pass(); return proxy_config_service_.Pass();
@ -56,7 +56,7 @@ class CefBrowserMainParts : public content::BrowserMainParts {
void PlatformCleanup(); void PlatformCleanup();
scoped_ptr<CefBrowserContext> browser_context_; scoped_ptr<CefBrowserContext> browser_context_;
CefDevToolsDelegate* devtools_delegate_; scoped_ptr<CefDevToolsDelegate> devtools_delegate_;
scoped_ptr<base::MessageLoop> message_loop_; scoped_ptr<base::MessageLoop> message_loop_;
scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
scoped_ptr<net::ProxyConfigService> proxy_config_service_; scoped_ptr<net::ProxyConfigService> proxy_config_service_;

2
libcef/browser/browser_urlrequest_impl.cc
View File

@ -15,7 +15,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "content/public/common/url_fetcher.h" #include "content/public/common/url_fetcher.h"
#include "net/base/load_flags.h" #include "net/base/load_flags.h"
#include "net/http/http_request_headers.h" #include "net/http/http_request_headers.h"

6
libcef/browser/chrome_scheme_handler.cc
View File

@ -23,9 +23,9 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
#include "content/browser/net/view_http_cache_job_factory.h" #include "content/browser/net/view_http_cache_job_factory.h"
#include "content/browser/net/view_blob_internals_job_factory.h" #include "content/browser/net/view_blob_internals_job_factory.h"

4
libcef/browser/devtools_delegate.cc
View File

@ -12,8 +12,8 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/md5.h" #include "base/md5.h"
#include "base/rand_util.h" #include "base/rand_util.h"
#include "base/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/time.h" #include "base/time.h"
#include "content/public/browser/devtools_http_handler.h" #include "content/public/browser/devtools_http_handler.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"

2
libcef/browser/devtools_scheme_handler.cc
View File

@ -8,7 +8,7 @@
#include "libcef/browser/internal_scheme_handler.h" #include "libcef/browser/internal_scheme_handler.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "content/public/common/url_constants.h" #include "content/public/common/url_constants.h"
#include "grit/devtools_resources_map.h" #include "grit/devtools_resources_map.h"

6
libcef/browser/download_item_impl.cc
View File

@ -24,17 +24,17 @@ bool CefDownloadItemImpl::IsValid() {
bool CefDownloadItemImpl::IsInProgress() { bool CefDownloadItemImpl::IsInProgress() {
CEF_VALUE_VERIFY_RETURN(false, false); CEF_VALUE_VERIFY_RETURN(false, false);
return const_value().IsInProgress(); return const_value().GetState() == content::DownloadItem::IN_PROGRESS;
} }
bool CefDownloadItemImpl::IsComplete() { bool CefDownloadItemImpl::IsComplete() {
CEF_VALUE_VERIFY_RETURN(false, false); CEF_VALUE_VERIFY_RETURN(false, false);
return const_value().IsComplete(); return const_value().GetState() == content::DownloadItem::COMPLETE;
} }
bool CefDownloadItemImpl::IsCanceled() { bool CefDownloadItemImpl::IsCanceled() {
CEF_VALUE_VERIFY_RETURN(false, false); CEF_VALUE_VERIFY_RETURN(false, false);
return const_value().IsCancelled(); return const_value().GetState() == content::DownloadItem::CANCELLED;
} }
int64 CefDownloadItemImpl::GetCurrentSpeed() { int64 CefDownloadItemImpl::GetCurrentSpeed() {

8
libcef/browser/download_manager_delegate.cc
View File

@ -15,8 +15,8 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/common/file_chooser_params.h" #include "content/public/common/file_chooser_params.h"
@ -130,7 +130,7 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
return; return;
DownloadItem* item = manager->GetDownload(download_id); DownloadItem* item = manager->GetDownload(download_id);
if (!item || !item->IsInProgress()) if (!item || item->GetState() != content::DownloadItem::IN_PROGRESS)
return; return;
bool handled = false; bool handled = false;
@ -215,7 +215,7 @@ class CefDownloadItemCallbackImpl : public CefDownloadItemCallback {
if (manager_) { if (manager_) {
DownloadItem* item = manager_->GetDownload(download_id_); DownloadItem* item = manager_->GetDownload(download_id_);
if (item && item->IsInProgress()) if (item && item->GetState() == content::DownloadItem::IN_PROGRESS)
item->Cancel(true); item->Cancel(true);
} }

2
libcef/browser/internal_scheme_handler.cc
View File

@ -6,7 +6,7 @@
#include "libcef/browser/internal_scheme_handler.h" #include "libcef/browser/internal_scheme_handler.h"
#include <string> #include <string>
#include "libcef/common/content_client.h" #include "libcef/common/content_client.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
namespace scheme { namespace scheme {

4
libcef/browser/javascript_dialog_gtk.cc
View File

@ -10,8 +10,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "base/logging.h" #include "base/logging.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
namespace { namespace {

2
libcef/browser/javascript_dialog_mac.mm
View File

@ -10,7 +10,7 @@
#import "base/memory/scoped_nsobject.h" #import "base/memory/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
// Helper object that receives the notification that the dialog/sheet is // Helper object that receives the notification that the dialog/sheet is
// going away. Is responsible for cleaning itself up. // going away. Is responsible for cleaning itself up.

2
libcef/browser/javascript_dialog_manager.cc
View File

@ -10,7 +10,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "net/base/net_util.h" #include "net/base/net_util.h"
namespace { namespace {

4
libcef/browser/javascript_dialog_win.cc
View File

@ -10,8 +10,8 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
class CefJavaScriptDialog; class CefJavaScriptDialog;

2
libcef/browser/menu_creator_runner_mac.mm
View File

@ -8,8 +8,8 @@
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#import "base/mac/scoped_sending_event.h" #import "base/mac/scoped_sending_event.h"
#import "chrome/browser/ui/cocoa/menu_controller.h"
#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents_view.h"
#import "ui/base/cocoa/menu_controller.h"
CefMenuCreatorRunnerMac::CefMenuCreatorRunnerMac() CefMenuCreatorRunnerMac::CefMenuCreatorRunnerMac()
: menu_controller_(nil) { : menu_controller_(nil) {

16
libcef/browser/render_widget_host_view_osr.cc
View File

@ -12,14 +12,8 @@
#include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/public/browser/content_browser_client.h" #include "content/public/browser/content_browser_client.h"
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/public/web/WebScreenInfo.h"
#if defined(OS_WIN)
#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h"
#endif
#include "webkit/common/cursors/webcursor.h" #include "webkit/common/cursors/webcursor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
namespace { namespace {
@ -209,8 +203,9 @@ void CefRenderWidgetHostViewOSR::SetIsLoading(bool is_loading) {
} }
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)
void CefRenderWidgetHostViewOSR::TextInputStateChanged( void CefRenderWidgetHostViewOSR::TextInputTypeChanged(
const ViewHostMsg_TextInputState_Params& params) { ui::TextInputType type,
bool can_compose_inline) {
} }
void CefRenderWidgetHostViewOSR::ImeCancelComposition() { void CefRenderWidgetHostViewOSR::ImeCancelComposition() {
@ -225,7 +220,8 @@ void CefRenderWidgetHostViewOSR::ImeCompositionRangeChanged(
void CefRenderWidgetHostViewOSR::DidUpdateBackingStore( void CefRenderWidgetHostViewOSR::DidUpdateBackingStore(
const gfx::Rect& scroll_rect, const gfx::Rect& scroll_rect,
const gfx::Vector2d& scroll_delta, const gfx::Vector2d& scroll_delta,
const std::vector<gfx::Rect>& copy_rects) { const std::vector<gfx::Rect>& copy_rects,
const ui::LatencyInfo& latency_info) {
if (!scroll_rect.IsEmpty()) { if (!scroll_rect.IsEmpty()) {
std::vector<gfx::Rect> dirty_rects(copy_rects); std::vector<gfx::Rect> dirty_rects(copy_rects);
dirty_rects.push_back(scroll_rect); dirty_rects.push_back(scroll_rect);

7
libcef/browser/render_widget_host_view_osr.h
View File

@ -116,8 +116,8 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase {
virtual void Blur() OVERRIDE; virtual void Blur() OVERRIDE;
virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE; virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
virtual void SetIsLoading(bool is_loading) OVERRIDE; virtual void SetIsLoading(bool is_loading) OVERRIDE;
virtual void TextInputStateChanged( virtual void TextInputTypeChanged(ui::TextInputType type,
const ViewHostMsg_TextInputState_Params& params) OVERRIDE; bool can_compose_inline) OVERRIDE;
virtual void ImeCancelComposition() OVERRIDE; virtual void ImeCancelComposition() OVERRIDE;
virtual void ImeCompositionRangeChanged( virtual void ImeCompositionRangeChanged(
const ui::Range& range, const ui::Range& range,
@ -125,7 +125,8 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase {
virtual void DidUpdateBackingStore( virtual void DidUpdateBackingStore(
const gfx::Rect& scroll_rect, const gfx::Rect& scroll_rect,
const gfx::Vector2d& scroll_delta, const gfx::Vector2d& scroll_delta,
const std::vector<gfx::Rect>& copy_rects) OVERRIDE; const std::vector<gfx::Rect>& copy_rects,
const ui::LatencyInfo& latency_info) OVERRIDE;
virtual void RenderViewGone(base::TerminationStatus status, virtual void RenderViewGone(base::TerminationStatus status,
int error_code) OVERRIDE; int error_code) OVERRIDE;
#if defined(OS_WIN) && !defined(USE_AURA) #if defined(OS_WIN) && !defined(USE_AURA)

5
libcef/browser/render_widget_host_view_osr_mac.mm
View File

@ -74,8 +74,9 @@ void CefRenderWidgetHostViewOSR::ImeCancelComposition() {
[client cancelComposition]; [client cancelComposition];
} }
void CefRenderWidgetHostViewOSR::TextInputStateChanged( void CefRenderWidgetHostViewOSR::TextInputTypeChanged(
const ViewHostMsg_TextInputState_Params& params) { ui::TextInputType type,
bool can_compose_inline) {
[NSApp updateWindows]; [NSApp updateWindows];
} }

2
libcef/browser/scheme_impl.cc
View File

@ -22,7 +22,7 @@
#include "base/lazy_instance.h" #include "base/lazy_instance.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "googleurl/src/url_util.h" #include "googleurl/src/url_util.h"
#include "net/base/completion_callback.h" #include "net/base/completion_callback.h"

4
libcef/browser/text_input_client_osr_mac.h
View File

@ -12,10 +12,10 @@
#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/memory/scoped_nsobject.h"
#include "base/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"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
// Implementation for the NSTextInputClient protocol used for enabling IME on // Implementation for the NSTextInputClient protocol used for enabling IME on
// mac when window rendering is disabled. // mac when window rendering is disabled.

6
libcef/browser/url_request_context_getter.cc
View File

@ -22,7 +22,7 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "base/threading/worker_pool.h" #include "base/threading/worker_pool.h"
#include "chrome/browser/net/proxy_service_factory.h" #include "chrome/browser/net/proxy_service_factory.h"
@ -36,6 +36,7 @@
#include "net/http/http_auth_handler_factory.h" #include "net/http/http_auth_handler_factory.h"
#include "net/http/http_cache.h" #include "net/http/http_cache.h"
#include "net/http/http_server_properties_impl.h" #include "net/http/http_server_properties_impl.h"
#include "net/http/transport_security_state.h"
#include "net/proxy/proxy_service.h" #include "net/proxy/proxy_service.h"
#include "net/ssl/default_server_bound_cert_store.h" #include "net/ssl/default_server_bound_cert_store.h"
#include "net/ssl/server_bound_cert_service.h" #include "net/ssl/server_bound_cert_service.h"
@ -97,6 +98,7 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL)); storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
storage_->set_transport_security_state(new net::TransportSecurityState);
scoped_ptr<net::ProxyService> system_proxy_service; scoped_ptr<net::ProxyService> system_proxy_service;
system_proxy_service.reset( system_proxy_service.reset(
@ -143,6 +145,8 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
url_request_context_->host_resolver(); url_request_context_->host_resolver();
network_session_params.cert_verifier = network_session_params.cert_verifier =
url_request_context_->cert_verifier(); url_request_context_->cert_verifier();
network_session_params.transport_security_state =
url_request_context_->transport_security_state();
network_session_params.server_bound_cert_service = network_session_params.server_bound_cert_service =
url_request_context_->server_bound_cert_service(); url_request_context_->server_bound_cert_service();
network_session_params.proxy_service = network_session_params.proxy_service =

3
libcef/browser/url_request_context_proxy.cc
View File

@ -11,7 +11,7 @@
#include "libcef/browser/thread_util.h" #include "libcef/browser/thread_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop_proxy.h" #include "base/message_loop/message_loop_proxy.h"
#include "net/cookies/cookie_store.h" #include "net/cookies/cookie_store.h"
#include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_getter.h"
@ -138,6 +138,7 @@ void CefURLRequestContextProxy::Initialize(CefBrowserHostImpl* browser) {
set_net_log(context->net_log()); set_net_log(context->net_log());
set_host_resolver(context->host_resolver()); set_host_resolver(context->host_resolver());
set_cert_verifier(context->cert_verifier()); set_cert_verifier(context->cert_verifier());
set_transport_security_state(context->transport_security_state());
set_server_bound_cert_service(context->server_bound_cert_service()); set_server_bound_cert_service(context->server_bound_cert_service());
set_fraudulent_certificate_reporter( set_fraudulent_certificate_reporter(
context->fraudulent_certificate_reporter()); context->fraudulent_certificate_reporter());

4
libcef/browser/web_contents_view_osr.cc
View File

@ -113,6 +113,10 @@ void CefWebContentsViewOSR::CloseTabAfterEventTracking() {
void CefWebContentsViewOSR::SetAllowOverlappingViews(bool overlapping) { void CefWebContentsViewOSR::SetAllowOverlappingViews(bool overlapping) {
} }
bool CefWebContentsViewOSR::GetAllowOverlappingViews() const {
return false;
}
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
// RenderViewHostDelegateView methods. // RenderViewHostDelegateView methods.

1
libcef/browser/web_contents_view_osr.h
View File

@ -54,6 +54,7 @@ class CefWebContentsViewOSR : public content::WebContentsViewPort,
virtual bool IsEventTracking() const OVERRIDE; virtual bool IsEventTracking() const OVERRIDE;
virtual void CloseTabAfterEventTracking() OVERRIDE; virtual void CloseTabAfterEventTracking() OVERRIDE;
virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE; virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE;
virtual bool GetAllowOverlappingViews() const OVERRIDE;
#endif #endif
// RenderViewHostDelegateView methods. // RenderViewHostDelegateView methods.

2
libcef/common/content_client.cc
View File

@ -12,7 +12,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
#include "base/stringprintf.h" #include "base/strings/stringprintf.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"

4
libcef/common/main_delegate.cc
View File

@ -13,8 +13,8 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/file_util.h" #include "base/file_util.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"

10
libcef/common/request_impl.cc
View File

@ -17,11 +17,11 @@
#include "net/base/upload_file_element_reader.h" #include "net/base/upload_file_element_reader.h"
#include "net/http/http_request_headers.h" #include "net/http/http_request_headers.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLRequest.h"
namespace { namespace {

2
libcef/common/request_impl.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#include "include/cef_request.h" #include "include/cef_request.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" #include "third_party/WebKit/public/platform/WebHTTPBody.h"
namespace net { namespace net {
class HttpRequestHeaders; class HttpRequestHeaders;

8
libcef/common/response_impl.cc
View File

@ -7,12 +7,12 @@
#include <string> #include <string>
#include "base/logging.h" #include "base/logging.h"
#include "base/stringprintf.h" #include "base/strings/stringprintf.h"
#include "net/http/http_request_headers.h" #include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h" #include "net/http/http_response_headers.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" #include "third_party/WebKit/public/platform/WebURLResponse.h"
#define CHECK_READONLY_RETURN_VOID() \ #define CHECK_READONLY_RETURN_VOID() \

4
libcef/common/string_types_impl.cc
View File

@ -4,8 +4,8 @@
#include "include/internal/cef_string_types.h" #include "include/internal/cef_string_types.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/string16.h" #include "base/strings/string16.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
namespace { namespace {

2
libcef/common/task_runner_impl.cc
View File

@ -10,7 +10,7 @@
#include "base/location.h" #include "base/location.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/message_loop_proxy.h" #include "base/message_loop/message_loop_proxy.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
using content::BrowserThread; using content::BrowserThread;

26
libcef/renderer/browser_impl.cc
View File

@ -17,23 +17,23 @@
#include "libcef/renderer/thread_util.h" #include "libcef/renderer/thread_util.h"
#include "libcef/renderer/webkit_glue.h" #include "libcef/renderer/webkit_glue.h"
#include "base/string16.h" #include "base/strings/string16.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "content/public/renderer/document_state.h" #include "content/public/renderer/document_state.h"
#include "content/public/renderer/navigation_state.h" #include "content/public/renderer/navigation_state.h"
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "net/http/http_util.h" #include "net/http/http_util.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" #include "third_party/WebKit/public/platform/WebURLResponse.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" #include "third_party/WebKit/public/web/WebDataSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" #include "third_party/WebKit/public/web/WebNode.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" #include "third_party/WebKit/public/web/WebScriptSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/public/web/WebView.h"
#include "webkit/base/file_path_string_conversions.h" #include "webkit/base/file_path_string_conversions.h"
#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkit_glue.h"

26
libcef/renderer/content_renderer_client.cc
View File

@ -29,27 +29,27 @@ MSVC_POP_WARNING();
#include "base/command_line.h" #include "base/command_line.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "chrome/renderer/loadtimes_extension_bindings.h" #include "chrome/renderer/loadtimes_extension_bindings.h"
#include "content/common/child_thread.h" #include "content/child/child_thread.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_thread.h"
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "ipc/ipc_sync_channel.h" #include "ipc/ipc_sync_channel.h"
#include "media/base/media.h" #include "media/base/media.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebPrerenderingSupport.h" #include "third_party/WebKit/public/platform/WebPrerenderingSupport.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebWorkerRunLoop.h" #include "third_party/WebKit/public/platform/WebWorkerRunLoop.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrerendererClient.h" #include "third_party/WebKit/public/web/WebPrerendererClient.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerInfo.h" #include "third_party/WebKit/public/web/WebWorkerInfo.h"
#include "v8/include/v8.h" #include "v8/include/v8.h"
#include "webkit/glue/worker_task_runner.h" #include "webkit/child/worker_task_runner.h"
namespace { namespace {

14
libcef/renderer/dom_document_impl.cc
View File

@ -7,13 +7,13 @@
#include "libcef/renderer/thread_util.h" #include "libcef/renderer/thread_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/public/web/WebElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" #include "third_party/WebKit/public/web/WebNode.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" #include "third_party/WebKit/public/web/WebRange.h"
using WebKit::WebDocument; using WebKit::WebDocument;
using WebKit::WebElement; using WebKit::WebElement;

4
libcef/renderer/dom_event_impl.cc
View File

@ -7,8 +7,8 @@
#include "libcef/renderer/thread_util.h" #include "libcef/renderer/thread_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h" #include "third_party/WebKit/public/web/WebDOMEvent.h"
using WebKit::WebDOMEvent; using WebKit::WebDOMEvent;
using WebKit::WebString; using WebKit::WebString;

2
libcef/renderer/dom_event_impl.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#include "include/cef_dom.h" #include "include/cef_dom.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h" #include "third_party/WebKit/public/web/WebDOMEvent.h"
class CefDOMDocumentImpl; class CefDOMDocumentImpl;

24
libcef/renderer/dom_node_impl.cc
View File

@ -10,18 +10,18 @@
#include "libcef/renderer/thread_util.h" #include "libcef/renderer/thread_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/string_util.h" #include "base/strings/string_util.h"
#include "base/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h" #include "third_party/WebKit/public/web/WebDOMEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEventListener.h" #include "third_party/WebKit/public/web/WebDOMEventListener.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/public/web/WebElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h" #include "third_party/WebKit/public/web/WebFormControlElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "third_party/WebKit/public/web/WebInputElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" #include "third_party/WebKit/public/web/WebNode.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h" #include "third_party/WebKit/public/web/WebSelectElement.h"
using WebKit::WebDocument; using WebKit::WebDocument;
using WebKit::WebDOMEvent; using WebKit::WebDOMEvent;

2
libcef/renderer/dom_node_impl.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#include "include/cef_dom.h" #include "include/cef_dom.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" #include "third_party/WebKit/public/web/WebNode.h"
class CefDOMDocumentImpl; class CefDOMDocumentImpl;

14
libcef/renderer/frame_impl.cc
View File

@ -13,13 +13,13 @@
#include "libcef/renderer/v8_impl.h" #include "libcef/renderer/v8_impl.h"
#include "libcef/renderer/webkit_glue.h" #include "libcef/renderer/webkit_glue.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" #include "third_party/WebKit/public/platform/WebData.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" #include "third_party/WebKit/public/web/WebScriptSource.h"
using WebKit::WebString; using WebKit::WebString;

4
libcef/renderer/render_message_filter.cc
View File

@ -12,8 +12,8 @@
#include "content/common/devtools_messages.h" #include "content/common/devtools_messages.h"
#include "googleurl/src/gurl.h" #include "googleurl/src/gurl.h"
#include "googleurl/src/url_util.h" #include "googleurl/src/url_util.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
CefRenderMessageFilter::CefRenderMessageFilter() CefRenderMessageFilter::CefRenderMessageFilter()
: channel_(NULL) { : channel_(NULL) {

6
libcef/renderer/render_process_observer.cc
View File

@ -7,9 +7,9 @@
#include "libcef/common/cef_messages.h" #include "libcef/common/cef_messages.h"
#include "libcef/renderer/content_renderer_client.h" #include "libcef/renderer/content_renderer_client.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
CefRenderProcessObserver::CefRenderProcessObserver() { CefRenderProcessObserver::CefRenderProcessObserver() {
} }

16
libcef/renderer/render_urlrequest_impl.cc
View File

@ -8,14 +8,14 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" #include "third_party/WebKit/public/platform/Platform.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" #include "third_party/WebKit/public/platform/WebURLLoader.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" #include "third_party/WebKit/public/platform/WebURLResponse.h"
using WebKit::WebString; using WebKit::WebString;
using WebKit::WebURL; using WebKit::WebURL;

18
libcef/renderer/v8_impl.cc
View File

@ -30,12 +30,12 @@ MSVC_POP_WARNING();
#include "base/bind.h" #include "base/bind.h"
#include "base/lazy_instance.h" #include "base/lazy_instance.h"
#include "base/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/threading/thread_local.h" #include "base/threading/thread_local.h"
#include "googleurl/src/gurl.h" #include "googleurl/src/gurl.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "third_party/WebKit/public/web/WebScriptController.h"
namespace { namespace {
@ -401,13 +401,13 @@ class CefV8MakeWeakParam {
// Callback for weak persistent reference destruction. // Callback for weak persistent reference destruction.
void TrackDestructor(v8::Isolate* isolate, void TrackDestructor(v8::Isolate* isolate,
v8::Persistent<v8::Value> object, v8::Persistent<v8::Value>* object,
void* parameter) { CefV8MakeWeakParam* parameter) {
if (parameter) if (parameter)
delete static_cast<CefV8MakeWeakParam*>(parameter); delete parameter;
object.Dispose(isolate); object->Dispose(isolate);
object.Clear(); object->Clear();
} }

4
libcef/renderer/webkit_glue.cc
View File

@ -6,8 +6,8 @@
#include "libcef/renderer/webkit_glue.h" #include "libcef/renderer/webkit_glue.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/public/web/WebElement.h"
#include "config.h" #include "config.h"
MSVC_PUSH_WARNING_LEVEL(0); MSVC_PUSH_WARNING_LEVEL(0);

2
libcef/renderer/webkit_glue.h
View File

@ -7,7 +7,7 @@
#define CEF_LIBCEF_RENDERER_WEBKIT_GLUE_H_ #define CEF_LIBCEF_RENDERER_WEBKIT_GLUE_H_
#include <string> #include <string>
#include "base/string16.h" #include "base/strings/string16.h"
#include "v8/include/v8.h" #include "v8/include/v8.h"
namespace WebKit { namespace WebKit {

7
patch/patch.cfg
View File

@ -26,11 +26,6 @@ patches = [
'name': 'message_loop_443', 'name': 'message_loop_443',
'path': '../base/', 'path': '../base/',
}, },
{
# http://code.google.com/p/chromiumembedded/issues/detail?id=899
'name': 'webkit_features',
'path': '../third_party/WebKit/Source/core/',
},
{ {
# http://code.google.com/p/chromiumembedded/issues/detail?id=933 # http://code.google.com/p/chromiumembedded/issues/detail?id=933
'name': 'webkit_933', 'name': 'webkit_933',
@ -44,7 +39,7 @@ patches = [
{ {
# Enable popups in offscreen rendering on Mac # Enable popups in offscreen rendering on Mac
'name': 'webkit_popups', 'name': 'webkit_popups',
'path': '../third_party/WebKit/Source/WebKit/chromium/', 'path': '../third_party/WebKit/',
}, },
{ {
# http://code.google.com/p/chromiumembedded/issues/detail?id=364 # http://code.google.com/p/chromiumembedded/issues/detail?id=364

4
patch/patches/gyp_331.patch
View File

@ -1,8 +1,8 @@
Index: gyp/generator/ninja.py Index: gyp/generator/ninja.py
=================================================================== ===================================================================
--- gyp/generator/ninja.py (revision 1640) --- gyp/generator/ninja.py (revision 1651)
+++ gyp/generator/ninja.py (working copy) +++ gyp/generator/ninja.py (working copy)
@@ -664,7 +664,16 @@ @@ -669,7 +669,16 @@
for path in copy['files']: for path in copy['files']:
# Normalize the path so trailing slashes don't confuse us. # Normalize the path so trailing slashes don't confuse us.
path = os.path.normpath(path) path = os.path.normpath(path)

13
patch/patches/webkit_features.patch
View File

@ -1,13 +0,0 @@
Index: features.gypi
===================================================================
--- features.gypi (revision 151551)
+++ features.gypi (working copy)
@@ -78,7 +78,7 @@
'feature_defines': [
'ENABLE_CALENDAR_PICKER=1',
'ENABLE_INPUT_SPEECH=1',
- 'ENABLE_INPUT_TYPE_COLOR=1',
+ 'ENABLE_INPUT_TYPE_COLOR=0',
'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
'ENABLE_LEGACY_NOTIFICATIONS=1',
'ENABLE_MEDIA_CAPTURE=0',

36
patch/patches/webkit_popups.patch
View File

@ -1,8 +1,8 @@
Index: public/WebView.h Index: public/web/WebView.h
=================================================================== ===================================================================
--- public/WebView.h (revision 151551) --- public/web/WebView.h (revision 152832)
+++ public/WebView.h (working copy) +++ public/web/WebView.h (working copy)
@@ -417,6 +417,7 @@ @@ -421,6 +421,7 @@
// Sets whether select popup menus should be rendered by the browser. // Sets whether select popup menus should be rendered by the browser.
WEBKIT_EXPORT static void setUseExternalPopupMenus(bool); WEBKIT_EXPORT static void setUseExternalPopupMenus(bool);
@ -10,11 +10,11 @@ Index: public/WebView.h
// Visited link state -------------------------------------------------- // Visited link state --------------------------------------------------
Index: src/ChromeClientImpl.cpp Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
=================================================================== ===================================================================
--- src/ChromeClientImpl.cpp (revision 151551) --- Source/WebKit/chromium/src/ChromeClientImpl.cpp (revision 152832)
+++ src/ChromeClientImpl.cpp (working copy) +++ Source/WebKit/chromium/src/ChromeClientImpl.cpp (working copy)
@@ -894,7 +894,7 @@ @@ -893,7 +893,7 @@
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
{ {
@ -23,11 +23,11 @@ Index: src/ChromeClientImpl.cpp
return adoptRef(new ExternalPopupMenu(frame, client, m_webView->client())); return adoptRef(new ExternalPopupMenu(frame, client, m_webView->client()));
return adoptRef(new PopupMenuChromium(frame, client)); return adoptRef(new PopupMenuChromium(frame, client));
Index: src/WebViewImpl.cpp Index: Source/WebKit/chromium/src/WebViewImpl.cpp
=================================================================== ===================================================================
--- src/WebViewImpl.cpp (revision 151551) --- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 152832)
+++ src/WebViewImpl.cpp (working copy) +++ Source/WebKit/chromium/src/WebViewImpl.cpp (working copy)
@@ -385,6 +385,7 @@ @@ -392,6 +392,7 @@
, m_fakeDoubleTapPageScaleFactor(0) , m_fakeDoubleTapPageScaleFactor(0)
, m_fakeDoubleTapUseAnchor(false) , m_fakeDoubleTapUseAnchor(false)
, m_contextMenuAllowed(false) , m_contextMenuAllowed(false)
@ -35,7 +35,7 @@ Index: src/WebViewImpl.cpp
, m_doingDragAndDrop(false) , m_doingDragAndDrop(false)
, m_ignoreInputEvents(false) , m_ignoreInputEvents(false)
, m_suppressNextKeypressEvent(false) , m_suppressNextKeypressEvent(false)
@@ -3634,9 +3635,14 @@ @@ -3660,9 +3661,14 @@
updateLayerTreeViewport(); updateLayerTreeViewport();
} }
@ -51,11 +51,11 @@ Index: src/WebViewImpl.cpp
} }
void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor) void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor)
Index: src/WebViewImpl.h Index: Source/WebKit/chromium/src/WebViewImpl.h
=================================================================== ===================================================================
--- src/WebViewImpl.h (revision 151551) --- Source/WebKit/chromium/src/WebViewImpl.h (revision 152832)
+++ src/WebViewImpl.h (working copy) +++ Source/WebKit/chromium/src/WebViewImpl.h (working copy)
@@ -417,7 +417,8 @@ @@ -415,7 +415,8 @@
// Returns true if popup menus should be rendered by the browser, false if // Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default). // they should be rendered by WebKit (which is the default).
@ -65,7 +65,7 @@ Index: src/WebViewImpl.h
bool contextMenuAllowed() const bool contextMenuAllowed() const
{ {
@@ -730,6 +731,8 @@ @@ -731,6 +732,8 @@
bool m_contextMenuAllowed; bool m_contextMenuAllowed;

2
tests/unittests/urlrequest_unittest.cc
View File

@ -14,7 +14,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/callback.h" #include "base/callback.h"
#include "base/stringprintf.h" #include "base/strings/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
// Include after base/bind.h to avoid name collisions with cef_tuple.h. // Include after base/bind.h to avoid name collisions with cef_tuple.h.

2
tools/gyp_cef
View File

@ -27,7 +27,7 @@ import gyp
sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit')) sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build')) sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build'))
sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
'Source', 'core', 'core.gyp', 'scripts')) 'Source', 'core', 'scripts'))
# On Windows, Psyco shortens warm runs of build/gyp_chromium by about # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
# 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70 # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70