Diff
Modified: trunk/Source/WebCore/ChangeLog (179918 => 179919)
--- trunk/Source/WebCore/ChangeLog 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebCore/ChangeLog 2015-02-11 08:01:19 UTC (rev 179919)
@@ -1,3 +1,17 @@
+2015-02-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r179910.
+ https://bugs.webkit.org/show_bug.cgi?id=141464
+
+ Caused assertions on debug bots (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "[WK2] Add logging to validate the network cache efficacy
+ (Part 2)"
+ https://bugs.webkit.org/show_bug.cgi?id=141345
+ http://trac.webkit.org/changeset/179910
+
2015-02-10 Chris Dumez <[email protected]>
Optimize MutableStyleProperties::removePropertiesInSet()
Modified: trunk/Source/WebCore/WebCore.exp.in (179918 => 179919)
--- trunk/Source/WebCore/WebCore.exp.in 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-02-11 08:01:19 UTC (rev 179919)
@@ -945,11 +945,6 @@
__ZN7WebCore21CrossThreadCopierBaseILb0ELb0EN3WTF6StringEE4copyERKS2_
__ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_19IDBDatabaseMetadataEE4copyERKS1_
__ZN7WebCore21DiagnosticLoggingKeys10webViewKeyEv
-__ZN7WebCore21DiagnosticLoggingKeys12retrievalKeyEv
-__ZN7WebCore21DiagnosticLoggingKeys15networkCacheKeyEv
-__ZN7WebCore21DiagnosticLoggingKeys25noLongerInCacheFailureKeyEv
-__ZN7WebCore21DiagnosticLoggingKeys26unhandledRequestFailureKeyEv
-__ZN7WebCore21DiagnosticLoggingKeys29unusableCachedEntryFailureKeyEv
__ZN7WebCore21DiagnosticLoggingKeys7userKeyEv
__ZN7WebCore21DiagnosticLoggingKeys9zoomedKeyEv
__ZN7WebCore21DisplayRefreshMonitor46handleDisplayRefreshedNotificationOnMainThreadEPv
Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (179918 => 179919)
--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-02-11 08:01:19 UTC (rev 179919)
@@ -103,11 +103,6 @@
return ASCIILiteral("navigation");
}
-String DiagnosticLoggingKeys::networkCacheKey()
-{
- return ASCIILiteral("networkCache");
-}
-
String DiagnosticLoggingKeys::networkKey()
{
return ASCIILiteral("network");
@@ -138,11 +133,6 @@
return ASCIILiteral("noDocumentLoader");
}
-String DiagnosticLoggingKeys::noLongerInCacheFailureKey()
-{
- return ASCIILiteral("noLongerInCacheFailure");
-}
-
String DiagnosticLoggingKeys::otherKey()
{
return ASCIILiteral("other");
@@ -308,11 +298,6 @@
return ASCIILiteral("resourceResponse");
}
-String DiagnosticLoggingKeys::retrievalKey()
-{
- return ASCIILiteral("retrieval");
-}
-
String DiagnosticLoggingKeys::revalidatingKey()
{
return ASCIILiteral("revalidating");
@@ -348,16 +333,6 @@
return ASCIILiteral("svgDocument");
}
-String DiagnosticLoggingKeys::unhandledRequestFailureKey()
-{
- return ASCIILiteral("unhandledRequestFailure");
-}
-
-String DiagnosticLoggingKeys::unusableCachedEntryFailureKey()
-{
- return ASCIILiteral("unusableCachedEntryFailure");
-}
-
String DiagnosticLoggingKeys::unusedKey()
{
return ASCIILiteral("unused");
Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (179918 => 179919)
--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-02-11 08:01:19 UTC (rev 179919)
@@ -63,12 +63,10 @@
static String mediaLoadingFailedKey();
static String mustRevalidateIsExpiredKey();
static String navigationKey();
- WEBCORE_EXPORT static String networkCacheKey();
static String networkKey();
static String noCacheKey();
static String noCurrentHistoryItemKey();
static String noDocumentLoaderKey();
- WEBCORE_EXPORT static String noLongerInCacheFailureKey();
static String noStoreKey();
static String notInMemoryCacheKey();
static String otherKey();
@@ -92,15 +90,12 @@
static String resourceKey();
static String resourceRequestKey();
static String resourceResponseKey();
- WEBCORE_EXPORT static String retrievalKey();
static String revalidatingKey();
static String sameLoadKey();
static String scriptKey();
static String sourceKey();
static String styleSheetKey();
static String svgDocumentKey();
- WEBCORE_EXPORT static String unhandledRequestFailureKey();
- WEBCORE_EXPORT static String unusableCachedEntryFailureKey();
static String unusedKey();
static String unusedReasonCredentialSettingsKey();
static String unusedReasonErrorKey();
Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabaseTracker.h (179918 => 179919)
--- trunk/Source/WebCore/platform/sql/SQLiteDatabaseTracker.h 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabaseTracker.h 2015-02-11 08:01:19 UTC (rev 179919)
@@ -38,7 +38,7 @@
WEBCORE_EXPORT void setClient(SQLiteDatabaseTrackerClient*);
#if !ASSERT_DISABLED
-WEBCORE_EXPORT bool hasTransactionInProgress();
+bool hasTransactionInProgress();
#endif
};
Modified: trunk/Source/WebKit2/ChangeLog (179918 => 179919)
--- trunk/Source/WebKit2/ChangeLog 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-11 08:01:19 UTC (rev 179919)
@@ -1,3 +1,17 @@
+2015-02-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r179910.
+ https://bugs.webkit.org/show_bug.cgi?id=141464
+
+ Caused assertions on debug bots (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "[WK2] Add logging to validate the network cache efficacy
+ (Part 2)"
+ https://bugs.webkit.org/show_bug.cgi?id=141345
+ http://trac.webkit.org/changeset/179910
+
2015-02-10 Chris Dumez <[email protected]>
[WK2] Add logging to validate the network cache efficacy (Part 2)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (179918 => 179919)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-02-11 08:01:19 UTC (rev 179919)
@@ -301,21 +301,6 @@
parentProcessConnection()->send(Messages::WebProcessPool::DidGetStatistics(data, callbackID), 0);
}
-void NetworkProcess::logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description)
-{
- parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessage(webPageID, message, description), 0);
-}
-
-void NetworkProcess::logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, WebCore::DiagnosticLoggingResultType result)
-{
- parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessageWithResult(webPageID, message, description, result), 0);
-}
-
-void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value)
-{
- parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessageWithValue(webPageID, message, description, value), 0);
-}
-
void NetworkProcess::terminate()
{
platformTerminate();
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (179918 => 179919)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-02-11 08:01:19 UTC (rev 179919)
@@ -33,7 +33,6 @@
#include "DownloadManager.h"
#include "MessageReceiverMap.h"
#include "NetworkResourceLoadScheduler.h"
-#include <WebCore/DiagnosticLoggingResultType.h>
#include <WebCore/SessionID.h>
#include <memory>
#include <wtf/Forward.h>
@@ -76,11 +75,6 @@
DownloadManager& downloadManager();
bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
- // Diagnostic messages logging.
- void logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description);
- void logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, WebCore::DiagnosticLoggingResultType);
- void logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value);
-
private:
NetworkProcess();
~NetworkProcess();
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (179918 => 179919)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-02-11 08:01:19 UTC (rev 179919)
@@ -141,7 +141,7 @@
}
RefPtr<NetworkResourceLoader> loader(this);
- NetworkCache::singleton().retrieve(originalRequest(), m_parameters.webPageID, [loader](std::unique_ptr<NetworkCache::Entry> entry) {
+ NetworkCache::singleton().retrieve(originalRequest(), [loader](std::unique_ptr<NetworkCache::Entry> entry) {
if (loader->hasOneRef()) {
// The loader has been aborted and is only held alive by this lambda.
return;
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (179918 => 179919)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-02-11 08:01:19 UTC (rev 179919)
@@ -218,7 +218,7 @@
return NetworkCacheKey(request.httpMethod(), partition, request.url().string());
}
-void NetworkCache::retrieve(const WebCore::ResourceRequest& originalRequest, uint64_t webPageID, std::function<void (std::unique_ptr<Entry>)> completionHandler)
+void NetworkCache::retrieve(const WebCore::ResourceRequest& originalRequest, std::function<void (std::unique_ptr<Entry>)> completionHandler)
{
ASSERT(isEnabled());
@@ -227,7 +227,7 @@
NetworkCacheKey storageKey = makeCacheKey(originalRequest);
if (!canRetrieve(originalRequest)) {
if (m_statistics)
- m_statistics->recordNotUsingCacheForRequest(webPageID, storageKey, originalRequest);
+ m_statistics->recordNotUsingCacheForRequest(storageKey, originalRequest);
completionHandler(nullptr);
return;
@@ -236,12 +236,12 @@
auto startTime = std::chrono::system_clock::now();
unsigned priority = originalRequest.priority();
- m_storage->retrieve(storageKey, priority, [this, originalRequest, completionHandler, startTime, storageKey, webPageID](std::unique_ptr<NetworkCacheStorage::Entry> entry) {
+ m_storage->retrieve(storageKey, priority, [this, originalRequest, completionHandler, startTime, storageKey](std::unique_ptr<NetworkCacheStorage::Entry> entry) {
if (!entry) {
LOG(NetworkCache, "(NetworkProcess) not found in storage");
if (m_statistics)
- m_statistics->recordRetrievalFailure(webPageID, storageKey, originalRequest);
+ m_statistics->recordRetrievalFailure(storageKey, originalRequest);
completionHandler(nullptr);
return false;
@@ -249,7 +249,7 @@
auto decodedEntry = decodeStorageEntry(*entry, originalRequest);
bool success = !!decodedEntry;
if (m_statistics)
- m_statistics->recordRetrievedCachedEntry(webPageID, storageKey, originalRequest, success);
+ m_statistics->recordRetrievedCachedEntry(storageKey, originalRequest, success);
#if !LOG_DISABLED
auto elapsedMS = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count();
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (179918 => 179919)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-02-11 08:01:19 UTC (rev 179919)
@@ -64,7 +64,7 @@
bool needsRevalidation;
};
// Completion handler may get called back synchronously on failure.
- void retrieve(const WebCore::ResourceRequest&, uint64_t webPageID, std::function<void (std::unique_ptr<Entry>)>);
+ void retrieve(const WebCore::ResourceRequest&, std::function<void (std::unique_ptr<Entry>)>);
struct MappedBody {
#if ENABLE(SHAREABLE_RESOURCE)
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h (179918 => 179919)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h 2015-02-11 08:01:19 UTC (rev 179919)
@@ -44,9 +44,9 @@
void clear();
- void recordNotUsingCacheForRequest(uint64_t webPageID, const NetworkCacheKey&, const WebCore::ResourceRequest&);
- void recordRetrievalFailure(uint64_t webPageID, const NetworkCacheKey&, const WebCore::ResourceRequest&);
- void recordRetrievedCachedEntry(uint64_t webPageID, const NetworkCacheKey&, const WebCore::ResourceRequest&, bool success);
+ void recordNotUsingCacheForRequest(const NetworkCacheKey&, const WebCore::ResourceRequest&);
+ void recordRetrievalFailure(const NetworkCacheKey&, const WebCore::ResourceRequest&);
+ void recordRetrievedCachedEntry(const NetworkCacheKey&, const WebCore::ResourceRequest&, bool success);
private:
explicit NetworkCacheStatistics(const String& databasePath);
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm (179918 => 179919)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm 2015-02-11 08:01:19 UTC (rev 179919)
@@ -31,9 +31,6 @@
#include "Logging.h"
#include "NetworkCache.h"
#include "NetworkCacheFileSystemPosix.h"
-#include "NetworkProcess.h"
-#include <WebCore/DiagnosticLoggingKeys.h>
-#include <WebCore/DiagnosticLoggingResultType.h>
#include <WebCore/ResourceRequest.h>
#include <WebCore/SQLiteDatabaseTracker.h>
#include <WebCore/SQLiteStatement.h>
@@ -168,42 +165,40 @@
});
}
-void NetworkCacheStatistics::recordNotUsingCacheForRequest(uint64_t webPageID, const NetworkCacheKey& key, const WebCore::ResourceRequest& request)
+void NetworkCacheStatistics::recordNotUsingCacheForRequest(const NetworkCacheKey& key, const WebCore::ResourceRequest& request)
{
String hash = key.hashAsString();
WebCore::URL requestURL = request.url();
- queryWasEverRequested(hash, [this, hash, requestURL, webPageID](bool wasEverRequested) {
+ queryWasEverRequested(hash, [this, hash, requestURL](bool wasEverRequested) {
if (wasEverRequested) {
- LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s was previously requested but is not handled by the cache", webPageID, requestURL.string().ascii().data());
- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalKey(), WebCore::DiagnosticLoggingKeys::unhandledRequestFailureKey());
+ LOG(NetworkCache, "(NetworkProcess) %s was previously requested but is not handled by the cache", requestURL.string().ascii().data());
+ // FIXME: Do diagnostic logging.
} else
markAsRequested(hash);
});
}
-void NetworkCacheStatistics::recordRetrievalFailure(uint64_t webPageID, const NetworkCacheKey& key, const WebCore::ResourceRequest& request)
+void NetworkCacheStatistics::recordRetrievalFailure(const NetworkCacheKey& key, const WebCore::ResourceRequest& request)
{
String hash = key.hashAsString();
WebCore::URL requestURL = request.url();
- queryWasEverRequested(hash, [this, hash, requestURL, webPageID](bool wasPreviouslyRequested) {
+ queryWasEverRequested(hash, [this, hash, requestURL](bool wasPreviouslyRequested) {
if (wasPreviouslyRequested) {
- LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s was previously cached but is no longer in the cache", webPageID, requestURL.string().ascii().data());
- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalKey(), WebCore::DiagnosticLoggingKeys::noLongerInCacheFailureKey());
+ LOG(NetworkCache, "(NetworkProcess) %s was previously cached but is no longer in the cache", requestURL.string().ascii().data());
+ // FIXME: Do diagnostic logging.
} else
markAsRequested(hash);
});
}
-void NetworkCacheStatistics::recordRetrievedCachedEntry(uint64_t webPageID, const NetworkCacheKey& key, const WebCore::ResourceRequest& request, bool success)
+void NetworkCacheStatistics::recordRetrievedCachedEntry(const NetworkCacheKey& key, const WebCore::ResourceRequest& request, bool success)
{
WebCore::URL requestURL = request.url();
- if (success) {
- LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s is in the cache and is used", webPageID, requestURL.string().ascii().data());
- NetworkProcess::singleton().logDiagnosticMessageWithResult(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalKey(), WebCore::DiagnosticLoggingResultPass);
- } else {
- LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s is in the cache but wasn't used", webPageID, requestURL.string().ascii().data());
- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalKey(), WebCore::DiagnosticLoggingKeys::unusableCachedEntryFailureKey());
- }
+ if (success)
+ LOG(NetworkCache, "(NetworkProcess) %s is in the cache and is used", requestURL.string().ascii().data());
+ else
+ LOG(NetworkCache, "(NetworkProcess) %s is in the cache but wasn't used", requestURL.string().ascii().data());
+ // FIXME: Do diagnostic logging.
}
void NetworkCacheStatistics::markAsRequested(const String& hash)
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (179918 => 179919)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-02-11 08:01:19 UTC (rev 179919)
@@ -230,30 +230,6 @@
#endif
}
-void NetworkProcessProxy::logDiagnosticMessage(uint64_t pageID, const String& message, const String& description)
-{
- WebPageProxy* page = WebProcessProxy::webPage(pageID);
- MESSAGE_CHECK(page);
-
- page->logDiagnosticMessage(message, description);
-}
-
-void NetworkProcessProxy::logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result)
-{
- WebPageProxy* page = WebProcessProxy::webPage(pageID);
- MESSAGE_CHECK(page);
-
- page->logDiagnosticMessageWithResult(message, description, result);
-}
-
-void NetworkProcessProxy::logDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, const String& value)
-{
- WebPageProxy* page = WebProcessProxy::webPage(pageID);
- MESSAGE_CHECK(page);
-
- page->logDiagnosticMessageWithValue(message, description, value);
-}
-
} // namespace WebKit
#endif // ENABLE(NETWORK_PROCESS)
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (179918 => 179919)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-02-11 08:01:19 UTC (rev 179919)
@@ -91,9 +91,6 @@
void didCreateNetworkConnectionToWebProcess(const IPC::Attachment&);
void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&, uint64_t challengeID);
void didDeleteWebsiteData(uint64_t callbackID);
- void logDiagnosticMessage(uint64_t pageID, const String& message, const String& description);
- void logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result);
- void logDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, const String& value);
// ProcessLauncher::Client
virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) override;
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in (179918 => 179919)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-02-11 08:01:19 UTC (rev 179919)
@@ -28,11 +28,6 @@
DidReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, WebCore::AuthenticationChallenge challenge, uint64_t challengeID)
DidDeleteWebsiteData(uint64_t callbackID)
-
- # Diagnostic messages logging
- LogDiagnosticMessage(uint64_t pageID, String message, String description)
- LogDiagnosticMessageWithResult(uint64_t pageID, String message, String description, uint32_t result)
- LogDiagnosticMessageWithValue(uint64_t pageID, String message, String description, String value)
}
#endif // ENABLE(NETWORK_PROCESS)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (179918 => 179919)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-02-11 06:16:04 UTC (rev 179918)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-02-11 08:01:19 UTC (rev 179919)
@@ -988,11 +988,6 @@
void setShouldDispatchFakeMouseMoveEvents(bool);
- // Diagnostic messages logging.
- void logDiagnosticMessage(const String& message, const String& description);
- void logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result);
- void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value);
-
private:
WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
void platformInitialize();
@@ -1242,6 +1237,11 @@
void setCursor(const WebCore::Cursor&);
void setCursorHiddenUntilMouseMoves(bool);
+ // Diagnostic messages logging.
+ void logDiagnosticMessage(const String& message, const String& description);
+ void logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result);
+ void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value);
+
void didReceiveEvent(uint32_t opaqueType, bool handled);
void stopResponsivenessTimer();
