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/page/gtk/FrameGtk.cpp

    r288 r433  
    11/* 
    2  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved. 
    3  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 
    4  * Copyright (C) 2007 Holger Hans Peter Freyther 
    5  * Copyright (C) 2008 Collabora Ltd.  All rights reserved. 
    6  * All rights reserved. 
    7  * 
    82 * Redistribution and use in source and binary forms, with or without 
    93 * modification, are permitted provided that the following conditions 
     
    3226 
    3327#include "NotImplemented.h" 
    34 #include "PluginView.h" 
    35 #include "ScriptController.h" 
    36 #include "runtime_root.h" 
    37 #include "runtime.h" 
    38  
    3928 
    4029namespace WebCore { 
    41  
    42 PassRefPtr<KJS::Bindings::Instance> Frame::createScriptInstanceForWidget(Widget* widget) 
    43 { 
    44     // FIXME: Ideally we'd have an isPluginView() here but we can't add that to the open source tree right now. 
    45     if (widget->isFrameView()) 
    46         return 0; 
    47  
    48     return static_cast<PluginView*>(widget)->bindingInstance(); 
    49 } 
    50  
    51 void Frame::clearPlatformScriptObjects() 
    52 { 
    53     notImplemented(); 
    54 } 
    55  
    56 void Frame::disconnectPlatformScriptObjects() 
    57 { 
    58     notImplemented(); 
    59 } 
    6030 
    6131DragImageRef Frame::dragImageForSelection()