<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203093] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203093">203093</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-07-11 16:25:40 -0700 (Mon, 11 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix indentation in FrameLoaderTypes.h
https://bugs.webkit.org/show_bug.cgi?id=159650
Reviewed by Brady Eidson.
* loader/FrameLoaderTypes.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderTypesh">trunk/Source/WebCore/loader/FrameLoaderTypes.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203092 => 203093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-11 23:23:56 UTC (rev 203092)
+++ trunk/Source/WebCore/ChangeLog 2016-07-11 23:25:40 UTC (rev 203093)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-07-11 Andy Estes <aestes@apple.com>
+
+ Fix indentation in FrameLoaderTypes.h
+ https://bugs.webkit.org/show_bug.cgi?id=159650
+
+ Reviewed by Brady Eidson.
+
+ * loader/FrameLoaderTypes.h:
+
</ins><span class="cx"> 2016-07-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Honor the second argument to FontFaceSet.load and FontFaceSet.check
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderTypes.h (203092 => 203093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderTypes.h 2016-07-11 23:23:56 UTC (rev 203092)
+++ trunk/Source/WebCore/loader/FrameLoaderTypes.h 2016-07-11 23:25:40 UTC (rev 203093)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,24 +26,23 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef FrameLoaderTypes_h
-#define FrameLoaderTypes_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- enum FrameState {
- FrameStateProvisional,
- // This state indicates we are ready to commit to a page,
- // which means the view will transition to use the new data source.
- FrameStateCommittedPage,
- FrameStateComplete
- };
</del><ins>+enum FrameState {
+ FrameStateProvisional,
+ // This state indicates we are ready to commit to a page,
+ // which means the view will transition to use the new data source.
+ FrameStateCommittedPage,
+ FrameStateComplete
+};
</ins><span class="cx">
</span><del>- enum PolicyAction {
- PolicyUse,
- PolicyDownload,
- PolicyIgnore
- };
</del><ins>+enum PolicyAction {
+ PolicyUse,
+ PolicyDownload,
+ PolicyIgnore
+};
</ins><span class="cx">
</span><span class="cx"> enum class FrameLoadType {
</span><span class="cx"> Standard,
</span><span class="lines">@@ -77,59 +76,58 @@
</span><span class="cx"> ShouldAllow,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- enum ClearProvisionalItemPolicy {
- ShouldClearProvisionalItem,
- ShouldNotClearProvisionalItem
- };
</del><ins>+enum ClearProvisionalItemPolicy {
+ ShouldClearProvisionalItem,
+ ShouldNotClearProvisionalItem
+};
</ins><span class="cx">
</span><del>- enum ObjectContentType {
- ObjectContentNone,
- ObjectContentImage,
- ObjectContentFrame,
- ObjectContentNetscapePlugin,
- ObjectContentOtherPlugin
- };
-
- enum UnloadEventPolicy {
- UnloadEventPolicyNone,
- UnloadEventPolicyUnloadOnly,
- UnloadEventPolicyUnloadAndPageHide
- };
</del><ins>+enum ObjectContentType {
+ ObjectContentNone,
+ ObjectContentImage,
+ ObjectContentFrame,
+ ObjectContentNetscapePlugin,
+ ObjectContentOtherPlugin
+};
</ins><span class="cx">
</span><del>- enum ShouldSendReferrer {
- MaybeSendReferrer,
- NeverSendReferrer
- };
</del><ins>+enum UnloadEventPolicy {
+ UnloadEventPolicyNone,
+ UnloadEventPolicyUnloadOnly,
+ UnloadEventPolicyUnloadAndPageHide
+};
</ins><span class="cx">
</span><del>- // Passed to FrameLoader::urlSelected() and ScriptController::executeIfJavaScriptURL()
- // to control whether, in the case of a JavaScript URL, executeIfJavaScriptURL() should
- // replace the document. It is a FIXME to eliminate this extra parameter from
- // executeIfJavaScriptURL(), in which case this enum can go away.
- enum ShouldReplaceDocumentIfJavaScriptURL {
- ReplaceDocumentIfJavaScriptURL,
- DoNotReplaceDocumentIfJavaScriptURL
- };
</del><ins>+enum ShouldSendReferrer {
+ MaybeSendReferrer,
+ NeverSendReferrer
+};
</ins><span class="cx">
</span><del>- enum WebGLLoadPolicy {
- WebGLBlockCreation,
- WebGLAllowCreation,
- WebGLPendingCreation
- };
</del><ins>+// Passed to FrameLoader::urlSelected() and ScriptController::executeIfJavaScriptURL()
+// to control whether, in the case of a JavaScript URL, executeIfJavaScriptURL() should
+// replace the document. It is a FIXME to eliminate this extra parameter from
+// executeIfJavaScriptURL(), in which case this enum can go away.
+enum ShouldReplaceDocumentIfJavaScriptURL {
+ ReplaceDocumentIfJavaScriptURL,
+ DoNotReplaceDocumentIfJavaScriptURL
+};
</ins><span class="cx">
</span><del>- enum class LockHistory {
- Yes,
- No
- };
</del><ins>+enum WebGLLoadPolicy {
+ WebGLBlockCreation,
+ WebGLAllowCreation,
+ WebGLPendingCreation
+};
</ins><span class="cx">
</span><del>- enum class LockBackForwardList {
- Yes,
- No
- };
</del><ins>+enum class LockHistory {
+ Yes,
+ No
+};
</ins><span class="cx">
</span><del>- enum class AllowNavigationToInvalidURL {
- Yes,
- No
- };
-}
</del><ins>+enum class LockBackForwardList {
+ Yes,
+ No
+};
</ins><span class="cx">
</span><del>-#endif
</del><ins>+enum class AllowNavigationToInvalidURL {
+ Yes,
+ No
+};
+
+} // namespace WebCore
</ins></span></pre>
</div>
</div>
</body>
</html>