[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [124127] branches/safari-536.26-branch/Source
From: lforschler () apple ! com
Date: 2012-07-31 0:48:15
Message-ID: 20120731004816.260114A1645 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[124127] branches/safari-536.26-branch/Source</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/124127">124127</a></dd> \
<dt>Author</dt> <dd>lforschler@apple.com</dd> <dt>Date</dt> <dd>2012-07-30 17:48:15 \
-0700 (Mon, 30 Jul 2012)</dd> </dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/121646">r121646</a>. \
<rdar://problem/11932486> & <rdar://problem/11932354></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53626branchSourceWebCoreChangeLog">branches/safari-536.26-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53626branchSourceWebCoreplatformContextMenuItemh">branches/safari-536.26-branch/Source/WebCore/platform/ContextMenuItem.h</a></li>
<li><a href="#branchessafari53626branchSourceWebKitmacChangeLog">branches/safari-536.26-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari53626branchSourceWebKitmacWebViewWebUIDelegatePrivateh">b \
ranches/safari-536.26-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53626branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-536.26-branch/Source/WebCore/ChangeLog (124126 => 124127)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-07-31 00:46:23 UTC (rev \
124126)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-07-31 00:48:15 UTC \
(rev 124127) </span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2012-07-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge 121646
+
+ 2012-07-01 Timothy Hatcher <timothy@apple.com>
+
+ Make the "Inspect Element" context menu item appear in nightly \
builds again. +
+ rdar://problem/11702613
+ https://webkit.org/b/89323
+
+ Reviewed by Dan Bernstein.
+
+ * platform/ContextMenuItem.h:
+ Fix the order of the ContextMenuAction enum to be binary compatible with
+ older versions of WebKit.
+
+2012-07-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge 121645
</span><span class="cx">
</span><span class="cx"> 2012-07-01 Dan Bernstein <mitz@apple.com>
</span></span></pre></div>
<a id="branchessafari53626branchSourceWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-536.26-branch/Source/WebCore/platform/ContextMenuItem.h (124126 => \
124127)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-536.26-branch/Source/WebCore/platform/ContextMenuItem.h 2012-07-31 \
00:46:23 UTC (rev 124126)
+++ branches/safari-536.26-branch/Source/WebCore/platform/ContextMenuItem.h 2012-07-31 \
00:48:15 UTC (rev 124127) </span><span class="lines">@@ -134,7 +134,6 @@
</span><span class="cx"> ContextMenuItemTagRightToLeft,
</span><span class="cx"> ContextMenuItemTagPDFSinglePageScrolling,
</span><span class="cx"> ContextMenuItemTagPDFFacingPagesScrolling,
</span><del>- ContextMenuItemTagDictationAlternative,
</del><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> ContextMenuItemTagInspectElement,
</span><span class="cx"> #endif
</span><span class="lines">@@ -164,6 +163,7 @@
</span><span class="cx"> ContextMenuItemTagEnterVideoFullscreen,
</span><span class="cx"> ContextMenuItemTagMediaPlayPause,
</span><span class="cx"> ContextMenuItemTagMediaMute,
</span><ins>+ ContextMenuItemTagDictationAlternative,
</ins><span class="cx"> ContextMenuItemBaseCustomTag = 5000,
</span><span class="cx"> ContextMenuItemCustomTagNoAction = 5998,
</span><span class="cx"> ContextMenuItemLastCustomTag = 5999,
</span></span></pre></div>
<a id="branchessafari53626branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-536.26-branch/Source/WebKit/mac/ChangeLog (124126 => 124127)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/safari-536.26-branch/Source/WebKit/mac/ChangeLog 2012-07-31 00:46:23 UTC \
(rev 124126)
+++ branches/safari-536.26-branch/Source/WebKit/mac/ChangeLog 2012-07-31 00:48:15 UTC \
(rev 124127) </span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2012-07-30 Lucas Forschler <lforschler@apple.com>
+
+ Merge 121646
+
+ 2012-07-01 Timothy Hatcher <timothy@apple.com>
+
+ Make the "Inspect Element" context menu item appear in nightly \
builds again. +
+ rdar://problem/11702613
+ https://webkit.org/b/89323
+
+ Reviewed by Dan Bernstein.
+
+ * WebView/WebUIDelegatePrivate.h:
+ Add missing enums that were added in ContextMenuItem.h but left out \
here. +
</ins><span class="cx"> 2012-06-12 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge 120357
</span></span></pre></div>
<a id="branchessafari53626branchSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-536.26-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h \
(124126 => 124127)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-536.26-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2012-07-31 \
00:46:23 UTC (rev 124126)
+++ branches/safari-536.26-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2012-07-31 \
00:48:15 UTC (rev 124127) </span><span class="lines">@@ -89,6 +89,17 @@
</span><span class="cx"> WebMenuItemTagMakeLowerCase,
</span><span class="cx"> WebMenuItemTagCapitalize,
</span><span class="cx"> WebMenuItemTagChangeBack,
</span><ins>+ WebMenuItemTagOpenMediaInNewWindow,
+ WebMenuItemTagCopyMediaLinkToClipboard,
+ WebMenuItemTagToggleMediaControls,
+ WebMenuItemTagToggleMediaLoop,
+ WebMenuItemTagEnterVideoFullscreen,
+ WebMenuItemTagMediaPlayPause,
+ WebMenuItemTagMediaMute,
+ WebMenuItemTagDictationAlternative,
+ WebMenuItemBaseCustomTag = 5000,
+ WebMenuItemCustomTagNoAction = 5998,
+ WebMenuItemLastCustomTag = 5999,
</ins><span class="cx"> WebMenuItemTagBaseApplication = 10000
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic