[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jam at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ea08ba59ddfbfeb0251fae4502eafad67a34f1f5
Author: jam at chromium.org <jam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 11:09:35 2010 +0000

    2010-08-11  John Abd-El-Malek  <jam at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Inform a plugin about the zoom level when it's created
            https://bugs.webkit.org/show_bug.cgi?id=42268
    
            * src/FrameLoaderClientImpl.cpp:
            (WebKit::FrameLoaderClientImpl::createPlugin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65145 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index bd40817..1501cd7 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-11  John Abd-El-Malek  <jam at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Inform a plugin about the zoom level when it's created
+        https://bugs.webkit.org/show_bug.cgi?id=42268
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::createPlugin):
+
 2010-08-11  Yury Semikhatsky  <yurys at chromium.org>
 
         Unreviewed. Fix Chromium compilation.
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index b416e35..db74080 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -37,6 +37,7 @@
 #include "FormState.h"
 #include "FrameLoader.h"
 #include "FrameLoadRequest.h"
+#include "FrameView.h"
 #include "HTTPParsers.h"
 #include "HistoryItem.h"
 #include "HitTestResult.h"
@@ -49,6 +50,7 @@
 #include "PlatformString.h"
 #include "PluginData.h"
 #include "PluginDataChromium.h"
+#include "Settings.h"
 #include "StringExtras.h"
 #include "WebDataSourceImpl.h"
 #include "WebDevToolsAgentPrivate.h"
@@ -1390,6 +1392,14 @@ PassRefPtr<Widget> FrameLoaderClientImpl::createPlugin(
     if (!webPlugin->initialize(container.get()))
         return 0;
 
+    if (m_webFrame->frame()->view()->zoomFactor() != 1) {
+        // There's a saved zoom level, so tell the plugin about it since
+        // WebViewImpl::setZoomLevel was called before the plugin was created.
+        webPlugin->setZoomFactor(
+            m_webFrame->frame()->view()->zoomFactor(),
+            m_webFrame->frame()->page()->settings()->zoomMode() == ZoomTextOnly);
+    }
+
     // The element might have been removed during plugin initialization!
     if (!element->renderer())
         return 0;

-- 
WebKit Debian packaging