Title: [142405] trunk
- Revision
- 142405
- Author
- [email protected]
- Date
- 2013-02-10 08:39:16 -0800 (Sun, 10 Feb 2013)
Log Message
Unreviewed, rolling out r142347.
http://trac.webkit.org/changeset/142347
https://bugs.webkit.org/show_bug.cgi?id=108273
Because a depending change r142343 was rolled out.
Source/WebKit2:
* WebProcess/InjectedBundle/API/c/WKBundlePage.h:
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
(WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle):
(WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle):
Tools:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::InjectedBundlePage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (142404 => 142405)
--- trunk/Source/WebKit2/ChangeLog 2013-02-10 16:04:43 UTC (rev 142404)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-10 16:39:16 UTC (rev 142405)
@@ -1,5 +1,18 @@
2013-02-10 Kent Tamura <[email protected]>
+ Unreviewed, rolling out r142347.
+ http://trac.webkit.org/changeset/142347
+ https://bugs.webkit.org/show_bug.cgi?id=108273
+
+ Because a depending change r142343 was rolled out.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+ (WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle):
+ (WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle):
+
+2013-02-10 Kent Tamura <[email protected]>
+
Unreviewed, rolling out r142343.
http://trac.webkit.org/changeset/142343
https://bugs.webkit.org/show_bug.cgi?id=108284
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (142404 => 142405)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-02-10 16:04:43 UTC (rev 142404)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-02-10 16:39:16 UTC (rev 142405)
@@ -246,6 +246,7 @@
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);
@@ -273,6 +274,7 @@
// Version 2.
WKBundlePageExceededDatabaseQuotaCallback didExceedDatabaseQuota;
+ WKBundlePagePlugInStartLabelImageCallback plugInStartLabelImage;
WKBundlePagePlugInCreateStartLabelTitleCallback createPlugInStartLabelTitle;
WKBundlePagePlugInCreateStartLabelSubtitleCallback createPlugInStartLabelSubtitle;
WKBundlePagePlugInCreateExtraStyleSheetCallback createPlugInExtraStyleSheet;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (142404 => 142405)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-02-10 16:04:43 UTC (rev 142404)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-02-10 16:39:16 UTC (rev 142405)
@@ -185,20 +185,12 @@
String InjectedBundlePageUIClient::plugInStartLabelTitle() const
{
- if (!m_client.createPlugInStartLabelTitle)
- return String();
-
- RefPtr<WebString> title = adoptRef(toImpl(m_client.createPlugInStartLabelTitle(m_client.clientInfo)));
- return title ? title->string() : String();
+ return String();
}
String InjectedBundlePageUIClient::plugInStartLabelSubtitle() const
{
- if (!m_client.createPlugInStartLabelSubtitle)
- return String();
-
- RefPtr<WebString> subtitle = adoptRef(toImpl(m_client.createPlugInStartLabelSubtitle(m_client.clientInfo)));
- return subtitle ? subtitle->string() : String();
+ return String();
}
String InjectedBundlePageUIClient::plugInExtraStyleSheet() const
Modified: trunk/Tools/ChangeLog (142404 => 142405)
--- trunk/Tools/ChangeLog 2013-02-10 16:04:43 UTC (rev 142404)
+++ trunk/Tools/ChangeLog 2013-02-10 16:39:16 UTC (rev 142405)
@@ -1,5 +1,16 @@
2013-02-10 Kent Tamura <[email protected]>
+ Unreviewed, rolling out r142347.
+ http://trac.webkit.org/changeset/142347
+ https://bugs.webkit.org/show_bug.cgi?id=108273
+
+ Because a depending change r142343 was rolled out.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage):
+
+2013-02-10 Kent Tamura <[email protected]>
+
[Chromium] Build fix for r142371
https://bugs.webkit.org/show_bug.cgi?id=109313
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (142404 => 142405)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-02-10 16:04:43 UTC (rev 142404)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-02-10 16:39:16 UTC (rev 142405)
@@ -368,6 +368,7 @@
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
