Skip to content

E
engine

sxychenjing / engine
与 Fork 源项目一致

从无法访问的项目Fork

通知 3
Star 0
Fork 0
E
engine

体验新版 GitCode，发现更多精彩内容 >>

提交 ac7ea65e 编写于 作者: O Ojan Vafai
浏览文件
操作

Remove a bunch of unused or never-set settings. 

Just mechanical changes. No change in behavior.

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/681553003
上级 57a45f79
隐藏空白更改
内联 并排
Showing with 41 addition and 344 deletion
engine/core/css/FontSize.cpp
浏览文件 @ ac7ea65e
......@@ -58,8 +58,8 @@ float FontSize::getComputedSizeFromSpecifiedSize(const Document* document, float
if (!settings)
return 1.0f;
int minSize = settings->minimumFontSize();
int minLogicalSize = settings->minimumLogicalFontSize();
int minSize = 0;
int minLogicalSize = 0;
float zoomedSize = specifiedSize * zoomFactor;
// Apply the hard minimum first. We only apply the hard minimum if after zooming we're still too small.
......@@ -126,7 +126,7 @@ float FontSize::fontSizeForKeyword(const Document* document, CSSValueID keyword,
}
// Value is outside the range of the table. Apply the scale factor instead.
float minLogicalSize = std::max(settings->minimumLogicalFontSize(), 1);
float minLogicalSize = 1;
return std::max(fontSizeFactors[keyword - CSSValueXxSmall] * mediumSize, minLogicalSize);
}
......
engine/core/dom/Position.cpp
浏览文件 @ ac7ea65e
......@@ -816,9 +816,7 @@ bool Position::isCandidate() const
return m_anchorNode->hasEditableStyle() && !Position::nodeIsUserSelectNone(deprecatedNode()) && atEditingBoundary();
}
} else {
LocalFrame* frame = m_anchorNode->document().frame();
bool caretBrowsing = frame->settings() && frame->settings()->caretBrowsingEnabled();
return (caretBrowsing || m_anchorNode->hasEditableStyle()) && !Position::nodeIsUserSelectNone(deprecatedNode()) && atEditingBoundary();
return m_anchorNode->hasEditableStyle() && !Position::nodeIsUserSelectNone(deprecatedNode()) && atEditingBoundary();
}
return false;
......
engine/core/editing/Caret.cpp
浏览文件 @ ac7ea65e
......@@ -210,17 +210,6 @@ void CaretBase::invalidateLocalCaretRect(Node* node, const LayoutRect& rect)
caretPainter->invalidatePaintRectangle(inflatedRect);
}
bool CaretBase::shouldRepaintCaret(const RenderView* view, bool isContentEditable) const
{
ASSERT(view);
bool caretBrowsing = false;
if (FrameView* frameView = view->frameView()) {
LocalFrame& frame = frameView->frame(); // The frame where the selection started
caretBrowsing = frame.settings() && frame.settings()->caretBrowsingEnabled();
}
return (caretBrowsing || isContentEditable);
}
void CaretBase::invalidateCaretRect(Node* node, bool caretRectChanged)
{
// EDIT FIXME: This is an unfortunate hack.
......@@ -239,10 +228,8 @@ void CaretBase::invalidateCaretRect(Node* node, bool caretRectChanged)
if (caretRectChanged)
return;
if (RenderView* view = node->document().renderView()) {
if (shouldRepaintCaret(view, node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)))
invalidateLocalCaretRect(node, localCaretRectWithoutUpdate());
}
if (node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable))
invalidateLocalCaretRect(node, localCaretRectWithoutUpdate());
}
void CaretBase::paintCaret(Node* node, GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
......
engine/core/editing/Caret.h
浏览文件 @ ac7ea65e
......@@ -54,7 +54,6 @@ protected:
bool updateCaretRect(Document*, const PositionWithAffinity& caretPosition);
bool updateCaretRect(Document*, const VisiblePosition& caretPosition);
IntRect absoluteBoundsForLocalRect(Node*, const LayoutRect&) const;
bool shouldRepaintCaret(const RenderView*, bool isContentEditable) const;
void paintCaret(Node*, GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect) const;
const LayoutRect& localCaretRectWithoutUpdate() const { return m_caretLocalRect; }
......
engine/core/editing/EditorCommand.cpp
浏览文件 @ ac7ea65e
......@@ -407,19 +407,6 @@ static bool enabledVisibleSelection(LocalFrame& frame, Event* event, EditorComma
return (selection.isCaret() && selection.isContentEditable()) || selection.isRange();
}
static bool caretBrowsingEnabled(LocalFrame& frame)
{
return frame.settings() && frame.settings()->caretBrowsingEnabled();
}
static EditorCommandSource dummyEditorCommandSource = static_cast<EditorCommandSource>(0);
static bool enabledVisibleSelectionOrCaretBrowsing(LocalFrame& frame, Event* event, EditorCommandSource)
{
// The EditorCommandSource parameter is unused in enabledVisibleSelection, so just pass a dummy variable
return caretBrowsingEnabled(frame) || enabledVisibleSelection(frame, event, dummyEditorCommandSource);
}
static bool enabledCopy(LocalFrame& frame, Event*, EditorCommandSource)
{
return frame.editor().canDHTMLCopy() || frame.editor().canCopy();
......@@ -435,12 +422,6 @@ static bool enabledInEditableText(LocalFrame& frame, Event* event, EditorCommand
return frame.editor().selectionForCommand(event).rootEditableElement();
}
static bool enabledInEditableTextOrCaretBrowsing(LocalFrame& frame, Event* event, EditorCommandSource)
{
// The EditorCommandSource parameter is unused in enabledInEditableText, so just pass a dummy variable
return caretBrowsingEnabled(frame) || enabledInEditableText(frame, event, dummyEditorCommandSource);
}
static bool enabledInRichlyEditableText(LocalFrame& frame, Event*, EditorCommandSource)
{
return frame.selection().isCaretOrRange() && frame.selection().isContentRichlyEditable() && frame.selection().rootEditableElement();
......@@ -480,36 +461,36 @@ static const CommandMap& createCommandMap()
{ "DeleteWordBackward", {20, executeDeleteWordBackward, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "DeleteWordForward", {21, executeDeleteWordForward, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "InsertNewline", {37, executeInsertNewline, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, isTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveDown", {55, executeMoveDown, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveDownAndModifySelection", {56, executeMoveDownAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveLeft", {59, executeMoveLeft, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveLeftAndModifySelection", {60, executeMoveLeftAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveDown", {55, executeMoveDown, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveDownAndModifySelection", {56, executeMoveDownAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveLeft", {59, executeMoveLeft, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveLeftAndModifySelection", {60, executeMoveLeftAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MovePageDown", {61, executeMovePageDown, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MovePageDownAndModifySelection", {62, executeMovePageDownAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MovePageUp", {63, executeMovePageUp, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MovePageUpAndModifySelection", {64, executeMovePageUpAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveParagraphBackward", {65, executeMoveParagraphBackward, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveParagraphBackwardAndModifySelection", {66, executeMoveParagraphBackwardAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveParagraphForward", {67, executeMoveParagraphForward, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveParagraphForwardAndModifySelection", {68, executeMoveParagraphForwardAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveRight", {69, executeMoveRight, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveRightAndModifySelection", {70, executeMoveRightAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToBeginningOfDocument", {71, executeMoveToBeginningOfDocument, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToBeginningOfDocumentAndModifySelection", {72, executeMoveToBeginningOfDocumentAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToBeginningOfLine", {73, executeMoveToBeginningOfLine, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToBeginningOfLineAndModifySelection", {74, executeMoveToBeginningOfLineAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToEndOfDocument", {79, executeMoveToEndOfDocument, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToEndOfDocumentAndModifySelection", {80, executeMoveToEndOfDocumentAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToEndOfLine", {81, executeMoveToEndOfLine, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToEndOfLineAndModifySelection", {82, executeMoveToEndOfLineAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveParagraphBackward", {65, executeMoveParagraphBackward, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveParagraphBackwardAndModifySelection", {66, executeMoveParagraphBackwardAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveParagraphForward", {67, executeMoveParagraphForward, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveParagraphForwardAndModifySelection", {68, executeMoveParagraphForwardAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveRight", {69, executeMoveRight, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveRightAndModifySelection", {70, executeMoveRightAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToBeginningOfDocument", {71, executeMoveToBeginningOfDocument, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToBeginningOfDocumentAndModifySelection", {72, executeMoveToBeginningOfDocumentAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToBeginningOfLine", {73, executeMoveToBeginningOfLine, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToBeginningOfLineAndModifySelection", {74, executeMoveToBeginningOfLineAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToEndOfDocument", {79, executeMoveToEndOfDocument, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToEndOfDocumentAndModifySelection", {80, executeMoveToEndOfDocumentAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToEndOfLine", {81, executeMoveToEndOfLine, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToEndOfLineAndModifySelection", {82, executeMoveToEndOfLineAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToLeftEndOfLine", {87, executeMoveToLeftEndOfLine, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveToLeftEndOfLineAndModifySelection", {88, executeMoveToLeftEndOfLineAndModifySelection, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveUp", {91, executeMoveUp, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveUpAndModifySelection", {92, executeMoveUpAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveWordLeft", {97, executeMoveWordLeft, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveWordLeftAndModifySelection", {98, executeMoveWordLeftAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveWordRight", {99, executeMoveWordRight, supportedFromMenuOrKeyBinding, enabledInEditableTextOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveWordRightAndModifySelection", {100, executeMoveWordRightAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelectionOrCaretBrowsing, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveUp", {91, executeMoveUp, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveUpAndModifySelection", {92, executeMoveUpAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveWordLeft", {97, executeMoveWordLeft, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveWordLeftAndModifySelection", {98, executeMoveWordLeftAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveWordRight", {99, executeMoveWordRight, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "MoveWordRightAndModifySelection", {100, executeMoveWordRightAndModifySelection, supportedFromMenuOrKeyBinding, enabledVisibleSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "OverWrite", {102, executeToggleOverwrite, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "Paste", {103, executePaste, supportedPaste, enabledPaste, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
{ "PasteAndMatchStyle", {104, executePasteAndMatchStyle, supportedPaste, enabledPaste, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
......
engine/core/editing/FrameSelection.cpp
浏览文件 @ ac7ea65e
......@@ -1236,10 +1236,9 @@ void FrameSelection::invalidateCaretRect()
if (!m_caretBlinkTimer.isActive() && newNode == m_previousCaretNode && newRect == m_previousCaretRect)
return;
RenderView* view = m_frame->document()->renderView();
if (m_previousCaretNode && shouldRepaintCaret(view, m_previousCaretNode->isContentEditable()))
if (m_previousCaretNode && m_previousCaretNode->isContentEditable())
invalidateLocalCaretRect(m_previousCaretNode.get(), m_previousCaretRect);
if (newNode && shouldRepaintCaret(view, newNode->isContentEditable()))
if (newNode && newNode->isContentEditable())
invalidateLocalCaretRect(newNode, newRect);
m_previousCaretNode = newNode;
......@@ -1512,9 +1511,6 @@ bool FrameSelection::shouldBlinkCaret() const
if (!caretIsVisible() || !isCaret())
return false;
if (m_frame->settings() && m_frame->settings()->caretBrowsingEnabled())
return false;
Element* root = rootEditableElement();
if (!root)
return false;
......@@ -1558,14 +1554,6 @@ void FrameSelection::setFocusedNodeIfNeeded()
if (isNone() || !isFocused())
return;
bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
if (caretBrowsing) {
if (Element* anchor = enclosingAnchorElement(base())) {
m_frame->page()->focusController().setFocusedElement(anchor, m_frame);
return;
}
}
if (Element* target = rootEditableElement()) {
// Walk up the DOM tree to search for a node to focus.
while (target) {
......@@ -1580,9 +1568,6 @@ void FrameSelection::setFocusedNodeIfNeeded()
}
m_frame->document()->setFocusedElement(nullptr);
}
if (caretBrowsing)
m_frame->page()->focusController().setFocusedElement(0, m_frame);
}
static String extractSelectedText(const FrameSelection& selection, TextIteratorBehavior behavior)
......
engine/core/frame/Settings.in
浏览文件 @ ac7ea65e
......@@ -26,12 +26,6 @@
defaultTextEncodingName type=String
# Sets the magnification value for validation message timer. If the
# magnification value is N, a validation message disappears automatically after
# <message length> * N / 1000 seconds. If N is equal to or less than 0, a
# validation message doesn't disappears automaticaly.
validationMessageTimerMagnification type=int, initial=50
# Number of pixels below which 2D canvas is rendered in software
# even if hardware acceleration is enabled.
# Hardware acceleration is useful for large canvases where it can avoid the
......@@ -42,22 +36,14 @@ validationMessageTimerMagnification type=int, initial=50
# draw canvas in software.
minimumAccelerated2dCanvasSize type=int, initial=257*256
minimumFontSize type=int, initial=0, invalidate=Style
minimumLogicalFontSize type=int, initial=0, invalidate=Style
defaultFontSize type=int, initial=0, invalidate=Style
defaultFixedFontSize type=int, initial=0, invalidate=Style
caretBrowsingEnabled initial=false
localStorageEnabled initial=false
allowUniversalAccessFromFileURLs initial=true
allowFileAccessFromFileURLs initial=true
javaScriptCanAccessClipboard initial=false
shouldClearDocumentBackground initial=true
textAreasAreResizable initial=false, invalidate=Style
shrinksStandaloneImagesToFit initial=true
deferredFiltersEnabled initial=true
containerCullingEnabled initial=false
......@@ -67,8 +53,6 @@ containerCullingEnabled initial=false
# Leaving enabled for now to not change existing behavior.
downloadableBinaryFontsEnabled initial=true
treatIPAddressAsDomain initial=false
preferCompositingToLCDTextEnabled initial=false, invalidate=AcceleratedCompositing
# 3D canvas (WebGL) support.
......@@ -81,12 +65,6 @@ accelerated2dCanvasMSAASampleCount type=int, initial=0
asynchronousSpellCheckingEnabled initial=false
hyperlinkAuditingEnabled initial=false
allowDisplayOfInsecureContent initial=true
allowRunningOfInsecureContent initial=true
# FIXME: Remove this temporary flag. See crbug.com/366483 for the target
# milestone.
allowConnectingInsecureWebSocket initial=false
mediaPlaybackRequiresUserGesture initial=false
scrollAnimatorEnabled initial=true
......@@ -118,17 +96,8 @@ maxTouchPoints type=int, initial=0
# crbug.com/304895 tracks removal once we're satisfied with the algorithm.
touchAdjustmentEnabled initial=true
navigateOnDragDrop initial=true
DOMPasteAllowed initial=false
allowCustomScrollbarInMainFrame initial=true
webSecurityEnabled initial=true
# This setting adds a means to enable/disable touch initiated drag & drop. If
# enabled, the user can initiate drag using long press.
# crbug.com/304894 tracks removal once it's been enabled on all platforms.
touchDragDropEnabled initial=false
unifiedTextCheckerEnabled initial=defaultUnifiedTextCheckerEnabled
# Some apps could have a default video poster if it is not set.
......@@ -150,16 +119,10 @@ useSolidColorScrollbars initial=true
mainFrameClipsContent initial=true
# Presumably used by tests? Unclear.
useWideViewport initial=true, invalidate=ViewportDescription
loadWithOverviewMode initial=true, invalidate=ViewportDescription
# Font scale factor for accessibility, applied as part of text autosizing.
accessibilityFontScaleFactor type=double, initial=1.0
# Only set by Layout Tests.
mediaTypeOverride type=String, initial="screen", invalidate=MediaType
......@@ -171,20 +134,6 @@ imagesEnabled initial=true, invalidate=ImageLoading
viewportEnabled initial=false, invalidate=ViewportDescription
viewportMetaEnabled initial=false
# Compensates for poor text legibility on mobile devices. This value is
# multiplied by the font scale factor when performing text autosizing of
# websites that do not set an explicit viewport description.
deviceScaleAdjustment type=double, initial=1.0
# This value indicates the maximum number of bytes a document is allowed
# to transmit in Beacons (via navigator.sendBeacon()) -- Beacons are
# intended to be smaller payloads transmitted as a page is unloading, not
# a general (one-way) network transmission API.
# The spec ( https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/Beacon/Overview.html )
# does not proscribe an upper limit, but allows for it -- the underlying
# API will return 'false' in that case.
maxBeaconTransmission type=int, initial=65536
# V8 supports different types of caching. Used by V8 bindings.
v8CacheOptions type=V8CacheOptions, initial=V8CacheOptionsOff
......@@ -197,6 +146,3 @@ availableHoverTypes type=int, initial=HoverTypeNone, invalidate=MediaQuery
# These values specify properties of the user's primary pointing device only.
primaryPointerType type=PointerType, initial=PointerTypeNone, invalidate=MediaQuery
primaryHoverType type=HoverType, initial=HoverTypeNone, invalidate=MediaQuery
accessibilityEnabled initial=false
inlineTextBoxAccessibilityEnabled initial=false
engine/core/page/EventHandler.cpp
浏览文件 @ ac7ea65e
......@@ -695,8 +695,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e
&& event.event().button() != RightButton) {
VisibleSelection newSelection;
Node* node = event.targetNode();
bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
if (node && node->renderer() && (caretBrowsing || node->hasEditableStyle())) {
if (node && node->renderer() && node->hasEditableStyle()) {
VisiblePosition pos = VisiblePosition(node->renderer()->positionForPoint(event.localPoint()));
newSelection = VisibleSelection(pos);
}
......
engine/core/page/FocusController.cpp
浏览文件 @ ac7ea65e
......@@ -334,11 +334,6 @@ bool FocusController::advanceFocusInDocumentOrder(FocusType type, bool initialFo
Document* document = frame->document();
Node* currentNode = document->focusedElement();
// FIXME: Not quite correct when it comes to focus transitions leaving/entering the WebView itself
bool caretBrowsing = frame->settings() && frame->settings()->caretBrowsingEnabled();
if (caretBrowsing && !currentNode)
currentNode = frame->selection().start().deprecatedNode();
document->updateLayoutIgnorePendingStylesheets();
......@@ -385,12 +380,6 @@ bool FocusController::advanceFocusInDocumentOrder(FocusType type, bool initialFo
setFocusedFrame(newDocument.frame());
if (caretBrowsing) {
Position position = firstPositionInOrBeforeNode(element);
VisibleSelection newSelection(position, position, DOWNSTREAM);
frame->selection().setSelection(newSelection);
}
element->focus(false, type);
return true;
}
......
engine/core/rendering/RenderBlock.cpp
浏览文件 @ ac7ea65e
......@@ -1413,40 +1413,31 @@ void RenderBlock::paintAsInlineBlock(RenderObject* renderer, PaintInfo& paintInf
}
}
static inline bool caretBrowsingEnabled(const Frame* frame)
static inline bool hasCursorCaret(const FrameSelection& selection, const RenderBlock* block)
{
Settings* settings = frame->settings();
return settings && settings->caretBrowsingEnabled();
return selection.caretRenderer() == block && selection.hasEditableStyle();
}
static inline bool hasCursorCaret(const FrameSelection& selection, const RenderBlock* block, bool caretBrowsing)
static inline bool hasDragCaret(const DragCaretController& dragCaretController, const RenderBlock* block)
{
return selection.caretRenderer() == block && (selection.hasEditableStyle() || caretBrowsing);
}
static inline bool hasDragCaret(const DragCaretController& dragCaretController, const RenderBlock* block, bool caretBrowsing)
{
return dragCaretController.caretRenderer() == block && (dragCaretController.isContentEditable() || caretBrowsing);
return dragCaretController.caretRenderer() == block && dragCaretController.isContentEditable();
}
bool RenderBlock::hasCaret() const
{
bool caretBrowsing = caretBrowsingEnabled(frame());
return hasCursorCaret(frame()->selection(), this, caretBrowsing)
|| hasDragCaret(frame()->page()->dragCaretController(), this, caretBrowsing);
return hasCursorCaret(frame()->selection(), this)
|| hasDragCaret(frame()->page()->dragCaretController(), this);
}
void RenderBlock::paintCarets(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
{
bool caretBrowsing = caretBrowsingEnabled(frame());
FrameSelection& selection = frame()->selection();
if (hasCursorCaret(selection, this, caretBrowsing)) {
if (hasCursorCaret(selection, this)) {
selection.paintCaret(paintInfo.context, paintOffset, paintInfo.rect);
}
DragCaretController& dragCaretController = frame()->page()->dragCaretController();
if (hasDragCaret(dragCaretController, this, caretBrowsing)) {
if (hasDragCaret(dragCaretController, this)) {
dragCaretController.paintDragCaret(frame(), paintInfo.context, paintOffset, paintInfo.rect);
}
}
......
engine/public/web/WebRuntimeFeatures.h
浏览文件 @ ac7ea65e
......@@ -58,8 +58,6 @@ public:
BLINK_EXPORT static void enableFileSystem(bool);
BLINK_EXPORT static void enableLocalStorage(bool);
BLINK_EXPORT static void enableMediaPlayer(bool);
BLINK_EXPORT static void enableSubpixelFontScaling(bool);
......
engine/public/web/WebSettings.h
浏览文件 @ ac7ea65e
......@@ -92,28 +92,9 @@ public:
// contents at an insecure URL. Otherwise, disallows it. The
// FrameLoaderClient set to the frame may override the value set by this
// method.
virtual void setAccessibilityEnabled(bool) = 0;
virtual void setAllowDisplayOfInsecureContent(bool) = 0;
virtual void setAllowFileAccessFromFileURLs(bool) = 0;
virtual void setAllowCustomScrollbarInMainFrame(bool) = 0;
// If set to true, allows frames with an https origin to run active
// contents at an insecure URL. This includes WebSockets. Otherwise,
// disallows it. The FrameLoaderClient set to the frame may override the
// value set by this method.
virtual void setAllowRunningOfInsecureContent(bool) = 0;
// If set to true, allows frames with an https origin to connect WebSockets
// with an insecure URL (ws://). Otherwise, disallows it. Only when this is
// set to true, this value overrides the value set by
// setAllowRunningOfInsecureContent() for WebSockets. The FrameLoaderClient
// set to the frame may override the value set by this method.
virtual void setAllowConnectingInsecureWebSocket(bool) = 0;
virtual void setAllowUniversalAccessFromFileURLs(bool) = 0;
virtual void setAntialiased2dCanvasEnabled(bool) = 0;
virtual void setAsynchronousSpellCheckingEnabled(bool) = 0;
virtual void setAutoZoomFocusedNodeToLegibleScale(bool) = 0;
virtual void setCaretBrowsingEnabled(bool) = 0;
virtual void setContainerCullingEnabled(bool) = 0;
virtual void setNavigateOnDragDrop(bool) = 0;
virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setDOMPasteAllowed(bool) = 0;
virtual void setDefaultFixedFontSize(int) = 0;
......@@ -123,7 +104,6 @@ public:
void setDeferred2dCanvasEnabled(bool) { } // temporary stub
virtual void setDeferredFiltersEnabled(bool) = 0;
virtual void setDeferredImageDecodingEnabled(bool) = 0;
virtual void setDeviceScaleAdjustment(float) = 0;
virtual void setDeviceSupportsMouse(bool) = 0;
virtual void setDeviceSupportsTouch(bool) = 0;
virtual void setDoubleTapToZoomEnabled(bool) = 0;
......@@ -134,21 +114,16 @@ public:
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setForceZeroLayoutHeight(bool) = 0;
virtual void setHyperlinkAuditingEnabled(bool) = 0;
virtual void setImagesEnabled(bool) = 0;
virtual void setInlineTextBoxAccessibilityEnabled(bool) = 0;
virtual void setJavaScriptCanAccessClipboard(bool) = 0;
virtual void setLoadsImagesAutomatically(bool) = 0;
virtual void setLoadWithOverviewMode(bool) = 0;
virtual void setLocalStorageEnabled(bool) = 0;
virtual void setMainFrameClipsContent(bool) = 0;
virtual void setMainFrameResizesAreOrientationChanges(bool) = 0;
virtual void setMaxTouchPoints(int) = 0;
virtual void setMediaControlsOverlayPlayButtonEnabled(bool) = 0;
virtual void setMediaPlaybackRequiresUserGesture(bool) = 0;
virtual void setMinimumAccelerated2dCanvasSize(int) = 0;
virtual void setMinimumFontSize(int) = 0;
virtual void setMinimumLogicalFontSize(int) = 0;
virtual void setOpenGLMultisamplingEnabled(bool) = 0;
virtual void setPerTilePaintingEnabled(bool) = 0;
virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
......@@ -164,24 +139,19 @@ public:
virtual void setShouldRespectImageOrientation(bool) = 0;
virtual void setShowFPSCounter(bool) = 0;
virtual void setShowPaintRects(bool) = 0;
virtual void setShrinksStandaloneImagesToFit(bool) = 0;
virtual void setShrinksViewportContentToFit(bool) = 0;
virtual void setSmartInsertDeleteEnabled(bool) = 0;
virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setSupportDeprecatedTargetDensityDPI(bool) = 0;
virtual void setTextAreasAreResizable(bool) = 0;
virtual void setAccessibilityFontScaleFactor(float) = 0;
virtual void setTouchDragDropEnabled(bool) = 0;
virtual void setTouchEditingEnabled(bool) = 0;
virtual void setUnifiedTextCheckerEnabled(bool) = 0;
virtual void setUseSolidColorScrollbars(bool) = 0;
virtual void setUseWideViewport(bool) = 0;
virtual void setV8CacheOptions(V8CacheOptions) = 0;
virtual void setValidationMessageTimerMagnification(int) = 0;
virtual void setViewportEnabled(bool) = 0;
virtual void setViewportMetaEnabled(bool) = 0;
virtual void setWebGLErrorsToConsoleEnabled(bool) = 0;
virtual void setWebSecurityEnabled(bool) = 0;
protected:
~WebSettings() { }
......
engine/web/WebRuntimeFeatures.cpp
浏览文件 @ ac7ea65e
......@@ -102,11 +102,6 @@ void WebRuntimeFeatures::enableFileSystem(bool enable)
RuntimeEnabledFeatures::setFileSystemEnabled(enable);
}
void WebRuntimeFeatures::enableLocalStorage(bool enable)
{
RuntimeEnabledFeatures::setLocalStorageEnabled(enable);
}
void WebRuntimeFeatures::enableMediaPlayer(bool enable)
{
RuntimeEnabledFeatures::setMediaEnabled(enable);
......
engine/web/WebSettingsImpl.cpp
浏览文件 @ ac7ea65e
......@@ -44,7 +44,6 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings)
, m_showFPSCounter(false)
, m_showPaintRects(false)
, m_renderVSyncNotificationEnabled(false)
, m_autoZoomFocusedNodeToLegibleScale(false)
, m_deferredImageDecodingEnabled(false)
, m_doubleTapToZoomEnabled(false)
, m_supportDeprecatedTargetDensityDPI(false)
......@@ -116,16 +115,6 @@ void WebSettingsImpl::setDefaultVideoPosterURL(const WebString& url)
m_settings->setDefaultVideoPosterURL(url);
}
void WebSettingsImpl::setMinimumFontSize(int size)
{
m_settings->setMinimumFontSize(size);
}
void WebSettingsImpl::setMinimumLogicalFontSize(int size)
{
m_settings->setMinimumLogicalFontSize(size);
}
void WebSettingsImpl::setDeviceSupportsTouch(bool deviceSupportsTouch)
{
m_settings->setDeviceSupportsTouch(deviceSupportsTouch);
......@@ -146,40 +135,11 @@ void WebSettingsImpl::setDeviceSupportsMouse(bool deviceSupportsMouse)
m_settings->setDeviceSupportsMouse(deviceSupportsMouse);
}
void WebSettingsImpl::setAutoZoomFocusedNodeToLegibleScale(bool autoZoomFocusedNodeToLegibleScale)
{
m_autoZoomFocusedNodeToLegibleScale = autoZoomFocusedNodeToLegibleScale;
}
void WebSettingsImpl::setAccessibilityFontScaleFactor(float fontScaleFactor)
{
m_settings->setAccessibilityFontScaleFactor(fontScaleFactor);
}
void WebSettingsImpl::setAccessibilityEnabled(bool enabled)
{
m_settings->setAccessibilityEnabled(enabled);
}
void WebSettingsImpl::setInlineTextBoxAccessibilityEnabled(bool enabled)
{
m_settings->setInlineTextBoxAccessibilityEnabled(enabled);
}
void WebSettingsImpl::setDeviceScaleAdjustment(float deviceScaleAdjustment)
{
}
void WebSettingsImpl::setDefaultTextEncodingName(const WebString& encoding)
{
m_settings->setDefaultTextEncodingName((String)encoding);
}
void WebSettingsImpl::setWebSecurityEnabled(bool enabled)
{
m_settings->setWebSecurityEnabled(enabled);
}
void WebSettingsImpl::setSupportDeprecatedTargetDensityDPI(bool supportDeprecatedTargetDensityDPI)
{
m_supportDeprecatedTargetDensityDPI = supportDeprecatedTargetDensityDPI;
......@@ -225,11 +185,6 @@ void WebSettingsImpl::setDOMPasteAllowed(bool enabled)
m_settings->setDOMPasteAllowed(enabled);
}
void WebSettingsImpl::setShrinksStandaloneImagesToFit(bool shrinkImages)
{
m_settings->setShrinksStandaloneImagesToFit(shrinkImages);
}
void WebSettingsImpl::setShrinksViewportContentToFit(bool shrinkViewportContent)
{
m_shrinksViewportContentToFit = shrinkViewportContent;
......@@ -260,11 +215,6 @@ void WebSettingsImpl::setJavaScriptCanAccessClipboard(bool enabled)
m_settings->setJavaScriptCanAccessClipboard(enabled);
}
void WebSettingsImpl::setLocalStorageEnabled(bool enabled)
{
m_settings->setLocalStorageEnabled(enabled);
}
void WebSettingsImpl::setMainFrameClipsContent(bool enabled)
{
m_settings->setMainFrameClipsContent(enabled);
......@@ -275,21 +225,6 @@ void WebSettingsImpl::setMaxTouchPoints(int maxTouchPoints)
m_settings->setMaxTouchPoints(maxTouchPoints);
}
void WebSettingsImpl::setAllowUniversalAccessFromFileURLs(bool allow)
{
m_settings->setAllowUniversalAccessFromFileURLs(allow);
}
void WebSettingsImpl::setAllowFileAccessFromFileURLs(bool allow)
{
m_settings->setAllowFileAccessFromFileURLs(allow);
}
void WebSettingsImpl::setTouchDragDropEnabled(bool enabled)
{
m_settings->setTouchDragDropEnabled(enabled);
}
void WebSettingsImpl::setTouchEditingEnabled(bool enabled)
{
m_settings->setTouchEditingEnabled(enabled);
......@@ -370,11 +305,6 @@ void WebSettingsImpl::setMinimumAccelerated2dCanvasSize(int numPixels)
m_settings->setMinimumAccelerated2dCanvasSize(numPixels);
}
void WebSettingsImpl::setHyperlinkAuditingEnabled(bool enabled)
{
m_settings->setHyperlinkAuditingEnabled(enabled);
}
void WebSettingsImpl::setAsynchronousSpellCheckingEnabled(bool enabled)
{
m_settings->setAsynchronousSpellCheckingEnabled(enabled);
......@@ -385,31 +315,6 @@ void WebSettingsImpl::setUnifiedTextCheckerEnabled(bool enabled)
m_settings->setUnifiedTextCheckerEnabled(enabled);
}
void WebSettingsImpl::setCaretBrowsingEnabled(bool enabled)
{
m_settings->setCaretBrowsingEnabled(enabled);
}
void WebSettingsImpl::setValidationMessageTimerMagnification(int newValue)
{
m_settings->setValidationMessageTimerMagnification(newValue);
}
void WebSettingsImpl::setAllowDisplayOfInsecureContent(bool enabled)
{
m_settings->setAllowDisplayOfInsecureContent(enabled);
}
void WebSettingsImpl::setAllowRunningOfInsecureContent(bool enabled)
{
m_settings->setAllowRunningOfInsecureContent(enabled);
}
void WebSettingsImpl::setAllowConnectingInsecureWebSocket(bool enabled)
{
m_settings->setAllowConnectingInsecureWebSocket(enabled);
}
void WebSettingsImpl::setPerTilePaintingEnabled(bool enabled)
{
m_perTilePaintingEnabled = enabled;
......@@ -494,16 +399,6 @@ void WebSettingsImpl::setViewportMetaEnabled(bool enabled)
m_settings->setViewportMetaEnabled(enabled);
}
void WebSettingsImpl::setNavigateOnDragDrop(bool enabled)
{
m_settings->setNavigateOnDragDrop(enabled);
}
void WebSettingsImpl::setAllowCustomScrollbarInMainFrame(bool enabled)
{
m_settings->setAllowCustomScrollbarInMainFrame(enabled);
}
void WebSettingsImpl::setSelectionIncludesAltImageText(bool enabled)
{
m_settings->setSelectionIncludesAltImageText(enabled);
......
engine/web/WebSettingsImpl.h
浏览文件 @ ac7ea65e
......@@ -52,19 +52,9 @@ public:
virtual void setAccelerated2dCanvasEnabled(bool) override;
virtual void setAccelerated2dCanvasMSAASampleCount(int) override;
virtual void setPreferCompositingToLCDTextEnabled(bool) override;
virtual void setAccessibilityEnabled(bool) override;
virtual void setAllowDisplayOfInsecureContent(bool) override;
virtual void setAllowFileAccessFromFileURLs(bool) override;
virtual void setAllowCustomScrollbarInMainFrame(bool) override;
virtual void setAllowRunningOfInsecureContent(bool) override;
virtual void setAllowConnectingInsecureWebSocket(bool) override;
virtual void setAllowUniversalAccessFromFileURLs(bool) override;
virtual void setAntialiased2dCanvasEnabled(bool) override;
virtual void setAsynchronousSpellCheckingEnabled(bool) override;
virtual void setAutoZoomFocusedNodeToLegibleScale(bool) override;
virtual void setCaretBrowsingEnabled(bool) override;
virtual void setContainerCullingEnabled(bool) override;
virtual void setNavigateOnDragDrop(bool) override;
virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
virtual void setDOMPasteAllowed(bool) override;
virtual void setDefaultFixedFontSize(int) override;
......@@ -73,7 +63,6 @@ public:
virtual void setDefaultVideoPosterURL(const WebString&) override;
virtual void setDeferredFiltersEnabled(bool) override;
virtual void setDeferredImageDecodingEnabled(bool) override;
virtual void setDeviceScaleAdjustment(float) override;
virtual void setDeviceSupportsMouse(bool) override;
// FIXME: Remove once the pointer/hover features are converted to use the
......@@ -88,21 +77,16 @@ public:
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
virtual void setForceZeroLayoutHeight(bool) override;
virtual void setHyperlinkAuditingEnabled(bool) override;
virtual void setImagesEnabled(bool) override;
virtual void setInlineTextBoxAccessibilityEnabled(bool) override;
virtual void setJavaScriptCanAccessClipboard(bool) override;
virtual void setLoadsImagesAutomatically(bool) override;
virtual void setLoadWithOverviewMode(bool) override;
virtual void setLocalStorageEnabled(bool) override;
virtual void setMainFrameClipsContent(bool) override;
virtual void setMainFrameResizesAreOrientationChanges(bool) override;
virtual void setMaxTouchPoints(int) override;
virtual void setMediaControlsOverlayPlayButtonEnabled(bool) override;
virtual void setMediaPlaybackRequiresUserGesture(bool) override;
virtual void setMinimumAccelerated2dCanvasSize(int) override;
virtual void setMinimumFontSize(int) override;
virtual void setMinimumLogicalFontSize(int) override;
virtual void setOpenGLMultisamplingEnabled(bool) override;
virtual void setPerTilePaintingEnabled(bool) override;
virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
......@@ -118,29 +102,23 @@ public:
virtual void setShouldRespectImageOrientation(bool) override;
virtual void setShowFPSCounter(bool) override;
virtual void setShowPaintRects(bool) override;
virtual void setShrinksStandaloneImagesToFit(bool) override;
virtual void setShrinksViewportContentToFit(bool) override;
virtual void setSmartInsertDeleteEnabled(bool) override;
virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
virtual void setSupportDeprecatedTargetDensityDPI(bool) override;
virtual void setTextAreasAreResizable(bool) override;
virtual void setAccessibilityFontScaleFactor(float) override;
virtual void setTouchDragDropEnabled(bool) override;
virtual void setTouchEditingEnabled(bool) override;
virtual void setUnifiedTextCheckerEnabled(bool) override;
virtual void setUseSolidColorScrollbars(bool) override;
virtual void setUseWideViewport(bool) override;
virtual void setV8CacheOptions(V8CacheOptions) override;
virtual void setValidationMessageTimerMagnification(int) override;
virtual void setViewportEnabled(bool) override;
virtual void setViewportMetaEnabled(bool) override;
virtual void setWebGLErrorsToConsoleEnabled(bool) override;
virtual void setWebSecurityEnabled(bool) override;
bool showFPSCounter() const { return m_showFPSCounter; }
bool showPaintRects() const { return m_showPaintRects; }
bool renderVSyncNotificationEnabled() const { return m_renderVSyncNotificationEnabled; }
bool autoZoomFocusedNodeToLegibleScale() const { return m_autoZoomFocusedNodeToLegibleScale; }
bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; }
bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; }
bool supportDeprecatedTargetDensityDPI() const { return m_supportDeprecatedTargetDensityDPI; }
......@@ -153,7 +131,6 @@ private:
bool m_showFPSCounter;
bool m_showPaintRects;
bool m_renderVSyncNotificationEnabled;
bool m_autoZoomFocusedNodeToLegibleScale;
bool m_deferredImageDecodingEnabled;
bool m_doubleTapToZoomEnabled;
bool m_perTilePaintingEnabled;
......
engine/web/WebViewImpl.cpp
浏览文件 @ ac7ea65e
......@@ -646,18 +646,6 @@ WebRect WebViewImpl::widenRectWithinPageBounds(const WebRect& source, int target
return WebRect(newX, source.y, newWidth, source.height);
}
float WebViewImpl::legibleScale() const
{
// Pages should be as legible as on desktop when at dpi scale, so no
// need to zoom in further when automatically determining zoom level
// (after double tap, find in page, etc), though the user should still
// be allowed to manually pinch zoom in further if they desire.
float legibleScale = 1;
if (page())
legibleScale *= page()->settings().accessibilityFontScaleFactor();
return legibleScale;
}
void WebViewImpl::computeScaleAndScrollForBlockRect(const WebPoint& hitPoint, const WebRect& blockRect, float padding, float defaultScaleWhenAlreadyLegible, float& scale, WebPoint& scroll)
{
//FIXME(sky)
......
engine/web/WebViewImpl.h
浏览文件 @ ac7ea65e
......@@ -327,7 +327,6 @@ public:
bool matchesHeuristicsForGpuRasterizationForTesting() const { return m_matchesHeuristicsForGpuRasterization; }
private:
float legibleScale() const;
void resumeTreeViewCommits();
IntSize contentsSize() const;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或