update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
This commit is contained in:
parent
d5e9b662f8
commit
6f2f761df3
90 changed files with 7411 additions and 7874 deletions
|
@ -1,33 +1,8 @@
|
|||
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
||||
index 6a161f0f36c6..349bc78976ad 100644
|
||||
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
||||
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
||||
@@ -48,6 +48,7 @@
|
||||
#include "ui/gfx/geometry/dip_util.h"
|
||||
#include "ui/gfx/mac/coordinate_conversion.h"
|
||||
#include "ui/gl/gl_switches.h"
|
||||
+#include "ui/gl/gpu_switching_manager.h"
|
||||
|
||||
using blink::WebInputEvent;
|
||||
using blink::WebMouseEvent;
|
||||
@@ -1112,6 +1113,12 @@ void RenderWidgetHostViewMac::SetBackgroundColor(SkColor color) {
|
||||
DCHECK(SkColorGetA(color) == SK_AlphaOPAQUE ||
|
||||
SkColorGetA(color) == SK_AlphaTRANSPARENT);
|
||||
bool opaque = SkColorGetA(color) == SK_AlphaOPAQUE;
|
||||
+ if (opaque) {
|
||||
+ bool wantsTransparent = ui::GpuSwitchingManager::UseTransparent() ||
|
||||
+ ([cocoa_view() window] && ![[cocoa_view() window] isOpaque]);
|
||||
+ if (wantsTransparent)
|
||||
+ opaque = NO;
|
||||
+ }
|
||||
if (background_is_opaque_ != opaque) {
|
||||
background_is_opaque_ = opaque;
|
||||
if (host())
|
||||
diff --git a/content/browser/renderer_host/render_widget_host_view_cocoa.mm b/content/browser/renderer_host/render_widget_host_view_cocoa.mm
|
||||
index c7ad6fa8c75f..bdfabc1061bb 100644
|
||||
index 5b4ae0732914..ea774eb81c75 100644
|
||||
--- a/content/browser/renderer_host/render_widget_host_view_cocoa.mm
|
||||
+++ b/content/browser/renderer_host/render_widget_host_view_cocoa.mm
|
||||
@@ -178,6 +178,11 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@@ -179,6 +179,11 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
|
||||
} // namespace
|
||||
|
||||
|
@ -39,7 +14,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
|
|||
// These are not documented, so use only after checking -respondsToSelector:.
|
||||
@interface NSApplication (UndocumentedSpeechMethods)
|
||||
- (void)speakString:(NSString*)string;
|
||||
@@ -355,6 +360,9 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@@ -363,6 +368,9 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
}
|
||||
|
||||
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
|
||||
|
@ -49,7 +24,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
|
|||
return [self acceptsMouseEventsWhenInactive];
|
||||
}
|
||||
|
||||
@@ -555,6 +563,7 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@@ -587,6 +595,7 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
if (EventIsReservedBySystem(theEvent))
|
||||
return NO;
|
||||
|
||||
|
@ -57,7 +32,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
|
|||
// If we return |NO| from this function, cocoa will send the key event to
|
||||
// the menu and only if the menu does not process the event to |keyDown:|. We
|
||||
// want to send the event to a renderer _before_ sending it to the menu, so
|
||||
@@ -568,6 +577,7 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@@ -600,6 +609,7 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
DCHECK(![[NSApp mainMenu] performKeyEquivalent:theEvent]);
|
||||
return NO;
|
||||
}
|
||||
|
@ -65,7 +40,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
|
|||
|
||||
// Command key combinations are sent via performKeyEquivalent rather than
|
||||
// keyDown:. We just forward this on and if WebCore doesn't want to handle
|
||||
@@ -664,6 +674,10 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@@ -699,6 +709,10 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
eventType == NSKeyDown &&
|
||||
!(modifierFlags & NSCommandKeyMask);
|
||||
|
||||
|
@ -76,7 +51,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
|
|||
// We only handle key down events and just simply forward other events.
|
||||
if (eventType != NSKeyDown) {
|
||||
client_->OnNSViewForwardKeyboardEvent(event, latency_info);
|
||||
@@ -1425,9 +1439,11 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@@ -1461,9 +1475,11 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
// Since this implementation doesn't have to wait any IPC calls, this doesn't
|
||||
// make any key-typing jank. --hbono 7/23/09
|
||||
//
|
||||
|
@ -88,7 +63,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
|
|||
|
||||
- (NSArray*)validAttributesForMarkedText {
|
||||
// This code is just copied from WebKit except renaming variables.
|
||||
@@ -1436,7 +1452,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
|
||||
@@ -1472,7 +1488,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
|
||||
initWithObjects:NSUnderlineStyleAttributeName,
|
||||
NSUnderlineColorAttributeName,
|
||||
NSMarkedClauseSegmentAttributeName,
|
||||
|
@ -100,3 +75,18 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
|
|||
}
|
||||
return validAttributesForMarkedText_.get();
|
||||
}
|
||||
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
||||
index 8b012bcb8f77..077ccbeaa913 100644
|
||||
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
||||
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
||||
@@ -53,6 +53,7 @@
|
||||
#include "ui/events/keycodes/dom/dom_code.h"
|
||||
#include "ui/gfx/geometry/dip_util.h"
|
||||
#include "ui/gfx/mac/coordinate_conversion.h"
|
||||
+#include "ui/gl/gpu_switching_manager.h"
|
||||
|
||||
using blink::WebInputEvent;
|
||||
using blink::WebMouseEvent;
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue