Changeset 140713 in webkit

Timestamp:

Jan 24, 2013 1:02:11 PM (11 years ago)

Author:

dino@apple.com

Message:

Allow some plugin snapshot UI content to come from Injected Bundle
​https://bugs.webkit.org/show_bug.cgi?id=107852

Reviewed by Anders Carlsson.

Source/WebKit2:

Hook up three new methods: plugInStartLabelTitle, plugInStartLabelSubtitle and
plugInExtraStyleSheet to allow some custom styling and content to come
from the InjectedBundle.

• WebProcess/InjectedBundle/API/c/WKBundlePage.h: Callbacks added to

WKBundlePageUIClient structure.

• WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp: Stub implementations

of the three new methods.
(WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle):
(WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle):
(WebKit::InjectedBundlePageUIClient::plugInExtraStyleSheet):

• WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:

(InjectedBundlePageUIClient):

• WebProcess/WebCoreSupport/WebChromeClient.cpp: Call into the injected bundle

for each of these methods.
(WebKit::WebChromeClient::plugInStartLabelTitle):
(WebKit::WebChromeClient::plugInStartLabelSubtitle):
(WebKit::WebChromeClient::plugInExtraStyleSheet):

• WebProcess/WebCoreSupport/WebChromeClient.h:

(WebChromeClient): Declare the virtual methods in the Chrome
Client so that they can accessed from WebCore eventually.

Tools:

Null implementations of plugInStartLabelTitle, plugInStartLabelSubtitle and
plugInExtraStyleSheet.

• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::InjectedBundlePage):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (modified) (2 diffs)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h (modified) (1 diff)
• Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-24  Dean Jackson  <dino@apple.com>
+
+        Allow some plugin snapshot UI content to come from Injected Bundle
+        https://bugs.webkit.org/show_bug.cgi?id=107852
+
+        Reviewed by Anders Carlsson.
+
+        Hook up three new methods: plugInStartLabelTitle, plugInStartLabelSubtitle and
+        plugInExtraStyleSheet to allow some custom styling and content to come
+        from the InjectedBundle.
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.h: Callbacks added to
+        WKBundlePageUIClient structure.
+        * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp: Stub implementations
+        of the three new methods.
+        (WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle):
+        (WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle):
+        (WebKit::InjectedBundlePageUIClient::plugInExtraStyleSheet):
+        * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
+        (InjectedBundlePageUIClient):
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp: Call into the injected bundle
+        for each of these methods.
+        (WebKit::WebChromeClient::plugInStartLabelTitle):
+        (WebKit::WebChromeClient::plugInStartLabelSubtitle):
+        (WebKit::WebChromeClient::plugInExtraStyleSheet):
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        (WebChromeClient): Declare the virtual methods in the Chrome
+        Client so that they can accessed from WebCore eventually.
+
 2013-01-24  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

@@ -250 +250 @@
 typedef uint64_t (*WKBundlePageExceededDatabaseQuotaCallback)(WKBundlePageRef page, WKSecurityOriginRef origin, WKStringRef databaseName, WKStringRef databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes, const void *clientInfo);
 typedef WKImageRef (*WKBundlePagePlugInStartLabelImageCallback)(WKBundlePageLabelSize size, const void *clientInfo);
+typedef WKStringRef (*WKBundlePagePlugInStartLabelTitleCallback)(const void *clientInfo);
+typedef WKStringRef (*WKBundlePagePlugInStartLabelSubtitleCallback)(const void *clientInfo);
+typedef WKStringRef (*WKBundlePagePlugInExtraStyleSheetCallback)(const void *clientInfo);
 
 struct WKBundlePageUIClient {
@@ -275 +278 @@
     WKBundlePageExceededDatabaseQuotaCallback                           didExceedDatabaseQuota;
     WKBundlePagePlugInStartLabelImageCallback                           plugInStartLabelImage;
+    WKBundlePagePlugInStartLabelTitleCallback                           plugInStartLabelTitle;
+    WKBundlePagePlugInStartLabelSubtitleCallback                        plugInStartLabelSubtitle;
+    WKBundlePagePlugInExtraStyleSheetCallback                           plugInExtraStyleSheet;
 };
 typedef struct WKBundlePageUIClient WKBundlePageUIClient;

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp

@@ -184 +184 @@
 }
 
+String InjectedBundlePageUIClient::plugInStartLabelTitle() const
+{
+    return String();
+}
+
+String InjectedBundlePageUIClient::plugInStartLabelSubtitle() const
+{
+    return String();
+}
+
+String InjectedBundlePageUIClient::plugInExtraStyleSheet() const
+{
+    return String();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h

@@ -73 +73 @@
 
     PassRefPtr<WebImage> plugInStartLabelImage(WebCore::RenderSnapshottedPlugIn::LabelSize) const;
+    String plugInStartLabelTitle() const;
+    String plugInStartLabelSubtitle() const;
+    String plugInExtraStyleSheet() const;
+
 };
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -806 +806 @@
 }
 
+String WebChromeClient::plugInStartLabelTitle() const
+{
+    return m_page->injectedBundleUIClient().plugInStartLabelTitle();
+}
+
+String WebChromeClient::plugInStartLabelSubtitle() const
+{
+    return m_page->injectedBundleUIClient().plugInStartLabelSubtitle();
+}
+
+String WebChromeClient::plugInExtraStyleSheet() const
+{
+    return m_page->injectedBundleUIClient().plugInExtraStyleSheet();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

@@ -220 +220 @@
 
     virtual PassRefPtr<WebCore::Image> plugInStartLabelImage(WebCore::RenderSnapshottedPlugIn::LabelSize) const OVERRIDE;
+    virtual String plugInStartLabelTitle() const;
+    virtual String plugInStartLabelSubtitle() const;
+    virtual String plugInExtraStyleSheet() const;
 
     String m_cachedToolTip;

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-24  Dean Jackson  <dino@apple.com>
+
+        Allow some plugin snapshot UI content to come from Injected Bundle
+        https://bugs.webkit.org/show_bug.cgi?id=107852
+
+        Reviewed by Anders Carlsson.
+
+        Null implementations of plugInStartLabelTitle, plugInStartLabelSubtitle and
+        plugInExtraStyleSheet.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::InjectedBundlePage):
+
 2013-01-24  Erik Arvidsson  <arv@chromium.org>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -378 +378 @@
         didExceedDatabaseQuota,
         0, /*plugInStartLabelImage*/
+        0, /*plugInStartLabelTitle*/
+        0, /*plugInStartLabelSubtitle*/
+        0, /*plugInExtraStyleSheet*/
     };
     WKBundlePageSetUIClient(m_page, &uiClient);