From c10f203620de13ca606e1516bf5361cae7e2e1ea Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 27 Feb 2013 17:56:03 +0000 Subject: [PATCH] Update to Chromium revision 184577. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1111 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- libcef/browser/browser_context.h | 4 ++-- libcef/browser/content_browser_client.cc | 13 +++++++++---- libcef/browser/content_browser_client.h | 2 +- libcef/browser/context.h | 2 +- libcef/browser/cookie_manager_impl.h | 2 +- libcef/browser/javascript_dialog_win.cc | 10 +++++----- libcef/browser/path_util_impl.cc | 2 +- libcef/browser/render_widget_host_view_osr.cc | 19 +++++++++++++++++++ libcef/browser/render_widget_host_view_osr.h | 10 ++++++++++ libcef/browser/scheme_impl.cc | 14 ++++++-------- libcef/browser/trace_subscriber.cc | 2 +- libcef/browser/trace_subscriber.h | 2 +- libcef/browser/url_request_context_getter.cc | 1 + libcef/browser/url_request_context_getter.h | 7 ++++++- libcef/browser/web_contents_view_osr.cc | 12 ++++++++++-- libcef/browser/web_contents_view_osr.h | 10 +++++++--- libcef/browser/web_plugin_impl.cc | 2 +- libcef/common/command_line_impl.cc | 2 +- libcef/common/main_delegate.cc | 4 ++-- libcef/renderer/render_urlrequest_impl.cc | 2 +- patch/patches/spi_webcore_364.patch | 6 +++--- patch/patches/tools_gyp.patch | 4 ++-- tests/unittests/download_unittest.cc | 2 +- 24 files changed, 93 insertions(+), 43 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index e8a708410..4bf1ae1e7 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -17,5 +17,5 @@ { 'chromium_url': 'http://src.chromium.org/svn/trunk/src', - 'chromium_revision': '181864', + 'chromium_revision': '184577', } diff --git a/libcef/browser/browser_context.h b/libcef/browser/browser_context.h index 6673d167e..d7728aed9 100644 --- a/libcef/browser/browser_context.h +++ b/libcef/browser/browser_context.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/browser_context.h" @@ -59,7 +59,7 @@ class CefBrowserContext : public content::BrowserContext { scoped_ptr chrome_devtools_protocol_handler); net::URLRequestContextGetter* CreateRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory, scoped_ptr blob_protocol_handler, diff --git a/libcef/browser/content_browser_client.cc b/libcef/browser/content_browser_client.cc index 42868253f..355ad76cd 100644 --- a/libcef/browser/content_browser_client.cc +++ b/libcef/browser/content_browser_client.cc @@ -21,7 +21,7 @@ #include "libcef/common/command_line_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/common/chrome_switches.h" #include "content/browser/plugin_service_impl.h" @@ -208,7 +208,7 @@ class CefPluginServiceFilter : public content::PluginServiceFilter { } virtual bool CanLoadPlugin(int render_process_id, - const FilePath& path) OVERRIDE { + const base::FilePath& path) OVERRIDE { return true; } }; @@ -238,6 +238,11 @@ class CefMediaObserver : public content::MediaObserver { int render_view_id, const content::MediaStreamDevice& device, content::MediaRequestState state) OVERRIDE {} + virtual void OnAudioStreamPlayingChanged( + int render_process_id, + int render_view_id, + int stream_id, + bool playing) OVERRIDE {} }; CefContentBrowserClient::CefContentBrowserClient() @@ -360,11 +365,11 @@ content::BrowserMainParts* CefContentBrowserClient::CreateBrowserMainParts( return browser_main_parts_; } -content::WebContentsView* +content::WebContentsViewPort* CefContentBrowserClient::OverrideCreateWebContentsView( content::WebContents* web_contents, content::RenderViewHostDelegateView** render_view_host_delegate_view) { - content::WebContentsView* view = NULL; + content::WebContentsViewPort* view = NULL; *render_view_host_delegate_view = NULL; // TODO(port): Implement this method to work on other platforms as part of // off-screen rendering support. diff --git a/libcef/browser/content_browser_client.h b/libcef/browser/content_browser_client.h index fd9673bf5..7a125c4ba 100644 --- a/libcef/browser/content_browser_client.h +++ b/libcef/browser/content_browser_client.h @@ -62,7 +62,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient { virtual content::BrowserMainParts* CreateBrowserMainParts( const content::MainFunctionParams& parameters) OVERRIDE; - virtual content::WebContentsView* OverrideCreateWebContentsView( + virtual content::WebContentsViewPort* OverrideCreateWebContentsView( content::WebContents* web_contents, content::RenderViewHostDelegateView** rvhdv) OVERRIDE; virtual void RenderProcessHostCreated( diff --git a/libcef/browser/context.h b/libcef/browser/context.h index 1db2ad849..f36564d6e 100644 --- a/libcef/browser/context.h +++ b/libcef/browser/context.h @@ -13,7 +13,7 @@ #include "include/cef_app.h" #include "include/cef_base.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/threading/platform_thread.h" diff --git a/libcef/browser/cookie_manager_impl.h b/libcef/browser/cookie_manager_impl.h index a9c8d5e81..8fc353b1b 100644 --- a/libcef/browser/cookie_manager_impl.h +++ b/libcef/browser/cookie_manager_impl.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_BROWSER_COOKIE_MANAGER_IMPL_H_ #include "include/cef_cookie.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "net/cookies/cookie_monster.h" // Implementation of the CefCookieManager interface. diff --git a/libcef/browser/javascript_dialog_win.cc b/libcef/browser/javascript_dialog_win.cc index c5841ca73..3c2bb1f97 100644 --- a/libcef/browser/javascript_dialog_win.cc +++ b/libcef/browser/javascript_dialog_win.cc @@ -8,7 +8,7 @@ #include "libcef/browser/browser_host_impl.h" #include "libcef_dll/resource.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -24,7 +24,7 @@ INT_PTR CALLBACK CefJavaScriptDialog::DialogProc(HWND dialog, LPARAM lparam) { switch (message) { case WM_INITDIALOG: { - SetWindowLongPtr(dialog, DWL_USER, static_cast(lparam)); + SetWindowLongPtr(dialog, DWLP_USER, static_cast(lparam)); CefJavaScriptDialog* owner = reinterpret_cast(lparam); owner->dialog_win_ = dialog; @@ -36,7 +36,7 @@ INT_PTR CALLBACK CefJavaScriptDialog::DialogProc(HWND dialog, } case WM_CLOSE: { CefJavaScriptDialog* owner = reinterpret_cast( - GetWindowLongPtr(dialog, DWL_USER)); + GetWindowLongPtr(dialog, DWLP_USER)); if (owner) { owner->Cancel(); owner->callback_.Run(false, string16()); @@ -50,7 +50,7 @@ INT_PTR CALLBACK CefJavaScriptDialog::DialogProc(HWND dialog, } case WM_COMMAND: { CefJavaScriptDialog* owner = reinterpret_cast( - GetWindowLongPtr(dialog, DWL_USER)); + GetWindowLongPtr(dialog, DWLP_USER)); string16 user_input; bool finish = false; bool result; @@ -158,7 +158,7 @@ void CefJavaScriptDialog::Cancel() { } if (dialog_win_ && IsWindow(dialog_win_)) { - SetWindowLongPtr(dialog_win_, DWL_USER, NULL); + SetWindowLongPtr(dialog_win_, DWLP_USER, NULL); DestroyWindow(dialog_win_); dialog_win_ = NULL; } diff --git a/libcef/browser/path_util_impl.cc b/libcef/browser/path_util_impl.cc index 10ead1a4c..9a73d800c 100644 --- a/libcef/browser/path_util_impl.cc +++ b/libcef/browser/path_util_impl.cc @@ -4,7 +4,7 @@ #include "include/cef_path_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/libcef/browser/render_widget_host_view_osr.cc b/libcef/browser/render_widget_host_view_osr.cc index 769de38fb..a4fab5cea 100644 --- a/libcef/browser/render_widget_host_view_osr.cc +++ b/libcef/browser/render_widget_host_view_osr.cc @@ -182,6 +182,11 @@ void CefRenderWidgetHostViewOSR::TextInputStateChanged( void CefRenderWidgetHostViewOSR::ImeCancelComposition() { } +void CefRenderWidgetHostViewOSR::ImeCompositionRangeChanged( + const ui::Range& range, + const std::vector& character_bounds) { +} + void CefRenderWidgetHostViewOSR::DidUpdateBackingStore( const gfx::Rect& scroll_rect, const gfx::Vector2d& scroll_delta, @@ -228,6 +233,10 @@ gfx::Rect CefRenderWidgetHostViewOSR::GetBoundsInRootWindow() { return gfx::Rect(); } +void CefRenderWidgetHostViewOSR::OnAccessibilityNotifications( + const std::vector& params) { +} + void CefRenderWidgetHostViewOSR::Destroy() { if (IsPopupWidget()) { if (parent_host_view_) @@ -251,6 +260,13 @@ void CefRenderWidgetHostViewOSR::SetTooltipText(const string16& tooltip_text) { } } +void CefRenderWidgetHostViewOSR::SelectionBoundsChanged( + const ViewHostMsg_SelectionBounds_Params& params) { +} + +void CefRenderWidgetHostViewOSR::ScrollOffsetChanged() { +} + content::BackingStore* CefRenderWidgetHostViewOSR::AllocBackingStore( const gfx::Size& size) { return render_widget_host_ ? @@ -302,6 +318,9 @@ void CefRenderWidgetHostViewOSR::AcceleratedSurfacePostSubBuffer( void CefRenderWidgetHostViewOSR::AcceleratedSurfaceSuspend() { } +void CefRenderWidgetHostViewOSR::AcceleratedSurfaceRelease() { +} + bool CefRenderWidgetHostViewOSR::HasAcceleratedSurface( const gfx::Size& desired_size) { return false; diff --git a/libcef/browser/render_widget_host_view_osr.h b/libcef/browser/render_widget_host_view_osr.h index ddb6b7861..5b369872c 100644 --- a/libcef/browser/render_widget_host_view_osr.h +++ b/libcef/browser/render_widget_host_view_osr.h @@ -75,6 +75,9 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase { virtual void TextInputStateChanged( const ViewHostMsg_TextInputState_Params& params) OVERRIDE; virtual void ImeCancelComposition() OVERRIDE; + virtual void ImeCompositionRangeChanged( + const ui::Range& range, + const std::vector& character_bounds) OVERRIDE; virtual void DidUpdateBackingStore( const gfx::Rect& scroll_rect, const gfx::Vector2d& scroll_delta, @@ -86,8 +89,14 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase { #endif virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; + void OnAccessibilityNotifications( + const std::vector& params) + OVERRIDE; virtual void Destroy() OVERRIDE; virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE; + virtual void SelectionBoundsChanged( + const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE; + virtual void ScrollOffsetChanged() OVERRIDE; virtual content::BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; virtual void CopyFromCompositingSurface( @@ -112,6 +121,7 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase { const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, int gpu_host_id) OVERRIDE; virtual void AcceleratedSurfaceSuspend() OVERRIDE; + virtual void AcceleratedSurfaceRelease() OVERRIDE; virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; virtual bool LockMouse() OVERRIDE; virtual void UnlockMouse() OVERRIDE; diff --git a/libcef/browser/scheme_impl.cc b/libcef/browser/scheme_impl.cc index 248eed6ac..371fa6c69 100644 --- a/libcef/browser/scheme_impl.cc +++ b/libcef/browser/scheme_impl.cc @@ -39,7 +39,7 @@ #include "net/url_request/url_request_ftp_job.h" #include "net/url_request/url_request_http_job.h" #include "net/url_request/url_request_job.h" -#include "net/url_request/url_request_job_factory.h" +#include "net/url_request/url_request_job_factory_impl.h" using net::URLRequestStatus; @@ -124,11 +124,9 @@ class CefUrlRequestManager { // Retrieve the singleton instance. static CefUrlRequestManager* GetInstance(); - net::URLRequestJobFactory* GetJobFactory() { - return const_cast( - static_cast( - _Context->request_context().get())-> - GetURLRequestContext()->job_factory()); + net::URLRequestJobFactoryImpl* GetJobFactoryImpl() { + return static_cast( + _Context->request_context().get())->job_factory_impl(); } bool AddFactory(const std::string& scheme, @@ -150,7 +148,7 @@ class CefUrlRequestManager { handler_map_[make_pair(scheme_lower, domain_lower)] = factory; - net::URLRequestJobFactory* job_factory = GetJobFactory(); + net::URLRequestJobFactoryImpl* job_factory = GetJobFactoryImpl(); job_factory->SetProtocolHandler(scheme_lower, new ProtocolHandler(scheme_lower)); @@ -178,7 +176,7 @@ class CefUrlRequestManager { void ClearFactories() { CEF_REQUIRE_IOT(); - net::URLRequestJobFactory* job_factory = GetJobFactory(); + net::URLRequestJobFactoryImpl* job_factory = GetJobFactoryImpl(); // Unregister with the ProtocolFactory. std::set schemes; diff --git a/libcef/browser/trace_subscriber.cc b/libcef/browser/trace_subscriber.cc index 896693761..8bcadb735 100644 --- a/libcef/browser/trace_subscriber.cc +++ b/libcef/browser/trace_subscriber.cc @@ -30,7 +30,7 @@ bool CefTraceSubscriber::BeginTracing(CefRefPtr client, client_ = client; return content::TraceController::GetInstance()->BeginTracing( - this, categories); + this, categories, base::debug::TraceLog::GetInstance()->trace_options()); } bool CefTraceSubscriber::EndTracingAsync() { diff --git a/libcef/browser/trace_subscriber.h b/libcef/browser/trace_subscriber.h index 3ce5e4a18..f76b4a4ec 100644 --- a/libcef/browser/trace_subscriber.h +++ b/libcef/browser/trace_subscriber.h @@ -9,7 +9,7 @@ #include "include/cef_trace.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/trace_subscriber.h" diff --git a/libcef/browser/url_request_context_getter.cc b/libcef/browser/url_request_context_getter.cc index d77266279..1de639b26 100644 --- a/libcef/browser/url_request_context_getter.cc +++ b/libcef/browser/url_request_context_getter.cc @@ -175,6 +175,7 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() { scoped_ptr job_factory( new net::URLRequestJobFactoryImpl()); + job_factory_impl_ = job_factory.get(); bool set_protocol = job_factory->SetProtocolHandler( chrome::kBlobScheme, blob_protocol_handler_.release()); DCHECK(set_protocol); diff --git a/libcef/browser/url_request_context_getter.h b/libcef/browser/url_request_context_getter.h index 495261401..bc3765a34 100644 --- a/libcef/browser/url_request_context_getter.h +++ b/libcef/browser/url_request_context_getter.h @@ -11,7 +11,7 @@ #include #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "net/url_request/url_request_context_getter.h" @@ -26,6 +26,7 @@ class HostResolver; class ProxyConfigService; class URLRequestContextStorage; class URLRequestJobFactory; +class URLRequestJobFactoryImpl; class URLSecurityManager; } @@ -89,6 +90,9 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter { GetNetworkTaskRunner() const OVERRIDE; net::HostResolver* host_resolver(); + net::URLRequestJobFactoryImpl* job_factory_impl() const { + return job_factory_impl_; + } void SetCookieStoragePath(const base::FilePath& path, bool persist_session_cookies); @@ -117,6 +121,7 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter { file_system_protocol_handler_; scoped_ptr developer_protocol_handler_; + net::URLRequestJobFactoryImpl* job_factory_impl_; typedef std::set RequestContextProxySet; RequestContextProxySet url_request_context_proxies_; diff --git a/libcef/browser/web_contents_view_osr.cc b/libcef/browser/web_contents_view_osr.cc index 8e886cbec..e6ef1da31 100644 --- a/libcef/browser/web_contents_view_osr.cc +++ b/libcef/browser/web_contents_view_osr.cc @@ -77,6 +77,9 @@ void CefWebContentsViewOSR::RenderViewCreated(content::RenderViewHost* host) { } } +void CefWebContentsViewOSR::RenderViewSwappedIn(content::RenderViewHost* host) { +} + void CefWebContentsViewOSR::Focus() { } @@ -93,6 +96,11 @@ WebDropData* CefWebContentsViewOSR::GetDropData() const { return NULL; } +gfx::Rect CefWebContentsViewOSR::GetViewBounds() const { + return view_ ? view_->GetViewBounds() : gfx::Rect(); +} + +#if defined(OS_MACOSX) bool CefWebContentsViewOSR::IsEventTracking() const { return false; } @@ -100,9 +108,9 @@ bool CefWebContentsViewOSR::IsEventTracking() const { void CefWebContentsViewOSR::CloseTabAfterEventTracking() { } -gfx::Rect CefWebContentsViewOSR::GetViewBounds() const { - return view_ ? view_->GetViewBounds() : gfx::Rect(); +void CefWebContentsViewOSR::SetAllowOverlappingViews(bool overlapping) { } +#endif // defined(OS_MACOSX) // RenderViewHostDelegateView methods. diff --git a/libcef/browser/web_contents_view_osr.h b/libcef/browser/web_contents_view_osr.h index d5e3e52dd..68bfcdb7d 100644 --- a/libcef/browser/web_contents_view_osr.h +++ b/libcef/browser/web_contents_view_osr.h @@ -9,7 +9,7 @@ #include #include "content/port/browser/render_view_host_delegate_view.h" -#include "content/public/browser/web_contents_view.h" +#include "content/port/browser/web_contents_view_port.h" namespace content { class WebContents; @@ -19,7 +19,7 @@ class WebContentsViewDelegate; class CefBrowserHostImpl; // An implementation of WebContentsView for off-screen rendering. -class CefWebContentsViewOSR : public content::WebContentsView, +class CefWebContentsViewOSR : public content::WebContentsViewPort, public content::RenderViewHostDelegateView { public: CefWebContentsViewOSR(content::WebContents* web_contents, @@ -42,14 +42,18 @@ class CefWebContentsViewOSR : public content::WebContentsView, int error_code) OVERRIDE; virtual void SizeContents(const gfx::Size& size) OVERRIDE; virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE; + virtual void RenderViewSwappedIn(content::RenderViewHost* host) OVERRIDE; virtual void Focus() OVERRIDE; virtual void SetInitialFocus() OVERRIDE; virtual void StoreFocus() OVERRIDE; virtual void RestoreFocus() OVERRIDE; virtual WebDropData* GetDropData() const OVERRIDE; + virtual gfx::Rect GetViewBounds() const OVERRIDE; +#if defined(OS_MACOSX) virtual bool IsEventTracking() const OVERRIDE; virtual void CloseTabAfterEventTracking() OVERRIDE; - virtual gfx::Rect GetViewBounds() const OVERRIDE; + virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE; +#endif // RenderViewHostDelegateView methods. virtual void StartDragging(const WebDropData& drop_data, diff --git a/libcef/browser/web_plugin_impl.cc b/libcef/browser/web_plugin_impl.cc index 1f3012b17..367d4675a 100644 --- a/libcef/browser/web_plugin_impl.cc +++ b/libcef/browser/web_plugin_impl.cc @@ -7,7 +7,7 @@ #include "libcef/browser/thread_util.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/browser/plugin_service_impl.h" namespace { diff --git a/libcef/common/command_line_impl.cc b/libcef/common/command_line_impl.cc index 2dd9817a7..8075b0ccc 100644 --- a/libcef/common/command_line_impl.cc +++ b/libcef/common/command_line_impl.cc @@ -4,7 +4,7 @@ #include "libcef/common/command_line_impl.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" CefCommandLineImpl::CefCommandLineImpl(CommandLine* value, diff --git a/libcef/common/main_delegate.cc b/libcef/common/main_delegate.cc index 4eb81b7ac..88e878828 100644 --- a/libcef/common/main_delegate.cc +++ b/libcef/common/main_delegate.cc @@ -10,7 +10,7 @@ #include "libcef/renderer/content_renderer_client.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/string_number_conversions.h" @@ -191,7 +191,7 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) { } if (settings.log_file.length > 0) { - base::FilePath file_path = FilePath(CefString(&settings.log_file)); + base::FilePath file_path = base::FilePath(CefString(&settings.log_file)); if (!file_path.empty()) command_line->AppendSwitchPath(switches::kLogFile, file_path); } diff --git a/libcef/renderer/render_urlrequest_impl.cc b/libcef/renderer/render_urlrequest_impl.cc index 8c66cf5ae..8e564dff4 100644 --- a/libcef/renderer/render_urlrequest_impl.cc +++ b/libcef/renderer/render_urlrequest_impl.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/message_loop.h" +#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" @@ -15,7 +16,6 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" using WebKit::WebString; diff --git a/patch/patches/spi_webcore_364.patch b/patch/patches/spi_webcore_364.patch index 37db45491..646f6fba6 100644 --- a/patch/patches/spi_webcore_364.patch +++ b/patch/patches/spi_webcore_364.patch @@ -1,8 +1,8 @@ Index: page/FrameView.cpp =================================================================== ---- page/FrameView.cpp (revision 137939) +--- page/FrameView.cpp (revision 143980) +++ page/FrameView.cpp (working copy) -@@ -209,10 +209,12 @@ +@@ -208,10 +208,12 @@ if (!page) return; @@ -17,7 +17,7 @@ Index: page/FrameView.cpp PassRefPtr FrameView::create(Frame* frame) Index: platform/mac/NSScrollerImpDetails.mm =================================================================== ---- platform/mac/NSScrollerImpDetails.mm (revision 137939) +--- platform/mac/NSScrollerImpDetails.mm (revision 143980) +++ platform/mac/NSScrollerImpDetails.mm (working copy) @@ -34,6 +34,7 @@ #if PLATFORM(CHROMIUM) diff --git a/patch/patches/tools_gyp.patch b/patch/patches/tools_gyp.patch index 0b06ecaba..37faffb95 100644 --- a/patch/patches/tools_gyp.patch +++ b/patch/patches/tools_gyp.patch @@ -1,8 +1,8 @@ Index: pylib/gyp/input.py =================================================================== ---- pylib/gyp/input.py (revision 1556) +--- pylib/gyp/input.py (revision 1583) +++ pylib/gyp/input.py (working copy) -@@ -857,7 +857,8 @@ +@@ -843,7 +843,8 @@ # that don't load quickly, this can be faster than #