diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebKit/mac/DOM | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebKit/mac/DOM')
| -rw-r--r-- | WebKit/mac/DOM/WebDOMOperations.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/WebKit/mac/DOM/WebDOMOperations.mm b/WebKit/mac/DOM/WebDOMOperations.mm index d21f2b0..3d69836 100644 --- a/WebKit/mac/DOM/WebDOMOperations.mm +++ b/WebKit/mac/DOM/WebDOMOperations.mm @@ -121,8 +121,7 @@ using namespace JSC; - (WebFrame *)webFrame { - Document* document = core(self); - Frame* frame = document->frame(); + Frame* frame = core(self)->frame(); if (!frame) return nil; return kit(frame); @@ -130,7 +129,6 @@ using namespace JSC; - (NSURL *)URLWithAttributeString:(NSString *)string { - // FIXME: Is deprecatedParseURL appropriate here? return core(self)->completeURL(deprecatedParseURL(string)); } |