Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
6794bc2a
E
engine
项目概览
qq_34031325
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6794bc2a
编写于
12月 06, 2016
作者:
C
Collin Jackson
提交者:
GitHub
12月 06, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename sky -> flutter in shell (#3293)
上级
cdb18a53
变更
17
显示空白变更内容
内联
并排
Showing
17 changed file
with
248 addition
and
187 deletion
+248
-187
shell/platform/android/AndroidManifest.xml
shell/platform/android/AndroidManifest.xml
+3
-3
shell/platform/android/BUILD.gn
shell/platform/android/BUILD.gn
+3
-0
shell/platform/android/io/flutter/app/FlutterActivity.java
shell/platform/android/io/flutter/app/FlutterActivity.java
+145
-0
shell/platform/android/io/flutter/app/FlutterApplication.java
...l/platform/android/io/flutter/app/FlutterApplication.java
+21
-0
shell/platform/android/org/domokit/sky/shell/SkyActivity.java
...l/platform/android/org/domokit/sky/shell/SkyActivity.java
+4
-136
shell/platform/android/org/domokit/sky/shell/SkyApplication.java
...latform/android/org/domokit/sky/shell/SkyApplication.java
+5
-11
shell/platform/darwin/desktop/BUILD.gn
shell/platform/darwin/desktop/BUILD.gn
+7
-7
shell/platform/darwin/desktop/Info.plist
shell/platform/darwin/desktop/Info.plist
+2
-2
shell/platform/darwin/desktop/flutter_app_delegate.h
shell/platform/darwin/desktop/flutter_app_delegate.h
+14
-0
shell/platform/darwin/desktop/flutter_app_delegate.m
shell/platform/darwin/desktop/flutter_app_delegate.m
+3
-3
shell/platform/darwin/desktop/flutter_application.h
shell/platform/darwin/desktop/flutter_application.h
+4
-4
shell/platform/darwin/desktop/flutter_application.mm
shell/platform/darwin/desktop/flutter_application.mm
+5
-5
shell/platform/darwin/desktop/flutter_mac.xib
shell/platform/darwin/desktop/flutter_mac.xib
+2
-2
shell/platform/darwin/desktop/flutter_window.h
shell/platform/darwin/desktop/flutter_window.h
+14
-0
shell/platform/darwin/desktop/flutter_window.mm
shell/platform/darwin/desktop/flutter_window.mm
+4
-4
shell/platform/darwin/desktop/main_mac.mm
shell/platform/darwin/desktop/main_mac.mm
+2
-2
travis/licenses.golden
travis/licenses.golden
+10
-8
未找到文件。
shell/platform/android/AndroidManifest.xml
浏览文件 @
6794bc2a
...
...
@@ -3,18 +3,18 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"
org.domokit.sky.shell
"
android:versionCode=
"1"
android:versionName=
"0.0.1"
>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"
io.flutter.app
"
android:versionCode=
"1"
android:versionName=
"0.0.1"
>
<uses-sdk
android:minSdkVersion=
"14"
android:targetSdkVersion=
"21"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<uses-feature
android:name=
"android.hardware.sensor.accelerometer"
android:required=
"true"
/>
<application
android:label=
"
Sky Shell"
android:name=
"Sky
Application"
android:debuggable=
"true"
>
<application
android:label=
"
Flutter Shell"
android:name=
"Flutter
Application"
android:debuggable=
"true"
>
<activity
android:configChanges=
"orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
android:hardwareAccelerated=
"true"
android:launchMode=
"standard"
android:name=
"
Sky
Activity"
android:name=
"
Flutter
Activity"
android:theme=
"@android:style/Theme.Black.NoTitleBar"
android:windowSoftInputMode=
"adjustResize"
>
<intent-filter>
...
...
shell/platform/android/BUILD.gn
浏览文件 @
6794bc2a
...
...
@@ -64,6 +64,8 @@ android_library("java") {
visibility = [ ":*" ]
java_files = [
"io/flutter/app/FlutterActivity.java",
"io/flutter/app/FlutterApplication.java",
"io/flutter/plugin/common/ActivityLifecycleListener.java",
"io/flutter/plugin/common/JSONMessageListener.java",
"io/flutter/plugin/editing/InputConnectionAdaptor.java",
...
...
@@ -76,6 +78,7 @@ android_library("java") {
"io/flutter/view/ResourceExtractor.java",
"io/flutter/view/ResourcePaths.java",
"io/flutter/view/VsyncWaiter.java",
# Deprecated classes provided for backwards compatibility
"org/domokit/sky/shell/SkyActivity.java",
"org/domokit/sky/shell/SkyApplication.java",
]
...
...
shell/platform/android/io/flutter/app/FlutterActivity.java
0 → 100644
浏览文件 @
6794bc2a
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package
io.flutter.app
;
import
android.app.Activity
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
io.flutter.plugin.platform.PlatformPlugin
;
import
io.flutter.view.FlutterMain
;
import
io.flutter.view.FlutterView
;
import
java.util.ArrayList
;
import
org.chromium.base.TraceEvent
;
/**
* Base class for activities that use Flutter.
*/
public
class
FlutterActivity
extends
Activity
{
private
FlutterView
mView
;
private
String
[]
getArgsFromIntent
(
Intent
intent
)
{
// Before adding more entries to this list, consider that arbitrary
// Android applications can generate intents with extra data and that
// there are many security-sensitive args in the binary.
ArrayList
<
String
>
args
=
new
ArrayList
<
String
>();
if
(
intent
.
getBooleanExtra
(
"trace-startup"
,
false
))
{
args
.
add
(
"--trace-startup"
);
}
if
(
intent
.
getBooleanExtra
(
"start-paused"
,
false
))
{
args
.
add
(
"--start-paused"
);
}
if
(
intent
.
getBooleanExtra
(
"enable-dart-profiling"
,
false
))
{
args
.
add
(
"--enable-dart-profiling"
);
}
if
(!
args
.
isEmpty
())
{
String
[]
argsArray
=
new
String
[
args
.
size
()];
return
args
.
toArray
(
argsArray
);
}
return
null
;
}
/**
* @see android.app.Activity#onCreate(android.os.Bundle)
*/
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
LOLLIPOP
)
{
Window
window
=
getWindow
();
window
.
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS
);
window
.
setStatusBarColor
(
0x40000000
);
window
.
getDecorView
().
setSystemUiVisibility
(
PlatformPlugin
.
DEFAULT_SYSTEM_UI
);
}
String
[]
args
=
getArgsFromIntent
(
getIntent
());
FlutterMain
.
ensureInitializationComplete
(
getApplicationContext
(),
args
);
mView
=
new
FlutterView
(
this
);
setContentView
(
mView
);
onFlutterReady
();
}
/**
* @see android.app.Activity#onDestroy()
*/
@Override
protected
void
onDestroy
()
{
if
(
mView
!=
null
)
{
mView
.
destroy
();
}
super
.
onDestroy
();
}
@Override
public
void
onBackPressed
()
{
if
(
mView
!=
null
)
{
mView
.
popRoute
();
return
;
}
super
.
onBackPressed
();
}
@Override
protected
void
onPause
()
{
super
.
onPause
();
if
(
mView
!=
null
)
{
mView
.
onPause
();
}
}
@Override
protected
void
onPostResume
()
{
super
.
onPostResume
();
if
(
mView
!=
null
)
{
mView
.
onPostResume
();
}
}
/**
* Override this function to customize startup behavior.
*/
protected
void
onFlutterReady
()
{
TraceEvent
.
instant
(
"FlutterActivity.onFlutterReady"
);
if
(
loadIntent
(
getIntent
()))
{
return
;
}
String
appBundlePath
=
FlutterMain
.
findAppBundlePath
(
getApplicationContext
());
if
(
appBundlePath
!=
null
)
{
mView
.
runFromBundle
(
appBundlePath
,
null
);
return
;
}
}
protected
void
onNewIntent
(
Intent
intent
)
{
loadIntent
(
intent
);
}
public
boolean
loadIntent
(
Intent
intent
)
{
String
action
=
intent
.
getAction
();
if
(
Intent
.
ACTION_RUN
.
equals
(
action
))
{
String
route
=
intent
.
getStringExtra
(
"route"
);
String
appBundlePath
=
intent
.
getDataString
();
if
(
appBundlePath
==
null
)
{
// Fall back to the installation path if no bundle path
// was specified.
appBundlePath
=
FlutterMain
.
findAppBundlePath
(
getApplicationContext
());
}
mView
.
runFromBundle
(
appBundlePath
,
intent
.
getStringExtra
(
"snapshot"
));
if
(
route
!=
null
)
mView
.
pushRoute
(
route
);
return
true
;
}
return
false
;
}
}
shell/platform/android/io/flutter/app/FlutterApplication.java
0 → 100644
浏览文件 @
6794bc2a
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package
io.flutter.app
;
import
android.app.Application
;
import
io.flutter.view.FlutterMain
;
/**
* Flutter implementation of {@link android.app.Application}, managing
* application-level global initializations.
*/
public
class
FlutterApplication
extends
Application
{
@Override
public
void
onCreate
()
{
super
.
onCreate
();
FlutterMain
.
startInitialization
(
this
);
}
}
shell/platform/android/org/domokit/sky/shell/SkyActivity.java
浏览文件 @
6794bc2a
...
...
@@ -4,143 +4,11 @@
package
org.domokit.sky.shell
;
import
android.app.Activity
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
io.flutter.plugin.platform.PlatformPlugin
;
import
io.flutter.view.FlutterMain
;
import
io.flutter.view.FlutterView
;
import
java.util.ArrayList
;
import
org.chromium.base.TraceEvent
;
import
io.flutter.app.FlutterActivity
;
/**
* Base class for activities that use Sky.
*/
public
class
SkyActivity
extends
Activity
{
private
FlutterView
mView
;
private
String
[]
getArgsFromIntent
(
Intent
intent
)
{
// Before adding more entries to this list, consider that arbitrary
// Android applications can generate intents with extra data and that
// there are many security-sensitive args in the binary.
ArrayList
<
String
>
args
=
new
ArrayList
<
String
>();
if
(
intent
.
getBooleanExtra
(
"trace-startup"
,
false
))
{
args
.
add
(
"--trace-startup"
);
}
if
(
intent
.
getBooleanExtra
(
"start-paused"
,
false
))
{
args
.
add
(
"--start-paused"
);
}
if
(
intent
.
getBooleanExtra
(
"enable-dart-profiling"
,
false
))
{
args
.
add
(
"--enable-dart-profiling"
);
}
if
(!
args
.
isEmpty
())
{
String
[]
argsArray
=
new
String
[
args
.
size
()];
return
args
.
toArray
(
argsArray
);
}
return
null
;
}
/**
* @see android.app.Activity#onCreate(android.os.Bundle)
*/
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
LOLLIPOP
)
{
Window
window
=
getWindow
();
window
.
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS
);
window
.
setStatusBarColor
(
0x40000000
);
window
.
getDecorView
().
setSystemUiVisibility
(
PlatformPlugin
.
DEFAULT_SYSTEM_UI
);
}
String
[]
args
=
getArgsFromIntent
(
getIntent
());
FlutterMain
.
ensureInitializationComplete
(
getApplicationContext
(),
args
);
mView
=
new
FlutterView
(
this
);
setContentView
(
mView
);
onSkyReady
();
}
/**
* @see android.app.Activity#onDestroy()
* Use io.flutter.app.FlutterActivity instead
* This class should be removed after Feb 2017
*/
@Override
protected
void
onDestroy
()
{
if
(
mView
!=
null
)
{
mView
.
destroy
();
}
// Do we need to shut down Sky too?
super
.
onDestroy
();
}
@Override
public
void
onBackPressed
()
{
if
(
mView
!=
null
)
{
mView
.
popRoute
();
return
;
}
super
.
onBackPressed
();
}
@Override
protected
void
onPause
()
{
super
.
onPause
();
if
(
mView
!=
null
)
{
mView
.
onPause
();
}
}
@Override
protected
void
onPostResume
()
{
super
.
onPostResume
();
if
(
mView
!=
null
)
{
mView
.
onPostResume
();
}
}
/**
* Override this function to customize startup behavior.
*/
protected
void
onSkyReady
()
{
TraceEvent
.
instant
(
"SkyActivity.onSkyReady"
);
if
(
loadIntent
(
getIntent
()))
{
return
;
}
String
appBundlePath
=
FlutterMain
.
findAppBundlePath
(
getApplicationContext
());
if
(
appBundlePath
!=
null
)
{
mView
.
runFromBundle
(
appBundlePath
,
null
);
return
;
}
}
protected
void
onNewIntent
(
Intent
intent
)
{
loadIntent
(
intent
);
}
public
boolean
loadIntent
(
Intent
intent
)
{
String
action
=
intent
.
getAction
();
if
(
Intent
.
ACTION_RUN
.
equals
(
action
))
{
String
route
=
intent
.
getStringExtra
(
"route"
);
String
appBundlePath
=
intent
.
getDataString
();
if
(
appBundlePath
==
null
)
{
// Fall back to the installation path if no bundle path
// was specified.
appBundlePath
=
FlutterMain
.
findAppBundlePath
(
getApplicationContext
());
}
mView
.
runFromBundle
(
appBundlePath
,
intent
.
getStringExtra
(
"snapshot"
));
if
(
route
!=
null
)
mView
.
pushRoute
(
route
);
return
true
;
}
return
false
;
}
public
class
SkyActivity
extends
FlutterActivity
{
}
shell/platform/android/org/domokit/sky/shell/SkyApplication.java
浏览文件 @
6794bc2a
...
...
@@ -4,18 +4,12 @@
package
org.domokit.sky.shell
;
import
android.app.Application
;
import
io.flutter.view.FlutterMain
;
import
io.flutter.app.FlutterApplication
;
/**
*
Sky implementation of {@link android.app.Application}, managing application-level global
*
initializations.
*
Use io.flutter.app.FlutterActivity instead
*
This class should be removed after Feb 2017
*/
public
class
SkyApplication
extends
Application
{
@Override
public
void
onCreate
()
{
super
.
onCreate
();
FlutterMain
.
startInitialization
(
this
);
}
@Deprecated
public
class
SkyApplication
extends
FlutterApplication
{
}
shell/platform/darwin/desktop/BUILD.gn
浏览文件 @
6794bc2a
...
...
@@ -13,12 +13,12 @@ source_set("mac_desktop_platform") {
"main_mac.mm",
"platform_view_mac.h",
"platform_view_mac.mm",
"
sky
_app_delegate.h",
"
sky
_app_delegate.m",
"
sky
_application.h",
"
sky
_application.mm",
"
sky
_window.h",
"
sky
_window.mm",
"
flutter
_app_delegate.h",
"
flutter
_app_delegate.m",
"
flutter
_application.h",
"
flutter
_application.mm",
"
flutter
_window.h",
"
flutter
_window.mm",
"vsync_waiter_mac.cc",
"vsync_waiter_mac.h",
]
...
...
@@ -57,7 +57,7 @@ resource_copy_mac("mac_desktop_resources") {
mac_app("shell_application_bundle") {
app_name = "SkyShell"
info_plist = "Info.plist"
xibs = [ "
sky
_mac.xib" ]
xibs = [ "
flutter
_mac.xib" ]
deps = [
":mac_desktop_platform",
...
...
shell/platform/darwin/desktop/Info.plist
浏览文件 @
6794bc2a
...
...
@@ -9,7 +9,7 @@
<key>
CFBundleIconFile
</key>
<string></string>
<key>
CFBundleIdentifier
</key>
<string>
org.domokit.sky
</string>
<string>
io.flutter
</string>
<key>
CFBundleInfoDictionaryVersion
</key>
<string>
6.0
</string>
<key>
CFBundleName
</key>
...
...
@@ -29,6 +29,6 @@
<key>
NSMainNibFile
</key>
<string>
sky_mac
</string>
<key>
NSPrincipalClass
</key>
<string>
Sky
Application
</string>
<string>
Flutter
Application
</string>
</dict>
</plist>
shell/platform/darwin/desktop/
sky_window
.h
→
shell/platform/darwin/desktop/
flutter_app_delegate
.h
浏览文件 @
6794bc2a
...
...
@@ -2,8 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef __SHELL_PLATFORM_DARWIN_DESKTOP_FLUTTER_APP_DELEGATE__
#define __SHELL_PLATFORM_DARWIN_DESKTOP_FLUTTER_APP_DELEGATE__
#import <Cocoa/Cocoa.h>
@interface
SkyWindow
:
NSWindow
@interface
FlutterAppDelegate
:
NSObject
<
NSApplicationDelegate
>
@end
#endif
/* defined(__SHELL_PLATFORM_DARWIN_DESKTOP_FLUTTER_APP_DELEGATE__) */
shell/platform/darwin/desktop/
sky
_app_delegate.m
→
shell/platform/darwin/desktop/
flutter
_app_delegate.m
浏览文件 @
6794bc2a
...
...
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "
sky
_app_delegate.h"
#import "
flutter
_app_delegate.h"
@interface
Sky
AppDelegate
()
@interface
Flutter
AppDelegate
()
@property
(
assign
)
IBOutlet
NSWindow
*
window
;
@end
@implementation
Sky
AppDelegate
@implementation
Flutter
AppDelegate
@end
shell/platform/darwin/desktop/
sky
_application.h
→
shell/platform/darwin/desktop/
flutter
_application.h
浏览文件 @
6794bc2a
...
...
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef __SHELL_
MAC_SKY
_APPLICATION__
#define __SHELL_
MAC_SKY
_APPLICATION__
#ifndef __SHELL_
PLATFORM_DARWIN_DESKTOP_FLUTTER
_APPLICATION__
#define __SHELL_
PLATFORM_DARWIN_DESKTOP_FLUTTER
_APPLICATION__
#import <AppKit/AppKit.h>
...
...
@@ -12,7 +12,7 @@
// A specific subclass of NSApplication is necessary on Mac in order to
// interact correctly with the main runloop.
@interface
Sky
Application
:
NSApplication
<
CrAppProtocol
,
CrAppControlProtocol
>
@interface
Flutter
Application
:
NSApplication
<
CrAppProtocol
,
CrAppControlProtocol
>
@end
#endif
/* defined(__SHELL_
MAC_SKY
_APPLICATION__) */
#endif
/* defined(__SHELL_
PLATFORM_DARWIN_DESKTOP_FLUTTER
_APPLICATION__) */
shell/platform/darwin/desktop/
sky
_application.mm
→
shell/platform/darwin/desktop/
flutter
_application.mm
浏览文件 @
6794bc2a
...
...
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "flutter/shell/platform/darwin/desktop/
sky
_application.h"
#include "flutter/shell/platform/darwin/desktop/
flutter
_application.h"
#include "base/auto_reset.h"
#include "base/logging.h"
@implementation
Sky
Application
{
@implementation
Flutter
Application
{
BOOL
handlingSendEvent_
;
}
+
(
void
)
initialize
{
if
(
self
==
[
Sky
Application
class
])
{
NSApplication
*
app
=
[
Sky
Application
sharedApplication
];
if
(
self
==
[
Flutter
Application
class
])
{
NSApplication
*
app
=
[
Flutter
Application
sharedApplication
];
DCHECK
([
app
conformsToProtocol
:
@protocol
(
CrAppControlProtocol
)])
<<
"Existing NSApp (class "
<<
[[
app
className
]
UTF8String
]
<<
") does not conform to required protocol."
;
DCHECK
(
base
::
MessagePumpMac
::
UsingCrApp
())
<<
"MessagePumpMac::Create() was called before "
<<
"+[
Sky
Application initialize]"
;
<<
"+[
Flutter
Application initialize]"
;
}
}
...
...
shell/platform/darwin/desktop/
sky
_mac.xib
→
shell/platform/darwin/desktop/
flutter
_mac.xib
浏览文件 @
6794bc2a
...
...
@@ -4,14 +4,14 @@
<plugIn
identifier=
"com.apple.InterfaceBuilder.CocoaPlugin"
version=
"10117"
/>
</dependencies>
<objects>
<customObject
id=
"-2"
userLabel=
"File's Owner"
customClass=
"
Sky
Application"
>
<customObject
id=
"-2"
userLabel=
"File's Owner"
customClass=
"
Flutter
Application"
>
<connections>
<outlet
property=
"delegate"
destination=
"Voe-Tx-rLC"
id=
"GzC-gU-4Uq"
/>
</connections>
</customObject>
<customObject
id=
"-1"
userLabel=
"First Responder"
customClass=
"FirstResponder"
/>
<customObject
id=
"-3"
userLabel=
"Application"
customClass=
"NSObject"
/>
<customObject
id=
"Voe-Tx-rLC"
customClass=
"
Sky
AppDelegate"
>
<customObject
id=
"Voe-Tx-rLC"
customClass=
"
Flutter
AppDelegate"
>
<connections>
<outlet
property=
"window"
destination=
"QvC-M9-y7g"
id=
"gIp-Ho-8D9"
/>
</connections>
...
...
shell/platform/darwin/desktop/
sky_app_delegate
.h
→
shell/platform/darwin/desktop/
flutter_window
.h
浏览文件 @
6794bc2a
...
...
@@ -2,8 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef __SHELL_PLATFORM_DARWIN_DESKTOP_FLUTTER_WINDOW__
#define __SHELL_PLATFORM_DARWIN_DESKTOP_FLUTTER_WINDOW__
#import <Cocoa/Cocoa.h>
@interface
SkyAppDelegate
:
NSObject
<
NSApplicationDelegate
>
@interface
FlutterWindow
:
NSWindow
@end
#endif
/* defined(__SHELL_PLATFORM_DARWIN_DESKTOP_FLUTTER_WINDOW__) */
shell/platform/darwin/desktop/
sky
_window.mm
→
shell/platform/darwin/desktop/
flutter
_window.mm
浏览文件 @
6794bc2a
...
...
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "
sky
_window.h"
#import "
flutter
_window.h"
#include "flutter/common/threads.h"
#include "flutter/shell/gpu/gpu_surface_gl.h"
#include "flutter/shell/platform/darwin/desktop/platform_view_mac.h"
@interface
Sky
Window
()
<
NSWindowDelegate
>
@interface
Flutter
Window
()
<
NSWindowDelegate
>
@property
(
assign
)
IBOutlet
NSOpenGLView
*
renderSurface
;
@property
(
getter
=
isSurfaceSetup
)
BOOL
surfaceSetup
;
...
...
@@ -37,7 +37,7 @@ static inline blink::PointerData::Change PointerChangeFromNSEventPhase(
return
blink
::
PointerData
::
Change
::
kCancel
;
}
@implementation
Sky
Window
{
@implementation
Flutter
Window
{
std
::
unique_ptr
<
shell
::
PlatformViewMac
>
_platformView
;
bool
_mouseIsDown
;
}
...
...
@@ -63,7 +63,7 @@ static inline blink::PointerData::Change PointerChangeFromNSEventPhase(
std
::
make_unique
<
shell
::
GPUSurfaceGL
>
(
_platformView
.
get
()));
}
// TODO(eseidel): This does not belong in
sky
_window!
// TODO(eseidel): This does not belong in
flutter
_window!
// Probably belongs in NSApplicationDelegate didFinishLaunching.
-
(
void
)
setupAndLoadDart
{
_platformView
->
SetupAndLoadDart
();
...
...
shell/platform/darwin/desktop/main_mac.mm
浏览文件 @
6794bc2a
...
...
@@ -11,7 +11,7 @@
#include "base/message_loop/message_loop.h"
#include "flutter/shell/common/switches.h"
#include "flutter/shell/platform/darwin/common/platform_mac.h"
#include "flutter/shell/platform/darwin/desktop/
sky
_application.h"
#include "flutter/shell/platform/darwin/desktop/
flutter
_application.h"
#include "flutter/shell/testing/testing.h"
namespace
shell
{
...
...
@@ -30,7 +30,7 @@ void AttachMessageLoopToMainRunLoop(void) {
}
// namespace shell
int
main
(
int
argc
,
const
char
*
argv
[])
{
[
Sky
Application
sharedApplication
];
[
Flutter
Application
sharedApplication
];
shell
::
PlatformMacMain
(
argc
,
argv
,
""
,
""
);
...
...
travis/licenses.golden
浏览文件 @
6794bc2a
...
...
@@ -12867,7 +12867,7 @@ FILE: ../../../flutter/lib/ui/window/window.h
FILE: ../../../flutter/runtime/platform_impl.h
FILE: ../../../flutter/shell/common/skia_event_tracer_impl.cc
FILE: ../../../flutter/shell/platform/darwin/desktop/Info.plist
FILE: ../../../flutter/shell/platform/darwin/desktop/
sky
_mac.xib
FILE: ../../../flutter/shell/platform/darwin/desktop/
flutter
_mac.xib
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Info.plist
FILE: ../../../flutter/shell/platform/darwin/ios/framework/module.modulemap
FILE: ../../../flutter/sky/engine/core/editing/CompositionUnderlineRangeFilter.cpp
...
...
@@ -14073,6 +14073,8 @@ FILE: ../../../flutter/shell/gpu/gpu_rasterizer.h
FILE: ../../../flutter/shell/platform/android/AndroidManifest.xml
FILE: ../../../flutter/shell/platform/android/flutter_main.cc
FILE: ../../../flutter/shell/platform/android/flutter_main.h
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java
FILE: ../../../flutter/shell/platform/android/io/flutter/view/ResourceCleaner.java
FILE: ../../../flutter/shell/platform/android/io/flutter/view/ResourceExtractor.java
FILE: ../../../flutter/shell/platform/android/io/flutter/view/ResourcePaths.java
...
...
@@ -14084,15 +14086,15 @@ FILE: ../../../flutter/shell/platform/android/platform_view_android.h
FILE: ../../../flutter/shell/platform/darwin/common/platform_mac.h
FILE: ../../../flutter/shell/platform/darwin/common/platform_mac.mm
FILE: ../../../flutter/shell/platform/darwin/common/string_conversions.h
FILE: ../../../flutter/shell/platform/darwin/desktop/flutter_app_delegate.h
FILE: ../../../flutter/shell/platform/darwin/desktop/flutter_app_delegate.m
FILE: ../../../flutter/shell/platform/darwin/desktop/flutter_application.h
FILE: ../../../flutter/shell/platform/darwin/desktop/flutter_application.mm
FILE: ../../../flutter/shell/platform/darwin/desktop/flutter_window.h
FILE: ../../../flutter/shell/platform/darwin/desktop/flutter_window.mm
FILE: ../../../flutter/shell/platform/darwin/desktop/main_mac.mm
FILE: ../../../flutter/shell/platform/darwin/desktop/platform_view_mac.h
FILE: ../../../flutter/shell/platform/darwin/desktop/platform_view_mac.mm
FILE: ../../../flutter/shell/platform/darwin/desktop/sky_app_delegate.h
FILE: ../../../flutter/shell/platform/darwin/desktop/sky_app_delegate.m
FILE: ../../../flutter/shell/platform/darwin/desktop/sky_application.h
FILE: ../../../flutter/shell/platform/darwin/desktop/sky_application.mm
FILE: ../../../flutter/shell/platform/darwin/desktop/sky_window.h
FILE: ../../../flutter/shell/platform/darwin/desktop/sky_window.mm
FILE: ../../../flutter/shell/platform/darwin/desktop/vsync_waiter_mac.cc
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
...
...
@@ -72009,4 +72011,4 @@ freely, subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution.
====================================================================================================
Total license count: 688
3161
6 of 31616
██████████ 100% (0 missing licenses) Done.
3161
8 of 31618
██████████ 100% (0 missing licenses) Done.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录