diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit/mac/DOM/WebDOMOperations.mm | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit/mac/DOM/WebDOMOperations.mm')
| -rw-r--r-- | Source/WebKit/mac/DOM/WebDOMOperations.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/WebKit/mac/DOM/WebDOMOperations.mm b/Source/WebKit/mac/DOM/WebDOMOperations.mm index 979433d..20e9ace 100644 --- a/Source/WebKit/mac/DOM/WebDOMOperations.mm +++ b/Source/WebKit/mac/DOM/WebDOMOperations.mm @@ -39,6 +39,7 @@ #import "WebKitNSStringExtras.h" #import <JavaScriptCore/APICast.h> #import <WebCore/Document.h> +#import <WebCore/Element.h> #import <WebCore/HTMLInputElement.h> #import <WebCore/HTMLParserIdioms.h> #import <WebCore/JSElement.h> @@ -73,6 +74,13 @@ using namespace JSC; return WebCore::markerTextForListItem(core(self)); } +- (JSValueRef)_shadowRoot:(JSContextRef)context +{ + JSLock lock(SilenceAssertionsOnly); + ExecState* execState = toJS(context); + return toRef(execState, toJS(execState, core(self)->shadowRoot())); +} + @end @implementation DOMNode (WebDOMNodeOperations) |