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

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

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
« no previous file with comments | « sky/engine/core/editing/VisiblePosition.cpp ('k') | sky/engine/core/editing/VisibleUnits.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 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "sky/engine/config.h" 26 #include "sky/engine/config.h"
27 #include "sky/engine/core/editing/VisibleSelection.h" 27 #include "sky/engine/core/editing/VisibleSelection.h"
28 28
29 #include "sky/engine/bindings/core/v8/ExceptionState.h" 29 #include "sky/engine/bindings2/exception_state.h"
30 #include "sky/engine/core/dom/Document.h" 30 #include "sky/engine/core/dom/Document.h"
31 #include "sky/engine/core/dom/Element.h" 31 #include "sky/engine/core/dom/Element.h"
32 #include "sky/engine/core/dom/Range.h" 32 #include "sky/engine/core/dom/Range.h"
33 #include "sky/engine/core/editing/TextIterator.h" 33 #include "sky/engine/core/editing/TextIterator.h"
34 #include "sky/engine/core/editing/VisibleUnits.h" 34 #include "sky/engine/core/editing/VisibleUnits.h"
35 #include "sky/engine/core/editing/htmlediting.h" 35 #include "sky/engine/core/editing/htmlediting.h"
36 #include "sky/engine/core/rendering/RenderObject.h" 36 #include "sky/engine/core/rendering/RenderObject.h"
37 #include "sky/engine/platform/geometry/LayoutPoint.h" 37 #include "sky/engine/platform/geometry/LayoutPoint.h"
38 #include "sky/engine/wtf/Assertions.h" 38 #include "sky/engine/wtf/Assertions.h"
39 #include "sky/engine/wtf/text/CString.h" 39 #include "sky/engine/wtf/text/CString.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 if (!boundary) 276 if (!boundary)
277 return nullptr; 277 return nullptr;
278 278
279 RefPtr<Range> searchRange(Range::create(document)); 279 RefPtr<Range> searchRange(Range::create(document));
280 TrackExceptionState exceptionState; 280 TrackExceptionState exceptionState;
281 281
282 Position start(pos.parentAnchoredEquivalent()); 282 Position start(pos.parentAnchoredEquivalent());
283 searchRange->selectNodeContents(boundary, exceptionState); 283 searchRange->selectNodeContents(boundary, exceptionState);
284 searchRange->setStart(start.containerNode(), start.offsetInContainerNode(), exceptionState); 284 searchRange->setStart(start.containerNode(), start.offsetInContainerNode(), exceptionState);
285 285
286 ASSERT(!exceptionState.hadException()); 286 ASSERT(!exceptionState.had_exception());
287 if (exceptionState.hadException()) 287 if (exceptionState.had_exception())
288 return nullptr; 288 return nullptr;
289 289
290 return searchRange.release(); 290 return searchRange.release();
291 } 291 }
292 292
293 void VisibleSelection::appendTrailingWhitespace() 293 void VisibleSelection::appendTrailingWhitespace()
294 { 294 {
295 RefPtr<Range> searchRange = makeSearchRange(m_end); 295 RefPtr<Range> searchRange = makeSearchRange(m_end);
296 if (!searchRange) 296 if (!searchRange)
297 return; 297 return;
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 sel.showTreeForThis(); 847 sel.showTreeForThis();
848 } 848 }
849 849
850 void showTree(const blink::VisibleSelection* sel) 850 void showTree(const blink::VisibleSelection* sel)
851 { 851 {
852 if (sel) 852 if (sel)
853 sel->showTreeForThis(); 853 sel->showTreeForThis();
854 } 854 }
855 855
856 #endif 856 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/editing/VisiblePosition.cpp ('k') | sky/engine/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698