diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebCore/html/HTMLPlugInElement.cpp | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
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 } |