Simplify the build fixes from r177615 and r177617.

Rubber-stamped by Dan Bernstein.

* UIProcess/mac/WebInspectorProxyMac.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177618 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 7a3153e7320306acfceb9f974a0549859b4ee64b..a33b9fe9223db62e311b5b81a8c4877d847686c8 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-19  Jessie Berlin  <jberlin@webkit.org>
+
+        Simplify the build fixes from r177615 and r177617.
+
+        Rubber-stamped by Dan Bernstein.
+
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+
 2014-12-19  Jessie Berlin  <jberlin@webkit.org>
 
         Another attempt at a speculative build fix.

diff --git a/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm b/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
index 8f0c33ecbf52251b8f973efd62d0802d4d690d41..a30fe657f68781d32854428302b9b7ec7830ab32 100644 (file)
--- a/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
+++ b/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
@@ -170,17 +170,13 @@ static const unsigned webViewCloseTimeout = 60;
 
 @end
 
-@interface WKWebInspectorWKView : WKView {
-@private
-    WKWebInspectorProxyObjCAdapter *_inspectorProxyObjCAdapter;
-}
-
+@interface WKWebInspectorWKView : WKView
 @property (nonatomic, assign) WKWebInspectorProxyObjCAdapter *inspectorProxyObjCAdapter;
 @end
 
 @implementation WKWebInspectorWKView
 
-@synthesize inspectorProxyObjCAdapter = _inspectorProxyObjCAdapter;
+@synthesize inspectorProxyObjCAdapter;
 
 - (NSInteger)tag
 {