mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 40af916d (#303546).
- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git core/frame/FrameView.cpp core/frame/FrameView.cpp
|
||||
index 3a1981b..95cb146 100644
|
||||
index 8a77e1c..06e6c47 100644
|
||||
--- core/frame/FrameView.cpp
|
||||
+++ core/frame/FrameView.cpp
|
||||
@@ -129,8 +129,10 @@ FrameView::FrameView(LocalFrame* frame)
|
||||
@@ -145,8 +145,10 @@ FrameView::FrameView(LocalFrame* frame)
|
||||
if (!m_frame->isMainFrame())
|
||||
return;
|
||||
|
||||
@ -12,7 +12,7 @@ index 3a1981b..95cb146 100644
|
||||
+#endif
|
||||
}
|
||||
|
||||
PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
|
||||
PassRefPtrWillBeRawPtr<FrameView> FrameView::create(LocalFrame* frame)
|
||||
diff --git platform/scroll/ScrollbarThemeMacCommon.mm platform/scroll/ScrollbarThemeMacCommon.mm
|
||||
index 90abb7c..6bb16c6 100644
|
||||
--- platform/scroll/ScrollbarThemeMacCommon.mm
|
||||
|
Reference in New Issue
Block a user