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

Side by Side Diff: Source/bindings/v8/custom/V8DocumentCustom.cpp

Issue 301233010: Oilpan: use transition types for remaining RefPtr<Document>s in dom/. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Have Document weakly track its attached Ranges Created 6 years, 6 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 | « Source/bindings/v8/ScriptController.cpp ('k') | Source/core/dom/ContainerNode.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) 2007-2009 Google Inc. All rights reserved. 2 * Copyright (C) 2007-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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "core/html/canvas/CanvasRenderingContext.h" 53 #include "core/html/canvas/CanvasRenderingContext.h"
54 #include "core/xml/DocumentXPathEvaluator.h" 54 #include "core/xml/DocumentXPathEvaluator.h"
55 #include "core/xml/XPathNSResolver.h" 55 #include "core/xml/XPathNSResolver.h"
56 #include "core/xml/XPathResult.h" 56 #include "core/xml/XPathResult.h"
57 #include "wtf/RefPtr.h" 57 #include "wtf/RefPtr.h"
58 58
59 namespace WebCore { 59 namespace WebCore {
60 60
61 void V8Document::evaluateMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info) 61 void V8Document::evaluateMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
62 { 62 {
63 RefPtr<Document> document = V8Document::toNative(info.Holder()); 63 RefPtrWillBeRawPtr<Document> document = V8Document::toNative(info.Holder());
64 ASSERT(document); 64 ASSERT(document);
65 ExceptionState exceptionState(ExceptionState::ExecutionContext, "evaluate", "Document", info.Holder(), info.GetIsolate()); 65 ExceptionState exceptionState(ExceptionState::ExecutionContext, "evaluate", "Document", info.Holder(), info.GetIsolate());
66 TOSTRING_VOID(V8StringResource<>, expression, info[0]); 66 TOSTRING_VOID(V8StringResource<>, expression, info[0]);
67 RefPtr<Node> contextNode = V8Node::toNativeWithTypeCheck(info.GetIsolate(), info[1]); 67 RefPtr<Node> contextNode = V8Node::toNativeWithTypeCheck(info.GetIsolate(), info[1]);
68 68
69 const int resolverArgumentIndex = 2; 69 const int resolverArgumentIndex = 2;
70 RefPtrWillBeRawPtr<XPathNSResolver> resolver = toXPathNSResolver(info[resolv erArgumentIndex], info.GetIsolate()); 70 RefPtrWillBeRawPtr<XPathNSResolver> resolver = toXPathNSResolver(info[resolv erArgumentIndex], info.GetIsolate());
71 if (!resolver && !isUndefinedOrNull(info[resolverArgumentIndex])) { 71 if (!resolver && !isUndefinedOrNull(info[resolverArgumentIndex])) {
72 exceptionState.throwTypeError(ExceptionMessages::argumentNullOrIncorrect Type(resolverArgumentIndex + 1, "XPathNSResolver")); 72 exceptionState.throwTypeError(ExceptionMessages::argumentNullOrIncorrect Type(resolverArgumentIndex + 1, "XPathNSResolver"));
73 exceptionState.throwIfNeeded(); 73 exceptionState.throwIfNeeded();
74 return; 74 return;
75 } 75 }
76 76
77 int type = toInt32(info[3]); 77 int type = toInt32(info[3]);
78 RefPtrWillBeRawPtr<XPathResult> inResult = V8XPathResult::toNativeWithTypeCh eck(info.GetIsolate(), info[4]); 78 RefPtrWillBeRawPtr<XPathResult> inResult = V8XPathResult::toNativeWithTypeCh eck(info.GetIsolate(), info[4]);
79 TONATIVE_VOID(RefPtrWillBeRawPtr<XPathResult>, result, DocumentXPathEvaluato r::evaluate(*document, expression, contextNode.get(), resolver.release(), type, inResult.get(), exceptionState)); 79 TONATIVE_VOID(RefPtrWillBeRawPtr<XPathResult>, result, DocumentXPathEvaluato r::evaluate(*document, expression, contextNode.get(), resolver.release(), type, inResult.get(), exceptionState));
80 if (exceptionState.throwIfNeeded()) 80 if (exceptionState.throwIfNeeded())
81 return; 81 return;
82 82
83 v8SetReturnValueFast(info, result.release(), document.get()); 83 v8SetReturnValueFast(info, result.release(), document.get());
84 } 84 }
85 85
86 } // namespace WebCore 86 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/ScriptController.cpp ('k') | Source/core/dom/ContainerNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698