Title: [142347] trunk
- Revision
- 142347
- Author
- [email protected]
- Date
- 2013-02-08 20:21:56 -0800 (Fri, 08 Feb 2013)
Log Message
Remove use of plugInStartLabelImage
https://bugs.webkit.org/show_bug.cgi?id=108273
Reviewed by Simon Fraser.
Source/WebKit2:
Remove any use of plugInStartLabelImage. While there, implement plugInStartLabelTitle
and plugInStartLabelSubtitle to return the values from the client.
implement them.
* WebProcess/InjectedBundle/API/c/WKBundlePage.h: Remove callback and entry from client structure.
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp: Remove plugInStartLabelImage.
(WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle): Ask the client bundle for value.
(WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle): Ditto.
Tools:
Removed plugInStartLabelImage entry from client structure.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::InjectedBundlePage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (142346 => 142347)
--- trunk/Source/WebKit2/ChangeLog 2013-02-09 04:04:21 UTC (rev 142346)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-09 04:21:56 UTC (rev 142347)
@@ -1,5 +1,21 @@
2013-02-08 Dean Jackson <[email protected]>
+ Remove use of plugInStartLabelImage
+ https://bugs.webkit.org/show_bug.cgi?id=108273
+
+ Reviewed by Simon Fraser.
+
+ Remove any use of plugInStartLabelImage. While there, implement plugInStartLabelTitle
+ and plugInStartLabelSubtitle to return the values from the client.
+ implement them.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h: Remove callback and entry from client structure.
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp: Remove plugInStartLabelImage.
+ (WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle): Ask the client bundle for value.
+ (WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle): Ditto.
+
+2013-02-08 Dean Jackson <[email protected]>
+
Snapshotted plug-in should use shadow root
https://bugs.webkit.org/show_bug.cgi?id=108284
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (142346 => 142347)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-02-09 04:04:21 UTC (rev 142346)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-02-09 04:21:56 UTC (rev 142347)
@@ -246,7 +246,6 @@
typedef WKBundlePageUIElementVisibility (*WKBundlePageToolbarsAreVisibleCallback)(WKBundlePageRef page, const void *clientInfo);
typedef void (*WKBundlePageReachedAppCacheOriginQuotaCallback)(WKBundlePageRef page, WKSecurityOriginRef origin, int64_t totalBytesNeeded, const void *clientInfo);
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 (*WKBundlePagePlugInCreateStartLabelTitleCallback)(const void *clientInfo);
typedef WKStringRef (*WKBundlePagePlugInCreateStartLabelSubtitleCallback)(const void *clientInfo);
typedef WKStringRef (*WKBundlePagePlugInCreateExtraStyleSheetCallback)(const void *clientInfo);
@@ -274,7 +273,6 @@
// Version 2.
WKBundlePageExceededDatabaseQuotaCallback didExceedDatabaseQuota;
- WKBundlePagePlugInStartLabelImageCallback plugInStartLabelImage;
WKBundlePagePlugInCreateStartLabelTitleCallback createPlugInStartLabelTitle;
WKBundlePagePlugInCreateStartLabelSubtitleCallback createPlugInStartLabelSubtitle;
WKBundlePagePlugInCreateExtraStyleSheetCallback createPlugInExtraStyleSheet;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (142346 => 142347)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-02-09 04:04:21 UTC (rev 142346)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-02-09 04:21:56 UTC (rev 142347)
@@ -165,12 +165,20 @@
String InjectedBundlePageUIClient::plugInStartLabelTitle() const
{
- return String();
+ if (!m_client.createPlugInStartLabelTitle)
+ return String();
+
+ RefPtr<WebString> title = adoptRef(toImpl(m_client.createPlugInStartLabelTitle(m_client.clientInfo)));
+ return title ? title->string() : String();
}
String InjectedBundlePageUIClient::plugInStartLabelSubtitle() const
{
- return String();
+ if (!m_client.createPlugInStartLabelSubtitle)
+ return String();
+
+ RefPtr<WebString> subtitle = adoptRef(toImpl(m_client.createPlugInStartLabelSubtitle(m_client.clientInfo)));
+ return subtitle ? subtitle->string() : String();
}
String InjectedBundlePageUIClient::plugInExtraStyleSheet() const
Modified: trunk/Tools/ChangeLog (142346 => 142347)
--- trunk/Tools/ChangeLog 2013-02-09 04:04:21 UTC (rev 142346)
+++ trunk/Tools/ChangeLog 2013-02-09 04:21:56 UTC (rev 142347)
@@ -1,3 +1,15 @@
+2013-02-08 Dean Jackson <[email protected]>
+
+ Remove use of plugInStartLabelImage
+ https://bugs.webkit.org/show_bug.cgi?id=108273
+
+ Reviewed by Simon Fraser.
+
+ Removed plugInStartLabelImage entry from client structure.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage):
+
2013-02-07 Timothy Hatcher <[email protected]>
Fix the WebInspectorAPI watch list.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (142346 => 142347)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-02-09 04:04:21 UTC (rev 142346)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-02-09 04:21:56 UTC (rev 142347)
@@ -368,7 +368,6 @@
0, /*toolbarsAreVisible*/
didReachApplicationCacheOriginQuota,
didExceedDatabaseQuota,
- 0, /*plugInStartLabelImage*/
0, /*plugInStartLabelTitle*/
0, /*plugInStartLabelSubtitle*/
0, /*plugInExtraStyleSheet*/
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
