Diff
Modified: trunk/Source/WTF/ChangeLog (185741 => 185742)
--- trunk/Source/WTF/ChangeLog 2015-06-19 08:05:54 UTC (rev 185741)
+++ trunk/Source/WTF/ChangeLog 2015-06-19 08:22:09 UTC (rev 185742)
@@ -1,3 +1,13 @@
+2015-06-19 Csaba Osztrogonác <[email protected]>
+
+ [WK2] Fix unused-private-field warning in WebProcess/Plugins/PluginView.<h|cpp>
+ https://bugs.webkit.org/show_bug.cgi?id=145252
+
+ Reviewed by Tim Horton.
+
+ * wtf/FeatureDefines.h: Moved the definition of ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC
+ here from Source/WebKit2/WebProcess/WebPage/WebPage.h
+
2015-06-17 Andreas Kling <[email protected]>
SegmentedVector should waste less memory.
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (185741 => 185742)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-06-19 08:05:54 UTC (rev 185741)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-06-19 08:22:09 UTC (rev 185742)
@@ -166,6 +166,10 @@
#define ENABLE_XSLT 0
#endif
+#if !defined(ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
+#define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
+#endif
+
#endif /* PLATFORM(IOS) */
/* --------- Apple MAC port (not IOS) --------- */
@@ -246,6 +250,10 @@
#define ENABLE_FILE_REPLACEMENT 1
#endif
+#if !defined(ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
+#define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
+#endif
+
#endif /* PLATFORM(MAC) */
/* --------- Apple Windows port --------- */
Modified: trunk/Source/WebKit2/ChangeLog (185741 => 185742)
--- trunk/Source/WebKit2/ChangeLog 2015-06-19 08:05:54 UTC (rev 185741)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-19 08:22:09 UTC (rev 185742)
@@ -1,3 +1,15 @@
+2015-06-19 Csaba Osztrogonác <[email protected]>
+
+ [WK2] Fix unused-private-field warning in WebProcess/Plugins/PluginView.<h|cpp>
+ https://bugs.webkit.org/show_bug.cgi?id=145252
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::PluginView): Added the necessary ifdef guard.
+ * WebProcess/Plugins/PluginView.h: Added the necessary ifdef guard.
+ * WebProcess/WebPage/WebPage.h: Moved the definition of ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC to WTF.
+
2015-06-18 Carlos Garcia Campos <[email protected]>
Do not store configuration parameters twice in WebProcessPool
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (185741 => 185742)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-06-19 08:05:54 UTC (rev 185741)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-06-19 08:22:09 UTC (rev 185742)
@@ -287,14 +287,18 @@
, m_isWaitingUntilMediaCanStart(false)
, m_isBeingDestroyed(false)
, m_pluginProcessHasCrashed(false)
+#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
, m_didPlugInStartOffScreen(false)
+#endif
, m_pendingURLRequestsTimer(RunLoop::main(), this, &PluginView::pendingURLRequestsTimerFired)
#if ENABLE(NETSCAPE_PLUGIN_API)
, m_npRuntimeObjectMap(this)
#endif
, m_manualStreamState(StreamStateInitial)
, m_pluginSnapshotTimer(*this, &PluginView::pluginSnapshotTimerFired, pluginSnapshotTimerDelay)
+#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC) || PLATFORM(COCOA)
, m_countSnapshotRetries(0)
+#endif
, m_didReceiveUserInteraction(false)
, m_pageScaleFactor(1)
, m_pluginIsPlayingAudio(false)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (185741 => 185742)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2015-06-19 08:05:54 UTC (rev 185741)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2015-06-19 08:22:09 UTC (rev 185742)
@@ -244,13 +244,16 @@
RefPtr<Plugin> m_plugin;
WebPage* m_webPage;
Plugin::Parameters m_parameters;
-
+
bool m_isInitialized;
bool m_isWaitingForSynchronousInitialization;
bool m_isWaitingUntilMediaCanStart;
bool m_isBeingDestroyed;
bool m_pluginProcessHasCrashed;
+
+#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
bool m_didPlugInStartOffScreen;
+#endif
// Pending URLRequests that the plug-in has made.
Deque<RefPtr<URLRequest>> m_pendingURLRequests;
@@ -281,12 +284,14 @@
WebCore::ResourceResponse m_manualStreamResponse;
WebCore::ResourceError m_manualStreamError;
RefPtr<WebCore::SharedBuffer> m_manualStreamData;
-
+
// This snapshot is used to avoid side effects should the plugin run JS during painting.
RefPtr<ShareableBitmap> m_transientPaintingSnapshot;
// This timer is used when plugin snapshotting is enabled, to capture a plugin placeholder.
WebCore::DeferrableOneShotTimer m_pluginSnapshotTimer;
+#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC) || PLATFORM(COCOA)
unsigned m_countSnapshotRetries;
+#endif
bool m_didReceiveUserInteraction;
double m_pageScaleFactor;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (185741 => 185742)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-19 08:05:54 UTC (rev 185741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-19 08:22:09 UTC (rev 185742)
@@ -104,8 +104,6 @@
OBJC_CLASS NSDictionary;
OBJC_CLASS NSObject;
OBJC_CLASS WKAccessibilityWebPageObject;
-
-#define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
#endif
namespace API {
