From 5ddde30071f639962dd557c453f2ad01f8f0fd00 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Wed, 8 Sep 2010 12:18:00 +0100
Subject: Merge WebKit at r66666 : Initial merge by git.

Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
---
 WebCore/html/HTMLPlugInElement.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'WebCore/html/HTMLPlugInElement.cpp')

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
 }
-- 
cgit v1.1