Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (223046 => 223047)
--- trunk/Source/_javascript_Core/ChangeLog 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1,3 +1,31 @@
+2017-10-09 Robin Morisset <[email protected]>
+
+ Make the names of the options consistent
+ https://bugs.webkit.org/show_bug.cgi?id=177933
+
+ Reviewed by Saam Barati.
+
+ I added an alias so the old spelling still works.
+ I also fixed a bunch of typos in comments all around the codebase.
+
+ * b3/B3LowerToAir.cpp:
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGIntegerRangeOptimizationPhase.cpp:
+ * dfg/DFGOperations.h:
+ * dfg/DFGSSAConversionPhase.h:
+ * dfg/DFGSpeculativeJIT.h:
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::lower):
+ * ftl/FTLOSREntry.cpp:
+ (JSC::FTL::prepareOSREntry):
+ * jit/CallFrameShuffler.cpp:
+ (JSC::CallFrameShuffler::prepareForTailCall):
+ * parser/Nodes.h:
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseExportDeclaration):
+ * runtime/Options.h:
+
2017-10-09 Oleksandr Skachkov <[email protected]>
Safari 10 /11 problem with if (!await get(something)).
Modified: trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp (223046 => 223047)
--- trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -762,7 +762,7 @@
return true;
// The use count might be 1 if the variable is live around a loop. We can guarantee that we
- // pick the the variable that is least likely to suffer this problem if we pick the one that
+ // pick the variable that is least likely to suffer this problem if we pick the one that
// is closest to us in an idom walk. By convention, we slightly bias this in favor of
// returning true.
Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (223046 => 223047)
--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -752,7 +752,7 @@
Node* addToGraph(Node* node)
{
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" appended ", node, " ", Graph::opName(node->op()), "\n");
m_currentBlock->append(node);
if (clobbersExitState(m_graph, node))
@@ -1296,7 +1296,7 @@
refineStatically(callLinkStatus, callTarget);
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" Handling call at ", currentCodeOrigin(), ": ", callLinkStatus, "\n");
if (!callLinkStatus.canOptimize()) {
@@ -1346,7 +1346,7 @@
m_inlineStackTop->m_callLinkInfos, m_callContextMap);
refineStatically(callLinkStatus, callTarget);
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" Varargs call link status at ", currentCodeOrigin(), ": ", callLinkStatus, "\n");
if (callLinkStatus.canOptimize()
@@ -1685,7 +1685,7 @@
// If there was a return, but no early returns, then we're done. We allow parsing of
// the caller to continue in whatever basic block we're in right now.
if (!inlineStackEntry.m_didEarlyReturn && inlineStackEntry.m_didReturn) {
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" Allowing parsing to continue in last inlined block.\n");
ASSERT(lastBlock->isEmpty() || !lastBlock->terminal());
@@ -1696,7 +1696,7 @@
// For debugging purposes, set the bytecodeBegin. Note that this doesn't matter
// for release builds because this block will never serve as a potential target
// in the linker's binary search.
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" Repurposing last block from ", lastBlock->bytecodeBegin, " to ", m_currentIndex, "\n");
lastBlock->bytecodeBegin = m_currentIndex;
if (callerLinkability == CallerDoesNormalLinking) {
@@ -1710,7 +1710,7 @@
return;
}
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" Creating new block after inlining.\n");
// If we get to this point then all blocks must end in some sort of terminals.
@@ -2229,7 +2229,7 @@
template<typename ChecksFunctor>
bool ByteCodeParser::handleIntrinsicCall(Node* callee, int resultOperand, Intrinsic intrinsic, int registerOffset, int argumentCountIncludingThis, SpeculatedType prediction, const ChecksFunctor& insertChecks)
{
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" The intrinsic is ", intrinsic, "\n");
// It so happens that the code below doesn't handle the invalid result case. We could fix that, but
@@ -3323,7 +3323,7 @@
Node* callTargetNode, int resultOperand, InternalFunction* function, int registerOffset,
int argumentCountIncludingThis, CodeSpecializationKind kind, SpeculatedType prediction, const ChecksFunctor& insertChecks)
{
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" Handling constant internal function ", JSValue(function), "\n");
// It so happens that the code below assumes that the result operand is valid. It's extremely
@@ -4282,7 +4282,7 @@
m_currentInstruction = currentInstruction; // Some methods want to use this, and we'd rather not thread it through calls.
OpcodeID opcodeID = Interpreter::getOpcodeID(currentInstruction->u.opcode);
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog(" parsing ", currentCodeOrigin(), ": ", opcodeID, "\n");
if (UNLIKELY(m_graph.compilation())) {
@@ -6044,9 +6044,9 @@
op = NewFunction;
}
set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(op, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
- static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_generator_func), "The length of op_new_func should eqaual to one of op_new_generator_func");
- static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_async_func), "The length of op_new_func should eqaual to one of op_new_async_func");
- static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_async_generator_func), "The length of op_new_func should eqaual to one of op_new_async_generator_func");
+ static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_generator_func), "The length of op_new_func should be equal to one of op_new_generator_func");
+ static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_async_func), "The length of op_new_func should be equal to one of op_new_async_func");
+ static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_async_generator_func), "The length of op_new_func should be equal to one of op_new_async_generator_func");
NEXT_OPCODE(op_new_func);
}
@@ -6072,9 +6072,9 @@
}
set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(op, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
- static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_generator_func_exp), "The length of op_new_func_exp should eqaual to one of op_new_generator_func_exp");
- static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_async_func_exp), "The length of op_new_func_exp should eqaual to one of op_new_async_func_exp");
- static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_async_generator_func_exp), "The length of op_new_func_exp should eqaual to one of op_new_async_func_exp");
+ static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_generator_func_exp), "The length of op_new_func_exp should be equal to one of op_new_generator_func_exp");
+ static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_async_func_exp), "The length of op_new_func_exp should be equal to one of op_new_async_func_exp");
+ static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_async_generator_func_exp), "The length of op_new_func_exp should be equal to one of op_new_async_func_exp");
NEXT_OPCODE(op_new_func_exp);
}
@@ -6488,7 +6488,7 @@
ASSERT(m_currentBlock->isEmpty() || m_currentBlock->terminal() || (m_currentIndex == codeBlock->instructions().size() && inlineCallFrame()) || !shouldContinueParsing);
if (!shouldContinueParsing) {
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog("Done parsing ", *codeBlock, "\n");
return;
}
@@ -6500,7 +6500,7 @@
// Should have reached the end of the instructions.
ASSERT(m_currentIndex == codeBlock->instructions().size());
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog("Done parsing ", *codeBlock, " (fell off end)\n");
}
@@ -6509,7 +6509,7 @@
// Set during construction.
ASSERT(!m_currentIndex);
- if (Options::verboseDFGByteCodeParsing())
+ if (Options::verboseDFGBytecodeParsing())
dataLog("Parsing ", *m_codeBlock, "\n");
m_dfgCodeBlock = m_graph.m_plan.profiledDFGCodeBlock;
Modified: trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp (223046 => 223047)
--- trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -799,7 +799,7 @@
// all possible inequalities between variables and constants, but we focus mainly on cheap
// cases for now.
- // Here are some of the the arrangements we can merge usefully assuming @c < @d:
+ // Here are some of the arrangements we can merge usefully assuming @c < @d:
//
// @x == @c || @x == @d => @x >= c && @x <= @d
// @x >= @c || @x <= @d => TOP
Modified: trunk/Source/_javascript_Core/dfg/DFGOperations.h (223046 => 223047)
--- trunk/Source/_javascript_Core/dfg/DFGOperations.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/dfg/DFGOperations.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -40,7 +40,7 @@
JSCell* JIT_OPERATION operationStringFromCharCode(ExecState*, int32_t) WTF_INTERNAL;
EncodedJSValue JIT_OPERATION operationStringFromCharCodeUntyped(ExecState*, EncodedJSValue) WTF_INTERNAL;
-// These routines are provide callbacks out to C++ implementations of operations too complex to JIT.
+// These routines provide callbacks out to C++ implementations of operations too complex to JIT.
JSCell* JIT_OPERATION operationObjectConstructor(ExecState*, JSGlobalObject*, EncodedJSValue encodedTarget) WTF_INTERNAL;
JSCell* JIT_OPERATION operationCreateThis(ExecState*, JSObject* constructor, int32_t inlineCapacity) WTF_INTERNAL;
EncodedJSValue JIT_OPERATION operationToThis(ExecState*, EncodedJSValue encodedOp1) WTF_INTERNAL;
Modified: trunk/Source/_javascript_Core/dfg/DFGSSAConversionPhase.h (223046 => 223047)
--- trunk/Source/_javascript_Core/dfg/DFGSSAConversionPhase.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/dfg/DFGSSAConversionPhase.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -33,7 +33,7 @@
// Convert ThreadedCPS form into SSA form. This results in a form that has:
//
-// - Minimal Phi's. We use the the Cytron et al (TOPLAS'91) algorithm for
+// - Minimal Phi's. We use the Cytron et al (TOPLAS'91) algorithm for
// Phi insertion. Most of the algorithm is implemented in SSACalculator
// and Dominators.
//
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h (223046 => 223047)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -778,7 +778,7 @@
// a child, and as such will use the same GeneratioInfo).
void useChildren(Node*);
- // These method called to initialize the the GenerationInfo
+ // These method called to initialize the GenerationInfo
// to describe the result of an operation.
void int32Result(GPRReg reg, Node* node, DataFormat format = DataFormatInt32, UseChildrenMode mode = CallUseChildren)
{
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (223046 => 223047)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -353,7 +353,7 @@
// Make sure everything is decorated. This does a bunch of deferred decorating. This has
// to happen last because our abstract heaps are generated lazily. They have to be
- // generated lazily because we have an infiniten number of numbered, indexed, and
+ // generated lazily because we have an infinite number of numbered, indexed, and
// absolute heaps. We only become aware of the ones we actually mention while lowering.
m_heaps.computeRangesAndDecorateInstructions();
Modified: trunk/Source/_javascript_Core/ftl/FTLOSREntry.cpp (223046 => 223047)
--- trunk/Source/_javascript_Core/ftl/FTLOSREntry.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/ftl/FTLOSREntry.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -76,7 +76,7 @@
JSValue reconstructedValue = values.argument(argument);
if (valueOnStack == reconstructedValue || !argument)
continue;
- dataLog("Mismatch between reconstructed values and the the value on the stack for argument arg", argument, " for ", *entryCodeBlock, " at bc#", bytecodeIndex, ":\n");
+ dataLog("Mismatch between reconstructed values and the value on the stack for argument arg", argument, " for ", *entryCodeBlock, " at bc#", bytecodeIndex, ":\n");
dataLog(" Value on stack: ", valueOnStack, "\n");
dataLog(" Reconstructed value: ", reconstructedValue, "\n");
RELEASE_ASSERT_NOT_REACHED();
Modified: trunk/Source/_javascript_Core/jit/CallFrameShuffler.cpp (223046 => 223047)
--- trunk/Source/_javascript_Core/jit/CallFrameShuffler.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/jit/CallFrameShuffler.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -384,7 +384,7 @@
// manually
m_newFrameOffset = 0;
#elif CPU(ARM) || CPU(MIPS)
- // We load the the frame pointer and link register
+ // We load the frame pointer and link register
// manually. We could ask the algorithm to load them for us,
// and it would allow us to use the link register as an extra
// temporary - but it'd mean that the frame pointer can also
Modified: trunk/Source/_javascript_Core/parser/Nodes.h (223046 => 223047)
--- trunk/Source/_javascript_Core/parser/Nodes.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/parser/Nodes.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -102,7 +102,7 @@
class ParserArenaFreeable {
public:
- // ParserArenaFreeable objects are are freed when the arena is deleted.
+ // ParserArenaFreeable objects are freed when the arena is deleted.
// Destructors are not called. Clients must not call delete on such objects.
void* operator new(size_t, ParserArena&);
};
Modified: trunk/Source/_javascript_Core/parser/Parser.cpp (223046 => 223047)
--- trunk/Source/_javascript_Core/parser/Parser.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/parser/Parser.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -3472,7 +3472,7 @@
semanticFailIfTrue(hasKeywordForLocalBindings, "Cannot use keyword as exported variable name");
// Since this export declaration does not have module specifier part, it exports the local bindings.
// While the export declaration with module specifier does not have any effect on the current module's scope,
- // the export named declaration without module specifier references the the local binding names.
+ // the export named declaration without module specifier references the local binding names.
// For example,
// export { A, B, C as D } from "mod"
// does not have effect on the current module's scope. But,
Modified: trunk/Source/_javascript_Core/runtime/Options.h (223046 => 223047)
--- trunk/Source/_javascript_Core/runtime/Options.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/_javascript_Core/runtime/Options.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -167,7 +167,7 @@
v(bool, dumpDFGFTLGraphAtEachPhase, false, Normal, "dumps the DFG graph at each phase of DFG compilation when compiling FTL code") \
v(bool, dumpB3GraphAtEachPhase, false, Normal, "dumps the B3 graph at each phase of compilation") \
v(bool, dumpAirGraphAtEachPhase, false, Normal, "dumps the Air graph at each phase of compilation") \
- v(bool, verboseDFGByteCodeParsing, false, Normal, nullptr) \
+ v(bool, verboseDFGBytecodeParsing, false, Normal, nullptr) \
v(bool, safepointBeforeEachPhase, true, Normal, nullptr) \
v(bool, verboseCompilation, false, Normal, nullptr) \
v(bool, verboseFTLCompilation, false, Normal, nullptr) \
@@ -514,6 +514,7 @@
v(enableDollarVM, useDollarVM, SameOption) \
v(enableWebAssembly, useWebAssembly, SameOption) \
v(enableAsyncIterator, useAsyncIterator, SameOption) \
+ v(verboseDFGByteCodeParsing, verboseDFGBytecodeParsing, SameOption) \
class Options {
Modified: trunk/Source/WebCore/ChangeLog (223046 => 223047)
--- trunk/Source/WebCore/ChangeLog 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/ChangeLog 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1,3 +1,60 @@
+2017-10-09 Robin Morisset <[email protected]>
+
+ Make the names of the options consistent
+ https://bugs.webkit.org/show_bug.cgi?id=177933
+
+ Reviewed by Saam Barati.
+
+ No functional change, just fixing comments.
+
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::buffered const):
+ (WebCore::MediaSource::monitorSourceBuffers):
+ * Modules/webaudio/AudioBufferSourceNode.cpp:
+ (WebCore::AudioBufferSourceNode::process):
+ * bindings/scripts/generate-bindings.pl:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustRenderStyle):
+ * editing/BreakBlockquoteCommand.cpp:
+ (WebCore::BreakBlockquoteCommand::doApply):
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::ReplaceSelectionCommand::doApply):
+ * editing/VisibleSelection.cpp:
+ (WebCore::VisibleSelection::setStartAndEndFromBaseAndExtentRespectingGranularity):
+ * editing/VisibleUnits.cpp:
+ (WebCore::closestWordBoundaryForPosition):
+ * html/parser/AtomicHTMLToken.h:
+ * html/parser/HTMLDocumentParser.cpp:
+ (WebCore::HTMLDocumentParser::end):
+ * inspector/InspectorOverlayPage.js:
+ (reset):
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::layoutWidth const):
+ (WebCore::ViewportConfiguration::layoutHeight const):
+ * platform/graphics/FloatPolygon.h:
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+ (WebCore::InbandTextTrackPrivateAVF::processCueAttributes):
+ * platform/graphics/filters/FilterOperation.h:
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ (WebCore::GraphicsContext3D::texImage2D):
+ * platform/mac/WidgetMac.mm:
+ (WebCore::safeRemoveFromSuperview):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::collapseMarginsWithChildInfo):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computePositionedLogicalWidthReplaced const):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::propagateRepaintToParentWithOutlineAutoIfNeeded const):
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::disabledTextColor const):
+ * style/ClassChangeInvalidation.cpp:
+ (WebCore::Style::computeClassChange):
+ * style/StyleScope.cpp:
+ (WebCore::Style::Scope::didChangeStyleSheetEnvironment):
+ * svg/SVGAltGlyphDefElement.cpp:
+ (WebCore::SVGAltGlyphDefElement::hasValidGlyphElements const):
+
2017-10-09 Adrian Perez de Castro <[email protected]>
[WPE][GTK] Propagate libepoxy compiler flags obtained from pkg-config
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (223046 => 223047)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -195,7 +195,7 @@
if (ended && sourceRanges.length())
sourceRanges.add(sourceRanges.start(sourceRanges.length() - 1), highestEndTime);
- // 5.3 Let new intersection ranges equal the the intersection between the intersection ranges and the source ranges.
+ // 5.3 Let new intersection ranges equal the intersection between the intersection ranges and the source ranges.
// 5.4 Replace the ranges in intersection ranges with the new intersection ranges.
m_buffered->intersectWith(sourceRanges);
}
@@ -397,7 +397,7 @@
return;
}
- // ↳ If the the HTMLMediaElement.readyState attribute equals HAVE_NOTHING:
+ // ↳ If the HTMLMediaElement.readyState attribute equals HAVE_NOTHING:
if (mediaElement()->readyState() == HTMLMediaElement::HAVE_NOTHING) {
// 1. Abort these steps.
return;
Modified: trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp (223046 => 223047)
--- trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -105,7 +105,7 @@
// After calling setBuffer() with a buffer having a different number of channels, there can in rare cases be a slight delay
// before the output bus is updated to the new number of channels because of use of tryLocks() in the context's updating system.
- // In this case, if the the buffer has just been changed and we're not quite ready yet, then just output silence.
+ // In this case, if the buffer has just been changed and we're not quite ready yet, then just output silence.
if (numberOfChannels() != buffer()->numberOfChannels()) {
outputBus.zero();
return;
Modified: trunk/Source/WebCore/bindings/scripts/generate-bindings.pl (223046 => 223047)
--- trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2017-10-09 16:49:13 UTC (rev 223047)
@@ -207,7 +207,7 @@
push(@{$targetDataNode->constants}, $constant);
}
} else {
- die "$idlFile is not a supplemental dependency of $targetIdlFile. There maybe a bug in the the supplemental dependency generator (preprocess-idls.pl).\n";
+ die "$idlFile is not a supplemental dependency of $targetIdlFile. There maybe a bug in the supplemental dependency generator (preprocess-idls.pl).\n";
}
}
}
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (223046 => 223047)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1048,7 +1048,7 @@
}
// If the inherited value of justify-items includes the 'legacy' keyword,
- // 'auto' computes to the the inherited value. Otherwise, 'auto' computes to
+ // 'auto' computes to the inherited value. Otherwise, 'auto' computes to
// 'normal'.
if (style.justifyItems().position() == ItemPositionAuto) {
if (parentBoxStyle->justifyItems().positionType() == LegacyPosition)
Modified: trunk/Source/WebCore/editing/BreakBlockquoteCommand.cpp (223046 => 223047)
--- trunk/Source/WebCore/editing/BreakBlockquoteCommand.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/editing/BreakBlockquoteCommand.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -75,7 +75,7 @@
bool isLastVisPosInNode = isLastVisiblePositionInNode(visiblePos, topBlockquote);
// If the position is at the beginning of the top quoted content, we don't need to break the quote.
- // Instead, insert the break before the blockquote, unless the position is as the end of the the quoted content.
+ // Instead, insert the break before the blockquote, unless the position is as the end of the quoted content.
if (isFirstVisiblePositionInNode(visiblePos, topBlockquote) && !isLastVisPosInNode) {
insertNodeBefore(breakNode.copyRef(), *topBlockquote);
setEndingSelection(VisibleSelection(positionBeforeNode(breakNode.ptr()), DOWNSTREAM, endingSelection().isDirectional()));
Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (223046 => 223047)
--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1192,7 +1192,7 @@
if (m_shouldMergeEnd && destinationNode != enclosingInline(destinationNode) && enclosingInline(destinationNode)->nextSibling())
insertNodeBefore(HTMLBRElement::create(document()), *refNode);
- // Merging the the first paragraph of inserted content with the content that came
+ // Merging the first paragraph of inserted content with the content that came
// before the selection that was pasted into would also move content after
// the selection that was pasted into if: only one paragraph was being pasted,
// and it was not wrapped in a block, the selection that was pasted into ended
Modified: trunk/Source/WebCore/editing/VisibleSelection.cpp (223046 => 223047)
--- trunk/Source/WebCore/editing/VisibleSelection.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/editing/VisibleSelection.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -286,7 +286,7 @@
// General case: Select the word the caret is positioned inside of, or at the start of (RightWordIfOnBoundary).
// Edge case: If the caret is after the last word in a soft-wrapped line or the last word in
// the document, select that last word (LeftWordIfOnBoundary).
- // Edge case: If the caret is after the last word in a paragraph, select from the the end of the
+ // Edge case: If the caret is after the last word in a paragraph, select from the end of the
// last word to the line break (also RightWordIfOnBoundary);
VisiblePosition start = VisiblePosition(m_start, m_affinity);
VisiblePosition originalEnd(m_end, m_affinity);
Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (223046 => 223047)
--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1971,7 +1971,7 @@
{
VisiblePosition result;
- // move the the position at the end of the word
+ // move the position at the end of the word
if (atBoundaryOfGranularity(position, LineGranularity, DirectionForward)) {
// Don't cross line boundaries.
result = position;
Modified: trunk/Source/WebCore/html/parser/AtomicHTMLToken.h (223046 => 223047)
--- trunk/Source/WebCore/html/parser/AtomicHTMLToken.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/html/parser/AtomicHTMLToken.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -78,7 +78,7 @@
String m_data; // Comment
- // We don't want to copy the the characters out of the HTMLToken, so we keep a pointer to its buffer instead.
+ // We don't want to copy the characters out of the HTMLToken, so we keep a pointer to its buffer instead.
// This buffer is owned by the HTMLToken and causes a lifetime dependence between these objects.
// FIXME: Add a mechanism for "internalizing" the characters when the HTMLToken is destroyed.
const UChar* m_externalCharacters; // Character
Modified: trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp (223046 => 223047)
--- trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -402,7 +402,7 @@
ASSERT(!isDetached());
ASSERT(!isScheduledForResume());
- // Informs the the rest of WebCore that parsing is really finished (and deletes this).
+ // Informs the rest of WebCore that parsing is really finished (and deletes this).
m_treeBuilder->finished();
}
Modified: trunk/Source/WebCore/inspector/InspectorOverlayPage.js (223046 => 223047)
--- trunk/Source/WebCore/inspector/InspectorOverlayPage.js 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/inspector/InspectorOverlayPage.js 2017-10-09 16:49:13 UTC (rev 223047)
@@ -172,7 +172,7 @@
canvas.style.height = viewportSize.height + "px";
context.scale(deviceScaleFactor, deviceScaleFactor);
- // We avoid getting the the context for the paint rects canvas until we need to paint, to avoid backing store allocation.
+ // We avoid getting the context for the paint rects canvas until we need to paint, to avoid backing store allocation.
paintRectsCanvas.width = deviceScaleFactor * viewportSize.width;
paintRectsCanvas.height = deviceScaleFactor * viewportSize.height;
paintRectsCanvas.style.width = viewportSize.width + "px";
Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (223046 => 223047)
--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -360,7 +360,7 @@
double maximumScale = this->maximumScale();
double maximumContentWidthInViewportCoordinate = maximumScale * m_configuration.width;
if (maximumContentWidthInViewportCoordinate < minimumLayoutSize.width()) {
- // The content zoomed to maxScale does not fit the the view. Return the minimum width
+ // The content zoomed to maxScale does not fit the view. Return the minimum width
// satisfying the constraint maximumScale.
return std::round(minimumLayoutSize.width() / maximumScale);
}
@@ -396,7 +396,7 @@
double maximumScale = this->maximumScale();
double maximumContentHeightInViewportCoordinate = maximumScale * m_configuration.height;
if (maximumContentHeightInViewportCoordinate < minimumLayoutSize.height()) {
- // The content zoomed to maxScale does not fit the the view. Return the minimum height that
+ // The content zoomed to maxScale does not fit the view. Return the minimum height that
// satisfy the constraint maximumScale.
return std::round(minimumLayoutSize.height() / maximumScale);
}
Modified: trunk/Source/WebCore/platform/graphics/FloatPolygon.h (223046 => 223047)
--- trunk/Source/WebCore/platform/graphics/FloatPolygon.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/platform/graphics/FloatPolygon.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -124,7 +124,7 @@
private:
// Edge vertex index1 is less than index2, except the last edge, where index2 is 0. When a polygon edge
- // is defined by 3 or more colinear vertices, index2 can be the the index of the last colinear vertex.
+ // is defined by 3 or more colinear vertices, index2 can be the index of the last colinear vertex.
unsigned m_vertexIndex1;
unsigned m_vertexIndex2;
unsigned m_edgeIndex;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (223046 => 223047)
--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -88,7 +88,7 @@
void InbandTextTrackPrivateAVF::processCueAttributes(CFAttributedStringRef attributedString, GenericCueData& cueData)
{
- // Some of the attributes we translate into per-cue WebVTT settings are are repeated on each part of an attributed string so only
+ // Some of the attributes we translate into per-cue WebVTT settings are repeated on each part of an attributed string so only
// process the first instance of each.
enum AttributeFlags {
Line = 1 << 0,
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (223046 => 223047)
--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -94,7 +94,7 @@
// True if the alpha channel of any pixel can change under this operation.
virtual bool affectsOpacity() const { return false; }
- // True if the the value of one pixel can affect the value of another pixel under this operation, such as blur.
+ // True if the value of one pixel can affect the value of another pixel under this operation, such as blur.
virtual bool movesPixels() const { return false; }
// True if the filter should not be allowed to work on content that is not available from this security origin.
virtual bool shouldBeRestrictedBySecurityOrigin() const { return false; }
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (223046 => 223047)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -409,7 +409,7 @@
// We are using a core profile. This means that GL_ALPHA, which is a valid format in WebGL for texImage2D
// is not supported in OpenGL. It needs to be backed with a GL_RED plane. We change the formats to GL_RED
// (both need to be GL_ALPHA in WebGL) and instruct the texture to swizzle the red component values with
- // the the alpha component values.
+ // the alpha component values.
openGLInternalFormat = openGLFormat = RED;
texParameteri(target, TEXTURE_SWIZZLE_A, RED);
}
Modified: trunk/Source/WebCore/platform/mac/WidgetMac.mm (223046 => 223047)
--- trunk/Source/WebCore/platform/mac/WidgetMac.mm 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/platform/mac/WidgetMac.mm 2017-10-09 16:49:13 UTC (rev 223047)
@@ -60,7 +60,7 @@
static void safeRemoveFromSuperview(NSView *view)
{
- // If the the view is the first responder, then set the window's first responder to nil so
+ // If the view is the first responder, then set the window's first responder to nil so
// we don't leave the window pointing to a view that's no longer in it.
NSWindow *window = [view window];
NSResponder *firstResponder = [window firstResponder];
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (223046 => 223047)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1004,7 +1004,7 @@
bool beforeQuirk = child ? hasMarginBeforeQuirk(*child) : false;
bool afterQuirk = child ? hasMarginAfterQuirk(*child) : false;
- // The child discards the before margin when the the after margin has discard in the case of a self collapsing block.
+ // The child discards the before margin when the after margin has discarded in the case of a self collapsing block.
childDiscardMarginBefore = childDiscardMarginBefore || (childDiscardMarginAfter && childIsSelfCollapsing);
// Get the four margin values for the child and cache them.
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (223046 => 223047)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -69,7 +69,7 @@
void rebuildFloatingObjectSetFromIntrudingFloats();
// RenderBlockFlow always contains either lines or paragraphs. When the children are all blocks (e.g. paragraphs), we call layoutBlockChildren.
- // When the children are are all inline (e.g., lines), we call layoutInlineChildren.
+ // When the children are all inline (e.g., lines), we call layoutInlineChildren.
void layoutBlockChildren(bool relayoutChildren, LayoutUnit& maxFloatLogicalBottom);
void layoutInlineChildren(bool relayoutChildren, LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom);
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (223046 => 223047)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -4017,7 +4017,7 @@
const LayoutUnit containerRelativeLogicalWidth = containingBlockLogicalWidthForPositioned(containerBlock, nullptr, false);
// To match WinIE, in quirks mode use the parent's 'direction' property
- // instead of the the container block's.
+ // instead of the container block's.
TextDirection containerDirection = containerBlock.style().direction();
// Variables to solve.
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (223046 => 223047)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -817,7 +817,7 @@
if (!hasOutlineAutoAncestor())
return;
- // FIXME: We should really propagate only when the the child renderer sticks out.
+ // FIXME: We should really propagate only when the child renderer sticks out.
bool repaintRectNeedsConverting = false;
// Issue repaint on the renderer with outline: auto.
for (const auto* renderer = this; renderer; renderer = renderer->parent()) {
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (223046 => 223047)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1313,7 +1313,7 @@
// If there's not very much contrast between the disabled color and the background color,
// just leave the text color alone. We don't want to change a good contrast color scheme so that it has really bad contrast.
- // If the the contrast was already poor, then it doesn't do any good to change it to a different poor contrast color scheme.
+ // If the contrast was already poor, then it doesn't do any good to change it to a different poor contrast color scheme.
if (differenceSquared(disabledColor, backgroundColor) < minColorContrastValue)
return textColor;
Modified: trunk/Source/WebCore/style/ClassChangeInvalidation.cpp (223046 => 223047)
--- trunk/Source/WebCore/style/ClassChangeInvalidation.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/style/ClassChangeInvalidation.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -74,7 +74,7 @@
changedClasses.append(newClasses[i].impl());
}
for (unsigned i = 0; i < oldSize; ++i) {
- // If the bit is not set the the corresponding class has been removed.
+ // If the bit is not set the corresponding class has been removed.
if (remainingClassBits.quickGet(i))
continue;
changedClasses.append(oldClasses[i].impl());
Modified: trunk/Source/WebCore/style/StyleScope.cpp (223046 => 223047)
--- trunk/Source/WebCore/style/StyleScope.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/style/StyleScope.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -608,7 +608,7 @@
{
if (!m_shadowRoot) {
for (auto* descendantShadowRoot : m_document.inDocumentShadowRoots()) {
- // Stylesheets is author shadow roots are are potentially affected.
+ // Stylesheets is author shadow roots are potentially affected.
if (descendantShadowRoot->mode() != ShadowRootMode::UserAgent)
descendantShadowRoot->styleScope().scheduleUpdate(UpdateType::ContentsOrInterpretation);
}
Modified: trunk/Source/WebCore/svg/SVGAltGlyphDefElement.cpp (223046 => 223047)
--- trunk/Source/WebCore/svg/SVGAltGlyphDefElement.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebCore/svg/SVGAltGlyphDefElement.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -65,7 +65,7 @@
// element surrounding those characters.
//
// The spec doesn't tell how to deal with the mixing of <glyphRef> and <altGlyItem>.
- // However, we determine content model by the the type of the first appearing element
+ // However, we determine content model by the type of the first appearing element
// just like Opera 11 does. After the content model is determined we skip elements
// which don't comform to it. For example:
// a. <altGlyphDef>
Modified: trunk/Source/WebKit/ChangeLog (223046 => 223047)
--- trunk/Source/WebKit/ChangeLog 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKit/ChangeLog 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1,3 +1,22 @@
+2017-10-09 Robin Morisset <[email protected]>
+
+ Make the names of the options consistent
+ https://bugs.webkit.org/show_bug.cgi?id=177933
+
+ Reviewed by Saam Barati.
+
+ * NetworkProcess/capture/json.hpp:
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::connectionDidClose):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _keyboardWillHide:]):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::runModal):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::inspectedViewFrameDidChange):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::selectWithGesture):
+
2017-10-09 Adrian Perez de Castro <[email protected]>
[WPE][GTK] Propagate libepoxy compiler flags obtained from pkg-config
Modified: trunk/Source/WebKit/NetworkProcess/capture/json.hpp (223046 => 223047)
--- trunk/Source/WebKit/NetworkProcess/capture/json.hpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKit/NetworkProcess/capture/json.hpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -183,7 +183,7 @@
number_integer, ///< number value (signed integer)
number_unsigned, ///< number value (unsigned integer)
number_float, ///< number value (floating-point)
- discarded ///< discarded by the the parser callback function
+ discarded ///< discarded by the parser callback function
};
/*!
@@ -11271,7 +11271,7 @@
number type (either integer, unsigned integer or floating point),
which is passed back to the caller via the result parameter.
- integral numbers that don't fit into the the range of the respective
+ integral numbers that don't fit into the range of the respective
type are parsed as number_float_t
floating-point values do not satisfy std::isfinite predicate
@@ -12318,7 +12318,7 @@
Uses a JSON pointer to retrieve a reference to the respective JSON value.
No bound checking is performed. The function does not change the JSON
- value; no `null` values are created. In particular, the the special value
+ value; no `null` values are created. In particular, the special value
`-` yields an exception.
@param[in] ptr JSON pointer to the desired element
Modified: trunk/Source/WebKit/Platform/IPC/Connection.cpp (223046 => 223047)
--- trunk/Source/WebKit/Platform/IPC/Connection.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKit/Platform/IPC/Connection.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -794,7 +794,7 @@
RunLoop::main().dispatch([protectedThis = makeRef(*this)]() mutable {
// If the connection has been explicitly invalidated before dispatchConnectionDidClose was called,
- // then the the connection will be invalid here.
+ // then the connection will be invalid here.
if (!protectedThis->isValid())
return;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (223046 => 223047)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2017-10-09 16:49:13 UTC (rev 223047)
@@ -2693,7 +2693,7 @@
{
// Ignore keyboard will hide notifications sent during rotation. They're just there for
// backwards compatibility reasons and processing the will hide notification would
- // temporarily screw up the the unobscured view area.
+ // temporarily screw up the unobscured view area.
if ([[UIPeripheralHost sharedInstance] rotationState])
return;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (223046 => 223047)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-10-09 16:49:13 UTC (rev 223047)
@@ -6010,7 +6010,7 @@
m_process->responsivenessTimer().stop();
// Our Connection's run loop might have more messages waiting to be handled after this RunModal message.
- // To make sure they are handled inside of the the nested modal run loop we must first signal the Connection's
+ // To make sure they are handled inside of the nested modal run loop we must first signal the Connection's
// run loop so we're guaranteed that it has a chance to wake up.
// See http://webkit.org/b/89590 for more discussion.
m_process->connection()->wakeUpRunLoop();
Modified: trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm (223046 => 223047)
--- trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm 2017-10-09 16:49:13 UTC (rev 223047)
@@ -560,7 +560,7 @@
CGFloat inspectorWidth = InspectorFrontendClientLocal::constrainedAttachedWindowWidth(currentDimension, parentWidth);
// Preserve the top position of the inspected view so banners in Safari still work. But don't use that
- // top position for the inspector view since the banners only stretch as wide as the the inspected view.
+ // top position for the inspector view since the banners only stretch as wide as the inspected view.
inspectedViewFrame = NSMakeRect(0, 0, parentWidth - inspectorWidth, inspectedViewTop);
CGFloat insetExcludingBanners = 0;
if ([inspectedView isKindOfClass:[WKView class]])
@@ -577,7 +577,7 @@
CGFloat inspectorWidth = InspectorFrontendClientLocal::constrainedAttachedWindowWidth(currentDimension, parentWidth);
// Preserve the top position of the inspected view so banners in Safari still work. But don't use that
- // top position for the inspector view since the banners only stretch as wide as the the inspected view.
+ // top position for the inspector view since the banners only stretch as wide as the inspected view.
inspectedViewFrame = NSMakeRect(inspectorWidth, 0, parentWidth - inspectorWidth, inspectedViewTop);
CGFloat insetExcludingBanners = 0;
if ([inspectedView isKindOfClass:[WKView class]])
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (223046 => 223047)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1116,7 +1116,7 @@
case GestureType::OneFingerTap:
{
VisiblePosition result;
- // move the the position at the end of the word
+ // move the position at the end of the word
if (atBoundaryOfGranularity(position, LineGranularity, DirectionForward)) {
// Don't cross line boundaries.
result = position;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (223046 => 223047)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-09 16:49:13 UTC (rev 223047)
@@ -1,3 +1,15 @@
+2017-10-09 Robin Morisset <[email protected]>
+
+ Make the names of the options consistent
+ https://bugs.webkit.org/show_bug.cgi?id=177933
+
+ Reviewed by Saam Barati.
+
+ * WebView/WebFrame.h:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView setMarkedText:selectedRange:]):
+ * WebView/WebView.h:
+
2017-10-06 Wenson Hsieh <[email protected]>
[iOS] Tweak support for classifying form controls (followup to r222487)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFrame.h (223046 => 223047)
--- trunk/Source/WebKitLegacy/mac/WebView/WebFrame.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFrame.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -123,7 +123,7 @@
@abstract Loads a page to display as a substitute for a URL that could not be reached.
@discussion This allows clients to display page-loading errors in the webview itself.
This is typically called while processing the WebFrameLoadDelegate method
- -webView:didFailProvisionalLoadWithError:forFrame: or one of the the WebPolicyDelegate methods
+ -webView:didFailProvisionalLoadWithError:forFrame: or one of the WebPolicyDelegate methods
-webView:decidePolicyForMIMEType:request:frame:decisionListener: or
-webView:unableToImplementPolicyWithError:frame:. If it is called from within one of those
three delegate methods then the back/forward list will be maintained appropriately.
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (223046 => 223047)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2017-10-09 16:49:13 UTC (rev 223047)
@@ -6697,7 +6697,7 @@
NSString *rangeString = [string attribute:NSTextInputReplacementRangeAttributeName atIndex:0 longestEffectiveRange:0 inRange:NSMakeRange(0, [text length])];
LOG(TextInput, " ReplacementRange: %@", rangeString);
// The AppKit adds a 'secret' property to the string that contains the replacement range.
- // The replacement range is the range of the the text that should be replaced with the new string.
+ // The replacement range is the range of the text that should be replaced with the new string.
if (rangeString)
replacementRange = NSRangeFromString(rangeString);
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.h (223046 => 223047)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.h 2017-10-09 16:37:11 UTC (rev 223046)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.h 2017-10-09 16:49:13 UTC (rev 223047)
@@ -141,7 +141,7 @@
/*!
@method canShowMIMETypeAsHTML:
- @abstract Checks if the the MIME type is a type that the WebKit will interpret as HTML.
+ @abstract Checks if the MIME type is a type that the WebKit will interpret as HTML.
@param MIMEType The MIME type to check.
@result YES if the MIMEtype in an HTML type.
*/
