Title: [178636] trunk/Source
- Revision
- 178636
- Author
- [email protected]
- Date
- 2015-01-18 16:03:33 -0800 (Sun, 18 Jan 2015)
Log Message
Attempt to fix the iOS build after <http://trac.webkit.org/changeset/178631>
(https://bugs.webkit.org/show_bug.cgi?id=129441)
Source/WebKit/mac:
Pass lvalue reference to WebCore::Highlight instead of pointer in call to InspectorController::getHighlight().
Also substitute HighlightType::Node and HighlightType::Rects for HighlightTypeNode and HighlightTypeRects, respectively.
* WebInspector/WebNodeHighlightView.mm:
(-[WebNodeHighlightView layoutSublayers:]):
Source/WebKit2:
* UIProcess/WKInspectorHighlightView.mm:
(-[WKInspectorHighlightView update:]): Substitute HighlightType::Node and
HighlightType::Rects for HighlightTypeNode and HighlightTypeRects, respectively.
* WebProcess/WebCoreSupport/WebInspectorClient.cpp:
(WebKit::WebInspectorClient::highlight): Pass lvalue reference to WebCore::Highlight
instead of pointer in call to InspectorController::getHighlight().
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (178635 => 178636)
--- trunk/Source/WebKit/mac/ChangeLog 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-19 00:03:33 UTC (rev 178636)
@@ -1,3 +1,14 @@
+2015-01-18 Daniel Bates <[email protected]>
+
+ Attempt to fix the iOS build after <http://trac.webkit.org/changeset/178631>
+ (https://bugs.webkit.org/show_bug.cgi?id=129441)
+
+ Pass lvalue reference to WebCore::Highlight instead of pointer in call to InspectorController::getHighlight().
+ Also substitute HighlightType::Node and HighlightType::Rects for HighlightTypeNode and HighlightTypeRects, respectively.
+
+ * WebInspector/WebNodeHighlightView.mm:
+ (-[WebNodeHighlightView layoutSublayers:]):
+
2015-01-16 Beth Dakin <[email protected]>
Make sure early cancellation of immediate action actually does that in WK1
Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm (178635 => 178636)
--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2015-01-19 00:03:33 UTC (rev 178636)
@@ -315,11 +315,11 @@
return;
Highlight h;
- [_webNodeHighlight inspectorController]->getHighlight(&h, InspectorOverlay::CoordinateSystem::View);
+ [_webNodeHighlight inspectorController]->getHighlight(h, InspectorOverlay::CoordinateSystem::View);
- if (h.type == HighlightTypeNode)
+ if (h.type == HighlightType::Node)
[self _layoutForNodeHighlight:&h parent:parentLayer];
- else if (h.type == HighlightTypeRects)
+ else if (h.type == HighlightType::Rects)
[self _layoutForRectsHighlight:&h parent:parentLayer];
}
#endif
Modified: trunk/Source/WebKit2/ChangeLog (178635 => 178636)
--- trunk/Source/WebKit2/ChangeLog 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-19 00:03:33 UTC (rev 178636)
@@ -1,3 +1,15 @@
+2015-01-18 Daniel Bates <[email protected]>
+
+ Attempt to fix the iOS build after <http://trac.webkit.org/changeset/178631>
+ (https://bugs.webkit.org/show_bug.cgi?id=129441)
+
+ * UIProcess/WKInspectorHighlightView.mm:
+ (-[WKInspectorHighlightView update:]): Substitute HighlightType::Node and
+ HighlightType::Rects for HighlightTypeNode and HighlightTypeRects, respectively.
+ * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+ (WebKit::WebInspectorClient::highlight): Pass lvalue reference to WebCore::Highlight
+ instead of pointer in call to InspectorController::getHighlight().
+
2015-01-18 Sam Weinig <[email protected]>
Fix style issues and add availability macros missed in r178634
Modified: trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm (178635 => 178636)
--- trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm 2015-01-19 00:03:33 UTC (rev 178636)
@@ -257,9 +257,9 @@
- (void)update:(const Highlight&)highlight
{
- if (highlight.type == HighlightTypeNode)
+ if (highlight.type == HighlightType::Node)
[self _layoutForNodeHighlight:highlight];
- else if (highlight.type == HighlightTypeRects)
+ else if (highlight.type == HighlightType::Rects)
[self _layoutForRectsHighlight:highlight];
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp (178635 => 178636)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2015-01-19 00:03:33 UTC (rev 178636)
@@ -123,7 +123,7 @@
}
#else
Highlight highlight;
- m_page->corePage()->inspectorController().getHighlight(&highlight, InspectorOverlay::CoordinateSystem::Document);
+ m_page->corePage()->inspectorController().getHighlight(highlight, InspectorOverlay::CoordinateSystem::Document);
m_page->showInspectorHighlight(highlight);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
