Permalink
Browse files

Now using Awesomium 1.08 LGPL version. Destroying of webviews now wor…

…king
  • Loading branch information...
unknown
unknown committed Nov 12, 2010
1 parent 239d566 commit b8bd57f95409246f7b5d6e34f3c8ff4596beade0
Showing with 337 additions and 1,163 deletions.
  1. BIN Assets/Plugins/UnityAwesomium.dll
  2. BIN Assets/test.unity
  3. BIN Awesomium.dll
  4. BIN Library/EditorUserBuildSettings.asset
  5. BIN Library/InspectorExpandedItems.asset
  6. BIN Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
  7. BIN Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
  8. BIN Library/ScriptAssemblies/Assembly-CSharp.dll
  9. BIN Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
  10. BIN Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
  11. BIN Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
  12. BIN Library/assetDatabase3
  13. BIN Library/cache/00/00000000000000002000000000000000
  14. BIN Library/cache/00/00000000000000003000000000000000
  15. BIN Library/cache/00/00000000000000004000000000000000
  16. BIN Library/cache/00/00000000000000005000000000000000
  17. BIN Library/cache/00/00000000000000006000000000000000
  18. BIN Library/cache/00/00000000000000007000000000000000
  19. BIN Library/cache/00/00000000000000009000000000000000
  20. BIN Library/cache/00/0000000000000000a000000000000000
  21. BIN Library/cache/00/0000000000000000b000000000000000
  22. BIN Library/cache/00/0000000000000000c000000000000000
  23. BIN Library/cache/0a/0ab79d7f243824f5d9826bd83522c8df
  24. BIN Library/cache/0b/0b167d00b3108411a8a963cba5ddde1b
  25. BIN Library/cache/19/195c271a9118d224c8562ae67cf47a66
  26. BIN Library/cache/1b/1b3805a7dbdb9a0478f52b05b691abb2
  27. BIN Library/cache/1d/1d5ac211a643e447ca78c2d794a16381
  28. BIN Library/cache/23/2372dd1814cb4ed47a91f8174877623e
  29. BIN Library/cache/2d/2da4750ec37d9394fb9cb4f7aea61749
  30. BIN Library/cache/32/32ef381921b3f7f479831b042c113762
  31. BIN Library/cache/35/352e5f82d7105ad408904c5f552b5fe7
  32. BIN Library/cache/39/397c6a4ca7b394e478c785a93c2c8909
  33. BIN Library/cache/60/60bca8f58a0b8478e946e6e86658cb29
  34. BIN Library/cache/63/63e17b67e6d81ac499bbb13d6d93f49e
  35. BIN Library/cache/66/66ebe4da1ef67e64e8aeccb820e409d6
  36. BIN Library/cache/68/68ec2fe99d1108b9d0006a298d76c639
  37. BIN Library/cache/74/743d8c5197cf888429d53c1bed49c255
  38. BIN Library/cache/7d/7d34d948539c9bf4b9a557ebc771dd9a
  39. BIN Library/cache/8a/8a98ef45bc7df804d95fd945abd2c943
  40. BIN Library/cache/96/96aaf6eedb57489419cd1c026e6af47a
  41. BIN Library/cache/a8/a8a85186e5d6a0f499559738477fbdfd
  42. BIN Library/cache/b1/b160ccd622e06c9439c8c8afa28d28a0
  43. BIN Library/cache/c4/c4e702f769357c54698524de673f6313
  44. BIN Library/cache/da/da93ddd6928094e24bb1f3f665f143d3
  45. BIN Library/cache/fb/fbf51a8f488eb954ab1b7f2566dfd56f
  46. BIN Library/metadata/00/00000000000000002000000000000000
  47. BIN Library/metadata/00/00000000000000003000000000000000
  48. BIN Library/metadata/00/00000000000000004000000000000000
  49. BIN Library/metadata/00/00000000000000005000000000000000
  50. BIN Library/metadata/00/00000000000000006000000000000000
  51. BIN Library/metadata/00/00000000000000007000000000000000
  52. BIN Library/metadata/00/00000000000000009000000000000000
  53. BIN Library/metadata/00/0000000000000000a000000000000000
  54. BIN Library/metadata/00/0000000000000000b000000000000000
  55. BIN Library/metadata/00/0000000000000000c000000000000000
  56. BIN Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
  57. BIN Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
  58. BIN Library/metadata/0c/0c404151eae2f404e94a102dbb9a1e8d
  59. BIN Library/metadata/19/195c271a9118d224c8562ae67cf47a66
  60. BIN Library/metadata/1b/1b3805a7dbdb9a0478f52b05b691abb2
  61. BIN Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
  62. BIN Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
  63. BIN Library/metadata/23/2372dd1814cb4ed47a91f8174877623e
  64. BIN Library/metadata/2d/2da4750ec37d9394fb9cb4f7aea61749
  65. BIN Library/metadata/32/32ef381921b3f7f479831b042c113762
  66. BIN Library/metadata/35/352e5f82d7105ad408904c5f552b5fe7
  67. BIN Library/metadata/39/397c6a4ca7b394e478c785a93c2c8909
  68. BIN Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
  69. BIN Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
  70. BIN Library/metadata/63/63e17b67e6d81ac499bbb13d6d93f49e
  71. BIN Library/metadata/66/66ebe4da1ef67e64e8aeccb820e409d6
  72. BIN Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
  73. BIN Library/metadata/74/743d8c5197cf888429d53c1bed49c255
  74. BIN Library/metadata/7d/7d34d948539c9bf4b9a557ebc771dd9a
  75. BIN Library/metadata/8a/8a98ef45bc7df804d95fd945abd2c943
  76. BIN Library/metadata/96/96aaf6eedb57489419cd1c026e6af47a
  77. BIN Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
  78. BIN Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
  79. BIN Library/metadata/a8/a8a85186e5d6a0f499559738477fbdfd
  80. BIN Library/metadata/b1/b160ccd622e06c9439c8c8afa28d28a0
  81. BIN Library/metadata/c4/c4e702f769357c54698524de673f6313
  82. BIN Library/metadata/c6/c64ceccb926e4ff4b831dd2a1e88ad8c
  83. BIN Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
  84. BIN Library/metadata/cc/cc9a9e51cb229ff4fa57502d98584f64
  85. BIN Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
  86. BIN Library/metadata/fb/fbf51a8f488eb954ab1b7f2566dfd56f
  87. BIN Library/previews/19/195c271a9118d224c8562ae67cf47a66
  88. BIN Library/previews/23/2314ce3a3eecf4816bad3c9eca4de2e1
  89. BIN Library/previews/23/2372dd1814cb4ed47a91f8174877623e
  90. BIN Library/previews/32/32ef381921b3f7f479831b042c113762
  91. BIN Library/previews/35/352e5f82d7105ad408904c5f552b5fe7
  92. BIN Library/previews/39/397c6a4ca7b394e478c785a93c2c8909
  93. BIN Library/previews/44/449b48f7eb5d87a4baaa5fb73f875a59
  94. BIN Library/previews/66/66ebe4da1ef67e64e8aeccb820e409d6
  95. BIN Library/previews/7d/7d34d948539c9bf4b9a557ebc771dd9a
  96. BIN Library/previews/8a/8a98ef45bc7df804d95fd945abd2c943
  97. BIN Library/previews/9d/9d4133d5d30b644bd87802a347eaccbe
  98. BIN Library/previews/a2/a2126534b3a11b34e977105bd9e3cc03
  99. BIN Library/previews/c4/c4e702f769357c54698524de673f6313
  100. BIN Library/previews/ca/ca49380a71a2bb64c830d06bd421b9d1
  101. BIN Library/previews/cc/cc9a9e51cb229ff4fa57502d98584f64
  102. +1 −1 UnityAwesomium.csproj
  103. BIN UnityAwesomiumSource/Unity/Awesomium/bin/Awesomium.dll
  104. BIN UnityAwesomiumSource/Unity/Awesomium/bin/Awesomium_d.dll
  105. +51 −68 UnityAwesomiumSource/Unity/Awesomium/include/JSValue.h
  106. +0 −520 UnityAwesomiumSource/Unity/Awesomium/include/KeyboardCodes.h
  107. +19 −9 UnityAwesomiumSource/Unity/Awesomium/include/PlatformUtils.h
  108. +25 −39 UnityAwesomiumSource/Unity/Awesomium/include/WebCore.h
  109. +0 −145 UnityAwesomiumSource/Unity/Awesomium/include/WebKeyboardEvent.h
  110. +65 −202 UnityAwesomiumSource/Unity/Awesomium/include/WebView.h
  111. +29 −51 UnityAwesomiumSource/Unity/Awesomium/include/WebViewListener.h
  112. BIN UnityAwesomiumSource/Unity/Awesomium/lib/Awesomium.lib
  113. BIN UnityAwesomiumSource/Unity/Awesomium/lib/Awesomium_d.lib
  114. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.dll
  115. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.exp
  116. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.lib
  117. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.pdb
  118. +14 −13 UnityAwesomiumSource/Unity/Unity/AwesomiumPlugin.cpp
  119. BIN UnityAwesomiumSource/Unity/Unity/Release/AwesomiumPlugin.obj
  120. BIN UnityAwesomiumSource/Unity/Unity/Release/BuildLog.htm
  121. +1 −1 UnityAwesomiumSource/Unity/Unity/Release/mt.dep
  122. BIN UnityAwesomiumSource/Unity/Unity/Release/vc90.idb
  123. BIN UnityAwesomiumSource/Unity/Unity/Release/vc90.pdb
  124. +25 −39 UnityAwesomiumSource/Unity/Unity/WebCore.h
  125. BIN UnityAwesomiumSource/Unity/UnityAwesomium.ncb
  126. BIN UnityAwesomiumSource/Unity/UnityAwesomium.suo
  127. BIN build/Awesomium.dll
  128. +95 −63 build/awesomium.log
  129. BIN build/test_Data/Managed/Assembly-CSharp-firstpass.dll
  130. BIN build/test_Data/Managed/Assembly-CSharp.dll
  131. BIN build/test_Data/Managed/Assembly-UnityScript-firstpass.dll
  132. BIN build/test_Data/Plugins/UnityAwesomium.dll
  133. BIN build/test_Data/mainData
  134. +12 −12 build/test_Data/output_log.txt
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -18,7 +18,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE;UNITY_3_1_0;UNITY_3_1;UNITY_EDITOR;ENABLE_PROFILER;UNITY_STANDALONE_WIN;ENABLE_GENERICS;ENABLE_DUCK_TYPING;ENABLE_TERRAIN;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CLOTH;ENABLE_WWW</DefineConstants>
+ <DefineConstants>DEBUG;TRACE;UNITY_3_0_0;UNITY_3_0;UNITY_EDITOR;ENABLE_PROFILER;UNITY_STANDALONE_WIN;ENABLE_GENERICS;ENABLE_DUCK_TYPING;ENABLE_TERRAIN;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CLOTH;ENABLE_WWW</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Binary file not shown.
Binary file not shown.
@@ -2,58 +2,72 @@
This file is a part of Awesomium, a library that makes it easy for
developers to embed web-content in their applications.
- Copyright (C) 2009 Khrona. All rights reserved. Awesomium is a trademark of Khrona.
+ Copyright (C) 2009 Adam J. Simmons
+
+ Project Website:
+ <http://princeofcode.com/awesomium.php>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA
*/
#ifndef __JSVALUE_H__
#define __JSVALUE_H__
#include <string>
#include <vector>
-#include <map>
#include "PlatformUtils.h"
-namespace Impl { struct VariantValue; }
+namespace Impl {
-namespace Awesomium
+typedef enum {
+ VariantType_NULL,
+ VariantType_BOOLEAN,
+ VariantType_INTEGER,
+ VariantType_DOUBLE,
+ VariantType_STRING
+} VariantType;
+
+struct VariantValue
{
+ VariantType type;
-class WebView;
+ std::string stringValue;
-class _OSMExport JSIdentifier
-{
-public:
- JSIdentifier(const char* value);
- JSIdentifier(const std::string& value);
- JSIdentifier(const wchar_t* value);
- JSIdentifier(const std::wstring& value);
- JSIdentifier(int value);
- JSIdentifier(const JSIdentifier& original);
- ~JSIdentifier();
- bool operator<(const JSIdentifier& rhs) const;
+ union {
+ bool booleanValue;
+ int integerValue;
+ double doubleValue;
+ } numericValue;
+};
- bool isString() const;
+}
- const std::wstring& getString() const;
- int getInteger() const;
+namespace Awesomium
+{
-protected:
- union { int intValue; std::wstring* strValue; } data;
- bool isStringData;
-};
+class WebView;
/**
* JSValue is a class that represents a Javascript value. It can be initialized from
* and converted to several types: boolean, integer, double, string
*/
class _OSMExport JSValue
{
- Impl::VariantValue* varValue;
+ Impl::VariantValue varValue;
public:
-
- typedef std::map<std::wstring, JSValue> Object;
- typedef std::vector<JSValue> Array;
-
/// Creates a null JSValue.
JSValue();
@@ -66,30 +80,12 @@ class _OSMExport JSValue
/// Creates a JSValue initialized with a double.
JSValue(double value);
- /// Creates a JSValue initialized with an ASCII string.
+ /// Creates a JSValue initialized with a string.
JSValue(const char* value);
- /// Creates a JSValue initialized with an ASCII string.
+ /// Creates a JSValue initialized with a string.
JSValue(const std::string& value);
- /// Creates a JSValue initialized with a wide string.
- JSValue(const wchar_t* value);
-
- /// Creates a JSValue initialized with a wide string.
- JSValue(const std::wstring& value);
-
- /// Creates a JSValue initialized with an object.
- JSValue(const Object& value);
-
- /// Creates a JSValue initialized with an array.
- JSValue(const Array& value);
-
- JSValue(const JSValue& original);
-
- ~JSValue();
-
- JSValue& operator=(const JSValue& rhs);
-
/// Returns whether or not this JSValue is a boolean.
bool isBoolean() const;
@@ -105,17 +101,16 @@ class _OSMExport JSValue
/// Returns whether or not this JSValue is a string.
bool isString() const;
- /// Returns whether or not this JSValue is an array.
- bool isArray() const;
-
- /// Returns whether or not this JSValue is an object.
- bool isObject() const;
-
/// Returns whether or not this JSValue is null.
bool isNull() const;
- /// Returns this JSValue as a wide string (converting if necessary).
- const std::wstring& toString() const;
+ /**
+ * Returns this JSValue as a string (converting if necessary).
+ *
+ * @note If this JSValue is not a string, the returned reference
+ * is only valid until the next call to JSValue::toString.
+ */
+ const std::string& toString() const;
/// Returns this JSValue as an integer (converting if necessary).
int toInteger() const;
@@ -125,18 +120,6 @@ class _OSMExport JSValue
/// Returns this JSValue as a boolean (converting if necessary).
bool toBoolean() const;
-
- /// Gets a reference to this JSValue's array value (will assert if not an array type)
- Array& getArray();
-
- /// Gets a constant reference to this JSValue's array value (will assert if not an array type)
- const Array& getArray() const;
-
- /// Gets a reference to this JSValue's object value (will assert if not an object type)
- Object& getObject();
-
- /// Gets a constant reference to this JSValue's object value (will assert if not an object type)
- const Object& getObject() const;
};
typedef std::vector<JSValue> JSArguments;
Oops, something went wrong.

0 comments on commit b8bd57f

Please sign in to comment.