Changeset 185742 in webkit

Timestamp:

Jun 19, 2015 1:22:09 AM (9 years ago)

Author:

Csaba Osztrogonác

Message:

[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.

Source/WebKit2:

• 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.

Source/WTF:

• wtf/FeatureDefines.h: Moved the definition of ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC

here from Source/WebKit2/WebProcess/WebPage/WebPage.h

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/FeatureDefines.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/PluginView.h (modified) (3 diffs)
• WebKit2/WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-06-19  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [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  <akling@apple.com>
 

trunk/Source/WTF/wtf/FeatureDefines.h

@@ -167 +167 @@
 #endif
 
+#if !defined(ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
+#define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
+#endif
+
 #endif /* PLATFORM(IOS) */
 
@@ -245 +249 @@
 #if !defined(ENABLE_FILE_REPLACEMENT)
 #define ENABLE_FILE_REPLACEMENT 1
+#endif
+
+#if !defined(ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
+#define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
 #endif
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-19  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [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  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -288 +288 @@
     , 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)
@@ -295 +297 @@
     , 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)

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h

@@ -245 +245 @@
     WebPage* m_webPage;
     Plugin::Parameters m_parameters;
-    
+
     bool m_isInitialized;
     bool m_isWaitingForSynchronousInitialization;
@@ -251 +251 @@
     bool m_isBeingDestroyed;
     bool m_pluginProcessHasCrashed;
+
+#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
     bool m_didPlugInStartOffScreen;
+#endif
 
     // Pending URLRequests that the plug-in has made.
@@ -282 +285 @@
     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;
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -105 +105 @@
 OBJC_CLASS NSObject;
 OBJC_CLASS WKAccessibilityWebPageObject;
-
-#define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
 #endif