forked from cocos2d/cocos2d-x
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request cocos2d#7882 from andyque/addWebView
add WebView
- Loading branch information
Showing
25 changed files
with
2,049 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -865,6 +865,8 @@ | |
290E94B6196FC16900694919 /* CocostudioParserTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */; }; | ||
295824591987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; }; | ||
2958245A1987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; }; | ||
298D7F6F19AC31F300FF096D /* UIWebViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 298D7F6D19AC31F300FF096D /* UIWebViewTest.cpp */; }; | ||
29AFEF6719ACCAA000F6B10A /* Test.html in Resources */ = {isa = PBXBuildFile; fileRef = 29AFEF6619ACCAA000F6B10A /* Test.html */; }; | ||
29FBBBFE196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */; }; | ||
29FBBBFF196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */; }; | ||
38FA2E73194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */; }; | ||
|
@@ -2886,6 +2888,9 @@ | |
290E94B4196FC16900694919 /* CocostudioParserTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocostudioParserTest.h; path = ../CocostudioParserTest.h; sourceTree = "<group>"; }; | ||
295824571987415900F9746D /* UIScale9SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScale9SpriteTest.cpp; sourceTree = "<group>"; }; | ||
295824581987415900F9746D /* UIScale9SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScale9SpriteTest.h; sourceTree = "<group>"; }; | ||
298D7F6D19AC31F300FF096D /* UIWebViewTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UIWebViewTest.cpp; path = UIWebViewTest/UIWebViewTest.cpp; sourceTree = "<group>"; }; | ||
298D7F6E19AC31F300FF096D /* UIWebViewTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIWebViewTest.h; path = UIWebViewTest/UIWebViewTest.h; sourceTree = "<group>"; }; | ||
29AFEF6619ACCAA000F6B10A /* Test.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = Test.html; path = "../tests/cpp-tests/Resources/Test.html"; sourceTree = "<group>"; }; | ||
29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocostudioParserJsonTest.cpp; sourceTree = "<group>"; }; | ||
29FBBBFD196A9ECD00E65826 /* CocostudioParserJsonTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocostudioParserJsonTest.h; sourceTree = "<group>"; }; | ||
38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionTimelineTestScene.cpp; sourceTree = "<group>"; }; | ||
|
@@ -6495,6 +6500,7 @@ | |
1AC35CB518CED84500F37B72 /* effect1.raw */, | ||
1AC35CB618CED84500F37B72 /* effect1.wav */, | ||
1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */, | ||
29AFEF6619ACCAA000F6B10A /* Test.html */, | ||
); | ||
name = Resources; | ||
sourceTree = "<group>"; | ||
|
@@ -6907,6 +6913,15 @@ | |
path = UIWidgetAddNodeTest; | ||
sourceTree = "<group>"; | ||
}; | ||
298D7F6C19AC31C000FF096D /* UIWebViewTest */ = { | ||
isa = PBXGroup; | ||
children = ( | ||
298D7F6D19AC31F300FF096D /* UIWebViewTest.cpp */, | ||
298D7F6E19AC31F300FF096D /* UIWebViewTest.h */, | ||
); | ||
name = UIWebViewTest; | ||
sourceTree = "<group>"; | ||
}; | ||
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { | ||
isa = PBXGroup; | ||
children = ( | ||
|
@@ -6988,6 +7003,7 @@ | |
29FBBC00196A9F0D00E65826 /* UIAndEditorTests */ = { | ||
isa = PBXGroup; | ||
children = ( | ||
298D7F6C19AC31C000FF096D /* UIWebViewTest */, | ||
295824571987415900F9746D /* UIScale9SpriteTest.cpp */, | ||
295824581987415900F9746D /* UIScale9SpriteTest.h */, | ||
29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */, | ||
|
@@ -7816,6 +7832,7 @@ | |
1AC35D0918CED84500F37B72 /* TileMaps in Resources */, | ||
1AC35CFF18CED84500F37B72 /* Particles in Resources */, | ||
1AC35C8818CECF1400F37B72 /* [email protected] in Resources */, | ||
29AFEF6719ACCAA000F6B10A /* Test.html in Resources */, | ||
1AC35CD518CED84500F37B72 /* ccb in Resources */, | ||
1AC35CE118CED84500F37B72 /* configs in Resources */, | ||
1AC35CE918CED84500F37B72 /* extensions in Resources */, | ||
|
@@ -8316,6 +8333,7 @@ | |
1AC35B3E18CECF0C00F37B72 /* Bug-422.cpp in Sources */, | ||
29080DAC191B595E0066F8DF /* UIFocusTest.cpp in Sources */, | ||
1AC35BF618CECF0C00F37B72 /* HttpClientTest.cpp in Sources */, | ||
298D7F6F19AC31F300FF096D /* UIWebViewTest.cpp in Sources */, | ||
29080DA6191B595E0066F8DF /* UIButtonTest_Editor.cpp in Sources */, | ||
1AC35B5018CECF0C00F37B72 /* ClickAndMoveTest.cpp in Sources */, | ||
); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.