diff options
Diffstat (limited to 'WebCore/html/HTMLPlugInElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLPlugInElement.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/html/HTMLPlugInElement.cpp b/WebCore/html/HTMLPlugInElement.cpp index 9f479fb..88642f7 100644 --- a/WebCore/html/HTMLPlugInElement.cpp +++ b/WebCore/html/HTMLPlugInElement.cpp @@ -177,6 +177,7 @@ NPObject* HTMLPlugInElement::getNPObject() #endif /* ENABLE(NETSCAPE_PLUGIN_API) */ +<<<<<<< HEAD void HTMLPlugInElement::updateWidgetCallback(Node* n) { static_cast<HTMLPlugInElement*>(n)->updateWidget(); @@ -189,4 +190,6 @@ bool HTMLPlugInElement::supportsFocus() const } #endif +======= +>>>>>>> webkit.org at r66666 } |