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

Side by Side Diff: sky/engine/core/editing/VisibleUnits.cpp

Issue 834693007: Remove the remaining parts of ignorePendingStylesheets and placeholder styles. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove comment. Created 5 years, 11 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
« no previous file with comments | « sky/engine/core/editing/VisiblePosition.cpp ('k') | sky/engine/core/editing/htmlediting.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 } 889 }
890 890
891 VisiblePosition previousLinePosition(const VisiblePosition &visiblePosition, int lineDirectionPoint, EditableType editableType) 891 VisiblePosition previousLinePosition(const VisiblePosition &visiblePosition, int lineDirectionPoint, EditableType editableType)
892 { 892 {
893 Position p = visiblePosition.deepEquivalent(); 893 Position p = visiblePosition.deepEquivalent();
894 Node* node = p.deprecatedNode(); 894 Node* node = p.deprecatedNode();
895 895
896 if (!node) 896 if (!node)
897 return VisiblePosition(); 897 return VisiblePosition();
898 898
899 node->document().updateLayoutIgnorePendingStylesheets(); 899 node->document().updateLayout();
900 900
901 RenderObject* renderer = node->renderer(); 901 RenderObject* renderer = node->renderer();
902 if (!renderer) 902 if (!renderer)
903 return VisiblePosition(); 903 return VisiblePosition();
904 904
905 RootInlineBox* root = 0; 905 RootInlineBox* root = 0;
906 InlineBox* box; 906 InlineBox* box;
907 int ignoredCaretOffset; 907 int ignoredCaretOffset;
908 visiblePosition.getInlineBoxAndOffset(box, ignoredCaretOffset); 908 visiblePosition.getInlineBoxAndOffset(box, ignoredCaretOffset);
909 if (box) { 909 if (box) {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 } 944 }
945 945
946 VisiblePosition nextLinePosition(const VisiblePosition &visiblePosition, int lin eDirectionPoint, EditableType editableType) 946 VisiblePosition nextLinePosition(const VisiblePosition &visiblePosition, int lin eDirectionPoint, EditableType editableType)
947 { 947 {
948 Position p = visiblePosition.deepEquivalent(); 948 Position p = visiblePosition.deepEquivalent();
949 Node* node = p.deprecatedNode(); 949 Node* node = p.deprecatedNode();
950 950
951 if (!node) 951 if (!node)
952 return VisiblePosition(); 952 return VisiblePosition();
953 953
954 node->document().updateLayoutIgnorePendingStylesheets(); 954 node->document().updateLayout();
955 955
956 RenderObject* renderer = node->renderer(); 956 RenderObject* renderer = node->renderer();
957 if (!renderer) 957 if (!renderer)
958 return VisiblePosition(); 958 return VisiblePosition();
959 959
960 RootInlineBox* root = 0; 960 RootInlineBox* root = 0;
961 InlineBox* box; 961 InlineBox* box;
962 int ignoredCaretOffset; 962 int ignoredCaretOffset;
963 visiblePosition.getInlineBoxAndOffset(box, ignoredCaretOffset); 963 visiblePosition.getInlineBoxAndOffset(box, ignoredCaretOffset);
964 if (box) { 964 if (box) {
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1372 int caretOffset; 1372 int caretOffset;
1373 position.position().getInlineBoxAndOffset(position.affinity(), inlineBox, ca retOffset); 1373 position.position().getInlineBoxAndOffset(position.affinity(), inlineBox, ca retOffset);
1374 1374
1375 if (inlineBox) 1375 if (inlineBox)
1376 renderer = &inlineBox->renderer(); 1376 renderer = &inlineBox->renderer();
1377 1377
1378 return renderer->localCaretRect(inlineBox, caretOffset); 1378 return renderer->localCaretRect(inlineBox, caretOffset);
1379 } 1379 }
1380 1380
1381 } 1381 }
OLDNEW
« no previous file with comments | « sky/engine/core/editing/VisiblePosition.cpp ('k') | sky/engine/core/editing/htmlediting.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698