diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKit/mac/DOM | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKit/mac/DOM')
| -rw-r--r-- | WebKit/mac/DOM/WebDOMOperations.mm | 9 | ||||
| -rw-r--r-- | WebKit/mac/DOM/WebDOMOperationsPrivate.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/WebKit/mac/DOM/WebDOMOperations.mm b/WebKit/mac/DOM/WebDOMOperations.mm index 2bda67a..194a000 100644 --- a/WebKit/mac/DOM/WebDOMOperations.mm +++ b/WebKit/mac/DOM/WebDOMOperations.mm @@ -53,11 +53,20 @@ using namespace WebCore; return [[[WebArchive alloc] _initWithCoreLegacyWebArchive:LegacyWebArchive::create(core(self))] autorelease]; } +@end + +@implementation DOMNode (WebDOMNodeOperationsPendingPublic) + - (NSString *)markupString { return createFullMarkup(core(self)); } +- (NSRect)_renderRect:(bool *)isReplaced +{ + return NSRect(core(self)->renderRect(isReplaced)); +} + @end /* This doesn't appear to be used by anyone. We should consider removing this. */ diff --git a/WebKit/mac/DOM/WebDOMOperationsPrivate.h b/WebKit/mac/DOM/WebDOMOperationsPrivate.h index 013a687..826aa7d 100644 --- a/WebKit/mac/DOM/WebDOMOperationsPrivate.h +++ b/WebKit/mac/DOM/WebDOMOperationsPrivate.h @@ -34,4 +34,5 @@ @interface DOMNode (WebDOMNodeOperationsPendingPublic) - (NSString *)markupString; +- (NSRect)_renderRect:(bool *)isReplaced; @end |