Title: [193971] branches/safari-601-branch/Source/WebCore
- Revision
- 193971
- Author
- [email protected]
- Date
- 2015-12-11 12:52:21 -0800 (Fri, 11 Dec 2015)
Log Message
Speculative build fix.
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193970 => 193971)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-11 19:56:18 UTC (rev 193970)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-11 20:52:21 UTC (rev 193971)
@@ -1,5 +1,14 @@
2015-12-11 Matthew Hanson <[email protected]>
+ Speculative build fix.
+
+ Reviewed by Dana Burkart and Babak Shafiei.
+
+ * dom/Document.h:
+ Resolve a conflict that was missed during the merge of r193966
+
+2015-12-11 Matthew Hanson <[email protected]>
+
Merge r193922. rdar://problem/23727472
2015-12-10 Enrica Casucci <[email protected]>
Modified: branches/safari-601-branch/Source/WebCore/dom/Document.h (193970 => 193971)
--- branches/safari-601-branch/Source/WebCore/dom/Document.h 2015-12-11 19:56:18 UTC (rev 193970)
+++ branches/safari-601-branch/Source/WebCore/dom/Document.h 2015-12-11 20:52:21 UTC (rev 193971)
@@ -113,11 +113,8 @@
class HTMLImageElement;
class HTMLMapElement;
class HTMLMediaElement;
-<<<<<<< HEAD
class HTMLNameCollection;
-=======
class HTMLPictureElement;
->>>>>>> 58f8aa0... Picture element needs to respond to dynamic viewport changes.
class HTMLScriptElement;
class HitTestRequest;
class HitTestResult;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
