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/WebKit2/WebProcess/InjectedBundle/DOM | |
| 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/WebKit2/WebProcess/InjectedBundle/DOM')
| -rw-r--r-- | Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp | 8 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp b/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp index 5e15872..bef3f90 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp +++ b/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp @@ -165,6 +165,14 @@ PassRefPtr<InjectedBundleNodeHandle> InjectedBundleNodeHandle::htmlTableCellElem return getOrCreate(static_cast<HTMLTableCellElement*>(m_node.get())->cellAbove()); } +PassRefPtr<InjectedBundleNodeHandle> InjectedBundleNodeHandle::elementShadowRoot() +{ + if (!m_node->isElementNode()) + return 0; + + return getOrCreate(static_cast<Element*>(m_node.get())->shadowRoot()); +} + PassRefPtr<WebFrame> InjectedBundleNodeHandle::documentFrame() { if (!m_node->isDocumentNode()) diff --git a/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h b/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h index e4a5ab9..e1003e8 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h +++ b/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h @@ -68,6 +68,8 @@ public: PassRefPtr<InjectedBundleNodeHandle> htmlTableCellElementCellAbove(); + PassRefPtr<InjectedBundleNodeHandle> elementShadowRoot(); + PassRefPtr<WebFrame> documentFrame(); PassRefPtr<WebFrame> htmlFrameElementContentFrame(); PassRefPtr<WebFrame> htmlIFrameElementContentFrame(); |