<!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>[161735] 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/161735">161735</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 21:34:14 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Update EditorIOS.mm to switch from pointers to references
* editing/ios/EditorIOS.mm:
(WebCore::Editor::setTextAlignmentForChangedBaseWritingDirection):
(WebCore::Editor::insertParagraphSeparatorInQuotedContent):
(WebCore::styleForSelectionStart):
(WebCore::Editor::selectionInWebArchiveFormat):
(WebCore::Editor::writeImageToPasteboard):
(WebCore::Editor::WebContentReader::readWebArchive):
(WebCore::Editor::WebContentReader::readRTFD):
(WebCore::Editor::WebContentReader::readRTF):
(WebCore::uniqueURLWithRelativePart):
(WebCore::Editor::WebContentReader::readPlainText):
(WebCore::Editor::webContentFromPasteboard):
(WebCore::Editor::createFragmentAndAddResources):
(WebCore::Editor::createFragmentForImageResourceAndAddResource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161734 => 161735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 05:33:47 UTC (rev 161734)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 05:34:14 UTC (rev 161735)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-10 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] Update EditorIOS.mm to switch from pointers to references
+
+ * editing/ios/EditorIOS.mm:
+ (WebCore::Editor::setTextAlignmentForChangedBaseWritingDirection):
+ (WebCore::Editor::insertParagraphSeparatorInQuotedContent):
+ (WebCore::styleForSelectionStart):
+ (WebCore::Editor::selectionInWebArchiveFormat):
+ (WebCore::Editor::writeImageToPasteboard):
+ (WebCore::Editor::WebContentReader::readWebArchive):
+ (WebCore::Editor::WebContentReader::readRTFD):
+ (WebCore::Editor::WebContentReader::readRTF):
+ (WebCore::uniqueURLWithRelativePart):
+ (WebCore::Editor::WebContentReader::readPlainText):
+ (WebCore::Editor::webContentFromPasteboard):
+ (WebCore::Editor::createFragmentAndAddResources):
+ (WebCore::Editor::createFragmentForImageResourceAndAddResource):
+
</ins><span class="cx"> 2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Push InspectorAgent down into JSC, give JSC an InspectorController
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (161734 => 161735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2014-01-11 05:33:47 UTC (rev 161734)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2014-01-11 05:34:14 UTC (rev 161735)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> // If the text has left or right alignment, flip left->right and right->left.
</span><span class="cx"> // Otherwise, do nothing.
</span><span class="cx">
</span><del>- RefPtr<EditingStyle> selectionStyle = EditingStyle::styleAtSelectionStart(frame()->selection().selection());
</del><ins>+ RefPtr<EditingStyle> selectionStyle = EditingStyle::styleAtSelectionStart(m_frame.selection().selection());
</ins><span class="cx"> if (!selectionStyle || !selectionStyle->style())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -159,14 +159,14 @@
</span><span class="cx"> if (!newValue)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Element* focusedElement = frame()->document()->focusedElement();
</del><ins>+ Element* focusedElement = m_frame.document()->focusedElement();
</ins><span class="cx"> if (focusedElement && (focusedElement->hasTagName(textareaTag) || (focusedElement->hasTagName(inputTag) &&
</span><span class="cx"> (toHTMLInputElement(focusedElement)->isTextField() ||
</span><span class="cx"> toHTMLInputElement(focusedElement)->isSearchField())))) {
</span><span class="cx"> if (direction == NaturalWritingDirection)
</span><span class="cx"> return;
</span><span class="cx"> toHTMLElement(focusedElement)->setAttribute(alignAttr, newValue);
</span><del>- frame()->document()->updateStyleIfNeeded();
</del><ins>+ m_frame.document()->updateStyleIfNeeded();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> bool Editor::insertParagraphSeparatorInQuotedContent()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Why is this missing calls to canEdit, canEditRichly, etc...
</span><del>- TypingCommand::insertParagraphSeparatorInQuotedContent(m_frame.document());
</del><ins>+ TypingCommand::insertParagraphSeparatorInQuotedContent(*m_frame.document());
</ins><span class="cx"> revealSelectionAfterEditingOperation();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<EditingStyle> typingStyle = frame->selection().typingStyle();
</span><span class="cx"> if (!typingStyle || !typingStyle->style())
</span><del>- return position.deprecatedNode()->renderer()->style();
</del><ins>+ return &position.deprecatedNode()->renderer()->style();
</ins><span class="cx">
</span><span class="cx"> RefPtr<Element> styleElement = frame->document()->createElement(spanTag, false);
</span><span class="cx">
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> ASSERT(!ec);
</span><span class="cx">
</span><span class="cx"> nodeToRemove = styleElement.get();
</span><del>- return styleElement->renderer() ? styleElement->renderer()->style() : 0;
</del><ins>+ return styleElement->renderer() ? &styleElement->renderer()->style() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const SimpleFontData* Editor::fontForSelection(bool& hasMultipleFonts) const
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> Editor::selectionInWebArchiveFormat()
</span><span class="cx"> {
</span><del>- RefPtr<LegacyWebArchive> archive = LegacyWebArchive::createFromSelection(m_frame);
</del><ins>+ RefPtr<LegacyWebArchive> archive = LegacyWebArchive::createFromSelection(&m_frame);
</ins><span class="cx"> return archive ? SharedBuffer::wrapCFData(archive->rawDataRepresentation().get()) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(cachedImage);
</span><span class="cx">
</span><del>- pasteboardImage.url.url = imageElement.document()->completeURL(stripLeadingAndTrailingHTMLSpaces(imageElement.imageSourceURL()));
</del><ins>+ pasteboardImage.url.url = imageElement.document().completeURL(stripLeadingAndTrailingHTMLSpaces(imageElement.imageSourceURL()));
</ins><span class="cx"> pasteboardImage.url.title = title;
</span><span class="cx"> pasteboardImage.resourceMIMEType = pasteboard.resourceMIMEType(cachedImage->response().mimeType());
</span><span class="cx">
</span><span class="lines">@@ -433,9 +433,9 @@
</span><span class="cx">
</span><span class="cx"> const String& type = mainResource->mimeType();
</span><span class="cx">
</span><del>- if (frame.loader()->client()->canShowMIMETypeAsHTML(type)) {
</del><ins>+ if (frame.loader().client().canShowMIMETypeAsHTML(type)) {
</ins><span class="cx"> // FIXME: The code in createFragmentAndAddResources calls setDefersLoading(true). Don't we need that here?
</span><del>- if (DocumentLoader* loader = frame.loader()->documentLoader())
</del><ins>+ if (DocumentLoader* loader = frame.loader().documentLoader())
</ins><span class="cx"> loader->addAllArchiveResources(archive.get());
</span><span class="cx">
</span><span class="cx"> String markupString = String::fromUTF8(mainResource->data()->data(), mainResource->data()->size());
</span><span class="lines">@@ -458,13 +458,13 @@
</span><span class="cx">
</span><span class="cx"> bool Editor::WebContentReader::readRTFD(PassRefPtr<SharedBuffer> buffer)
</span><span class="cx"> {
</span><del>- addFragment(frame.editor().createFragmentAndAddResources(adoptNS([[NSAttributedString alloc] initWithRTFD:buffer->createNSData() documentAttributes:nullptr]).get()));
</del><ins>+ addFragment(frame.editor().createFragmentAndAddResources(adoptNS([[NSAttributedString alloc] initWithRTFD:buffer->createNSData().get() documentAttributes:nullptr]).get()));
</ins><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::WebContentReader::readRTF(PassRefPtr<SharedBuffer> buffer)
</span><span class="cx"> {
</span><del>- addFragment(frame.editor().createFragmentAndAddResources(adoptNS([[NSAttributedString alloc] initWithRTF:buffer->createNSData() documentAttributes:nullptr]).get()));
</del><ins>+ addFragment(frame.editor().createFragmentAndAddResources(adoptNS([[NSAttributedString alloc] initWithRTF:buffer->createNSData().get() documentAttributes:nullptr]).get()));
</ins><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx"> RetainPtr<CFUUIDRef> UUIDRef = adoptCF(CFUUIDCreate(kCFAllocatorDefault));
</span><span class="cx"> RetainPtr<NSString> UUIDString = adoptNS((NSString *)CFUUIDCreateString(kCFAllocatorDefault, UUIDRef.get()));
</span><span class="cx">
</span><del>- return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/%@", @"webkit-fake-url", UUIDString.get(), relativePart]];;
</del><ins>+ return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/%@", @"webkit-fake-url", UUIDString.get(), relativePart]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::WebContentReader::readImage(PassRefPtr<SharedBuffer> buffer, const String& type)
</span><span class="lines">@@ -530,7 +530,7 @@
</span><span class="cx"> if (!allowPlainText)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- addFragment(createFragmentFromText(&context, [text precomposedStringWithCanonicalMapping]));
</del><ins>+ addFragment(createFragmentFromText(context, [text precomposedStringWithCanonicalMapping]));
</ins><span class="cx"> if (!fragment)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> // Or refactor so it does not do that.
</span><span class="cx"> PassRefPtr<DocumentFragment> Editor::webContentFromPasteboard(Pasteboard& pasteboard, Range& context, bool allowPlainText, bool& chosePlainText)
</span><span class="cx"> {
</span><del>- WebContentReader reader(*m_frame, context, allowPlainText);
</del><ins>+ WebContentReader reader(m_frame, context, allowPlainText);
</ins><span class="cx"> pasteboard.read(reader);
</span><span class="cx"> chosePlainText = reader.madeFragmentFromPlainText;
</span><span class="cx"> return reader.fragment.release();
</span><span class="lines">@@ -563,26 +563,26 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DocumentFragment> Editor::createFragmentAndAddResources(NSAttributedString *string)
</span><span class="cx"> {
</span><del>- if (!m_frame->page() || !m_frame->document() || !m_frame->document()->isHTMLDocument())
</del><ins>+ if (!m_frame.page() || !m_frame.document() || !m_frame.document()->isHTMLDocument())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!string)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- bool wasDeferringCallbacks = m_frame->page()->defersLoading();
</del><ins>+ bool wasDeferringCallbacks = m_frame.page()->defersLoading();
</ins><span class="cx"> if (!wasDeferringCallbacks)
</span><del>- m_frame->page()->setDefersLoading(true);
</del><ins>+ m_frame.page()->setDefersLoading(true);
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<ArchiveResource>> resources;
</span><span class="cx"> RefPtr<DocumentFragment> fragment = client()->documentFragmentFromAttributedString(string, resources);
</span><span class="cx">
</span><del>- if (DocumentLoader* loader = m_frame->loader()->documentLoader()) {
</del><ins>+ if (DocumentLoader* loader = m_frame.loader().documentLoader()) {
</ins><span class="cx"> for (size_t i = 0, size = resources.size(); i < size; ++i)
</span><span class="cx"> loader->addArchiveResource(resources[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!wasDeferringCallbacks)
</span><del>- m_frame->page()->setDefersLoading(false);
</del><ins>+ m_frame.page()->setDefersLoading(false);
</ins><span class="cx">
</span><span class="cx"> return fragment.release();
</span><span class="cx"> }
</span><span class="lines">@@ -592,15 +592,15 @@
</span><span class="cx"> if (!resource)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<Element> imageElement = m_frame->document()->createElement(HTMLNames::imgTag, false);
</del><ins>+ RefPtr<Element> imageElement = m_frame.document()->createElement(HTMLNames::imgTag, false);
</ins><span class="cx"> // FIXME: The code in createFragmentAndAddResources calls setDefersLoading(true). Don't we need that here?
</span><del>- if (DocumentLoader* loader = m_frame->loader()->documentLoader())
</del><ins>+ if (DocumentLoader* loader = m_frame.loader().documentLoader())
</ins><span class="cx"> loader->addArchiveResource(resource.get());
</span><span class="cx">
</span><span class="cx"> NSURL *URL = resource->url();
</span><span class="cx"> imageElement->setAttribute(HTMLNames::srcAttr, [URL isFileURL] ? [URL absoluteString] : resource->url());
</span><span class="cx">
</span><del>- RefPtr<DocumentFragment> fragment = m_frame->document()->createDocumentFragment();
</del><ins>+ RefPtr<DocumentFragment> fragment = m_frame.document()->createDocumentFragment();
</ins><span class="cx"> fragment->appendChild(imageElement.release());
</span><span class="cx">
</span><span class="cx"> return fragment.release();
</span></span></pre>
</div>
</div>
</body>
</html>