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

Side by Side Diff: sky/engine/web/WebRange.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/web/WebNode.cpp ('k') | sky/engine/web/WebSettingsImpl.h » ('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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "sky/engine/config.h" 31 #include "sky/engine/config.h"
32 #include "sky/engine/public/web/WebRange.h" 32 #include "sky/engine/public/web/WebRange.h"
33 33
34 #include "sky/engine/bindings/core/v8/ExceptionState.h" 34 #include "sky/engine/bindings2/exception_state.h"
35 #include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h" 35 #include "sky/engine/bindings2/exception_state_placeholder.h"
36 #include "sky/engine/core/dom/Document.h" 36 #include "sky/engine/core/dom/Document.h"
37 #include "sky/engine/core/dom/Element.h" 37 #include "sky/engine/core/dom/Element.h"
38 #include "sky/engine/core/dom/Range.h" 38 #include "sky/engine/core/dom/Range.h"
39 #include "sky/engine/core/dom/shadow/ShadowRoot.h" 39 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
40 #include "sky/engine/core/editing/FrameSelection.h" 40 #include "sky/engine/core/editing/FrameSelection.h"
41 #include "sky/engine/core/editing/PlainTextRange.h" 41 #include "sky/engine/core/editing/PlainTextRange.h"
42 #include "sky/engine/core/frame/FrameView.h" 42 #include "sky/engine/core/frame/FrameView.h"
43 #include "sky/engine/core/frame/LocalFrame.h" 43 #include "sky/engine/core/frame/LocalFrame.h"
44 #include "sky/engine/public/platform/WebString.h" 44 #include "sky/engine/public/platform/WebString.h"
45 #include "sky/engine/public/web/WebExceptionCode.h" 45 #include "sky/engine/public/web/WebExceptionCode.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 : m_private(range) 110 : m_private(range)
111 { 111 {
112 } 112 }
113 113
114 WebRange::operator PassRefPtr<Range>() const 114 WebRange::operator PassRefPtr<Range>() const
115 { 115 {
116 return m_private.get(); 116 return m_private.get();
117 } 117 }
118 118
119 } // namespace blink 119 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/web/WebNode.cpp ('k') | sky/engine/web/WebSettingsImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698