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

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: rebase-and-stuff Created 4 years, 9 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 1654 matching lines...) Expand 10 before | Expand all | Expand 10 after
1665 renderedStart.positionInGraphicsLayerBacking(selection.start, true); 1665 renderedStart.positionInGraphicsLayerBacking(selection.start, true);
1666 if (!selection.start.layer) 1666 if (!selection.start.layer)
1667 return false; 1667 return false;
1668 1668
1669 VisiblePosition visibleEnd(visibleSelection.visibleEnd()); 1669 VisiblePosition visibleEnd(visibleSelection.visibleEnd());
1670 RenderedPosition renderedEnd(visibleEnd); 1670 RenderedPosition renderedEnd(visibleEnd);
1671 renderedEnd.positionInGraphicsLayerBacking(selection.end, false); 1671 renderedEnd.positionInGraphicsLayerBacking(selection.end, false);
1672 if (!selection.end.layer) 1672 if (!selection.end.layer)
1673 return false; 1673 return false;
1674 1674
1675 selection.type = visibleSelection.selectionType(); 1675 selection.type = visibleSelection.getSelectionType();
1676 selection.isEditable = visibleSelection.isContentEditable(); 1676 selection.isEditable = visibleSelection.isContentEditable();
1677 if (selection.isEditable) { 1677 if (selection.isEditable) {
1678 if (HTMLTextFormControlElement* enclosingTextFormControlElement = enclos ingTextFormControl(visibleSelection.rootEditableElement())) 1678 if (HTMLTextFormControlElement* enclosingTextFormControlElement = enclos ingTextFormControl(visibleSelection.rootEditableElement()))
1679 selection.isEmptyTextFormControl = enclosingTextFormControlElement-> value().isEmpty(); 1679 selection.isEmptyTextFormControl = enclosingTextFormControlElement-> value().isEmpty();
1680 } 1680 }
1681 selection.start.isTextDirectionRTL |= primaryDirectionOf(*visibleSelection.s tart().anchorNode()) == RTL; 1681 selection.start.isTextDirectionRTL |= primaryDirectionOf(*visibleSelection.s tart().anchorNode()) == RTL;
1682 selection.end.isTextDirectionRTL |= primaryDirectionOf(*visibleSelection.end ().anchorNode()) == RTL; 1682 selection.end.isTextDirectionRTL |= primaryDirectionOf(*visibleSelection.end ().anchorNode()) == RTL;
1683 1683
1684 return true; 1684 return true;
1685 } 1685 }
(...skipping 2441 matching lines...) Expand 10 before | Expand all | Expand 10 after
4127 return m_hiddenForThrottling && m_crossOriginForThrottling; 4127 return m_hiddenForThrottling && m_crossOriginForThrottling;
4128 } 4128 }
4129 4129
4130 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4130 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4131 { 4131 {
4132 ASSERT(layoutView()); 4132 ASSERT(layoutView());
4133 return *layoutView(); 4133 return *layoutView();
4134 } 4134 }
4135 4135
4136 } // namespace blink 4136 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileReader.idl ('k') | third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698