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

Side by Side Diff: sky/engine/web/WebNode.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/WebLocalFrameImpl.cpp ('k') | sky/engine/web/WebRange.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) 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/WebNode.h" 32 #include "sky/engine/public/web/WebNode.h"
33 33
34 #include "sky/engine/bindings/core/v8/ExceptionState.h" 34 #include "sky/engine/bindings2/exception_state.h"
35 #include "sky/engine/core/dom/Document.h" 35 #include "sky/engine/core/dom/Document.h"
36 #include "sky/engine/core/dom/Element.h" 36 #include "sky/engine/core/dom/Element.h"
37 #include "sky/engine/core/dom/Node.h" 37 #include "sky/engine/core/dom/Node.h"
38 #include "sky/engine/core/dom/NodeList.h" 38 #include "sky/engine/core/dom/NodeList.h"
39 #include "sky/engine/core/events/Event.h" 39 #include "sky/engine/core/events/Event.h"
40 #include "sky/engine/core/html/HTMLElement.h" 40 #include "sky/engine/core/html/HTMLElement.h"
41 #include "sky/engine/core/rendering/RenderObject.h" 41 #include "sky/engine/core/rendering/RenderObject.h"
42 #include "sky/engine/platform/Widget.h" 42 #include "sky/engine/platform/Widget.h"
43 #include "sky/engine/public/platform/WebString.h" 43 #include "sky/engine/public/platform/WebString.h"
44 #include "sky/engine/public/platform/WebVector.h" 44 #include "sky/engine/public/platform/WebVector.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 bool WebNode::focused() const 160 bool WebNode::focused() const
161 { 161 {
162 return m_private->focused(); 162 return m_private->focused();
163 } 163 }
164 164
165 bool WebNode::remove() 165 bool WebNode::remove()
166 { 166 {
167 TrackExceptionState exceptionState; 167 TrackExceptionState exceptionState;
168 m_private->remove(exceptionState); 168 m_private->remove(exceptionState);
169 return !exceptionState.hadException(); 169 return !exceptionState.had_exception();
170 } 170 }
171 171
172 bool WebNode::containsIncludingShadowDOM(const WebNode& other) const 172 bool WebNode::containsIncludingShadowDOM(const WebNode& other) const
173 { 173 {
174 return m_private->containsIncludingShadowDOM(other.m_private.get()); 174 return m_private->containsIncludingShadowDOM(other.m_private.get());
175 } 175 }
176 176
177 WebElement WebNode::shadowHost() const 177 WebElement WebNode::shadowHost() const
178 { 178 {
179 if (isNull()) 179 if (isNull())
(...skipping 12 matching lines...) Expand all
192 m_private = node; 192 m_private = node;
193 return *this; 193 return *this;
194 } 194 }
195 195
196 WebNode::operator PassRefPtr<Node>() const 196 WebNode::operator PassRefPtr<Node>() const
197 { 197 {
198 return m_private.get(); 198 return m_private.get();
199 } 199 }
200 200
201 } // namespace blink 201 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/web/WebLocalFrameImpl.cpp ('k') | sky/engine/web/WebRange.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698