1
0
Yuchen Lin 2019-04-26 20:53:59 +00:00 committed by Git OBS Bridge
parent a98a0f7394
commit 6b546c6d1c
5 changed files with 125 additions and 103 deletions

View File

@ -1,7 +1,7 @@
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc
@@ -400,6 +400,8 @@ static VAEntrypoint GetVaEntryPoint(Vaap @@ -400,6 +400,8 @@ static VAEntrypoint GetVaEntryPoint(Vaap
case VaapiWrapper::kCodecModeMax: case VaapiWrapper::kCodecModeMax:
NOTREACHED(); NOTREACHED();
@ -11,10 +11,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/gpu/v
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/cc/input/snap_fling_controller.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/cc/input/snap_fling_controller.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/cc/input/snap_fling_controller.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/cc/input/snap_fling_controller.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/cc/input/snap_fling_controller.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/cc/input/snap_fling_controller.cc
@@ -26,6 +26,8 @@ bool SnapFlingController::FilterEventFor @@ -26,6 +26,8 @@ bool SnapFlingController::FilterEventFor
case GestureScrollType::kEnd: { case GestureScrollType::kEnd: {
return state_ == State::kActive || state_ == State::kFinished; return state_ == State::kActive || state_ == State::kFinished;
@ -24,10 +24,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/cc/input/sn
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/chrome/browser/ui/webui/discards/discards_ui.cc
@@ -48,6 +48,8 @@ mojom::LifecycleUnitVisibility GetLifecy @@ -48,6 +48,8 @@ mojom::LifecycleUnitVisibility GetLifecy
return mojom::LifecycleUnitVisibility::OCCLUDED; return mojom::LifecycleUnitVisibility::OCCLUDED;
case content::Visibility::VISIBLE: case content::Visibility::VISIBLE:
@ -37,10 +37,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/chrome/brow
} }
#if defined(COMPILER_MSVC) #if defined(COMPILER_MSVC)
NOTREACHED(); NOTREACHED();
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/autofill/core/browser/autofill_manager.cc
@@ -285,6 +285,7 @@ PopupType AutofillManager::GetPopupType( @@ -285,6 +285,7 @@ PopupType AutofillManager::GetPopupType(
default: default:
@ -49,10 +49,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/cast_channel/cast_message_util.cc
@@ -368,6 +368,8 @@ const char* GetAppAvailabilityResultToSt @@ -368,6 +368,8 @@ const char* GetAppAvailabilityResultToSt
return "unavailable"; return "unavailable";
case GetAppAvailabilityResult::kUnknown: case GetAppAvailabilityResult::kUnknown:
@ -62,10 +62,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
@@ -337,6 +337,8 @@ PageloadMetrics_ConnectionType ProtoConn @@ -337,6 +337,8 @@ PageloadMetrics_ConnectionType ProtoConn
return PageloadMetrics_ConnectionType_CONNECTION_NONE; return PageloadMetrics_ConnectionType_CONNECTION_NONE;
case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH: case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
@ -84,10 +84,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/browser/cache_storage/cache_storage_quota_client.cc
@@ -98,6 +98,8 @@ storage::QuotaClient::ID CacheStorageQuo @@ -98,6 +98,8 @@ storage::QuotaClient::ID CacheStorageQuo
return kServiceWorkerCache; return kServiceWorkerCache;
case CacheStorageOwner::kBackgroundFetch: case CacheStorageOwner::kBackgroundFetch:
@ -97,10 +97,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/bro
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc
@@ -94,6 +94,8 @@ const char* VideoCaptureDeviceDescriptor @@ -94,6 +94,8 @@ const char* VideoCaptureDeviceDescriptor
return "Virtual Device"; return "Virtual Device";
case VideoCaptureApi::UNKNOWN: case VideoCaptureApi::UNKNOWN:
@ -110,10 +110,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/captu
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/net/nqe/network_quality_estimator.cc
@@ -1342,6 +1342,8 @@ base::TimeDelta NetworkQualityEstimator: @@ -1342,6 +1342,8 @@ base::TimeDelta NetworkQualityEstimator:
case nqe::internal::OBSERVATION_CATEGORY_COUNT: case nqe::internal::OBSERVATION_CATEGORY_COUNT:
NOTREACHED(); NOTREACHED();
@ -123,10 +123,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/net/nqe/net
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/services/audio/public/cpp/audio_system_to_service_adapter.cc
@@ -66,6 +66,8 @@ const char* GetTraceEvent(Action action) @@ -66,6 +66,8 @@ const char* GetTraceEvent(Action action)
return "AudioSystemToServiceAdapter::GetAssociatedOutputDeviceID"; return "AudioSystemToServiceAdapter::GetAssociatedOutputDeviceID";
case kGetInputDeviceInfo: case kGetInputDeviceInfo:
@ -136,10 +136,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/au
} }
NOTREACHED(); NOTREACHED();
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/services/network/cross_origin_read_blocking.cc
@@ -800,6 +800,8 @@ bool CrossOriginReadBlocking::ResponseAn @@ -800,6 +800,8 @@ bool CrossOriginReadBlocking::ResponseAn
return sniffers_.empty() && !found_blockable_content_; return sniffers_.empty() && !found_blockable_content_;
case kBlock: case kBlock:
@ -158,10 +158,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/ne
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
@@ -1191,6 +1191,8 @@ AXTextPosition AXLayoutObject::GetTextPo @@ -1191,6 +1191,8 @@ AXTextPosition AXLayoutObject::GetTextPo
return kAXTextPositionSubscript; return kAXTextPositionSubscript;
case EVerticalAlign::kSuper: case EVerticalAlign::kSuper:
@ -171,10 +171,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_param.cc
@@ -144,6 +144,7 @@ String AudioParamHandler::GetParamName() @@ -144,6 +144,7 @@ String AudioParamHandler::GetParamName()
return custom_param_name_; return custom_param_name_;
default: default:
@ -183,10 +183,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
@@ -1291,6 +1291,8 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR @@ -1291,6 +1291,8 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR
case ax::mojom::Role::kPresentational: case ax::mojom::Role::kPresentational:
case ax::mojom::Role::kUnknown: case ax::mojom::Role::kUnknown:
@ -196,10 +196,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/accessib
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/password_manager/core/browser/browser_save_password_progress_logger.cc
@@ -86,6 +86,8 @@ std::string VoteTypeToString( @@ -86,6 +86,8 @@ std::string VoteTypeToString(
return "HTML classifier"; return "HTML classifier";
case AutofillUploadContents::Field::FIRST_USE: case AutofillUploadContents::Field::FIRST_USE:
@ -209,10 +209,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/previews/content/previews_hints.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/previews/content/previews_hints.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/previews/content/previews_hints.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/components/previews/content/previews_hints.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/previews/content/previews_hints.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/previews/content/previews_hints.cc
@@ -94,6 +94,8 @@ ConvertProtoOptimizationTypeToPreviewsOp @@ -94,6 +94,8 @@ ConvertProtoOptimizationTypeToPreviewsOp
return PreviewsType::NOSCRIPT; return PreviewsType::NOSCRIPT;
case optimization_guide::proto::RESOURCE_LOADING: case optimization_guide::proto::RESOURCE_LOADING:
@ -222,10 +222,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/previews/core/previews_black_list.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/previews/core/previews_black_list.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/components/previews/core/previews_black_list.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/components/previews/core/previews_black_list.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/previews/core/previews_black_list.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/components/previews/core/previews_black_list.cc
@@ -33,6 +33,9 @@ PreviewsEligibilityReason BlacklistReaso @@ -33,6 +33,9 @@ PreviewsEligibilityReason BlacklistReaso
return PreviewsEligibilityReason::ALLOWED; return PreviewsEligibilityReason::ALLOWED;
case blacklist::BlacklistReason::kAllowed: case blacklist::BlacklistReason::kAllowed:
@ -236,10 +236,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/components/
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/browser/frame_host/frame_tree_node.cc
@@ -624,6 +624,7 @@ bool FrameTreeNode::UpdateUserActivation @@ -624,6 +624,7 @@ bool FrameTreeNode::UpdateUserActivation
return NotifyUserActivation(); return NotifyUserActivation();
} }
@ -248,10 +248,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/bro
} }
void FrameTreeNode::OnSetHasReceivedUserGestureBeforeNavigation(bool value) { void FrameTreeNode::OnSetHasReceivedUserGestureBeforeNavigation(bool value) {
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/renderer/input/input_event_prediction.cc
@@ -76,6 +76,8 @@ std::unique_ptr<ui::InputPredictor> Inpu @@ -76,6 +76,8 @@ std::unique_ptr<ui::InputPredictor> Inpu
return std::make_unique<ui::LeastSquaresPredictor>(); return std::make_unique<ui::LeastSquaresPredictor>();
case PredictorType::kKalman: case PredictorType::kKalman:
@ -261,10 +261,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/ren
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/renderer/media/webrtc/peer_connection_tracker.cc
@@ -112,6 +112,8 @@ static const char* SerializeDirection( @@ -112,6 +112,8 @@ static const char* SerializeDirection(
return "'recvonly'"; return "'recvonly'";
case webrtc::RtpTransceiverDirection::kInactive: case webrtc::RtpTransceiverDirection::kInactive:
@ -274,10 +274,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/content/ren
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
@@ -397,6 +397,8 @@ bool BluetoothRemoteGattCharacteristic:: @@ -397,6 +397,8 @@ bool BluetoothRemoteGattCharacteristic::
return hasNotify; return hasNotify;
case NotificationType::kIndication: case NotificationType::kIndication:
@ -287,10 +287,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/device/blue
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/blink/watch_time_reporter.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/media/blink/watch_time_reporter.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/media/blink/watch_time_reporter.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/media/blink/watch_time_reporter.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/blink/watch_time_reporter.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/media/blink/watch_time_reporter.cc
@@ -571,6 +571,8 @@ WatchTimeKey WatchTimeReporter::GetDispl @@ -571,6 +571,8 @@ WatchTimeKey WatchTimeReporter::GetDispl
return DISPLAY_TYPE_KEY(DisplayFullscreen); return DISPLAY_TYPE_KEY(DisplayFullscreen);
case DisplayType::kPictureInPicture: case DisplayType::kPictureInPicture:
@ -300,10 +300,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/media/blink
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/services/ui/public/cpp/gpu/command_buffer_metrics.cc
@@ -86,6 +86,8 @@ std::string ContextTypeToString(ContextT @@ -86,6 +86,8 @@ std::string ContextTypeToString(ContextT
return "Unknown"; return "Unknown";
case ContextType::FOR_TESTING: case ContextType::FOR_TESTING:
@ -313,10 +313,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/services/ui
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/core/css/style_environment_variables.cc
@@ -67,6 +67,7 @@ const AtomicString StyleEnvironmentVaria @@ -67,6 +67,7 @@ const AtomicString StyleEnvironmentVaria
} }
@ -325,10 +325,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
} }
// static // static
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/core/html/media/media_controls.cc
@@ -36,6 +36,9 @@ AtomicString MediaControls::GetSizingCSS @@ -36,6 +36,9 @@ AtomicString MediaControls::GetSizingCSS
return kMediaControlsSizingMediumCSSClass; return kMediaControlsSizingMediumCSSClass;
case MediaControlsSizingClass::kLarge: case MediaControlsSizingClass::kLarge:
@ -339,10 +339,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
} }
NOTREACHED(); NOTREACHED();
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc
@@ -53,6 +53,9 @@ String ToCookieListItemSameSite(network: @@ -53,6 +53,9 @@ String ToCookieListItemSameSite(network:
return "lax"; return "lax";
case network::mojom::CookieSameSite::NO_RESTRICTION: case network::mojom::CookieSameSite::NO_RESTRICTION:
@ -353,10 +353,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
} }
NOTREACHED(); NOTREACHED();
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/platform/heap/heap_stats_collector.h
@@ -94,6 +94,8 @@ class PLATFORM_EXPORT ThreadHeapStatsCol @@ -94,6 +94,8 @@ class PLATFORM_EXPORT ThreadHeapStatsCol
return "BlinkGC.VisitPersistents"; return "BlinkGC.VisitPersistents";
case Id::kVisitStackRoots: case Id::kVisitStackRoots:
@ -366,10 +366,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
@@ -688,6 +688,9 @@ PageSchedulerImpl::PageLifecycleStateTra @@ -688,6 +688,9 @@ PageSchedulerImpl::PageLifecycleStateTra
NOTREACHED(); NOTREACHED();
return base::nullopt; return base::nullopt;
@ -380,10 +380,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/ui/base/mojo/clipboard_struct_traits.h
@@ -20,6 +20,9 @@ struct EnumTraits<ui::mojom::ClipboardTy @@ -20,6 +20,9 @@ struct EnumTraits<ui::mojom::ClipboardTy
return ui::mojom::ClipboardType::SELECTION; return ui::mojom::ClipboardType::SELECTION;
case ui::CLIPBOARD_TYPE_DRAG: case ui::CLIPBOARD_TYPE_DRAG:
@ -403,10 +403,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/base/moj
} }
NOTREACHED(); NOTREACHED();
return false; return false;
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/views/layout/layout_provider.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/ui/views/layout/layout_provider.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/ui/views/layout/layout_provider.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/ui/views/layout/layout_provider.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/views/layout/layout_provider.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/ui/views/layout/layout_provider.cc
@@ -156,6 +156,8 @@ int LayoutProvider::GetCornerRadiusMetri @@ -156,6 +156,8 @@ int LayoutProvider::GetCornerRadiusMetri
return is_touch ? 8 : 4; return is_touch ? 8 : 4;
case EMPHASIS_MAXIMUM: case EMPHASIS_MAXIMUM:
@ -416,10 +416,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/ui/views/la
} }
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc
@@ -28,6 +28,8 @@ String TransceiverDirectionToString( @@ -28,6 +28,8 @@ String TransceiverDirectionToString(
return "recvonly"; return "recvonly";
case webrtc::RtpTransceiverDirection::kInactive: case webrtc::RtpTransceiverDirection::kInactive:
@ -429,10 +429,10 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
} }
NOTREACHED(); NOTREACHED();
} }
Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc
=================================================================== ===================================================================
--- qtwebengine-everywhere-src-5.12.0-beta4.orig/src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc --- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc
+++ qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc +++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc
@@ -237,6 +237,7 @@ bool MixedContentChecker::IsMixedContent @@ -237,6 +237,7 @@ bool MixedContentChecker::IsMixedContent
const FetchClientSettingsObjectImpl& settings, const FetchClientSettingsObjectImpl& settings,
const KURL& url) { const KURL& url) {
@ -441,3 +441,16 @@ Index: qtwebengine-everywhere-src-5.12.0-beta4/src/3rdparty/chromium/third_party
case HttpsState::kNone: case HttpsState::kNone:
return false; return false;
Index: qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/common/navigation_params.cc
===================================================================
--- qtwebengine-everywhere-src-5.12.3.orig/src/3rdparty/chromium/content/common/navigation_params.cc
+++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/content/common/navigation_params.cc
@@ -36,6 +36,8 @@ bool IsNavigationDownloadAllowed(Navigat
case NavigationDownloadPolicy::kAllowOpenerCrossOrigin:
case NavigationDownloadPolicy::kAllowOpenerCrossOriginNoGesture:
return true;
+ default:
+ __builtin_unreachable();
}
}

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Apr 18 07:27:59 UTC 2019 - fabian@ritter-vogt.de
- Update to 5.12.3:
* New bugfix release
* For more details please see:
* http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.12.3/?h=v5.12.3
- Refresh chromium-non-void-return.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 14 08:52:25 UTC 2019 - fabian@ritter-vogt.de Thu Mar 14 08:52:25 UTC 2019 - fabian@ritter-vogt.de

View File

@ -52,16 +52,16 @@
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
Name: libqt5-qtwebengine Name: libqt5-qtwebengine
Version: 5.12.2 Version: 5.12.3
Release: 0 Release: 0
Summary: Qt 5 WebEngine Library Summary: Qt 5 WebEngine Library
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Url: https://www.qt.io Url: https://www.qt.io
%define base_name libqt5 %define base_name libqt5
%define real_version 5.12.2 %define real_version 5.12.3
%define so_version 5.12.2 %define so_version 5.12.3
%define tar_version qtwebengine-everywhere-src-5.12.2 %define tar_version qtwebengine-everywhere-src-5.12.3
Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6 # PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:082b1d6e60c1be61881bc8533acc67d9688620d6b3a538417f62b27b34ead493
size 249240772

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317
size 249275648