Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(345)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 renderedStart.positionInGraphicsLayerBacking(selection.start, true); 1652 renderedStart.positionInGraphicsLayerBacking(selection.start, true);
1653 if (!selection.start.layer) 1653 if (!selection.start.layer)
1654 return false; 1654 return false;
1655 1655
1656 VisiblePosition visibleEnd(visibleSelection.visibleEnd()); 1656 VisiblePosition visibleEnd(visibleSelection.visibleEnd());
1657 RenderedPosition renderedEnd(visibleEnd); 1657 RenderedPosition renderedEnd(visibleEnd);
1658 renderedEnd.positionInGraphicsLayerBacking(selection.end, false); 1658 renderedEnd.positionInGraphicsLayerBacking(selection.end, false);
1659 if (!selection.end.layer) 1659 if (!selection.end.layer)
1660 return false; 1660 return false;
1661 1661
1662 selection.type = visibleSelection.selectionType(); 1662 selection.type = visibleSelection.getSelectionType();
1663 selection.isEditable = visibleSelection.isContentEditable(); 1663 selection.isEditable = visibleSelection.isContentEditable();
1664 if (selection.isEditable) { 1664 if (selection.isEditable) {
1665 if (HTMLTextFormControlElement* enclosingTextFormControlElement = enclos ingTextFormControl(visibleSelection.rootEditableElement())) 1665 if (HTMLTextFormControlElement* enclosingTextFormControlElement = enclos ingTextFormControl(visibleSelection.rootEditableElement()))
1666 selection.isEmptyTextFormControl = enclosingTextFormControlElement-> value().isEmpty(); 1666 selection.isEmptyTextFormControl = enclosingTextFormControlElement-> value().isEmpty();
1667 } 1667 }
1668 selection.start.isTextDirectionRTL |= primaryDirectionOf(*visibleSelection.s tart().anchorNode()) == RTL; 1668 selection.start.isTextDirectionRTL |= primaryDirectionOf(*visibleSelection.s tart().anchorNode()) == RTL;
1669 selection.end.isTextDirectionRTL |= primaryDirectionOf(*visibleSelection.end ().anchorNode()) == RTL; 1669 selection.end.isTextDirectionRTL |= primaryDirectionOf(*visibleSelection.end ().anchorNode()) == RTL;
1670 1670
1671 return true; 1671 return true;
1672 } 1672 }
(...skipping 2440 matching lines...) Expand 10 before | Expand all | Expand 10 after
4113 return m_hiddenForThrottling && m_crossOriginForThrottling; 4113 return m_hiddenForThrottling && m_crossOriginForThrottling;
4114 } 4114 }
4115 4115
4116 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4116 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4117 { 4117 {
4118 ASSERT(layoutView()); 4118 ASSERT(layoutView());
4119 return *layoutView(); 4119 return *layoutView();
4120 } 4120 }
4121 4121
4122 } // namespace blink 4122 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698