<!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>[167357] trunk/Source/WebKit2</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/167357">167357</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-16 10:54:50 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some style checker complaints in PDFPlugin
https://bugs.webkit.org/show_bug.cgi?id=131706
Reviewed by Darin Adler.
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(-[WKPDFPluginAccessibilityObject accessibilityAttributeValue:]):
(-[WKPDFPluginAccessibilityObject accessibilityAttributeValue:forParameter:]):
(-[WKPDFPluginAccessibilityObject accessibilityAttributeNames]):
(WebKit::PDFPlugin::attemptToUnlockPDF):
(WebKit::PDFPlugin::updatePageAndDeviceScaleFactors):
(WebKit::PDFPlugin::isEditingCommandEnabled):
(WebKit::PDFPlugin::nextMatchForString):
(WebKit::PDFPlugin::handleWheelEvent):
(WebKit::PDFPlugin::liveData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167356 => 167357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-16 17:50:57 UTC (rev 167356)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-16 17:54:50 UTC (rev 167357)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-16 Tim Horton <timothy_horton@apple.com>
+
+ Fix some style checker complaints in PDFPlugin
+ https://bugs.webkit.org/show_bug.cgi?id=131706
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (-[WKPDFPluginAccessibilityObject accessibilityAttributeValue:]):
+ (-[WKPDFPluginAccessibilityObject accessibilityAttributeValue:forParameter:]):
+ (-[WKPDFPluginAccessibilityObject accessibilityAttributeNames]):
+ (WebKit::PDFPlugin::attemptToUnlockPDF):
+ (WebKit::PDFPlugin::updatePageAndDeviceScaleFactors):
+ (WebKit::PDFPlugin::isEditingCommandEnabled):
+ (WebKit::PDFPlugin::nextMatchForString):
+ (WebKit::PDFPlugin::handleWheelEvent):
+ (WebKit::PDFPlugin::liveData):
+
</ins><span class="cx"> 2014-04-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Add a form delegate method corresponding to willSubmitForm
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (167356 => 167357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-04-16 17:50:57 UTC (rev 167356)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-04-16 17:54:50 UTC (rev 167357)
</span><span class="lines">@@ -112,16 +112,15 @@
</span><span class="cx"> // will jump to the next or previous page, to match PDFKit behavior.
</span><span class="cx"> static const int defaultScrollMagnitudeThresholdForPageFlip = 20;
</span><span class="cx">
</span><del>-@interface WKPDFPluginAccessibilityObject : NSObject
-{
</del><ins>+@interface WKPDFPluginAccessibilityObject : NSObject {
</ins><span class="cx"> PDFLayerController *_pdfLayerController;
</span><span class="cx"> NSObject *_parent;
</span><span class="cx"> WebKit::PDFPlugin* _pdfPlugin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@property(assign) PDFLayerController *pdfLayerController;
-@property(assign) NSObject *parent;
-@property(assign) WebKit::PDFPlugin* pdfPlugin;
</del><ins>+@property (assign) PDFLayerController *pdfLayerController;
+@property (assign) NSObject *parent;
+@property (assign) WebKit::PDFPlugin* pdfPlugin;
</ins><span class="cx">
</span><span class="cx"> - (id)initWithPDFPlugin:(WebKit::PDFPlugin *)plugin;
</span><span class="cx">
</span><span class="lines">@@ -129,9 +128,9 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKPDFPluginAccessibilityObject
</span><span class="cx">
</span><del>-@synthesize pdfLayerController = _pdfLayerController;
-@synthesize parent = _parent;
-@synthesize pdfPlugin = _pdfPlugin;
</del><ins>+@synthesize pdfLayerController=_pdfLayerController;
+@synthesize parent=_parent;
+@synthesize pdfPlugin=_pdfPlugin;
</ins><span class="cx">
</span><span class="cx"> - (id)initWithPDFPlugin:(WebKit::PDFPlugin *)plugin
</span><span class="cx"> {
</span><span class="lines">@@ -152,31 +151,31 @@
</span><span class="cx"> {
</span><span class="cx"> if ([attribute isEqualToString:NSAccessibilityParentAttribute])
</span><span class="cx"> return _parent;
</span><del>- else if ([attribute isEqualToString:NSAccessibilityValueAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityValueAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilityValueAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilitySelectedTextAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilitySelectedTextAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilitySelectedTextAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilitySelectedTextRangeAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityNumberOfCharactersAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityNumberOfCharactersAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilityNumberOfCharactersAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilityVisibleCharacterRangeAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityTopLevelUIElementAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityTopLevelUIElementAttribute])
</ins><span class="cx"> return [_parent accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityRoleAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityRoleAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilityRoleAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilityRoleDescriptionAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityWindowAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityWindowAttribute])
</ins><span class="cx"> return [_parent accessibilityAttributeValue:NSAccessibilityWindowAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilitySizeAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilitySizeAttribute])
</ins><span class="cx"> return [NSValue valueWithSize:_pdfPlugin->boundsOnScreen().size()];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityFocusedAttribute])
</ins><span class="cx"> return [_parent accessibilityAttributeValue:NSAccessibilityFocusedAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityEnabledAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityEnabledAttribute])
</ins><span class="cx"> return [_parent accessibilityAttributeValue:NSAccessibilityEnabledAttribute];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityPositionAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityPositionAttribute])
</ins><span class="cx"> return [NSValue valueWithPoint:_pdfPlugin->boundsOnScreen().location()];
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="lines">@@ -187,12 +186,14 @@
</span><span class="cx"> if ([attribute isEqualToString:NSAccessibilityBoundsForRangeParameterizedAttribute]) {
</span><span class="cx"> NSRect boundsInPDFViewCoordinates = [[_pdfLayerController accessibilityBoundsForRangeAttributeForParameter:parameter] rectValue];
</span><span class="cx"> NSRect boundsInScreenCoordinates = _pdfPlugin->convertFromPDFViewToScreen(boundsInPDFViewCoordinates);
</span><del>- return [NSValue valueWithRect:boundsInScreenCoordinates];;
- } else if ([attribute isEqualToString:NSAccessibilityLineForIndexParameterizedAttribute])
</del><ins>+ return [NSValue valueWithRect:boundsInScreenCoordinates];
+ }
+
+ if ([attribute isEqualToString:NSAccessibilityLineForIndexParameterizedAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilityLineForIndexAttributeForParameter:parameter];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityRangeForLineParameterizedAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityRangeForLineParameterizedAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilityRangeForLineAttributeForParameter:parameter];
</span><del>- else if ([attribute isEqualToString:NSAccessibilityStringForRangeParameterizedAttribute])
</del><ins>+ if ([attribute isEqualToString:NSAccessibilityStringForRangeParameterizedAttribute])
</ins><span class="cx"> return [_pdfLayerController accessibilityStringForRangeAttributeForParameter:parameter];
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="lines">@@ -207,8 +208,8 @@
</span><span class="cx"> {
</span><span class="cx"> static NSArray *attributeNames = 0;
</span><span class="cx">
</span><del>- if (!attributeNames)
- attributeNames = [[NSArray arrayWithObjects:NSAccessibilityValueAttribute,
</del><ins>+ if (!attributeNames) {
+ attributeNames = @[NSAccessibilityValueAttribute,
</ins><span class="cx"> NSAccessibilitySelectedTextAttribute,
</span><span class="cx"> NSAccessibilitySelectedTextRangeAttribute,
</span><span class="cx"> NSAccessibilityNumberOfCharactersAttribute,
</span><span class="lines">@@ -221,8 +222,9 @@
</span><span class="cx"> NSAccessibilitySizeAttribute,
</span><span class="cx"> NSAccessibilityFocusedAttribute,
</span><span class="cx"> NSAccessibilityEnabledAttribute,
</span><del>- NSAccessibilityPositionAttribute,
- nil] retain];
</del><ins>+ NSAccessibilityPositionAttribute];
+ [attributeNames retain];
+ }
</ins><span class="cx">
</span><span class="cx"> return attributeNames;
</span><span class="cx"> }
</span><span class="lines">@@ -271,8 +273,7 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><del>-@interface WKPDFPluginScrollbarLayer : CALayer
-{
</del><ins>+@interface WKPDFPluginScrollbarLayer : CALayer {
</ins><span class="cx"> WebKit::PDFPlugin* _pdfPlugin;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -282,7 +283,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKPDFPluginScrollbarLayer
</span><span class="cx">
</span><del>-@synthesize pdfPlugin = _pdfPlugin;
</del><ins>+@synthesize pdfPlugin=_pdfPlugin;
</ins><span class="cx">
</span><span class="cx"> - (id)initWithPDFPlugin:(WebKit::PDFPlugin *)plugin
</span><span class="cx"> {
</span><span class="lines">@@ -306,12 +307,11 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WKPDFLayerControllerDelegate : NSObject<PDFLayerControllerDelegate>
-{
</del><ins>+@interface WKPDFLayerControllerDelegate : NSObject<PDFLayerControllerDelegate> {
</ins><span class="cx"> WebKit::PDFPlugin* _pdfPlugin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@property(assign) WebKit::PDFPlugin* pdfPlugin;
</del><ins>+@property (assign) WebKit::PDFPlugin* pdfPlugin;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -1005,7 +1005,7 @@
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::attemptToUnlockPDF(const String& password)
</span><span class="cx"> {
</span><del>- [m_pdfLayerController attemptToUnlockWithPassword:password];
</del><ins>+ [m_pdfLayerController.get() attemptToUnlockWithPassword:password];
</ins><span class="cx">
</span><span class="cx"> if (![pdfDocument() isLocked]) {
</span><span class="cx"> m_passwordField = nullptr;
</span><span class="lines">@@ -1021,7 +1021,7 @@
</span><span class="cx"> if (!handlesPageScaleFactor())
</span><span class="cx"> newScaleFactor *= webFrame()->page()->pageScaleFactor();
</span><span class="cx">
</span><del>- [m_pdfLayerController setDeviceScaleFactor:newScaleFactor];
</del><ins>+ [m_pdfLayerController.get() setDeviceScaleFactor:newScaleFactor];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::contentsScaleFactorChanged(float)
</span><span class="lines">@@ -1505,7 +1505,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (commandName == "copy" || commandName == "takeFindStringFromSelection")
</span><span class="cx"> return [m_pdfLayerController currentSelection];
</span><del>-
</del><ins>+
</ins><span class="cx"> if (commandName == "selectAll")
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -1722,7 +1722,7 @@
</span><span class="cx">
</span><span class="cx"> PDFSelection *selectionForInitialSearch = [initialSelection copy];
</span><span class="cx"> if (startInSelection) {
</span><del>- // Initially we want to include the selected text in the search. So we must modify the starting search
</del><ins>+ // Initially we want to include the selected text in the search. So we must modify the starting search
</ins><span class="cx"> // selection to fit PDFDocument's search requirements: selection must have a length >= 1, begin before
</span><span class="cx"> // the current selection (if searching forwards) or after (if searching backwards).
</span><span class="cx"> int initialSelectionLength = [[initialSelection string] length];
</span><span class="lines">@@ -1741,10 +1741,10 @@
</span><span class="cx"> // If we first searched in the selection, and we found the selection, search again from just past the selection.
</span><span class="cx"> if (startInSelection && [foundSelection isEqual:initialSelection])
</span><span class="cx"> foundSelection = [document findString:target fromSelection:initialSelection withOptions:options];
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!foundSelection && wrapSearch)
</span><span class="cx"> foundSelection = [document findString:target fromSelection:nil withOptions:options];
</span><del>-
</del><ins>+
</ins><span class="cx"> return foundSelection;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1835,10 +1835,10 @@
</span><span class="cx"> return ScrollableArea::handleWheelEvent(platform(event));
</span><span class="cx">
</span><span class="cx"> NSUInteger currentPageIndex = [m_pdfLayerController currentPageIndex];
</span><del>- bool inFirstPage = currentPageIndex == 0;
</del><ins>+ bool inFirstPage = !currentPageIndex;
</ins><span class="cx"> bool inLastPage = [m_pdfLayerController lastPageIndex] == currentPageIndex;
</span><span class="cx">
</span><del>- bool atScrollTop = scrollPosition().y() == 0;
</del><ins>+ bool atScrollTop = !scrollPosition().y();
</ins><span class="cx"> bool atScrollBottom = scrollPosition().y() == maximumScrollPosition().y();
</span><span class="cx">
</span><span class="cx"> bool inMomentumScroll = event.momentumPhase() != WebWheelEvent::PhaseNone;
</span><span class="lines">@@ -1853,7 +1853,9 @@
</span><span class="cx"> if (event.delta().height() <= -scrollMagnitudeThresholdForPageFlip && !inMomentumScroll)
</span><span class="cx"> [m_pdfLayerController gotoNextPage];
</span><span class="cx"> return true;
</span><del>- } else if (atScrollTop && !inFirstPage && event.delta().height() > 0) {
</del><ins>+ }
+
+ if (atScrollTop && !inFirstPage && event.delta().height() > 0) {
</ins><span class="cx"> if (event.delta().height() >= scrollMagnitudeThresholdForPageFlip && !inMomentumScroll) {
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [m_pdfLayerController gotoPreviousPage];
</span><span class="lines">@@ -1875,8 +1877,8 @@
</span><span class="cx"> // untouched by the user, so that PDFs which PDFKit can't display will still be downloadable.
</span><span class="cx"> if (m_pdfDocumentWasMutated)
</span><span class="cx"> return [m_pdfDocument dataRepresentation];
</span><del>- else
- return rawData();
</del><ins>+
+ return rawData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSObject *PDFPlugin::accessibilityObject() const
</span></span></pre>
</div>
</div>
</body>
</html>