Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3

1 files changed, 63 insertions, 0 deletions

diff --git a/Source/WebKit/mac/WebView/WebHTMLView.h b/Source/WebKit/mac/WebView/WebHTMLView.h
new file mode 100644
index 0000000..a191cef
--- /dev/null
+++ b/Source/WebKit/mac/WebView/WebHTMLView.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WebDocument.h>
+
+@class WebDataSource;
+@class WebHTMLViewPrivate;
+
+/*!
+    @class WebHTMLView
+    @discussion A document view of WebFrameView that displays HTML content.
+    WebHTMLView is a NSControl because it hosts NSCells that are painted by WebCore's Aqua theme
+    renderer (and those cells must be hosted by an enclosing NSControl in order to paint properly).
+*/
+@interface WebHTMLView : NSControl <WebDocumentView, WebDocumentSearching>
+{
+@private
+    WebHTMLViewPrivate *_private;
+}
+
+/*!
+    @method setNeedsToApplyStyles:
+    @abstract Sets flag to cause reapplication of style information.
+    @param flag YES to apply style information, NO to not apply style information.
+*/
+- (void)setNeedsToApplyStyles:(BOOL)flag;
+
+/*!
+    @method reapplyStyles
+    @discussion Immediately causes reapplication of style information to the view.  This should not be called directly,
+    instead call setNeedsToApplyStyles:.
+*/
+- (void)reapplyStyles;
+
+- (void)outdent:(id)sender;
+
+@end
+