summaryrefslogtreecommitdiffstats
path: root/WebCore/plugins
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-10-08 11:13:05 +0100
committerSteve Block <steveblock@google.com>2009-10-14 16:51:25 +0100
commitd19c83b203e72c34b78a731c61d73c77ad99794e (patch)
treec6b214d4568504bbd761227647a64786a22635c2 /WebCore/plugins
parenta5f64bb29c5e0a6a5d59257da60d3bffba7819e7 (diff)
downloadexternal_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.zip
external_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.tar.gz
external_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.tar.bz2
Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org. Do not merge.
This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch.
Diffstat (limited to 'WebCore/plugins')
-rw-r--r--WebCore/plugins/PluginView.cpp6
-rw-r--r--WebCore/plugins/PluginView.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index c6b0cae..eeb4af4 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -401,7 +401,7 @@ void PluginView::performRequest(PluginRequest* request)
// Targeted JavaScript requests are only allowed on the frame that contains the JavaScript plugin
// and this has been made sure in ::load.
ASSERT(targetFrameName.isEmpty() || m_parentFrame->tree()->find(targetFrameName) == m_parentFrame);
-
+
#if USE(JSC)
// Executing a script can cause the plugin view to be destroyed, so we keep a reference to the parent frame.
RefPtr<Frame> parentFrame = m_parentFrame;
@@ -1194,11 +1194,11 @@ void PluginView::paintMissingPluginIcon(GraphicsContext* context, const IntRect&
int yOffset = (frameRect().height() - imageRect.height()) / 2;
imageRect.move(xOffset, yOffset);
-
+
if (!rect.intersects(imageRect)) {
return;
}
-
+
context->save();
context->clip(windowClipRect());
context->drawImage(nullPluginImage.get(), imageRect.location());
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 5c39535..f88bfdf 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -299,7 +299,7 @@ namespace WebCore {
NPP m_instance;
NPP_t m_instanceStruct;
NPWindow m_npWindow;
-
+
Vector<bool, 4> m_popupStateStack;
HashSet<RefPtr<PluginStream> > m_streams;