From 2cbcfcea8801e4e806084c4041802ffd60713560 Mon Sep 17 00:00:00 2001
From: Hedger Wang <hedger@fb.com>
Date: Fri, 10 Jul 2015 12:21:19 -0700
Subject: [PATCH] [Android][JS]: supports prop "html" in WebView

---
 Libraries/Components/WebView/WebView.android.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js
index b525c44f3..274d76728 100644
--- a/Libraries/Components/WebView/WebView.android.js
+++ b/Libraries/Components/WebView/WebView.android.js
@@ -36,7 +36,8 @@ var WebView = React.createClass({
   propTypes: {
     renderError: PropTypes.func, // view to show if there's an error
     renderLoading: PropTypes.func, // loading indicator to show
-    url: PropTypes.string.isRequired,
+    url: PropTypes.string,
+    html: PropTypes.string,
     automaticallyAdjustContentInsets: PropTypes.bool,
     contentInset: EdgeInsetsPropType,
     onNavigationStateChange: PropTypes.func,
@@ -102,6 +103,7 @@ var WebView = React.createClass({
         key="webViewKey"
         style={webViewStyles}
         url={this.props.url}
+        html={this.props.html}
         injectedJavaScript={this.props.injectedJavaScript}
         userAgent={this.props.userAgent}
         javaScriptEnabledAndroid={this.props.javaScriptEnabledAndroid}
@@ -183,6 +185,7 @@ var WebView = React.createClass({
 
 var RCTWebView = createReactNativeComponentClass({
   validAttributes: merge(ReactNativeViewAttributes.UIView, {
+    html: true,
     injectedJavaScript: true,
     javaScriptEnabledAndroid: true,
     url: true,