Show
Ignore:
Timestamp:
08/08/08 14:23:27 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35637

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/WebCore/bindings/objc/DOM.mm

    r387 r433  
    6060#import "RenderImage.h" 
    6161#import "RenderView.h" 
     62#import "ScriptController.h" 
    6263#import "SimpleFontData.h" 
    6364#import "Text.h" 
     
    418419    if (WebCore::Node *n = [self _node]) { 
    419420        if (WebCore::Frame* frame = n->document()->frame()) 
    420             return frame->bindingRootObject(); 
     421            return frame->script()->bindingRootObject(); 
    421422    } 
    422423    return 0;