Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

Side by Side Diff: Source/WebCore/inspector/front-end/View.js

Issue 12320033: Merge 143437 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/inspector/front-end/Drawer.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2011 Google Inc. All Rights Reserved. 3 * Copyright (C) 2011 Google Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 29 matching lines...) Expand all
40 this._cssFiles = []; 40 this._cssFiles = [];
41 this._notificationDepth = 0; 41 this._notificationDepth = 0;
42 } 42 }
43 43
44 WebInspector.View._cssFileToVisibleViewCount = {}; 44 WebInspector.View._cssFileToVisibleViewCount = {};
45 WebInspector.View._cssFileToStyleElement = {}; 45 WebInspector.View._cssFileToStyleElement = {};
46 46
47 WebInspector.View.prototype = { 47 WebInspector.View.prototype = {
48 markAsRoot: function() 48 markAsRoot: function()
49 { 49 {
50 WebInspector.View._assert(!this.element.parentElement, "Attempt to mark as root attached node");
50 this._isRoot = true; 51 this._isRoot = true;
51 }, 52 },
52 53
53 isShowing: function() 54 isShowing: function()
54 { 55 {
55 return this._isShowing; 56 return this._isShowing;
56 }, 57 },
57 58
58 setHideOnDetach: function() 59 setHideOnDetach: function()
59 { 60 {
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 { 468 {
468 WebInspector.View._assert(!child.__viewCounter && !child.__view, "Attempt to remove element containing view via regular DOM operation"); 469 WebInspector.View._assert(!child.__viewCounter && !child.__view, "Attempt to remove element containing view via regular DOM operation");
469 return WebInspector.View._originalRemoveChild.call(this, child); 470 return WebInspector.View._originalRemoveChild.call(this, child);
470 } 471 }
471 472
472 Element.prototype.removeChildren = function() 473 Element.prototype.removeChildren = function()
473 { 474 {
474 WebInspector.View._assert(!this.__viewCounter, "Attempt to remove element co ntaining view via regular DOM operation"); 475 WebInspector.View._assert(!this.__viewCounter, "Attempt to remove element co ntaining view via regular DOM operation");
475 WebInspector.View._originalRemoveChildren.call(this); 476 WebInspector.View._originalRemoveChildren.call(this);
476 } 477 }
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/front-end/Drawer.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698