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

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

Issue 2555923002: Changed TextDirection to an enum class and renamed its members (Closed)
Patch Set: Small rebase fixes Created 4 years 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 1915 matching lines...) Expand 10 before | Expand all | Expand 10 after
1926 selection.type = visibleSelection.getSelectionType(); 1926 selection.type = visibleSelection.getSelectionType();
1927 selection.isEditable = visibleSelection.isContentEditable(); 1927 selection.isEditable = visibleSelection.isContentEditable();
1928 if (selection.isEditable) { 1928 if (selection.isEditable) {
1929 if (TextControlElement* enclosingTextControlElement = 1929 if (TextControlElement* enclosingTextControlElement =
1930 enclosingTextControl(visibleSelection.rootEditableElement())) { 1930 enclosingTextControl(visibleSelection.rootEditableElement())) {
1931 selection.isEmptyTextControl = 1931 selection.isEmptyTextControl =
1932 enclosingTextControlElement->value().isEmpty(); 1932 enclosingTextControlElement->value().isEmpty();
1933 } 1933 }
1934 } 1934 }
1935 selection.start.isTextDirectionRTL |= 1935 selection.start.isTextDirectionRTL |=
1936 primaryDirectionOf(*visibleSelection.start().anchorNode()) == RTL; 1936 primaryDirectionOf(*visibleSelection.start().anchorNode()) ==
1937 TextDirection::Rtl;
1937 selection.end.isTextDirectionRTL |= 1938 selection.end.isTextDirectionRTL |=
1938 primaryDirectionOf(*visibleSelection.end().anchorNode()) == RTL; 1939 primaryDirectionOf(*visibleSelection.end().anchorNode()) ==
1940 TextDirection::Rtl;
1939 1941
1940 return true; 1942 return true;
1941 } 1943 }
1942 1944
1943 void FrameView::updateCompositedSelectionIfNeeded() { 1945 void FrameView::updateCompositedSelectionIfNeeded() {
1944 if (!RuntimeEnabledFeatures::compositedSelectionUpdateEnabled()) 1946 if (!RuntimeEnabledFeatures::compositedSelectionUpdateEnabled())
1945 return; 1947 return;
1946 1948
1947 TRACE_EVENT0("blink", "FrameView::updateCompositedSelectionIfNeeded"); 1949 TRACE_EVENT0("blink", "FrameView::updateCompositedSelectionIfNeeded");
1948 1950
(...skipping 2715 matching lines...) Expand 10 before | Expand all | Expand 10 after
4664 DCHECK(m_frame->isMainFrame()); 4666 DCHECK(m_frame->isMainFrame());
4665 return m_initialViewportSize.width(); 4667 return m_initialViewportSize.width();
4666 } 4668 }
4667 4669
4668 int FrameView::initialViewportHeight() const { 4670 int FrameView::initialViewportHeight() const {
4669 DCHECK(m_frame->isMainFrame()); 4671 DCHECK(m_frame->isMainFrame());
4670 return m_initialViewportSize.height(); 4672 return m_initialViewportSize.height();
4671 } 4673 }
4672 4674
4673 } // namespace blink 4675 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698